Upload main.py

main.py

@@ -232,29 +232,30 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
             print(f"跳过空内容的消息: {message}")
             continue
 
+        # 创建新的消息字典
+        new_message = {"role": role}
+        
         if isinstance(content, list):
             text_parts = []
             images = []
+            
             for item in content:
                 if not isinstance(item, dict):
                     print(f"跳过非字典类型的内容项: {item}")
                     continue
-                    
-                item_type = item.get("type")
-                if not item_type:
-                    print(f"跳过没有type的内容项: {item}")
-                    continue
 
-                if item_type == "text" and isinstance(item.get("text"), str):
+                # 处理文本内容
+                if isinstance(item.get("text"), str):
                     text_parts.append(item["text"])
-                elif item_type == "image_url" and isinstance(item.get("image_url"), dict):
+                    has_text = True
+                    continue
+
+                # 处理图片内容
+                image_url = item.get("image_url")
+                if isinstance(image_url, dict) and isinstance(image_url.get("url"), str):
                     has_image = True
-                    image_info = item["image_url"]
-                    url = image_info.get("url", "")
-                    if not isinstance(url, str):
-                        print(f"跳过非字符串类型的URL: {url}")
-                        continue
-                        
+                    url = image_url["url"]
+                    
                     if is_base64_image(url):
                         try:
                             base64_str = url.split(",")[1]
@@ -268,23 +269,20 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
                     else:
                         images.append({"data": url})
                 else:
-                    print(f"跳过未知类型的内容项: {item}")
-                    continue
+                    print(f"跳过无效的图片URL: {image_url}")
             
             # 合并文本部分
-            extracted_content = " ".join(text_parts).strip()
-            new_message = {"role": role}
-            
-            if extracted_content:
-                has_text = True
-                new_message["content"] = extracted_content
+            if text_parts:
+                new_message["content"] = " ".join(text_parts).strip()
             else:
-                new_message["content"] = ""  # 确保content字段存在
+                new_message["content"] = ""
                 
+            # 添加图片（如果有）
             if images:
                 new_message["images"] = images
                 
-            if extracted_content or images:  # 只有当有文本或图片时才添加消息
+            # 只有当消息有文本或图片时才添加
+            if text_parts or images:
                 cleaned_messages.append(new_message)
                 print(f"添加了新消息: {new_message}")
             else:
@@ -294,10 +292,8 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
             content_str = content.strip()
             if content_str:
                 has_text = True
-                cleaned_messages.append({
-                    "role": role,
-                    "content": content_str
-                })
+                new_message["content"] = content_str
+                cleaned_messages.append(new_message)
                 print("保留了文本内容:", content_str)
             else:
                 print("删除了空内容的消息")
@@ -382,7 +378,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}")
@@ -576,7 +572,7 @@ async def images_generations(request: Request, api_key: str = Depends(verify_api
 
             print(f"提取的路径: {extracted_path}")
 
-            # Step 5: 拼接最终的存储URL
+            # Step 5: 拼接最���的存储URL
             storage_url = f"https://api.chaton.ai/storage/{extracted_path}"
             print(f"存储URL: {storage_url}")
 
@@ -638,7 +634,7 @@ def main():
 
     # 检查 API_KEY 是否设置
     if not os.environ.get("API_KEY"):
-        print("警告: API_KEY 环境变量未设置。客户端验证将无法正常工作。")
+        print("警告: API_KEY 环境变量未设置。客户端验���将无法正常工作。")
 
     # 确保 images 目录存在
     if not os.path.exists("images"):