Upload 4 files

app.py

@@ -233,36 +233,31 @@ def handle_api_error(error, attempt):
         return 0, None
 
     elif isinstance(error, generation_types.BlockedPromptException):
-        logger.warning(f"BlockedPromptException caught. Attributes:")
-        for attr_name in dir(error):
-            try:
-                attr_value = getattr(error, attr_name)
-                logger.warning(f"  {attr_name}: {attr_value}")
-            except Exception as e:
-                logger.warning(f"  {attr_name}: Could not retrieve value - {e}")
-
         try:
-            reason = error.prompt_feedback.block_reason
-            if reason == generation_types.PromptFeedback.BlockReason.SAFETY:
-                logger.warning(f"提示因安全原因被阻止：{error.prompt_feedback.safety_ratings}")
-                return 2, None
-            elif reason == generation_types.PromptFeedback.BlockReason.BLOCKLIST:
-                logger.warning(f"提示因包含阻止列表中的术语而被阻止")
-                return 2, None
-            elif reason == generation_types.PromptFeedback.BlockReason.PROHIBITED_CONTENT:
-                logger.warning(f"提示因包含禁止内容而被阻止")
-                return 2, None
-            elif reason == generation_types.PromptFeedback.BlockReason.OTHER:
-                logger.warning(f"提示因未知原因被阻止")
-                return 2, None
-            elif reason == generation_types.PromptFeedback.BlockReason.BLOCK_REASON_UNSPECIFIED:
-                logger.warning(f"提示因未知原因被阻止")
-                return 2, None
+            reason = error.args[0].split(':', 1)[0].strip()
+            block_reason_str = error.args[0].split(':', 1)[1].strip()
+            if reason == "block_reason": 
+                if block_reason_str == "SAFETY":
+                    logger.warning(f"提示因安全原因被阻止")
+                    return 2, None
+                elif block_reason_str == "BLOCKLIST":
+                    logger.warning(f"提示因包含阻止列表中的术语而被阻止")
+                    return 2, None
+                elif block_reason_str == "PROHIBITED_CONTENT":
+                    logger.warning(f"提示因包含禁止内容而被阻止")
+                    return 2, None
+                elif block_reason_str == "OTHER":
+                    logger.warning(f"提示因未知原因被阻止")
+                    return 2, None
+                else:
+                    logger.warning(f"提示被阻止，原因未知: {reason}")
+                    return 2, None
             else:
                 logger.warning(f"提示被阻止，原因未知: {reason}")
                 return 2, None
-        except AttributeError:
-            logger.error("AttributeError: 'BlockedPromptException' object has no attribute 'prompt_feedback'")
+        except (IndexError, AttributeError) as e:
+            logger.error(f"Error accessing block_reason: {e}")
+            logger.error(f"BlockedPromptException: {error}")
             return 2, None
 
     else: