Upload 2 files

app.py

@@ -320,11 +320,11 @@ def handle_api_error(error, attempt, current_api_key):
                         return 0, None
                     error_message = error_data['error'].get('message', 'Bad Request')
                     error_type = error_data['error'].get('type', 'invalid_request_error')
-                    logger.warning(f"400 坏请求: {error_message}")
+                    logger.warning(f"400 错误请求: {error_message}")
                     return 1, jsonify({'error': {'message': error_message, 'type': error_type}})
             except ValueError:
-                logger.warning("400 坏请求 (无法解析错误响应)")
-                return 1, jsonify({'error': {'message': '400 坏请求 (无法解析错误响应)', 'type': 'invalid_request_error'}})
+                logger.warning("400 错误请求：响应不是有效的JSON格式")
+                return 1, jsonify({'error': {'message': '', 'type': 'invalid_request_error'}})
 
         elif status_code == 429:
             delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
@@ -479,7 +479,7 @@ def chat_completions():
                                     parts = content['parts']
                                     if is_thinking and not show_thoughts:
                                         parts = [part for part in parts if not part.get('thought')]
-                                    if parts: 
+                                    if parts:
                                         text = parts[0].get('text', '')
                                         finish_reason = candidate.get('finishReason')
 
@@ -496,17 +496,47 @@ def chat_completions():
                                             }
                                             yield f"data: {json.dumps(data)}\n\n"
 
+                            if candidate.get("finishReason") and candidate.get("finishReason") != "STOP":
+                                error_message = {
+                                    "error": {
+                                        "code": "content_filter",
+                                        "message": "模型的响应因违反内容政策而被标记",
+                                        "status": candidate.get("finishReason"),
+                                        "details": []
+                                    }
+                                }
+                                yield f"data: {json.dumps(error_message)}\n\n"
+                                break
+
+                            if 'safetyRatings' in candidate:
+                                for rating in candidate['safetyRatings']:
+                                    if rating['probability'] == 'HIGH':
+                                        error_message = {
+                                            "error": {
+                                                "code": "content_filter",
+                                                "message": f"模型的响应因高概率被标记为 {rating['category']}",
+                                                "status": "SAFETY_RATING_HIGH",
+                                                "details": [rating]
+                                            }
+                                        }
+                                        yield f"data: {json.dumps(error_message)}\n\n"
+                                        break
+                                else:
+                                    continue
+                                break
+
                     except json.JSONDecodeError:
-                        logger.debug(f"JSONDecodeError, buffer now: {buffer}")
+                        logger.debug(f"JSON解析错误, 当前缓冲区内容: {buffer}")
                         continue
 
                 except Exception as e:
-                    logger.error(f"Stream error during processing: {e}, Raw data line: {line}")
+                    logger.error(f"流式处理期间发生错误: {e}, 原始数据行: {line}")
                     yield f"data: {json.dumps({'error': str(e)})}\n\n"
 
-            yield f"data: {json.dumps({'choices': [{'delta': {}, 'finish_reason': 'stop', 'index': 0}]})}\n\n"
-            logger.info(f"流式结束 ←")
-            logger.info(f"200!")
+            else:
+                yield f"data: {json.dumps({'choices': [{'delta': {}, 'finish_reason': 'stop', 'index': 0}]})}\n\n"
+                logger.info(f"流式结束 ←")
+                logger.info(f"200!")
         except Exception as e:
             logger.error(f"流式处理错误↙\n{e}")
             yield f"data: {json.dumps({'error': str(e)})}\n\n"