Skip to content

Commit

Permalink
FIX: fix f string staff (#43)
Browse files Browse the repository at this point in the history
* fix: response is not declared when a request fails resulting in a response.text exception

* fix: f string staff

* chore: bump version to 0.19.1
  • Loading branch information
Yaocool authored Jun 12, 2024
1 parent 30523bd commit 3d65c9f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions dingtalk_stream/chatbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ def get_image_download_url(self, download_code: str) -> str:

response.raise_for_status()
except Exception as e:
self.logger.error(f'get_image_download_url, error={e}, response.text={response.text if 'response' in locals() else ''}')
self.logger.error(f'get_image_download_url, error={e}, response.text={response.text if "response" in locals() else ""}')
return ""
return response.json()["downloadUrl"]

Expand Down Expand Up @@ -607,7 +607,7 @@ def set_off_duty_prompt(self, text: str, title: str = "", logo: str = ""):

response.raise_for_status()
except Exception as e:
self.logger.error(f'set_off_duty_prompt, error={e}, response.text={response.text if 'response' in locals() else ''}')
self.logger.error(f'set_off_duty_prompt, error={e}, response.text={response.text if "response" in locals() else ""}')
return response.status_code
return response.json()

Expand All @@ -633,7 +633,7 @@ def reply_text(self,
data=json.dumps(values))
response.raise_for_status()
except Exception as e:
self.logger.error(f'reply text failed, error={e}, response.text={response.text if 'response' in locals() else ''}')
self.logger.error(f'reply text failed, error={e}, response.text={response.text if "response" in locals() else ""}')
return None
return response.json()

Expand Down Expand Up @@ -661,7 +661,7 @@ def reply_markdown(self,
data=json.dumps(values))
response.raise_for_status()
except Exception as e:
self.logger.error(f'reply markdown failed, error={e}, response.text={response.text if 'response' in locals() else ''}')
self.logger.error(f'reply markdown failed, error={e}, response.text={response.text if "response" in locals() else ""}')
return None
return response.json()

Expand Down Expand Up @@ -742,7 +742,7 @@ def reply_card(self,

return card_biz_id
except Exception as e:
self.logger.error(f'reply card failed, error={e}, response.text={response.text if 'response' in locals() else ''}')
self.logger.error(f'reply card failed, error={e}, response.text={response.text if "response" in locals() else ""}')
return ""

def update_card(self, card_biz_id: str, card_data: dict):
Expand Down Expand Up @@ -778,7 +778,7 @@ def update_card(self, card_biz_id: str, card_data: dict):
data=json.dumps(values))
response.raise_for_status()
except Exception as e:
self.logger.error(f'update card failed, error={e}, response.text={response.text if 'response' in locals() else ''}')
self.logger.error(f'update card failed, error={e}, response.text={response.text if "response" in locals() else ""}')
return response.status_code
return response.json()

Expand Down
6 changes: 3 additions & 3 deletions dingtalk_stream/stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def open_connection(self):
data=request_body)
response.raise_for_status()
except Exception as e:
self.logger.error(f'open connection failed, error={e}, response.text={response.text if 'response' in locals() else ''}')
self.logger.error(f'open connection failed, error={e}, response.text={response.text if "response" in locals() else ""}')
return None
return response.json()

Expand Down Expand Up @@ -196,7 +196,7 @@ def get_access_token(self):
data=json.dumps(values))
response.raise_for_status()
except Exception as e:
self.logger.error(f'get dingtalk access token failed, error={e}, response.text={response.text if 'response' in locals() else ''}')
self.logger.error(f'get dingtalk access token failed, error={e}, response.text={response.text if "response" in locals() else ""}')
return None

result = response.json()
Expand All @@ -223,7 +223,7 @@ def upload_to_dingtalk(self, image_content, filetype='image', filename='image.pn
self.reset_access_token()
response.raise_for_status()
except Exception as e:
self.logger.error(f'upload to dingtalk failed, error={e}, response.text={response.text if 'response' in locals() else ''}')
self.logger.error(f'upload to dingtalk failed, error={e}, response.text={response.text if "response" in locals() else ""}')
return None
if 'media_id' not in response.json():
self.logger.error('upload to dingtalk failed, error response is %s', response.json())
Expand Down
2 changes: 1 addition & 1 deletion dingtalk_stream/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION_STRING = '0.19.0'
VERSION_STRING = '0.19.1'

0 comments on commit 3d65c9f

Please sign in to comment.