fix: response is not declared when a request fails resulting in a res…

…ponse.text exception (#42)
open-dingtalk · Jun 11, 2024 · a87c910 · a87c910
1 parent ad66fee
commit a87c910
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/dingtalk_stream/card_replier.py b/dingtalk_stream/card_replier.py
@@ -106,7 +106,7 @@ def create_and_send_card(
             response.raise_for_status()
         except Exception as e:
             self.logger.error(
-                f"CardResponder.send_card failed, create card instance failed, error={e}, response.text={response.text}"
+                f"CardResponder.send_card failed, create card instance failed, error={e}, response.text={response.text if 'response' in locals() else ''}"
             )
             return ""
 
@@ -166,7 +166,7 @@ def create_and_send_card(
             return card_instance_id
         except Exception as e:
             self.logger.error(
-                f"put_card_data.create_and_send_card failed, send card failed, error={e}, response.text={response.text}"
+                f"put_card_data.create_and_send_card failed, send card failed, error={e}, response.text={response.text if 'response' in locals() else ''}"
             )
             return ""
 
@@ -267,7 +267,7 @@ def create_and_deliver_card(
             )
         except Exception as e:
             self.logger.error(
-                f"CardReplier.put_card_data failed, update card failed, error={e}, response.text={response.text}"
+                f"CardReplier.put_card_data failed, update card failed, error={e}, response.text={response.text if 'response' in locals() else ''}"
             )
 
         return card_instance_id
@@ -304,7 +304,7 @@ def put_card_data(self, card_instance_id: str, card_data: dict, **kwargs):
             response.raise_for_status()
         except Exception as e:
             self.logger.error(
-                f"CardReplier.put_card_data failed, update card failed, error={e}, response.text={response.text}"
+                f"CardReplier.put_card_data failed, update card failed, error={e}, response.text={response.text if 'response' in locals() else ''}"
             )
             return
 
@@ -416,6 +416,6 @@ def streaming(
             response.raise_for_status()
         except Exception as e:
             self.logger.error(
-                f"AICardReplier.streaming failed, error={e}, response.text={response.text}"
+                f"AICardReplier.streaming failed, error={e}, response.text={response.text if 'response' in locals() else ''}"
             )
             return
diff --git a/dingtalk_stream/chatbot.py b/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}')
+            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}')
+            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}')
+            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}')
+            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}')
+            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}')
+            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()
 

diff --git a/dingtalk_stream/stream.py b/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}')
+            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}')
+            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,9 +223,9 @@ 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}')
+            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 resonse is %s', response.json())
+            self.logger.error('upload to dingtalk failed, error response is %s', response.json())
             raise Exception('upload failed, error=%s' % response.json())
         return response.json()['media_id']