From 4dd7e3f8568acc6323802dfa3476bf82a5b65db1 Mon Sep 17 00:00:00 2001 From: "jinli.yl" Date: Fri, 13 Jun 2025 11:04:48 +0800 Subject: [PATCH] bugfix --- cookbook/simple_agent/quick_start.md | 7 ++---- .../simple_agent/your_own_agent_enhanced.py | 2 +- experiencemaker/em_service.py | 24 ++++++++----------- experiencemaker/storage/base_vector_store.py | 2 +- experiencemaker/tool/__init__.py | 3 +++ experiencemaker/utils/registry.py | 6 ++++- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cookbook/simple_agent/quick_start.md b/cookbook/simple_agent/quick_start.md index bcd4f44a..bd5a877d 100644 --- a/cookbook/simple_agent/quick_start.md +++ b/cookbook/simple_agent/quick_start.md @@ -51,10 +51,7 @@ python -m experiencemaker.em_service \ --port=8001 \ --llm='{"backend": "openai_compatible", "model_name": "qwen3-32b", "temperature": 0.6}' \ --embedding_model='{"backend": "openai_compatible", "model_name": "text-embedding-v4", "dimensions": 1024}' \ - --vector_store='{"backend": "elasticsearch", "index_name": "your_own_agent"}' \ - --context_generator='{"backend": "simple", "retrieve_top_k": 1}' \ + --vector_store='{"backend": "elasticsearch"}' \ + --context_generator='{"backend": "simple"}' \ --summarizer='{"backend": "simple"}' ``` - - -``` \ No newline at end of file diff --git a/cookbook/simple_agent/your_own_agent_enhanced.py b/cookbook/simple_agent/your_own_agent_enhanced.py index 7831be4e..be70de89 100644 --- a/cookbook/simple_agent/your_own_agent_enhanced.py +++ b/cookbook/simple_agent/your_own_agent_enhanced.py @@ -46,7 +46,7 @@ class YourOwnAgentEnhanced(YourOwnAgent): def execute(self): self.summary_experience(query="Analyze the company Tesla.") - self.summary_experience(query="Analyze the company Apple.") + # self.summary_experience(query="Analyze the company Apple.") return self.run_with_experience(query="Analyze Xiaomi Corporation.") diff --git a/experiencemaker/em_service.py b/experiencemaker/em_service.py index deff9507..1370aa0b 100644 --- a/experiencemaker/em_service.py +++ b/experiencemaker/em_service.py @@ -13,21 +13,17 @@ from experiencemaker.utils.util_function import load_env_keys load_env_keys() -from experiencemaker.model import LLM_REGISTRY, EMBEDDING_MODEL_REGISTRY -from experiencemaker.model.base_embedding_model import BaseEmbeddingModel -from experiencemaker.model.base_llm import BaseLLM -from experiencemaker.module.agent_wrapper import AGENT_WRAPPER_REGISTRY -from experiencemaker.module.agent_wrapper.agent_wrapper_mixin import AgentWrapperMixin -from experiencemaker.module.context_generator import CONTEXT_GENERATOR_REGISTRY -from experiencemaker.module.context_generator.base_context_generator import BaseContextGenerator -from experiencemaker.module.summarizer import SUMMARIZER_REGISTRY -from experiencemaker.module.summarizer.base_summarizer import BaseSummarizer +from experiencemaker.model.base_embedding_model import BaseEmbeddingModel, EMBEDDING_MODEL_REGISTRY +from experiencemaker.model.base_llm import BaseLLM, LLM_REGISTRY +from experiencemaker.module.agent_wrapper.agent_wrapper_mixin import AgentWrapperMixin, AGENT_WRAPPER_REGISTRY +from experiencemaker.module.context_generator.base_context_generator import BaseContextGenerator, \ + CONTEXT_GENERATOR_REGISTRY +from experiencemaker.module.summarizer.base_summarizer import BaseSummarizer, SUMMARIZER_REGISTRY from experiencemaker.schema.experience import Experience from experiencemaker.schema.request import AgentWrapperRequest, ContextGeneratorRequest, SummarizerRequest from experiencemaker.schema.response import AgentWrapperResponse, ContextGeneratorResponse, SummarizerResponse from experiencemaker.schema.trajectory import Trajectory, ContextMessage -from experiencemaker.storage import VECTOR_STORE_REGISTRY -from experiencemaker.storage.base_vector_store import BaseVectorStore +from experiencemaker.storage.base_vector_store import BaseVectorStore, VECTOR_STORE_REGISTRY class EMService(BaseModel): @@ -286,8 +282,8 @@ python -m experiencemaker.em_service \ --port=8001 \ --llm='{"backend": "openai_compatible", "model_name": "qwen3-32b", "temperature": 0.6}' \ --embedding_model='{"backend": "openai_compatible", "model_name": "text-embedding-v4", "dimensions": 1024}' \ - --vector_store='{"backend": "elasticsearch", "index_name": "simple_agent"}' \ - --agent_wrapper='{"backend": "simple", "max_steps": 10}' \ - --context_generator='{"backend": "simple", "retrieve_top_k": 1}' \ + --vector_store='{"backend": "elasticsearch"}' \ + --agent_wrapper='{"backend": "simple"}' \ + --context_generator='{"backend": "simple"}' \ --summarizer='{"backend": "simple"}' """ diff --git a/experiencemaker/storage/base_vector_store.py b/experiencemaker/storage/base_vector_store.py index 5ddf2516..7ccb918b 100644 --- a/experiencemaker/storage/base_vector_store.py +++ b/experiencemaker/storage/base_vector_store.py @@ -11,7 +11,7 @@ VECTOR_STORE_REGISTRY = Registry() class BaseVectorStore(BaseModel, ABC): embedding_model: BaseEmbeddingModel = Field(default=...) - index_name: str = Field(default=...) + index_name: str = Field(default="default") def exist_index(self, index_name: str = None) -> bool: raise NotImplementedError diff --git a/experiencemaker/tool/__init__.py b/experiencemaker/tool/__init__.py index e69de29b..925b94c8 100644 --- a/experiencemaker/tool/__init__.py +++ b/experiencemaker/tool/__init__.py @@ -0,0 +1,3 @@ +from experiencemaker.tool.code_tool import CodeTool +from experiencemaker.tool.dashscope_search_tool import DashscopeSearchTool +from experiencemaker.tool.terminate_tool import TerminateTool diff --git a/experiencemaker/utils/registry.py b/experiencemaker/utils/registry.py index df4c567d..84888d14 100644 --- a/experiencemaker/utils/registry.py +++ b/experiencemaker/utils/registry.py @@ -23,5 +23,9 @@ class Registry(object): raise KeyError(f"name={name} is not registered!") return self._registry[name] - def list_all(self) -> List[str]: + def __contains__(self, name: str): + return name in self._registry + + @property + def registered_module_names(self) -> List[str]: return sorted(self._registry.keys())