Update app.py

app.py

@@ -2,6 +2,7 @@ import os
 import time
 import logging
 import requests
+import json
 import concurrent.futures
 from datetime import datetime, timedelta
 from apscheduler.schedulers.background import BackgroundScheduler
@@ -308,8 +309,6 @@ def check_tokens():
 
     return jsonify(results)
 
-import json
-
 @app.route('/handsome/v1/chat/completions', methods=['POST'])
 def handsome_chat_completions():
     if not check_authorization(request):
@@ -369,28 +368,28 @@ def handsome_chat_completions():
                             continue
                         try:
                             response_json = json.loads(line)
-                            
+
                             if "usage" in response_json and "completion_tokens" in response_json["usage"]:
                                 completion_tokens = response_json["usage"]["completion_tokens"]
-                            
+
                             if "choices" in response_json and len(response_json["choices"]) > 0 and "delta" in response_json["choices"][0] and "content" in response_json["choices"][0]["delta"]:
                                 response_content += response_json["choices"][0]["delta"]["content"]
-                                
+
                             if "usage" in response_json and "prompt_tokens" in response_json["usage"]:
                                 prompt_tokens = response_json["usage"]["prompt_tokens"]
 
                         except (KeyError, ValueError, IndexError) as e:
                             logging.error(f"解析流式响应单行 JSON 失败: {e}, 行内容: {line}")
-                            
+
                 user_content = ""
                 messages = data.get("messages", [])
                 for message in messages:
-                    if message["role"] == "user":
+                    if message["role"] == "user" and isinstance(message["content"], str):
                         user_content += message["content"] + " "
                 user_content = user_content.strip()
 
                 logging.info(
-                    f"使用的key: {api_key}, 提示token: {prompt_tokens}, 输出token: {completion_tokens}, 首字用时: {first_token_time:.4f}秒, 总共用时: {total_time:.4f}秒, 使用的模型: {model_name}, 用户的内容: {user_content}, 输出的内容: {response_content}"
+                    f"使用的key: {api_key}, 提示token: {prompt_tokens}, 输出token: {completion_tokens}, 首字用时: {first_token_time:.4f}秒, 总共用时: {total_time:.4f}秒, 使用的模型: {model_name}, 用户的内容: {user_content.replace(chr(10), '\\n').replace(chr(13), '\\n')}, 输出的内容: {response_content.replace(chr(10), '\\n').replace(chr(13), '\\n')}"
                 )
             return Response(stream_with_context(generate()), content_type=response.headers['Content-Type'])
         else:
@@ -412,12 +411,12 @@ def handsome_chat_completions():
             user_content = ""
             messages = data.get("messages", [])
             for message in messages:
-                if message["role"] == "user":
+                if message["role"] == "user" and isinstance(message["content"], str):
                     user_content += message["content"] + " "
             user_content = user_content.strip()
 
             logging.info(
-                f"使用的key: {api_key}, 提示token: {prompt_tokens}, 输出token: {completion_tokens}, 首字用时: 0, 总共用时: {total_time:.4f}秒, 使用的模型: {model_name}, 用户的内容: {user_content}, 输出的内容: {response_content}"
+                f"使用的key: {api_key}, 提示token: {prompt_tokens}, 输出token: {completion_tokens}, 首字用时: 0, 总共用时: {total_time:.4f}秒, 使用的模型: {model_name}, 用户的内容: {user_content.replace(chr(10), '\\n').replace(chr(13), '\\n')}, 输出的内容: {response_content.replace(chr(10), '\\n').replace(chr(13), '\\n')}"
             )
             return jsonify(response_json)