From 205d4e4776a9fe87e89f02246d9184a0a0845c44 Mon Sep 17 00:00:00 2001 From: "jinli.yl" Date: Thu, 5 Jun 2025 19:36:12 +0800 Subject: [PATCH] fix namespace --- experiencescope/model/__init__.py | 6 +++--- experiencescope/model/base_embedding_model.py | 2 +- experiencescope/model/base_llm.py | 4 ++-- .../model/openai_compatible_embedding_model.py | 2 +- experiencescope/model/openai_compatible_llm.py | 14 +++++--------- .../module/agent_wrapper/base_agent_wrapper.py | 6 +++--- .../agent_wrapper/base_agent_wrapper_mixin.py | 8 ++++---- .../module/agent_wrapper/naive_agent_wrapper.py | 6 +++--- experiencescope/module/base_module.py | 8 ++++---- .../context_generator/base_context_generator.py | 8 ++++---- .../module/environment/base_environment.py | 10 +++++----- .../module/evaluator/base_evaluator.py | 8 ++++---- .../module/reward_fn/base_reward_fn.py | 6 +++--- experiencescope/module/runner/base_runner.py | 10 +++++----- .../module/summarizer/base_summarizer.py | 6 +++--- experiencescope/module/trainner/base_trainner.py | 2 +- experiencescope/schema/module_loader.py | 2 +- experiencescope/schema/request.py | 4 ++-- experiencescope/schema/response.py | 2 +- experiencescope/schema/trajectory.py | 2 +- experiencescope/service/model_service.py | 16 ++++++++-------- experiencescope/service/model_service_client.py | 6 +++--- experiencescope/storage/base_sample_buffer.py | 2 +- experiencescope/storage/base_vector_store.py | 4 ++-- experiencescope/storage/es_vector_store.py | 4 ++-- experiencescope/storage/file_vector_store.py | 4 ++-- experiencescope/tool/__init__.py | 9 +++++---- experiencescope/tool/code_tool.py | 2 +- experiencescope/tool/dashscope_search_tool.py | 4 ++-- experiencescope/tool/mcp_tool.py | 11 ++++++----- experiencescope/tool/terminate_tool.py | 2 +- experiencescope/utils/http_client.py | 2 +- experiencescope/utils/test_key.py | 10 +++++----- experiencescope/utils/trajectory_utils.py | 2 +- 34 files changed, 96 insertions(+), 98 deletions(-) diff --git a/experiencescope/model/__init__.py b/experiencescope/model/__init__.py index cf37ad31..4d5cd809 100644 --- a/experiencescope/model/__init__.py +++ b/experiencescope/model/__init__.py @@ -1,7 +1,7 @@ -from beyondagent.core.model.openai_compatible_embedding_model import OpenAICompatibleEmbeddingModel -from beyondagent.core.model.openai_compatible_llm import OpenAICompatibleBaseLLM +from experiencescope.model.openai_compatible_embedding_model import OpenAICompatibleEmbeddingModel +from experiencescope.model.openai_compatible_llm import OpenAICompatibleBaseLLM -from beyondagent.core.utils.registry import Registry +from experiencescope.utils.registry import Registry LLM_REGISTRY = Registry("llm") LLM_REGISTRY.register(OpenAICompatibleBaseLLM, "openai_compatible") diff --git a/experiencescope/model/base_embedding_model.py b/experiencescope/model/base_embedding_model.py index b675a51c..91ec92b6 100644 --- a/experiencescope/model/base_embedding_model.py +++ b/experiencescope/model/base_embedding_model.py @@ -4,7 +4,7 @@ from typing import List from loguru import logger from pydantic import BaseModel, Field -from beyondagent.core.schema.vector_store_node import VectorStoreNode +from experiencescope.schema.vector_store_node import VectorStoreNode class BaseEmbeddingModel(BaseModel, ABC): diff --git a/experiencescope/model/base_llm.py b/experiencescope/model/base_llm.py index 79707652..d372c492 100644 --- a/experiencescope/model/base_llm.py +++ b/experiencescope/model/base_llm.py @@ -4,8 +4,8 @@ from typing import List, Literal from loguru import logger from pydantic import Field, BaseModel -from beyondagent.core.schema.trajectory import Message, ActionMessage -from beyondagent.core.tool.base_tool import BaseTool +from experiencescope.schema.trajectory import Message, ActionMessage +from experiencescope.tool.base_tool import BaseTool class BaseLLM(BaseModel, ABC): diff --git a/experiencescope/model/openai_compatible_embedding_model.py b/experiencescope/model/openai_compatible_embedding_model.py index a2240539..c796bcf8 100644 --- a/experiencescope/model/openai_compatible_embedding_model.py +++ b/experiencescope/model/openai_compatible_embedding_model.py @@ -4,7 +4,7 @@ from typing import Literal, List from openai import OpenAI from pydantic import Field, PrivateAttr, model_validator -from beyondagent.core.model.base_embedding_model import BaseEmbeddingModel +from experiencescope.model.base_embedding_model import BaseEmbeddingModel class OpenAICompatibleEmbeddingModel(BaseEmbeddingModel): diff --git a/experiencescope/model/openai_compatible_llm.py b/experiencescope/model/openai_compatible_llm.py index 4a78587a..feb86d06 100644 --- a/experiencescope/model/openai_compatible_llm.py +++ b/experiencescope/model/openai_compatible_llm.py @@ -6,10 +6,10 @@ from openai import OpenAI from openai.types import CompletionUsage from pydantic import Field, PrivateAttr, model_validator -from beyondagent.core.enumeration.chunk_enum import ChunkEnum -from beyondagent.core.model.base_llm import BaseLLM -from beyondagent.core.schema.trajectory import Message, ActionMessage, ToolCall -from beyondagent.core.tool.base_tool import BaseTool +from experiencescope.enumeration.chunk_enum import ChunkEnum +from experiencescope.model.base_llm import BaseLLM +from experiencescope.schema.trajectory import Message, ActionMessage, ToolCall +from experiencescope.tool.base_tool import BaseTool class OpenAICompatibleBaseLLM(BaseLLM): @@ -103,16 +103,12 @@ class OpenAICompatibleBaseLLM(BaseLLM): yield e.args, ChunkEnum.ERROR def _chat(self, messages: List[Message], tools: List[BaseTool] = None, **kwargs) -> ActionMessage: - # usage = None reasoning_content = "" answer_content = "" tool_calls = [] for chunk, chunk_enum in self.stream_chat(messages, tools, **kwargs): - if chunk_enum is ChunkEnum.USAGE: - usage = chunk - - elif chunk_enum is ChunkEnum.THINK: + if chunk_enum is ChunkEnum.THINK: reasoning_content += chunk elif chunk_enum is ChunkEnum.ANSWER: diff --git a/experiencescope/module/agent_wrapper/base_agent_wrapper.py b/experiencescope/module/agent_wrapper/base_agent_wrapper.py index c32b88d2..31e4ed60 100644 --- a/experiencescope/module/agent_wrapper/base_agent_wrapper.py +++ b/experiencescope/module/agent_wrapper/base_agent_wrapper.py @@ -4,9 +4,9 @@ from typing import List from loguru import logger from pydantic import Field -from beyondagent.core.module.agent_wrapper.base_agent_wrapper import BaseAgentWrapper -from beyondagent.core.module.environment.base_environment import BaseEnvironment -from beyondagent.core.schema.trajectory import Trajectory, Message, StateMessage, ActionMessage, ContextMessage +from experiencescope.module.agent_wrapper.base_agent_wrapper_mixin import BaseAgentWrapperMixin +from experiencescope.module.environment.base_environment import BaseEnvironment +from experiencescope.schema.trajectory import Trajectory, Message, StateMessage, ActionMessage, ContextMessage class BaseAgentWrapper(BaseAgentWrapperMixin, ABC): diff --git a/experiencescope/module/agent_wrapper/base_agent_wrapper_mixin.py b/experiencescope/module/agent_wrapper/base_agent_wrapper_mixin.py index e7d4f469..f872d472 100644 --- a/experiencescope/module/agent_wrapper/base_agent_wrapper_mixin.py +++ b/experiencescope/module/agent_wrapper/base_agent_wrapper_mixin.py @@ -1,10 +1,10 @@ from abc import ABC -from pydantic import Field, BaseModel +from pydantic import Field -from beyondagent.core.module.base_module import BaseModule -from beyondagent.core.module.context_generator.base_context_generator import BaseContextGenerator -from beyondagent.core.schema.trajectory import Trajectory, ActionMessage, Message +from experiencescope.module.base_module import BaseModule +from experiencescope.module.context_generator.base_context_generator import BaseContextGenerator +from experiencescope.schema.trajectory import Trajectory, ActionMessage, Message class BaseAgentWrapperMixin(BaseModule, ABC): diff --git a/experiencescope/module/agent_wrapper/naive_agent_wrapper.py b/experiencescope/module/agent_wrapper/naive_agent_wrapper.py index 7c28a308..dadf0c8c 100644 --- a/experiencescope/module/agent_wrapper/naive_agent_wrapper.py +++ b/experiencescope/module/agent_wrapper/naive_agent_wrapper.py @@ -1,10 +1,10 @@ import datetime +from experiencescope.module.agent_wrapper.base_agent_wrapper_v2 import BaseAgentWrapperV2 from loguru import logger -from beyondagent.core.module.agent_wrapper.base_agent_wrapper_v2 import BaseAgentWrapperV2 -from beyondagent.core.module.environment.base_environment import BaseEnvironment -from beyondagent.core.schema.trajectory import Message, StateMessage, ContextMessage, ActionMessage +from experiencescope.module.environment.base_environment import BaseEnvironment +from experiencescope.schema.trajectory import Message, StateMessage, ContextMessage, ActionMessage class NaiveAgentWrapper(BaseAgentWrapperV2): diff --git a/experiencescope/module/base_module.py b/experiencescope/module/base_module.py index 7616076b..ca2ebfdc 100644 --- a/experiencescope/module/base_module.py +++ b/experiencescope/module/base_module.py @@ -3,10 +3,10 @@ from abc import ABC from loguru import logger from pydantic import BaseModel, Field, model_validator -from beyondagent.core.model import LLM_REGISTRY, EMBEDDING_MODEL_REGISTRY -from beyondagent.core.model.base_embedding_model import BaseEmbeddingModel -from beyondagent.core.model.base_llm import BaseLLM -from beyondagent.core.utils.prompt_handler import PromptHandler +from experiencescope.model import LLM_REGISTRY, EMBEDDING_MODEL_REGISTRY +from experiencescope.model.base_embedding_model import BaseEmbeddingModel +from experiencescope.model.base_llm import BaseLLM +from experiencescope.utils.prompt_handler import PromptHandler class BaseModule(BaseModel, ABC): diff --git a/experiencescope/module/context_generator/base_context_generator.py b/experiencescope/module/context_generator/base_context_generator.py index da8ac911..cb77923f 100644 --- a/experiencescope/module/context_generator/base_context_generator.py +++ b/experiencescope/module/context_generator/base_context_generator.py @@ -3,10 +3,10 @@ from typing import List from pydantic import Field -from beyondagent.core.module.base_module import BaseModule -from beyondagent.core.schema.trajectory import Trajectory, ContextMessage -from beyondagent.core.schema.vector_store_node import VectorStoreNode -from beyondagent.core.storage.base_vector_store import BaseVectorStore +from experiencescope.module.base_module import BaseModule +from experiencescope.schema.trajectory import Trajectory, ContextMessage +from experiencescope.schema.vector_store_node import VectorStoreNode +from experiencescope.storage.base_vector_store import BaseVectorStore class BaseContextGenerator(BaseModule, ABC): diff --git a/experiencescope/module/environment/base_environment.py b/experiencescope/module/environment/base_environment.py index a08875ad..41ea1c27 100644 --- a/experiencescope/module/environment/base_environment.py +++ b/experiencescope/module/environment/base_environment.py @@ -2,11 +2,11 @@ from typing import List from pydantic import Field -from beyondagent.core.module.base_module import BaseModule -from beyondagent.core.module.reward_fn.base_reward_fn import BaseRewardFn -from beyondagent.core.schema.reward import Reward -from beyondagent.core.schema.trajectory import StateMessage, ActionMessage, ToolCall -from beyondagent.core.tool.base_tool import BaseTool +from experiencescope.module.base_module import BaseModule +from experiencescope.module.reward_fn.base_reward_fn import BaseRewardFn +from experiencescope.schema.reward import Reward +from experiencescope.schema.trajectory import StateMessage, ActionMessage, ToolCall +from experiencescope.tool.base_tool import BaseTool class BaseEnvironment(BaseModule): diff --git a/experiencescope/module/evaluator/base_evaluator.py b/experiencescope/module/evaluator/base_evaluator.py index 1ae5b515..7dd924a0 100644 --- a/experiencescope/module/evaluator/base_evaluator.py +++ b/experiencescope/module/evaluator/base_evaluator.py @@ -2,10 +2,10 @@ from abc import ABC from pydantic import BaseModel, Field -from beyondagent.core.module.agent_wrapper.base_agent_wrapper import BaseAgentWrapper -from beyondagent.core.module.context_generator.base_context_generator import BaseContextGenerator -from beyondagent.core.module.environment.base_environment import BaseEnvironment -from beyondagent.core.module.summarizer.base_summarizer import BaseSummarizer +from experiencescope.module.agent_wrapper.base_agent_wrapper import BaseAgentWrapper +from experiencescope.module.context_generator.base_context_generator import BaseContextGenerator +from experiencescope.module.environment.base_environment import BaseEnvironment +from experiencescope.module.summarizer.base_summarizer import BaseSummarizer class BaseEvaluator(BaseModel, ABC): diff --git a/experiencescope/module/reward_fn/base_reward_fn.py b/experiencescope/module/reward_fn/base_reward_fn.py index 5f84b738..adf7f1dd 100644 --- a/experiencescope/module/reward_fn/base_reward_fn.py +++ b/experiencescope/module/reward_fn/base_reward_fn.py @@ -1,8 +1,8 @@ from abc import ABC -from beyondagent.core.module.base_module import BaseModule -from beyondagent.core.schema.reward import Reward -from beyondagent.core.schema.trajectory import Trajectory +from experiencescope.module.base_module import BaseModule +from experiencescope.schema.reward import Reward +from experiencescope.schema.trajectory import Trajectory class BaseRewardFn(BaseModule, ABC): diff --git a/experiencescope/module/runner/base_runner.py b/experiencescope/module/runner/base_runner.py index 7967466a..c4cc1947 100644 --- a/experiencescope/module/runner/base_runner.py +++ b/experiencescope/module/runner/base_runner.py @@ -2,11 +2,11 @@ from typing import List from pydantic import BaseModel, Field -from beyondagent.core.module.agent_wrapper.base_agent_wrapper import BaseAgentWrapper -from beyondagent.core.module.context_generator.base_context_generator import BaseContextGenerator -from beyondagent.core.module.environment.base_environment import BaseEnvironment -from beyondagent.core.module.summarizer.base_summarizer import BaseSummarizer -from beyondagent.core.schema.trajectory import Trajectory +from experiencescope.module.agent_wrapper.base_agent_wrapper import BaseAgentWrapper +from experiencescope.module.context_generator.base_context_generator import BaseContextGenerator +from experiencescope.module.environment.base_environment import BaseEnvironment +from experiencescope.module.summarizer.base_summarizer import BaseSummarizer +from experiencescope.schema.trajectory import Trajectory class BaseRunner(BaseModel): diff --git a/experiencescope/module/summarizer/base_summarizer.py b/experiencescope/module/summarizer/base_summarizer.py index 1505e846..70863dbb 100644 --- a/experiencescope/module/summarizer/base_summarizer.py +++ b/experiencescope/module/summarizer/base_summarizer.py @@ -2,9 +2,9 @@ from typing import List from pydantic import Field -from beyondagent.core.module.base_module import BaseModule -from beyondagent.core.schema.trajectory import Trajectory, Sample, SummaryMessage -from beyondagent.core.storage.base_vector_store import BaseVectorStore +from experiencescope.module.base_module import BaseModule +from experiencescope.schema.trajectory import Trajectory, Sample, SummaryMessage +from experiencescope.storage.base_vector_store import BaseVectorStore class BaseSummarizer(BaseModule): diff --git a/experiencescope/module/trainner/base_trainner.py b/experiencescope/module/trainner/base_trainner.py index 4fd4a2af..007e7b79 100644 --- a/experiencescope/module/trainner/base_trainner.py +++ b/experiencescope/module/trainner/base_trainner.py @@ -3,7 +3,7 @@ from typing import List from pydantic import BaseModel, Field -from beyondagent.core.schema.trajectory import Trajectory +from experiencescope.schema.trajectory import Trajectory class BaseTrainner(BaseModel, ABC): diff --git a/experiencescope/schema/module_loader.py b/experiencescope/schema/module_loader.py index 4dde4a2b..fe3e8348 100644 --- a/experiencescope/schema/module_loader.py +++ b/experiencescope/schema/module_loader.py @@ -2,7 +2,7 @@ from importlib import import_module from pydantic import BaseModel, Field -from beyondagent.core.utils.file_handler import FileHandler +from experiencescope.utils.file_handler import FileHandler class ModuleLoader(BaseModel): diff --git a/experiencescope/schema/request.py b/experiencescope/schema/request.py index 21a42656..9a0dbb7b 100644 --- a/experiencescope/schema/request.py +++ b/experiencescope/schema/request.py @@ -3,8 +3,8 @@ from typing import List from pydantic import Field -from beyondagent.core.schema.module_loader import ModuleLoader -from beyondagent.core.schema.trajectory import Trajectory +from experiencescope.schema.module_loader import ModuleLoader +from experiencescope.schema.trajectory import Trajectory class BaseRequest(ModuleLoader, ABC): diff --git a/experiencescope/schema/response.py b/experiencescope/schema/response.py index db3c9ae8..dfc89c8f 100644 --- a/experiencescope/schema/response.py +++ b/experiencescope/schema/response.py @@ -3,7 +3,7 @@ from typing import List from pydantic import BaseModel, Field -from beyondagent.core.schema.trajectory import Trajectory, ContextMessage, Sample +from experiencescope.schema.trajectory import Trajectory, ContextMessage, Sample class BaseResponse(BaseModel, ABC): diff --git a/experiencescope/schema/trajectory.py b/experiencescope/schema/trajectory.py index 46e93336..c3dd8544 100644 --- a/experiencescope/schema/trajectory.py +++ b/experiencescope/schema/trajectory.py @@ -5,7 +5,7 @@ from uuid import uuid4 from pydantic import BaseModel, Field, model_validator -from beyondagent.core.enumeration.role import Role +from experiencescope.enumeration.role import Role class ToolCall(BaseModel): diff --git a/experiencescope/service/model_service.py b/experiencescope/service/model_service.py index 4ff0e94e..4017b888 100644 --- a/experiencescope/service/model_service.py +++ b/experiencescope/service/model_service.py @@ -1,14 +1,14 @@ -from beyondagent.core.utils.logger import init_logger +from experiencescope.utils.logger import init_logger init_logger() from typing import List from fastapi import FastAPI -from beyondagent.core.module.agent_wrapper.base_agent_wrapper import BaseAgentWrapper -from beyondagent.core.module.context_generator.base_context_generator import BaseContextGenerator -from beyondagent.core.module.summarizer.base_summarizer import BaseSummarizer -from beyondagent.core.schema.request import AgentWrapperRequest, ContextGeneratorRequest, SummarizerRequest -from beyondagent.core.schema.response import AgentWrapperResponse, ContextGeneratorResponse, SummarizerResponse -from beyondagent.core.schema.trajectory import ContextMessage, Trajectory, Sample +from experiencescope.module.agent_wrapper.base_agent_wrapper import BaseAgentWrapper +from experiencescope.module.context_generator.base_context_generator import BaseContextGenerator +from experiencescope.module.summarizer.base_summarizer import BaseSummarizer +from experiencescope.schema.request import AgentWrapperRequest, ContextGeneratorRequest, SummarizerRequest +from experiencescope.schema.response import AgentWrapperResponse, ContextGeneratorResponse, SummarizerResponse +from experiencescope.schema.trajectory import ContextMessage, Trajectory, Sample import uvicorn app = FastAPI() @@ -39,4 +39,4 @@ if __name__ == '__main__': uvicorn.run(app, host="0.0.0.0", port=8000, timeout_keep_alive=600000, limit_concurrency=32) # launch with: -# python -m beyondagent.core.service.model_service \ No newline at end of file +# python -m experiencescope.service.model_service diff --git a/experiencescope/service/model_service_client.py b/experiencescope/service/model_service_client.py index 5b1f3c45..652c9341 100644 --- a/experiencescope/service/model_service_client.py +++ b/experiencescope/service/model_service_client.py @@ -1,8 +1,8 @@ from pydantic import Field -from beyondagent.core.schema.request import AgentWrapperRequest, ContextGeneratorRequest, SummarizerRequest -from beyondagent.core.schema.response import AgentWrapperResponse, ContextGeneratorResponse, SummarizerResponse -from beyondagent.core.utils.http_client import HttpClient +from experiencescope.schema.request import AgentWrapperRequest, ContextGeneratorRequest, SummarizerRequest +from experiencescope.schema.response import AgentWrapperResponse, ContextGeneratorResponse, SummarizerResponse +from experiencescope.utils.http_client import HttpClient class ModelServiceClient(HttpClient): diff --git a/experiencescope/storage/base_sample_buffer.py b/experiencescope/storage/base_sample_buffer.py index 969e68f1..747928c7 100644 --- a/experiencescope/storage/base_sample_buffer.py +++ b/experiencescope/storage/base_sample_buffer.py @@ -2,7 +2,7 @@ from typing import List from pydantic import BaseModel -from beyondagent.core.schema.trajectory import Sample +from experiencescope.schema.trajectory import Sample class BaseSampleBuffer(BaseModel): diff --git a/experiencescope/storage/base_vector_store.py b/experiencescope/storage/base_vector_store.py index f49100b9..3bf44731 100644 --- a/experiencescope/storage/base_vector_store.py +++ b/experiencescope/storage/base_vector_store.py @@ -3,8 +3,8 @@ from typing import List from pydantic import BaseModel, Field -from beyondagent.core.model.base_embedding_model import BaseEmbeddingModel -from beyondagent.core.schema.vector_store_node import VectorStoreNode +from experiencescope.model.base_embedding_model import BaseEmbeddingModel +from experiencescope.schema.vector_store_node import VectorStoreNode class BaseVectorStore(BaseModel, ABC): diff --git a/experiencescope/storage/es_vector_store.py b/experiencescope/storage/es_vector_store.py index 312bfe5d..1b1baca3 100644 --- a/experiencescope/storage/es_vector_store.py +++ b/experiencescope/storage/es_vector_store.py @@ -6,8 +6,8 @@ from elasticsearch.helpers import bulk from loguru import logger from pydantic import Field, PrivateAttr, model_validator -from beyondagent.core.schema.vector_store_node import VectorStoreNode -from beyondagent.core.storage.base_vector_store import BaseVectorStore +from experiencescope.schema.vector_store_node import VectorStoreNode +from experiencescope.storage.base_vector_store import BaseVectorStore class EsVectorStore(BaseVectorStore): diff --git a/experiencescope/storage/file_vector_store.py b/experiencescope/storage/file_vector_store.py index 4041ef4b..881baf5d 100644 --- a/experiencescope/storage/file_vector_store.py +++ b/experiencescope/storage/file_vector_store.py @@ -7,8 +7,8 @@ from typing import List, Any from loguru import logger from pydantic import Field, model_validator, PrivateAttr -from beyondagent.core.schema.vector_store_node import VectorStoreNode -from beyondagent.core.storage.base_vector_store import BaseVectorStore +from experiencescope.schema.vector_store_node import VectorStoreNode +from experiencescope.storage.base_vector_store import BaseVectorStore class FileVectorStore(BaseVectorStore): diff --git a/experiencescope/tool/__init__.py b/experiencescope/tool/__init__.py index ebbcbd5d..e70e0447 100644 --- a/experiencescope/tool/__init__.py +++ b/experiencescope/tool/__init__.py @@ -1,7 +1,8 @@ -from beyondagent.core.tool.python_tools.code_tool import CodeTool -from beyondagent.core.tool.python_tools.dashscope_search_tool import DashscopeSearchTool -from beyondagent.core.tool.python_tools.terminate_tool import TerminateTool -from beyondagent.core.utils.registry import Registry +from experiencescope.tool.python_tools.code_tool import CodeTool +from experiencescope.tool.python_tools.dashscope_search_tool import DashscopeSearchTool +from experiencescope.tool.python_tools.terminate_tool import TerminateTool + +from experiencescope.utils.registry import Registry TOOL_REGISTRY = Registry("tools") TOOL_REGISTRY.register(CodeTool) diff --git a/experiencescope/tool/code_tool.py b/experiencescope/tool/code_tool.py index 6bdfd195..b35f9525 100644 --- a/experiencescope/tool/code_tool.py +++ b/experiencescope/tool/code_tool.py @@ -1,7 +1,7 @@ import sys from io import StringIO -from beyondagent.core.tool.base_tool import BaseTool +from experiencescope.tool.base_tool import BaseTool class CodeTool(BaseTool): diff --git a/experiencescope/tool/dashscope_search_tool.py b/experiencescope/tool/dashscope_search_tool.py index f42b2b6f..31cdcc3d 100644 --- a/experiencescope/tool/dashscope_search_tool.py +++ b/experiencescope/tool/dashscope_search_tool.py @@ -6,7 +6,7 @@ from dashscope.api_entities.dashscope_response import Message from loguru import logger from pydantic import Field -from beyondagent.core.tool.base_tool import BaseTool +from experiencescope.tool.base_tool import BaseTool class DashscopeSearchTool(BaseTool): @@ -141,7 +141,7 @@ Extract the original content related to the user's question directly from the co return result def main(): - from beyondagent.core.utils.test_key import set_key + from experiencescope.utils.test_key import set_key set_key() query = "What is artificial intelligence?" diff --git a/experiencescope/tool/mcp_tool.py b/experiencescope/tool/mcp_tool.py index 4e0e45a8..7e9d2b9c 100644 --- a/experiencescope/tool/mcp_tool.py +++ b/experiencescope/tool/mcp_tool.py @@ -1,13 +1,14 @@ -from mcp.client.sse import sse_client -from mcp import ClientSession import asyncio -from pydantic import Field -from typing import List,Optional +from typing import List, Optional + from loguru import logger +from mcp import ClientSession +from mcp.client.sse import sse_client +from pydantic import Field +from experiencescope.tool.base_tool import BaseTool -from beyondagent.core.tool.base_tool import BaseTool class MCPTool(BaseTool): server_url: str = Field(..., description="MCP server URL") diff --git a/experiencescope/tool/terminate_tool.py b/experiencescope/tool/terminate_tool.py index c29c8931..e09274b8 100644 --- a/experiencescope/tool/terminate_tool.py +++ b/experiencescope/tool/terminate_tool.py @@ -1,4 +1,4 @@ -from beyondagent.core.tool.base_tool import BaseTool +from experiencescope.tool.base_tool import BaseTool class TerminateTool(BaseTool): diff --git a/experiencescope/utils/http_client.py b/experiencescope/utils/http_client.py index 9b70ee00..3f28725c 100644 --- a/experiencescope/utils/http_client.py +++ b/experiencescope/utils/http_client.py @@ -6,7 +6,7 @@ import requests from loguru import logger from pydantic import BaseModel, Field, PrivateAttr -from beyondagent.core.enumeration.http_enum import HttpEnum +from experiencescope.enumeration.http_enum import HttpEnum class HttpClient(BaseModel): diff --git a/experiencescope/utils/test_key.py b/experiencescope/utils/test_key.py index de2c5d07..7299c5cc 100644 --- a/experiencescope/utils/test_key.py +++ b/experiencescope/utils/test_key.py @@ -1,7 +1,7 @@ import json import os -from beyondagent.core.schema.module_loader import ModuleLoader +from experiencescope.schema.module_loader import ModuleLoader def load_env_keys(): @@ -13,21 +13,21 @@ def load_env_keys(): agent_wrapper_loader = ModuleLoader( - class_path="beyondagent.core.module.agent_wrapper.naive_agent_wrapper", + class_path="experiencescope.module.agent_wrapper.naive_agent_wrapper", class_name="NaiveAgentWrapper", config_path="beyondagent/config/agent_wrapper/naive_agent_wrapper.json") context_generator_loader = ModuleLoader( - class_path="beyondagent.core.module.context_generator.simple_context_generator", + class_path="experiencescope.module.context_generator.simple_context_generator", class_name="SimpleContextGenerator", config_path="beyondagent/config/context_generator/simple_context_generator.json") summarizer_loader = ModuleLoader( - class_path="beyondagent.core.module.summarizer.simple_summarizer", + class_path="experiencescope.module.summarizer.simple_summarizer", class_name="SimpleSummarizer", config_path="beyondagent/config/summarizer/simple_summarizer.json") env_loader = ModuleLoader( - class_path="beyondagent.core.module.environment.simple_environment", + class_path="experiencescope.module.environment.simple_environment", class_name="SimpleEnvironment", config_path="beyondagent/config/environment/simple_environment.json") \ No newline at end of file diff --git a/experiencescope/utils/trajectory_utils.py b/experiencescope/utils/trajectory_utils.py index 33cecf5f..01c1c437 100644 --- a/experiencescope/utils/trajectory_utils.py +++ b/experiencescope/utils/trajectory_utils.py @@ -1,7 +1,7 @@ from typing import List +from experiencescope.schema.trajectory import Message, StateMessage, ActionMessage -from beyondagent.core.schema.trajectory import Message, StateMessage, ActionMessage def format_trajectory_steps(steps: List[Message]) -> str: format_steps = []