Update app.py

app.py

@@ -182,7 +182,7 @@ def decode_base64_file(data_url: str) -> tuple[str, str, str]:
         logger.error(f"Failed to parse data URL: {e}")
         return None, None, None
 
-async def upload_image_to_imgbb(session: aiohttp.ClientSession, base64_data: str) -> str:
+async def upload_image_to_imgbb(base64_data: str) -> str:
     """
     将 base64 图片上传到 imgbb
     返回图片的 URL
@@ -203,21 +203,22 @@ async def upload_image_to_imgbb(session: aiohttp.ClientSession, base64_data: str
         
         logger.info(f"Uploading image to imgbb, size: {len(base64_content)} chars")
         
-        # 上传到 imgbb
-        async with session.post(IMGBB_API_URL, data=data, timeout=30) as response:
-            if response.status == 200:
-                result = await response.json()
-                if result.get('success'):
-                    image_url = result['data']['url']
-                    logger.info(f"Image uploaded successfully: {image_url}")
-                    return image_url
+        # 使用独立的 session 上传到 imgbb
+        async with aiohttp.ClientSession() as session:
+            async with session.post(IMGBB_API_URL, data=data, timeout=30) as response:
+                if response.status == 200:
+                    result = await response.json()
+                    if result.get('success'):
+                        image_url = result['data']['url']
+                        logger.info(f"Image uploaded successfully: {image_url}")
+                        return image_url
+                    else:
+                        logger.error(f"imgbb upload failed: {result}")
+                        return None
                 else:
-                    logger.error(f"imgbb upload failed: {result}")
+                    error_text = await response.text()
+                    logger.error(f"imgbb upload error: {response.status} - {error_text}")
                     return None
-            else:
-                error_text = await response.text()
-                logger.error(f"imgbb upload error: {response.status} - {error_text}")
-                return None
                 
     except asyncio.TimeoutError:
         logger.error("Timeout uploading image to imgbb")
@@ -226,7 +227,7 @@ async def upload_image_to_imgbb(session: aiohttp.ClientSession, base64_data: str
         logger.error(f"Failed to upload image to imgbb: {e}")
         return None
 
-async def format_image_for_model(session: aiohttp.ClientSession, base64_data: str, model_config: Dict[str, Any]) -> str:
+async def format_image_for_model(base64_data: str, model_config: Dict[str, Any]) -> str:
     """
     根据模型配置格式化图片数据
     """
@@ -234,7 +235,7 @@ async def format_image_for_model(session: aiohttp.ClientSession, base64_data: st
     
     if image_format == "url":
         # 需要上传图片到 imgbb 并返回 URL
-        image_url = await upload_image_to_imgbb(session, base64_data)
+        image_url = await upload_image_to_imgbb(base64_data)
         if image_url:
             return image_url
         else:
@@ -379,7 +380,7 @@ def format_files_for_prompt(files: List[Dict[str, str]]) -> str:
     
     return "\n".join(file_sections)
 
-async def transform_openai_to_replicate(session: aiohttp.ClientSession, openai_request: Dict[str, Any], model_override: str = None) -> Dict[str, Any]:
+async def transform_openai_to_replicate(openai_request: Dict[str, Any], model_override: str = None) -> Dict[str, Any]:
     """将OpenAI格式的请求转换为Replicate格式"""
     try:
         messages = openai_request.get("messages", [])
@@ -449,7 +450,7 @@ async def transform_openai_to_replicate(session: aiohttp.ClientSession, openai_r
         formatted_image = None
         if has_images and primary_image:
             logger.info(f"Processing image for model {model} with format {model_config.get('image_format')}")
-            formatted_image = await format_image_for_model(session, primary_image, model_config)
+            formatted_image = await format_image_for_model(primary_image, model_config)
             
             if not formatted_image:
                 logger.error("Failed to format image for model")
@@ -652,7 +653,7 @@ async def root():
         "status": "running",
         "replicate_token_configured": bool(REPLICATE_API_TOKEN),
         "imgbb_token_configured": bool(IMGBB_API_KEY),
-        "version": "1.2.0",
+        "version": "1.2.1",
         "supported_models": list(MODEL_CONFIGS.keys()),
         "vision_support": True,
         "file_support": True,
@@ -703,13 +704,14 @@ async def chat_completions(request: Request):
         logger.info(f"Client parameters: max_tokens={body.get('max_tokens', 'not set')}, temperature={body.get('temperature', 'not set')}")
         logger.info(f"Message count: {len(body.get('messages', []))}")
         
-        async with aiohttp.ClientSession() as session:
-            # 转换请求格式
-            replicate_data, model = await transform_openai_to_replicate(session, body)
-            
-            if body.get("stream", False):
-                # 流式响应
-                async def generate_stream():
+        # 转换请求格式（不依赖 session）
+        replicate_data, model = await transform_openai_to_replicate(body)
+        
+        if body.get("stream", False):
+            # 流式响应
+            async def generate_stream():
+                # 在生成器内部创建独立的 session
+                async with aiohttp.ClientSession() as session:
                     try:
                         # 创建预测
                         prediction = await create_replicate_prediction(session, model, replicate_data)
@@ -786,6 +788,7 @@ async def chat_completions(request: Request):
                         yield "data: [DONE]\n\n"
                     except Exception as e:
                         logger.error(f"Stream generation error: {e}")
+                        logger.error(f"Traceback: {traceback.format_exc()}")
                         error_response = {
                             "error": {
                                 "message": str(e),
@@ -793,20 +796,21 @@ async def chat_completions(request: Request):
                             }
                         }
                         yield f"data: {json.dumps(error_response)}\n\n"
-                
-                return StreamingResponse(
-                    generate_stream(),
-                    media_type="text/event-stream",
-                    headers={
-                        "Cache-Control": "no-cache",
-                        "Connection": "keep-alive",
-                        "Access-Control-Allow-Origin": "*",
-                        "X-Accel-Buffering": "no",
-                    }
-                )
             
-            else:
-                # 非流式响应
+            return StreamingResponse(
+                generate_stream(),
+                media_type="text/event-stream",
+                headers={
+                    "Cache-Control": "no-cache",
+                    "Connection": "keep-alive",
+                    "Access-Control-Allow-Origin": "*",
+                    "X-Accel-Buffering": "no",
+                }
+            )
+        
+        else:
+            # 非流式响应
+            async with aiohttp.ClientSession() as session:
                 # 创建预测
                 prediction = await create_replicate_prediction(session, model, replicate_data)
                 prediction_id = prediction.get('id')