Update app.py

app.py

@@ -387,15 +387,20 @@ def handsome_chat_completions():
                 user_content = ""
                 messages = data.get("messages", [])
                 for message in messages:
-                    if message["role"] == "user" and isinstance(message["content"], str):
-                        user_content += message["content"] + " "
+                    if message["role"] == "user":
+                        if isinstance(message["content"], str):
+                            user_content += message["content"] + " "
+                        elif isinstance(message["content"], list):
+                            for item in message["content"]:
+                                if isinstance(item, dict) and item.get("type") == "text":
+                                    user_content += item.get("text", "") + " "
+        
                 user_content = user_content.strip()
-                
+        
                 # 记录日志，将换行符替换为 \n
-                # Create temporary variables to hold the replaced strings
                 user_content_replaced = user_content.replace('\n', '\\n').replace('\r', '\\n')
                 response_content_replaced = response_content.replace('\n', '\\n').replace('\r', '\\n')
-
+        
                 logging.info(
                     f"使用的key: {api_key}, 提示token: {prompt_tokens}, 输出token: {completion_tokens}, 首字用时: {first_token_time:.4f}秒, 总共用时: {total_time:.4f}秒, 使用的模型: {model_name}, 用户的内容: {user_content_replaced}, 输出的内容: {response_content_replaced}"
                 )
@@ -418,19 +423,24 @@ def handsome_chat_completions():
                 completion_tokens = 0
                 response_content = ""
 
-            # 提取用户输入的内容，忽略非文本内容
+                # 提取用户输入的内容，处理包含文本和文件的消息
                 user_content = ""
                 messages = data.get("messages", [])
                 for message in messages:
-                    if message["role"] == "user" and isinstance(message["content"], str):
-                        user_content += message["content"] + " "
+                    if message["role"] == "user":
+                        if isinstance(message["content"], str):
+                            user_content += message["content"] + " "
+                        elif isinstance(message["content"], list):
+                            for item in message["content"]:
+                                if isinstance(item, dict) and item.get("type") == "text":
+                                    user_content += item.get("text", "") + " "
+        
                 user_content = user_content.strip()
-                
+        
                 # 记录日志，将换行符替换为 \n
-                # Create temporary variables to hold the replaced strings
                 user_content_replaced = user_content.replace('\n', '\\n').replace('\r', '\\n')
                 response_content_replaced = response_content.replace('\n', '\\n').replace('\r', '\\n')
-
+        
                 logging.info(
                     f"使用的key: {api_key}, 提示token: {prompt_tokens}, 输出token: {completion_tokens}, 首字用时: 0, 总共用时: {total_time:.4f}秒, 使用的模型: {model_name}, 用户的内容: {user_content_replaced}, 输出的内容: {response_content_replaced}"
                 )