Merge pull request #6 from jihe520/dev

jihe520 · web-flow · commit 55767587ba65 · 2025-05-03T18:55:58.000+08:00
change prompt
diff --git a/README.md b/README.md
@@ -140,7 +140,7 @@ Thanks to the following projects:
 - [TaskWeaver](https://github.com/microsoft/TaskWeaver)
 - [Code-Interpreter](https://github.com/MrGreyfun/Local-Code-Interpreter/tree/main)
 - [Latex](https://github.com/Veni222987/MathModelingLatexTemplate/tree/main)
-
+- [Agent Laboratory](https://github.com/SamuelSchmidgall/AgentLaboratory)
 
 ## 其他
 
diff --git a/README_EN.md b/README_EN.md
@@ -138,6 +138,7 @@ Thanks to the following projects:
 - [TaskWeaver](https://github.com/microsoft/TaskWeaver)
 - [Code-Interpreter](https://github.com/MrGreyfun/Local-Code-Interpreter/tree/main)
 - [Latex](https://github.com/Veni222987/MathModelingLatexTemplate/tree/main)
+- [Agent Laboratory](https://github.com/SamuelSchmidgall/AgentLaboratory)
 
 ## Others
 
diff --git a/backend/app/core/agents.py b/backend/app/core/agents.py
@@ -108,6 +108,7 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
 
         # 如果是第一次运行，则添加系统提示
         if self.is_first_run:
+            logger.info("首次运行，添加系统提示和数据集文件信息")
             self.is_first_run = False
             self.append_chat_history({"role": "system", "content": self.system_prompt})
             # 当前数据集文件
@@ -118,22 +119,26 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
                 }
             )
 
+        # 添加 sub_task
+        logger.info(f"添加子任务提示: {prompt}")
         self.append_chat_history({"role": "user", "content": prompt})
 
         retry_count = 0
         last_error_message = ""
         task_completed = False
 
         if self.current_chat_turns >= self.max_chat_turns:
+            logger.error(f"超过最大聊天次数: {self.max_chat_turns}")
             await redis_manager.publish_message(
                 self.task_id,
-                SystemMessage(content="超过最大思考次数", type="error"),
+                SystemMessage(content="超过最大聊天次数", type="error"),
             )
             raise Exception(
                 f"Reached maximum number of chat turns ({self.max_chat_turns}). Task incomplete."
             )
 
         if retry_count >= self.max_retries:
+            logger.error(f"超过最大尝试次数: {self.max_retries}")
             await redis_manager.publish_message(
                 self.task_id,
                 SystemMessage(content="超过最大尝试次数", type="error"),
@@ -149,21 +154,25 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
             and self.current_chat_turns < self.max_chat_turns
         ):
             self.current_chat_turns += 1
+            logger.info(f"当前对话轮次: {self.current_chat_turns}")
             response = await self.model.chat(
                 history=self.chat_history,
                 tools=tools,
                 tool_choice="auto",
                 agent_name=self.__class__.__name__,
             )
 
+            # 如果有工具调用
             if (
                 hasattr(response.choices[0].message, "tool_calls")
                 and response.choices[0].message.tool_calls
             ):
+                logger.info("检测到工具调用")
                 tool_call = response.choices[0].message.tool_calls[0]
                 tool_id = tool_call.id
                 # TODO: json JSON解析时遇到了无效的转义字符
                 if tool_call.function.name == "execute_code":
+                    logger.info(f"调用工具: {tool_call.function.name}")
                     await redis_manager.publish_message(
                         self.task_id,
                         SystemMessage(
@@ -191,7 +200,7 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
                     )
 
                     # 执行工具调用
-                    logger.warning("执行工具调用")
+                    logger.info("执行工具调用")
                     (
                         text_to_gpt,
                         error_occurred,
@@ -208,11 +217,11 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
                             "tool_call_id": tool_id,
                         }
                     )
-
+                    # 代码执行错误
                     if error_occurred:
-                        logger.warning("代码执行错误")
-
+                        logger.warning(f"代码执行错误: {error_message}")
                         retry_count += 1
+                        logger.info(f"当前尝试次:{retry_count} / {self.max_retries}")
                         last_error_message = error_message
                         reflection_prompt = get_reflection_prompt(error_message, code)
 
@@ -224,12 +233,16 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
                         self.append_chat_history(
                             {"role": "user", "content": reflection_prompt}
                         )
+                        # 如果代码出错，返回重新开始
                         continue
 
                     # 检查任务完成情况时也计入对话轮次
                     self.current_chat_turns += 1
+                    logger.info(
+                        f"当前对话轮次: {self.current_chat_turns} / {self.max_chat_turns}"
+                    )
                     # 使用所有执行结果生成检查提示
-                    logger.warning("判断是否完成")
+                    logger.info("判断是否完成")
 
                     completion_check_prompt = get_completion_check_prompt(
                         prompt, text_to_gpt
@@ -252,14 +265,18 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
                         hasattr(completion_response.choices[0].message, "tool_calls")
                         and completion_response.choices[0].message.tool_calls
                     ):
-                        logger.warning("没有调用工具，代表已经完成了")
+                        logger.info("没有调用工具，代表任务已完成")
                         task_completed = True
                         return completion_response.choices[0].message.content
+            else:
+                logger.info("没有工具，代表任务完成")
 
             if retry_count >= self.max_retries:
+                logger.error(f"超过最大尝试次数: {self.max_retries}")
                 return f"Failed to complete task after {self.max_retries} attempts. Last error: {last_error_message}"
 
             if self.current_chat_turns >= self.max_chat_turns:
+                logger.error(f"超过最大对话轮次: {self.max_chat_turns}")
                 return f"Reached maximum number of chat turns ({self.max_chat_turns}). Task incomplete."
 
         logger.info(f"{self.__class__.__name__}:完成:执行子任务: {subtask_title}")
@@ -270,6 +287,7 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
 # 长文本
 # TODO: 并行 parallel
 # TODO: 获取当前文件下的文件
+# TODO: 引用cites tool
 class WriterAgent(Agent):  # 同样继承自Agent类
     def __init__(
         self,
diff --git a/backend/app/core/functions.py b/backend/app/core/functions.py
@@ -20,3 +20,9 @@
         },
     },
 ]
+
+# TODO: pip install python
+
+# TODO: read files
+
+# TODO: get_cites
diff --git a/backend/app/core/prompts.py b/backend/app/core/prompts.py
@@ -53,15 +53,15 @@
 12. 在生成代码时，对于包含单引号的字符串，请使用双引号包裹，避免使用转义字符
 13. **你尽量在较少的对话轮次内完成任务。减少反复思考的次数**
 14. 在求解问题和建立模型过程中，适当的进行可视化
-15. 不要询问用户任何有关内容，按照你的项目完成。
+
 
 Important:
 1. Files are already in the current directory
 2. No need to check file existence
 3. No need to ask user about files
 4. Just proceed with data processing directly
+5. Don't ask user any thing about how to do and next to do,just do it by yourself
 
-Note: If the user uploads a file, you will receive a system message "User uploaded a file: filename". Use the filename as the path in the code.
 """
 # 15. 在画图时候，matplotlib 需要正确显示中文，避免乱码问题
 
@@ -110,12 +110,12 @@ def get_reflection_prompt(error_message, code) -> str:
 4. File path issues
 5. Any other potential issues
 6. 如果一个任务反复无法完成，尝试切换路径、简化路径，千万别陷入反复重试，导致死循环。
-7. 不要询问用户任何有关内容，按照你的项目完成。
+7. Don't ask user any thing about how to do and next to do,just do it by yourself.
 
 Previous code:
 {code}
 
-Please provide an explanation of what went wrong and the corrected code.
+Please provide an explanation of what went wrong and Remenber call the function tools to retry 
 """
 
 
@@ -134,8 +134,9 @@ def get_completion_check_prompt(prompt, text_to_gpt) -> str:
 3. Are there any remaining steps needed?
 4. Is the output satisfactory and complete?
 5. 如果一个任务反复无法完成，尝试切换路径、简化路径或直接跳过，千万别陷入反复重试，导致死循环。
-6. 尽量在较少的对话轮次内完成任务，task_completed = True
-If the task is not complete, please explain what remains to be done and continue with the next steps.
-If the task is complete, please provide a summary of what was accomplished about your create image name.
-7. 不要询问用户任何有关内容，按照你的项目完成。
+6. 尽量在较少的对话轮次内完成任务
+7. If the task is complete, please provide a short summary of what was accomplished and don't call function tool.
+8. If the task is not complete, please rethink how to do and call function tool
+9. Don't ask user any thing about how to do and next to do,just do it by yourself
+
 """
diff --git a/backend/app/utils/redis_manager.py b/backend/app/utils/redis_manager.py
@@ -66,7 +66,9 @@ async def publish_message(self, task_id: str, message: Message):
         try:
             message_json = message.model_dump_json()
             await client.publish(channel, message_json)
-            logger.debug(f"消息已发布到频道 {channel}: {message_json}")
+            logger.debug(
+                f"消息已发布到频道 {channel}:mes_type:{message.msg_type}:msg_content:{message.content}"
+            )
             # 保存消息到文件
             await self._save_message_to_file(task_id, message)
         except Exception as e:
