FIX: fix f string staff (#43)

* 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

Author: Yaocool

dingtalk_stream/chatbot.py

@@ -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"]
 
@@ -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()
 
@@ -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()
 
@@ -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()
 
@@ -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):
@@ -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()
 

dingtalk_stream/stream.py

@@ -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()
 
@@ -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()
@@ -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())

dingtalk_stream/version.py

@@ -1 +1 @@
-VERSION_STRING = '0.19.0'
+VERSION_STRING = '0.19.1'