Update app.py

app.py

@@ -73,12 +73,12 @@ def process_function_call(function_name, function_args):
         keywords = function_args.get('keywords', [])
         if not keywords:
             return "搜索关键词为空，无法执行搜索。"
-        return json.dumps(search_duckduckgo(keywords), ensure_ascii=False)
+        return search_duckduckgo(keywords)
     elif function_name == "search_papers":
         query = function_args.get('query', '')
         if not query:
             return "搜索查询为空，无法执行论文搜索。"
-        return json.dumps(search_papers(query), ensure_ascii=False)
+        return search_papers(query)
     elif function_name == "send_email":
         to = function_args.get('to', '')
         subject = function_args.get('subject', '')
@@ -86,14 +86,14 @@ def process_function_call(function_name, function_args):
         if not to or not subject or not content:
             return "邮件信息不完整，无法发送邮件。"
         success = send_email(to, subject, content)
-        return json.dumps({
+        return {
             "success": success,
             "message": "邮件发送成功" if success else "邮件发送失败",
             "to": to,
             "subject": subject,
             "content": content,
-            "is_email": True  # 添加这个标记来识别邮件发送功能
-        }, ensure_ascii=False)
+            "is_email": True
+        }
     else:
         return "未知的函数调用。"
 
@@ -159,15 +159,19 @@ def chat():
         result = process_function_call(function_name, function_args)
         status_log.append(f"函数 {function_name} 执行完成")
         
-        # 检查是否为邮件发送功能
-        result_dict = json.loads(result)
-        if result_dict.get("is_email", False):
-            response = f"邮件{'已成功' if result_dict['success'] else '未能成功'}发送到 {result_dict['to']}。\n\n主题：{result_dict['subject']}\n\n内容：\n{result_dict['content']}"
+        if isinstance(result, dict) and result.get("is_email", False):
+            response = f"邮件{'已成功' if result['success'] else '未能成功'}发送到 {result['to']}。\n\n主题：{result['subject']}\n\n内容：\n{result['content']}"
+        elif isinstance(result, list) or isinstance(result, str):
+            messages.append({
+                "role": "function",
+                "name": function_name,
+                "content": json.dumps(result, ensure_ascii=False)
+            })
         else:
             messages.append({
                 "role": "function",
                 "name": function_name,
-                "content": result
+                "content": str(result)
             })
     
     # 只有在没有邮件发送结果时才调用主模型