Upload app.py

app.py

@@ -1,5 +1,5 @@
 from flask import Flask, request, jsonify, Response, stream_with_context, render_template_string
-from google.generativeai.types import generation_types
+from google.generativeai.types import BlockedPromptException, StopCandidateException, generation_types
 from google.api_core.exceptions import InvalidArgument, ResourceExhausted, Aborted, InternalServerError, ServiceUnavailable, PermissionDenied
 import google.generativeai as genai
 import json
@@ -227,16 +227,28 @@ def handle_api_error(error, attempt):
         switch_api_key()
         return 0, None
 
-    elif isinstance(error, generation_types.StopCandidateException):
+    elif isinstance(error, StopCandidateException):
         logger.warning(f"AI输出内容被Gemini官方阻挡，代理没有得到有效回复")
         switch_api_key()
         return 0, None
 
-    elif "block_reason" in str(error):
-        logger.error(f"Gemini官方开始发癫，请等待官方恢复")
-        switch_api_key()
-        return 2, None
-
+    elif isinstance(error, BlockedPromptException):
+        reason = error.block_reason
+        if reason == generation_types.BlockReason.SAFETY:
+            logger.warning(f"提示因安全原因被阻止：{error.safety_ratings}")
+            return 2, None
+        elif reason == generation_types.BlockReason.BLOCKLIST:
+            logger.warning(f"提示因包含阻止列表中的术语而被阻止")
+            return 2, None
+        elif reason == generation_types.BlockReason.PROHIBITED_CONTENT:
+            logger.warning(f"提示因包含禁止内容而被阻止")
+            return 2, None
+        elif reason == generation_types.BlockReason.OTHER:
+            logger.warning(f"提示因未知原因被阻止")
+            return 2, None
+        else:
+            logger.warning(f"提示被阻止，原因未知: {reason}")
+            return 2, None
     else:
         logger.error(f"其他错误↙\n {error}")
         return 2, None