Update app.py

app.py

@@ -550,11 +550,14 @@ def upload_image_to_wechat(image_data):
 #         logging.error(f"API调用错误: {str(e)}")
 #         raise
 def process_long_running_task(messages, message_type='text', image_data=None):
+    """
+    处理长时间运行的任务，支持文本对话和图片识别
+    """
     try:
-        logging.info(f"Starting AI service call, message type: {message_type}")
+        logging.info(f"开始调用AI服务，消息类型: {message_type}")
         
         if message_type == 'image':
-            # Image recognition logic (unchanged)
+            # 图片识别逻辑保持不变
             try:
                 image_content = get_image_content(image_data['media_id'])
                 image_base64 = base64.b64encode(image_content).decode('utf-8')
@@ -574,26 +577,31 @@ def process_long_running_task(messages, message_type='text', image_data=None):
                     }
                 ]
                 
-                logging.info("Starting image recognition model")
+                logging.info("开始调用图像识别模型")
                 image_response = client.chat.completions.create(
                     model="gpt-4o-mini",
                     messages=image_messages,
                     max_tokens=300,
                     timeout=60
                 )
-                logging.info("Image recognition completed")
+                logging.info("图像识别完成")
                 
+                if not image_response.choices:
+                    raise Exception("图像识别服务未返回有效结果")
+                    
                 return {
                     "type": "text",
                     "content": image_response.choices[0].message.content
                 }
                 
             except Exception as e:
-                logging.error(f"Error in image processing: {str(e)}")
+                logging.error(f"图像识别过程中发生错误: {str(e)}")
                 raise
                 
         else:
+            # 处理文本消息
             try:
+                logging.info("开始处理文本消息")
                 response = client.chat.completions.create(
                     model="o3-mini",
                     messages=messages,
@@ -602,69 +610,74 @@ def process_long_running_task(messages, message_type='text', image_data=None):
                     timeout=60
                 )
                 
-                # First check if we have a valid response
-                if not response or not response.choices:
-                    raise Exception("No valid response received from API")
-
-                message = response.choices[0].message
-                if not message:
-                    raise Exception("No message in response")
-
-                # Then check for tool calls
-                if message.tool_calls:
-                    tool_call = message.tool_calls[0]
+                # 检查是否需要生成图片
+                if response.choices[0].message.tool_calls:
+                    tool_call = response.choices[0].message.tool_calls[0]
                     if tool_call.function.name == "generate_image":
-                        args = json.loads(tool_call.function.arguments)
-                        
-                        headers = {
-                            'Content-Type': 'application/json',
-                            'Authorization': f'Bearer {IMAGE_MODEL_KEY}'
-                        }
-                        
-                        response = requests.post(
-                            IMAGE_MODEL_URL,
-                            headers=headers,
-                            json={
-                                "model": "grok-3-imageGen",
-                                "messages": [{
-                                    "role": "user",
-                                    "content": args['prompt']
-                                }]
+                        try:
+                            logging.info("检测到图片生成请求")
+                            args = json.loads(tool_call.function.arguments)
+                            
+                            # 使用新的DALL-E 3 API进行图片生成
+                            image_generation_response = requests.post(
+                                "https://api1.oaipro.com/v1/images/generations",
+                                headers={
+                                    'Content-Type': 'application/json',
+                                    'Authorization': f'Bearer {IMAGE_MODEL_KEY}'
+                                },
+                                json={
+                                    "model": "dall-e-3",
+                                    "prompt": args['prompt'],
+                                    "n": 1,
+                                    "size": "1024x1024"
+                                },
+                                timeout=60
+                            )
+                            image_generation_response.raise_for_status()
+                            generation_result = image_generation_response.json()
+                            
+                            if 'data' not in generation_result or not generation_result['data']:
+                                raise Exception("图片生成服务未返回有效结果")
+                            
+                            # 获取生成的图片URL
+                            image_url = generation_result['data'][0]['url']
+                            
+                            # 下载生成的图片
+                            img_response = requests.get(image_url, timeout=30)
+                            img_response.raise_for_status()
+                            
+                            # 上传图片到微信服务器
+                            media_id = upload_image_to_wechat(img_response.content)
+                            
+                            return {
+                                "type": "image",
+                                "media_id": media_id
                             }
-                        )
-                        
-                        response.raise_for_status()
-                        
-                        # Process the response
-                        for line in response.iter_lines():
-                            if not line:
-                                continue
                             
-                            data = json.loads(line.decode('utf-8'))
-                            if data.get('result', {}).get('event', {}).get('imageAttachmentUpdate', {}).get('progress') == 100:
-                                image_url = data['result']['event']['imageAttachmentUpdate']['imageUrl']
-                                img_response = requests.get(image_url, headers=headers)
-                                img_response.raise_for_status()
-                                
-                                media_id = upload_image_to_wechat(img_response.content)
-                                return {
-                                    "type": "image",
-                                    "media_id": media_id
-                                }
-                
-                # If no image generation, return the text response
+                        except requests.exceptions.RequestException as e:
+                            logging.error(f"图片生成过程中发生网络错误: {str(e)}")
+                            raise
+                        except Exception as e:
+                            logging.error(f"图片生成过程中发生错误: {str(e)}")
+                            raise
+                
+                # 返回文本响应
                 return {
                     "type": "text",
-                    "content": message.content if message.content else "No response content"
+                    "content": response.choices[0].message.content
                 }
                 
+            except requests.exceptions.RequestException as e:
+                logging.error(f"处理文本消息时发生网络错误: {str(e)}")
+                raise
             except Exception as e:
-                logging.error(f"Error in text processing: {str(e)}")
+                logging.error(f"处理文本消息时发生错误: {str(e)}")
                 raise
-    
+                
     except Exception as e:
-        logging.error(f"API call error: {str(e)}")
+        logging.error(f"API调用错误: {str(e)}")
         raise
+
 def handle_async_task(session, task_id, messages=None, message_type='text', message_data=None):
     """
     处理异步任务，支持文本对话和图片识别