Upload main.py

main.py

@@ -221,13 +221,17 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
             print(f"跳过非字典类型的消息: {message}")
             continue
             
-        content = message.get("content", "")
+        content = message.get("content")
         role = message.get("role")
         
         if not role:
             print(f"跳过没有role的消息: {message}")
             continue
 
+        if not content:
+            print(f"跳过空内容的消息: {message}")
+            continue
+
         if isinstance(content, list):
             text_parts = []
             images = []
@@ -236,9 +240,14 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
                     print(f"跳过非字典类型的内容项: {item}")
                     continue
                     
-                if "text" in item and isinstance(item["text"], str):
+                item_type = item.get("type")
+                if not item_type:
+                    print(f"跳过没有type的内容项: {item}")
+                    continue
+
+                if item_type == "text" and isinstance(item.get("text"), str):
                     text_parts.append(item["text"])
-                elif "image_url" in item and isinstance(item["image_url"], dict):
+                elif item_type == "image_url" and isinstance(item.get("image_url"), dict):
                     has_image = True
                     image_info = item["image_url"]
                     url = image_info.get("url", "")
@@ -258,30 +267,29 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
                             continue
                     else:
                         images.append({"data": url})
+                else:
+                    print(f"跳过未知类型的内容项: {item}")
+                    continue
             
             # 合并文本部分
             extracted_content = " ".join(text_parts).strip()
+            new_message = {"role": role}
+            
             if extracted_content:
                 has_text = True
-                new_message = {
-                    "role": role,
-                    "content": extracted_content
-                }
-                if images:
-                    new_message["images"] = images
-                cleaned_messages.append(new_message)
-                print("Extracted:", extracted_content)
-            elif images:
-                has_image = True
-                new_message = {
-                    "role": role,
-                    "content": "",
-                    "images": images
-                }
+                new_message["content"] = extracted_content
+            else:
+                new_message["content"] = ""  # 确保content字段存在
+                
+            if images:
+                new_message["images"] = images
+                
+            if extracted_content or images:  # 只有当有文本或图片时才添加消息
                 cleaned_messages.append(new_message)
-                print("Extracted image only.")
+                print(f"添加了新消息: {new_message}")
             else:
-                print("Deleted message with empty content.")
+                print("跳过没有文本和图片的消息")
+                
         elif isinstance(content, str):
             content_str = content.strip()
             if content_str:
@@ -290,11 +298,11 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
                     "role": role,
                     "content": content_str
                 })
-                print("Retained content:", content_str)
+                print("保留了文本内容:", content_str)
             else:
-                print("Deleted message with empty content.")
+                print("删除了空内容的消息")
         else:
-            print(f"Deleted non-expected type of content message: {type(content)}")
+            print(f"删除了非预期类型的内容消息: {type(content)}")
 
     if not cleaned_messages:
         raise HTTPException(status_code=400, detail="所有消息的内容均为空。")
@@ -336,7 +344,7 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
     }
 
     if is_stream:
-        # 流式响��处理
+        # 流式响应处理
         async def event_generator():
             async with httpx.AsyncClient(timeout=None) as client_stream:
                 try:
@@ -374,7 +382,7 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
                                                 new_sse_line = f"data: {json.dumps(new_sse_json, ensure_ascii=False)}\n\n"
                                                 yield new_sse_line
                                 except json.JSONDecodeError:
-                                    print("JSON解析错误")
+                                    print("JSON解析错��")
                                     continue
                 except httpx.RequestError as exc:
                     print(f"外部API请求失败: {exc}")