From 055ee34bf227f329ed26b50b579c8349f782b5a6 Mon Sep 17 00:00:00 2001 From: "jinli.yl" Date: Tue, 10 Jun 2025 17:27:04 +0800 Subject: [PATCH] reformat service --- cookbook/{ => simple_agent}/__init__.py | 0 .../experience_maker_client.py => em_client.py} | 2 +- .../experience_maker_service.py => em_service.py} | 10 +++++----- experiencemaker/service/__init__.py | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename cookbook/{ => simple_agent}/__init__.py (100%) rename experiencemaker/{service/experience_maker_client.py => em_client.py} (96%) rename experiencemaker/{service/experience_maker_service.py => em_service.py} (98%) delete mode 100644 experiencemaker/service/__init__.py diff --git a/cookbook/__init__.py b/cookbook/simple_agent/__init__.py similarity index 100% rename from cookbook/__init__.py rename to cookbook/simple_agent/__init__.py diff --git a/experiencemaker/service/experience_maker_client.py b/experiencemaker/em_client.py similarity index 96% rename from experiencemaker/service/experience_maker_client.py rename to experiencemaker/em_client.py index da9c4a41..d9bf6fe7 100644 --- a/experiencemaker/service/experience_maker_client.py +++ b/experiencemaker/em_client.py @@ -5,7 +5,7 @@ from experiencemaker.schema.response import AgentWrapperResponse, ContextGenerat from experiencemaker.utils.http_client import HttpClient -class ExperienceMakerClient(HttpClient): +class EMClient(HttpClient): base_url: str = Field(default=...) def call_agent_wrapper(self, request: AgentWrapperRequest): diff --git a/experiencemaker/service/experience_maker_service.py b/experiencemaker/em_service.py similarity index 98% rename from experiencemaker/service/experience_maker_service.py rename to experiencemaker/em_service.py index 7f678b46..d03ea18a 100644 --- a/experiencemaker/service/experience_maker_service.py +++ b/experiencemaker/em_service.py @@ -29,7 +29,7 @@ from experiencemaker.storage import VECTOR_STORE_REGISTRY from experiencemaker.storage.base_vector_store import BaseVectorStore -class ExperienceMakerService(BaseModel): +class EMService(BaseModel): workspace_id: str = Field(default="") host: str = Field(default="0.0.0.0") port: int = Field(default=8001) @@ -192,7 +192,7 @@ class ExperienceMakerService(BaseModel): app = FastAPI() -service: ExperienceMakerService | None = None +service: EMService | None = None @app.post('/agent_wrapper', response_model=AgentWrapperResponse) @@ -212,7 +212,7 @@ def call_summarizer(request: SummarizerRequest): if __name__ == "__main__": parser = argparse.ArgumentParser() - field_dict = ExperienceMakerService.model_fields + field_dict = EMService.model_fields assert isinstance(field_dict, dict) json_keys = [] @@ -231,7 +231,7 @@ if __name__ == "__main__": service_kwargs = {k: json.loads(v) if k in json_keys else v for k, v in args.__dict__.items()} logger.info(f"service.kwargs={json.dumps(service_kwargs, indent=2, ensure_ascii=False)}") - service = ExperienceMakerService(**service_kwargs) + service = EMService(**service_kwargs) uvicorn.run(app, host=service.host, port=service.port, @@ -239,7 +239,7 @@ if __name__ == "__main__": limit_concurrency=service.limit_concurrency) # launch with: -# python -m experiencemaker.service.experience_maker_service \ +# 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}' \ diff --git a/experiencemaker/service/__init__.py b/experiencemaker/service/__init__.py deleted file mode 100644 index e69de29b..00000000