Upload main.py

main.py

@@ -228,7 +228,7 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
             print(f"跳过没有role的消息: {message}")
             continue
 
-        if not content:
+        if content is None:
             print(f"跳过空内容的消息: {message}")
             continue
 
@@ -245,31 +245,31 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
                     continue
 
                 # 处理文本内容
-                if isinstance(item.get("text"), str):
-                    text_parts.append(item["text"])
+                text = item.get("text")
+                if text and isinstance(text, str):
+                    text_parts.append(text)
                     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
-                    url = image_url["url"]
-                    
-                    if is_base64_image(url):
-                        try:
-                            base64_str = url.split(",")[1]
-                            filename = save_base64_image(base64_str)
-                            base_url = app.state.base_url
-                            image_url = f"{base_url}/images/{filename}"
-                            images.append({"data": image_url})
-                        except Exception as e:
-                            print(f"处理base64图片时出错: {e}")
-                            continue
+                if image_url and isinstance(image_url, dict):
+                    url = image_url.get("url")
+                    if url and isinstance(url, str):
+                        has_image = True
+                        if is_base64_image(url):
+                            try:
+                                base64_str = url.split(",")[1]
+                                filename = save_base64_image(base64_str)
+                                base_url = app.state.base_url
+                                image_url = f"{base_url}/images/{filename}"
+                                images.append({"data": image_url})
+                            except Exception as e:
+                                print(f"处理base64图片时出错: {e}")
+                                continue
+                        else:
+                            images.append({"data": url})
                     else:
-                        images.append({"data": url})
-                else:
-                    print(f"跳过无效的图片URL: {image_url}")
+                        print(f"跳过无效的图片URL: {image_url}")
             
             # 合并文本部分
             if text_parts:
@@ -301,7 +301,7 @@ async def chat_completions(request: Request, background_tasks: BackgroundTasks,
             print(f"删除了非预期类型的内容消息: {type(content)}")
 
     if not cleaned_messages:
-        raise HTTPException(status_code=400, detail="所有消息的内容均为空。")
+        raise HTTPException(status_code=400, detail="所��消息的内容均为空。")
 
     # 验证模型
     if model not in MODELS:
@@ -572,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}")
 
@@ -634,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"):