update

update

Author: jihe520

README.md

@@ -59,8 +59,8 @@
 > 欢迎贡献
 
 
-案例参考 ./demo 文件夹下
-如果你有好的案例可以提交 PR 在该目录下
+案例参考 [demo](./demo/) 文件夹下
+**如果你有跑出来好的案例可以提交 PR 在该目录下**
 
 ## 📖 使用教程
 
@@ -73,7 +73,9 @@
 1. 配置模型
 
 复制`/backend/.env.dev.example`到`/backend/.env.dev`(删除`.example` 后缀)
+
 **配置环境变量**
+
 推荐模型能力较强的、参数量大的模型。
 
 
@@ -114,10 +116,11 @@ pnpm i #确保电脑安装了 pnpm
 pnpm run dev
 ```
 
+[教程](./docs/md/tutorial.md)
 
 运行的结果和产生在`backend/project/work_dir/xxx/*`目录下
 - notebook.ipynb: 保存运行过程中产生的代码
-- res.md: 保存最后运行产生的结果为 markdown 格式，使用 markdown 转 word(研究下 pandoc)
+- res.md: 保存最后运行产生的结果为 markdown 格式
 
 ## 🤝 贡献和开发
 
@@ -134,8 +137,8 @@ clone 项目后，下载 **Todo Tree** 插件，可以查看代码中所有具
 
 ## 📄 版权License
 
-个人免费使用，请勿商业用途，商业用途联系我（作者）
-禁止闭源分发
+个人免费使用，请勿商业用途。
+[License](./docs/md/License.md)
 
 ## 🙏 Reference
 
@@ -150,9 +153,7 @@ Thanks to the following projects:
 
 ### Sponsor
 
-<div align="center">
-  <img src="./docs/sponser.png" alt="Buy Me a Coffee" width="280"/>
-</div>
+[Buy Me a Coffee](./docs/sponser.md)
 
 感谢赞助
 [danmo-tyc](https://github.com/danmo-tyc)
@@ -162,4 +163,6 @@ Thanks to the following projects:
 有问题可以进群问
 [QQ 群：699970403](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=rFKquDTSxKcWpEhRgpJD-dPhTtqLwJ9r&authKey=xYKvCFG5My4uYZTbIIoV5MIPQedW7hYzf0%2Fbs4EUZ100UegQWcQ8xEEgTczHsyU6&noverify=0&group_code=699970403)
 
-<img src="./docs/qq.jpg" height="400px">
+<div align="center">
+    <img src="./docs/qq.jpg" height="400px">
+</div>

backend/app/core/agents/coder_agent.py

@@ -1,11 +1,11 @@
 from app.core.agents.agent import Agent
 from app.config.setting import settings
 from app.utils.log_util import logger
-from app.utils.redis_manager import redis_manager
-from app.schemas.response import SystemMessage
+from app.services.redis_manager import redis_manager
+from app.schemas.response import SystemMessage, InterpreterMessage
 from app.tools.base_interpreter import BaseCodeInterpreter
 from app.core.llm.llm import LLM
-from app.models.model import CoderToWriter
+from app.schemas.A2A import CoderToWriter
 from app.core.prompts import CODER_PROMPT
 from app.utils.common_utils import get_current_files
 import json
@@ -108,7 +108,16 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
                             content=f"代码手调用{tool_call.function.name}工具"
                         ),
                     )
+
                     code = json.loads(tool_call.function.arguments)["code"]
+
+                    await redis_manager.publish_message(
+                        self.task_id,
+                        InterpreterMessage(
+                            input={"code": code},
+                        ),
+                    )
+
                     full_content = response.choices[0].message.content
                     # 更新对话历史 - 添加助手的响应
                     self.append_chat_history(
@@ -197,8 +206,6 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
                         agent_name=self.__class__.__name__,
                     )
 
-                    # # TODO: 压缩对话历史
-
                     ## 没有调用工具，代表已经完成了
                     if not (
                         hasattr(completion_response.choices[0].message, "tool_calls")
@@ -209,10 +216,14 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
                         return CoderToWriter(
                             coder_response=completion_response.choices[
                                 0
-                            ].message.content
+                            ].message.content,
+                            created_images=await self.code_interpreter.get_created_images(
+                                subtask_title
+                            ),
                         )
             else:
                 logger.info("没有工具，代表任务完成")
+                task_completed = True
 
             if retry_count >= self.max_retries:
                 logger.error(f"超过最大尝试次数: {self.max_retries}")
@@ -224,4 +235,9 @@ async def run(self, prompt: str, subtask_title: str) -> CoderToWriter:
 
         logger.info(f"{self.__class__.__name__}:完成:执行子任务: {subtask_title}")
 
-        return CoderToWriter(coder_response=response.choices[0].message.content)
+        return CoderToWriter(
+            coder_response=response.choices[0].message.content,
+            created_images=await self.code_interpreter.get_created_images(
+                subtask_title
+            ),
+        )

backend/app/core/agents/coordinator_agent.py

@@ -3,7 +3,7 @@
 from app.core.prompts import COORDINATOR_PROMPT
 import json
 from app.utils.log_util import logger
-from app.models.model import CoordinatorToModeler
+from app.schemas.A2A import CoordinatorToModeler
 
 
 class CoordinatorAgent(Agent):
@@ -18,7 +18,6 @@ def __init__(
 
     async def run(self, ques_all: str) -> CoordinatorToModeler:
         """用户输入问题 使用LLM 格式化 questions"""
-        # TODO:  "note": <补充说明,如果没有补充说明，请填 null>,
         self.append_chat_history({"role": "system", "content": self.system_prompt})
         self.append_chat_history({"role": "user", "content": ques_all})
 

backend/app/core/agents/modeler_agent.py

@@ -1,9 +1,10 @@
 from app.core.agents.agent import Agent
 from app.core.llm.llm import LLM
 from app.core.prompts import MODELER_PROMPT
-from app.models.model import CoordinatorToModeler, ModelerToCoder
+from app.schemas.A2A import CoordinatorToModeler, ModelerToCoder
 from app.utils.log_util import logger
 import json
+from icecream import ic
 
 
 class ModelerAgent(Agent):  # 继承自Agent类
@@ -21,7 +22,7 @@ async def run(self, coordinator_to_modeler: CoordinatorToModeler) -> ModelerToCo
         self.append_chat_history(
             {
                 "role": "user",
-                "content": coordinator_to_modeler.questions.model_dump_json(),
+                "content": json.dumps(coordinator_to_modeler.questions),
             }
         )
 
@@ -36,9 +37,9 @@ async def run(self, coordinator_to_modeler: CoordinatorToModeler) -> ModelerToCo
 
         if not json_str:
             raise ValueError("返回的 JSON 字符串为空，请检查输入内容。")
-
         try:
             questions_solution = json.loads(json_str)
+            ic(questions_solution)
             return ModelerToCoder(questions_solution=questions_solution)
         except json.JSONDecodeError as e:
             raise ValueError(f"JSON 解析错误: {e}")

backend/app/core/agents/writer_agent.py

@@ -1,17 +1,16 @@
 from app.core.agents.agent import Agent
 from app.core.llm.llm import LLM
 from app.core.prompts import get_writer_prompt
-from app.utils.enums import CompTemplate, FormatOutPut
-from app.models.user_output import UserOutput
+from app.schemas.enums import CompTemplate, FormatOutPut
 from app.tools.openalex_scholar import OpenAlexScholar
 from app.utils.log_util import logger
-from app.utils.redis_manager import redis_manager
-from app.schemas.response import SystemMessage
+from app.services.redis_manager import redis_manager
+from app.schemas.response import SystemMessage, WriterMessage
 import json
 from app.core.functions import writer_tools
-from app.utils.common_utils import get_footnotes
+from app.utils.common_utils import split_footnotes
 from icecream import ic
-from app.models.model import WriterResponse
+from app.schemas.A2A import WriterResponse
 
 
 # 长文本
@@ -27,13 +26,14 @@ def __init__(
         max_chat_turns: int = 10,  # 添加最大对话轮次限制
         comp_template: CompTemplate = CompTemplate,
         format_output: FormatOutPut = FormatOutPut.Markdown,
-        user_output: UserOutput = None,
         scholar: OpenAlexScholar = None,
+        max_memory: int = 25,  # 添加最大记忆轮次
     ) -> None:
-        super().__init__(task_id, model, max_chat_turns, user_output)
+        super().__init__(task_id, model, max_chat_turns, max_memory)
         self.format_out_put = format_output
         self.comp_template = comp_template
         self.scholar = scholar
+        self.is_first_run = True
         self.system_prompt = get_writer_prompt(format_output)
         self.available_images: list[str] = []
 
@@ -52,19 +52,21 @@ async def run(
         """
         logger.info(f"subtitle是:{sub_title}")
 
+        if self.is_first_run:
+            self.is_first_run = False
+            self.append_chat_history({"role": "system", "content": self.system_prompt})
+
         if available_images:
             self.available_images = available_images
             # 拼接成完整URL
             image_list = ",".join(available_images)
             image_prompt = f"\n可用的图片链接列表：\n{image_list}\n请在写作时适当引用这些图片链接。"
-            ic(image_prompt)
+            logger.info(f"image_prompt是:{image_prompt}")
             prompt = prompt + image_prompt
 
         logger.info(f"{self.__class__.__name__}:开始:执行对话")
         self.current_chat_turns += 1  # 重置对话轮次计数器
 
-        # 更新对话历史
-        self.append_chat_history({"role": "system", "content": self.system_prompt})
         self.append_chat_history({"role": "user", "content": prompt})
 
         # 获取历史消息用于本次对话
@@ -76,6 +78,8 @@ async def run(
             sub_title=sub_title,
         )
 
+        footnotes = []
+
         if (
             hasattr(response.choices[0].message, "tool_calls")
             and response.choices[0].message.tool_calls
@@ -92,7 +96,14 @@ async def run(
                 )
 
                 query = json.loads(tool_call.function.arguments)["query"]
-                footnotes = get_footnotes(query)
+
+                await redis_manager.publish_message(
+                    self.task_id,
+                    WriterMessage(
+                        input={"query": query},
+                    ),
+                )
+
                 full_content = response.choices[0].message.content
                 # 更新对话历史 - 添加助手的响应
                 self.append_chat_history(
@@ -113,10 +124,13 @@ async def run(
                 )
 
                 try:
-                    papers = self.scholar.search_papers(query)
+                    papers = await self.scholar.search_papers(query)
                 except Exception as e:
-                    logger.error(f"搜索文献失败: {str(e)}")
-                    return f"搜索文献失败: {str(e)}"
+                    error_msg = f"搜索文献失败: {str(e)}"
+                    logger.error(error_msg)
+                    return WriterResponse(
+                        response_content=error_msg, footnotes=footnotes
+                    )
                 # TODO: pass to frontend
                 papers_str = self.scholar.papers_to_str(papers)
                 logger.info(f"搜索文献结果\n{papers_str}")
@@ -136,6 +150,9 @@ async def run(
                     sub_title=sub_title,
                 )
                 response_content = next_response.choices[0].message.content
+                main_text, footnotes = split_footnotes(response_content)
+                logger.info(f"使用到的footnotes: {footnotes}")
+                response_content = main_text
         else:
             response_content = response.choices[0].message.content
         self.chat_history.append({"role": "assistant", "content": response_content})

backend/app/core/flows.py

@@ -4,8 +4,9 @@
 
 
 class Flows:
-    def __init__(self):
+    def __init__(self, questions: dict[str, str | int]):
         self.flows: dict[str, dict] = {}
+        self.questions: dict[str, str | int] = questions
 
     def set_flows(self, ques_count: int):
         ques_str = [f"ques{i}" for i in range(1, ques_count + 1)]
@@ -139,6 +140,5 @@ def get_seq(self, ques_count: int) -> dict[str, str]:
             *ques_str,
             "sensitivity_analysis",
             "judge",
-            "reference",
         ]
         return {key: "" for key in seq}