Upload main.py

main.py

@@ -233,16 +233,19 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
             images = []
             for item in content:
                 if not isinstance(item, dict):
+                    print(f"跳过非字典类型的内容项: {item}")
                     continue
                     
-                if "text" in item:
-                    text_parts.append(item.get("text", ""))
-                elif "image_url" in item:
+                if "text" in item and isinstance(item["text"], str):
+                    text_parts.append(item["text"])
+                elif "image_url" in item and isinstance(item["image_url"], dict):
                     has_image = True
-                    image_info = item.get("image_url", {})
-                    if not isinstance(image_info, dict):
-                        continue
+                    image_info = item["image_url"]
                     url = image_info.get("url", "")
+                    if not isinstance(url, str):
+                        print(f"跳过非字符串类型的URL: {url}")
+                        continue
+                        
                     if is_base64_image(url):
                         try:
                             base64_str = url.split(",")[1]
@@ -255,34 +258,43 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
                             continue
                     else:
                         images.append({"data": url})
+            
+            # 合并文本部分
             extracted_content = " ".join(text_parts).strip()
             if extracted_content:
                 has_text = True
-                message["content"] = extracted_content
+                new_message = {
+                    "role": role,
+                    "content": extracted_content
+                }
                 if images:
-                    message["images"] = images
-                cleaned_messages.append(message)
+                    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
+                }
+                cleaned_messages.append(new_message)
+                print("Extracted image only.")
             else:
-                if images:
-                    has_image = True
-                    message["content"] = ""
-                    message["images"] = images
-                    cleaned_messages.append(message)
-                    print("Extracted image only.")
-                else:
-                    print("Deleted message with empty content.")
+                print("Deleted message with empty content.")
         elif isinstance(content, str):
             content_str = content.strip()
             if content_str:
                 has_text = True
-                message["content"] = content_str
-                cleaned_messages.append(message)
+                cleaned_messages.append({
+                    "role": role,
+                    "content": content_str
+                })
                 print("Retained content:", content_str)
             else:
                 print("Deleted message with empty content.")
         else:
-            print("Deleted non-expected type of content message.")
+            print(f"Deleted non-expected type of content message: {type(content)}")
 
     if not cleaned_messages:
         raise HTTPException(status_code=400, detail="所有消息的内容均为空。")
@@ -324,7 +336,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:
@@ -460,7 +472,7 @@ async def images_generations(request: Request, api_key: str = Depends(verify_api
 
     print("Received Image Generations JSON:", json.dumps(request_body, ensure_ascii=False))
 
-    # 验证必��的字段
+    # 验证必的字段
     if "prompt" not in request_body:
         return send_error_response("缺少必需的字段: prompt", status_code=400)
 
@@ -572,7 +584,7 @@ async def images_generations(request: Request, api_key: str = Depends(verify_api
             if not image_bytes:
                 return send_error_response("无法从 URL 下载图像。", status_code=500)
 
-            # 转���为 Base64
+            # 转为 Base64
             image_base64 = base64.b64encode(image_bytes).decode('utf-8')
 
             # 将图片保存到images目录并构建可访问的URL