fix namespace

This commit is contained in:
jinli.yl 2025-06-05 19:36:12 +08:00
parent ef224979cc
commit 205d4e4776
34 changed files with 96 additions and 98 deletions

View file

@ -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")

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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:

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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
# python -m experiencescope.service.model_service

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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):

View file

@ -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)

View file

@ -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):

View file

@ -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?"

View file

@ -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")

View file

@ -1,4 +1,4 @@
from beyondagent.core.tool.base_tool import BaseTool
from experiencescope.tool.base_tool import BaseTool
class TerminateTool(BaseTool):

View file

@ -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):

View file

@ -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")

View file

@ -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 = []