From 0b804f2278ce4630e76cb49cc3991087b5a1e17d Mon Sep 17 00:00:00 2001 From: "jinli.yl" Date: Wed, 11 Jun 2025 23:19:47 +0800 Subject: [PATCH] bugfix --- cookbook/simple_agent/your_own_agent.py | 2 +- cookbook/simple_agent/your_own_agent_enhanced.py | 10 +++++++--- experiencemaker/schema/request.py | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cookbook/simple_agent/your_own_agent.py b/cookbook/simple_agent/your_own_agent.py index b812b75c..09543f8c 100644 --- a/cookbook/simple_agent/your_own_agent.py +++ b/cookbook/simple_agent/your_own_agent.py @@ -28,7 +28,7 @@ class YourOwnAgent(PromptMixin): llm: BaseLLM | None = Field(default=None) max_steps: int = Field(default=10) tools: List[BaseTool] = [CodeTool(), DashscopeSearchTool(), TerminateTool()] - prompt_file_path: Path = Path(__file__).parent / "Your_own_agent_prompt.yaml" + prompt_file_path: Path = Path(__file__).parent / "your_own_agent_prompt.yaml" def think(self, context: AgentContext): now_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') diff --git a/cookbook/simple_agent/your_own_agent_enhanced.py b/cookbook/simple_agent/your_own_agent_enhanced.py index f252c30f..d162fb2c 100644 --- a/cookbook/simple_agent/your_own_agent_enhanced.py +++ b/cookbook/simple_agent/your_own_agent_enhanced.py @@ -11,6 +11,7 @@ from experiencemaker.schema.trajectory import Trajectory class YourOwnAgentEnhanced(YourOwnAgent): em_client: EMClient | None = Field(default=None) + workspace_id: str = Field(default=...) @model_validator(mode="after") def init_client(self): @@ -21,14 +22,16 @@ class YourOwnAgentEnhanced(YourOwnAgent): messages = self.run(query) trajectory: Trajectory = Trajectory(query=query, steps=messages, answer=messages[-1].content, done=True) - request: SummarizerRequest = SummarizerRequest(trajectories=[trajectory]) + request: SummarizerRequest = SummarizerRequest(trajectories=[trajectory], workspace_id=self.workspace_id) response: SummarizerResponse = self.em_client.call_summarizer(request) for experience in response.experiences: logger.info(experience.model_dump_json()) def run_with_experience(self, query: str): trajectory: Trajectory = Trajectory(query=query) - request: ContextGeneratorRequest = ContextGeneratorRequest(trajectory=trajectory) + request: ContextGeneratorRequest = ContextGeneratorRequest(trajectory=trajectory, + retrieve_top_k=1, + workspace_id=self.workspace_id) response: ContextGeneratorResponse = self.em_client.call_context_generator(request) new_query = f"{response.context_msg.content}\n\nUser Question\n{query}" logger.info(f"new query={new_query}") @@ -48,6 +51,7 @@ class YourOwnAgentEnhanced(YourOwnAgent): if __name__ == "__main__": - agent = YourOwnAgentEnhanced(llm=OpenAICompatibleBaseLLM(model_name="qwen3-32b", temperature=0.6)) + agent = YourOwnAgentEnhanced(workspace_id="w_agent_enhanced", + llm=OpenAICompatibleBaseLLM(model_name="qwen3-32b", temperature=0.6)) traj = agent.execute() logger.info(traj.model_dump_json(indent=2)) diff --git a/experiencemaker/schema/request.py b/experiencemaker/schema/request.py index 5ffe659b..8c818ccb 100644 --- a/experiencemaker/schema/request.py +++ b/experiencemaker/schema/request.py @@ -17,8 +17,8 @@ class AgentWrapperRequest(BaseRequest): class ContextGeneratorRequest(BaseRequest): trajectory: Trajectory = Field(default_factory=Trajectory) + retrieve_top_k: int = Field(default=1) class SummarizerRequest(BaseRequest): trajectories: List[Trajectory] = Field(default_factory=dict) - return_experience: bool = Field(default=True)