refact: BaseAgentFactory

samuelint · samuelint · commit cbdd591f2e17 · 2024-07-29T09:09:04.000-04:00
diff --git a/langchain_openai_api_bridge/core/__init__.py b/langchain_openai_api_bridge/core/__init__.py
@@ -1,5 +1,5 @@
-from .agent_factory import AgentFactory
+from .base_agent_factory import BaseAgentFactory
 
 __all__ = [
-    "AgentFactory",
+    "BaseAgentFactory",
 ]
diff --git a/langchain_openai_api_bridge/core/base_agent_factory.py b/langchain_openai_api_bridge/core/base_agent_factory.py
@@ -4,7 +4,7 @@
 from langchain_openai_api_bridge.core.create_agent_dto import CreateAgentDto
 
 
-class AgentFactory(ABC):
+class BaseAgentFactory(ABC):
 
     @abstractmethod
     def create_agent(self, llm: BaseChatModel, dto: CreateAgentDto) -> Runnable:
diff --git a/langchain_openai_api_bridge/core/langchain_openai_api_bridge.py b/langchain_openai_api_bridge/core/langchain_openai_api_bridge.py
@@ -1,14 +1,14 @@
 from typing import Callable, Optional, Union
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_openai_api_bridge.core.utils import TinyDIContainer
 
 
 class LangchainOpenaiApiBridge:
     def __init__(
         self,
-        agent_factory_provider: Union[Callable[[], AgentFactory], AgentFactory],
+        agent_factory_provider: Union[Callable[[], BaseAgentFactory], BaseAgentFactory],
         tiny_di_container: Optional[TinyDIContainer] = None,
     ) -> None:
         self.tiny_di_container = tiny_di_container or TinyDIContainer()
 
-        self.tiny_di_container.register(AgentFactory, to=agent_factory_provider)
+        self.tiny_di_container.register(BaseAgentFactory, to=agent_factory_provider)
diff --git a/langchain_openai_api_bridge/fastapi/chat_completion_router.py b/langchain_openai_api_bridge/fastapi/chat_completion_router.py
@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Header
 from fastapi.responses import JSONResponse
 
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_openai_api_bridge.core.create_agent_dto import CreateAgentDto
 from langchain_openai_api_bridge.chat_completion.http_stream_response_adapter import (
     HttpStreamResponseAdapter,
@@ -24,7 +24,7 @@ async def assistant_retreive_thread_messages(
         request: OpenAIChatCompletionRequest, authorization: str = Header(None)
     ):
         api_key = get_bearer_token(authorization)
-        agent_factory = tiny_di_container.resolve(AgentFactory)
+        agent_factory = tiny_di_container.resolve(BaseAgentFactory)
         create_agent_dto = CreateAgentDto(
             model=request.model,
             api_key=api_key,
diff --git a/langchain_openai_api_bridge/fastapi/internal_agent_factory.py b/langchain_openai_api_bridge/fastapi/internal_agent_factory.py
@@ -1,13 +1,13 @@
 from langchain_openai_api_bridge.assistant.create_thread_runs_api_dto import (
     ThreadRunsDto,
 )
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_openai_api_bridge.core.create_agent_dto import CreateAgentDto
 from langchain_core.runnables import Runnable
 
 
 class InternalAgentFactory:
-    def __init__(self, agent_factory: AgentFactory) -> None:
+    def __init__(self, agent_factory: BaseAgentFactory) -> None:
         self.agent_factory = agent_factory
 
     def create_agent(self, thread_run_dto: ThreadRunsDto, api_key: str) -> Runnable:
diff --git a/langchain_openai_api_bridge/fastapi/langchain_openai_api_bridge_fastapi.py b/langchain_openai_api_bridge/fastapi/langchain_openai_api_bridge_fastapi.py
@@ -22,7 +22,7 @@
 from langchain_openai_api_bridge.assistant.repository.thread_repository import (
     ThreadRepository,
 )
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_openai_api_bridge.core.langchain_openai_api_bridge import (
     LangchainOpenaiApiBridge,
 )
@@ -41,7 +41,7 @@ class LangchainOpenaiApiBridgeFastAPI(LangchainOpenaiApiBridge):
     def __init__(
         self,
         app: FastAPI,
-        agent_factory_provider: Union[Callable[[], AgentFactory], AgentFactory],
+        agent_factory_provider: Union[Callable[[], BaseAgentFactory], BaseAgentFactory],
     ) -> None:
         super().__init__(agent_factory_provider=agent_factory_provider)
         self.app = app
diff --git a/tests/test_functional/fastapi_assistant_agent_anthropic/my_anthropic_agent_factory.py b/tests/test_functional/fastapi_assistant_agent_anthropic/my_anthropic_agent_factory.py
@@ -2,7 +2,7 @@
     AnthropicOpenAICompatibleChatModel,
 )
 
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_core.runnables import Runnable
 from langchain_core.language_models import BaseChatModel
 from langchain_core.tools import tool
@@ -17,7 +17,7 @@ def magic_number_tool(input: int) -> int:
     return input + 2
 
 
-class MyAnthropicAgentFactory(AgentFactory):
+class MyAnthropicAgentFactory(BaseAgentFactory):
 
     def create_agent(self, llm: BaseChatModel, dto: CreateAgentDto) -> Runnable:
         return create_react_agent(
diff --git a/tests/test_functional/fastapi_assistant_agent_custom_service/my_agent_factory.py b/tests/test_functional/fastapi_assistant_agent_custom_service/my_agent_factory.py
@@ -1,4 +1,4 @@
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_core.runnables import Runnable
 from langchain_core.language_models import BaseChatModel
 from langchain_core.tools import tool
@@ -14,7 +14,7 @@ def magic_number_tool(input: int) -> int:
     return input + 2
 
 
-class MyAgentFactory(AgentFactory):
+class MyAgentFactory(BaseAgentFactory):
 
     def create_agent(self, llm: BaseChatModel, dto: CreateAgentDto) -> Runnable:
         return create_react_agent(
diff --git a/tests/test_functional/fastapi_assistant_agent_groq/my_groq_agent_factory.py b/tests/test_functional/fastapi_assistant_agent_groq/my_groq_agent_factory.py
@@ -1,13 +1,13 @@
 from langchain_groq import ChatGroq
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_core.runnables import Runnable
 from langchain_core.language_models import BaseChatModel
 from langgraph.prebuilt import create_react_agent
 
 from langchain_openai_api_bridge.core.create_agent_dto import CreateAgentDto
 
 
-class MyGroqAgentFactory(AgentFactory):
+class MyGroqAgentFactory(BaseAgentFactory):
 
     def create_agent(self, llm: BaseChatModel, dto: CreateAgentDto) -> Runnable:
         return create_react_agent(
diff --git a/tests/test_functional/fastapi_assistant_agent_llamacpp/my_llamacpp_agent_factory.py b/tests/test_functional/fastapi_assistant_agent_llamacpp/my_llamacpp_agent_factory.py
@@ -4,7 +4,7 @@
 from langchain_openai_api_bridge.chat_model_adapter.llamacpp import (
     LLamacppOpenAICompatibleChatModel,
 )
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_core.runnables import Runnable
 from langchain_core.language_models import BaseChatModel
 from langchain_core.tools import tool
@@ -20,7 +20,7 @@ def magic_number_tool(input: int) -> int:
     return input + 2
 
 
-class MyLlamacppAgentFactory(AgentFactory):
+class MyLlamacppAgentFactory(BaseAgentFactory):
 
     def create_agent(self, llm: BaseChatModel, dto: CreateAgentDto) -> Runnable:
         return create_react_agent(
diff --git a/tests/test_functional/fastapi_assistant_agent_openai/my_agent_factory.py b/tests/test_functional/fastapi_assistant_agent_openai/my_agent_factory.py
@@ -1,4 +1,4 @@
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_core.runnables import Runnable
 from langchain_core.language_models import BaseChatModel
 from langchain_core.tools import tool
@@ -14,7 +14,7 @@ def magic_number_tool(input: int) -> int:
     return input + 2
 
 
-class MyAgentFactory(AgentFactory):
+class MyAgentFactory(BaseAgentFactory):
 
     def create_agent(self, llm: BaseChatModel, dto: CreateAgentDto) -> Runnable:
         return create_react_agent(
diff --git a/tests/test_functional/fastapi_chat_completion_anthropic/my_anthropic_agent_factory.py b/tests/test_functional/fastapi_chat_completion_anthropic/my_anthropic_agent_factory.py
@@ -1,4 +1,4 @@
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_core.runnables import Runnable
 from langchain_core.language_models import BaseChatModel
 from langgraph.prebuilt import create_react_agent
@@ -7,7 +7,7 @@
 from langchain_openai_api_bridge.core.create_agent_dto import CreateAgentDto
 
 
-class MyAnthropicAgentFactory(AgentFactory):
+class MyAnthropicAgentFactory(BaseAgentFactory):
 
     def create_agent(self, llm: BaseChatModel, dto: CreateAgentDto) -> Runnable:
         return create_react_agent(
diff --git a/tests/test_functional/fastapi_chat_completion_openai/my_openai_agent_factory.py b/tests/test_functional/fastapi_chat_completion_openai/my_openai_agent_factory.py
@@ -1,4 +1,4 @@
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_core.runnables import Runnable
 from langchain_core.language_models import BaseChatModel
 from langchain_core.tools import tool
@@ -14,7 +14,7 @@ def magic_number_tool(input: int) -> int:
     return input + 2
 
 
-class MyOpenAIAgentFactory(AgentFactory):
+class MyOpenAIAgentFactory(BaseAgentFactory):
 
     def create_agent(self, llm: BaseChatModel, dto: CreateAgentDto) -> Runnable:
         return create_react_agent(
diff --git a/tests/test_functional/injector/app_module.py b/tests/test_functional/injector/app_module.py
@@ -8,7 +8,7 @@
     InMemoryMessageRepository,
     InMemoryRunRepository,
 )
-from langchain_openai_api_bridge.core import AgentFactory
+from langchain_openai_api_bridge.core import BaseAgentFactory
 from tests.test_functional.injector.with_injector_my_agent_factory import (
     WithInjectorMyAgentFactory,
 )
@@ -19,4 +19,4 @@ def configure(self, binder: Binder):
         binder.bind(ThreadRepository, to=InMemoryThreadRepository, scope=singleton)
         binder.bind(MessageRepository, to=InMemoryMessageRepository, scope=singleton)
         binder.bind(RunRepository, to=InMemoryRunRepository, scope=singleton)
-        binder.bind(AgentFactory, to=WithInjectorMyAgentFactory)
+        binder.bind(BaseAgentFactory, to=WithInjectorMyAgentFactory)
diff --git a/tests/test_functional/injector/with_injector_assistant_server_openai.py b/tests/test_functional/injector/with_injector_assistant_server_openai.py
@@ -9,7 +9,7 @@
     MessageRepository,
     RunRepository,
 )
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_openai_api_bridge.fastapi import (
     LangchainOpenaiApiBridgeFastAPI,
 )
@@ -37,7 +37,7 @@
 injector = Injector([MyAppModule()])
 
 bridge = LangchainOpenaiApiBridgeFastAPI(
-    app=app, agent_factory_provider=lambda: injector.get(AgentFactory)
+    app=app, agent_factory_provider=lambda: injector.get(BaseAgentFactory)
 )
 bridge.bind_openai_assistant_api(
     thread_repository_provider=lambda: injector.get(ThreadRepository),
diff --git a/tests/test_functional/injector/with_injector_my_agent_factory.py b/tests/test_functional/injector/with_injector_my_agent_factory.py
@@ -1,4 +1,4 @@
-from langchain_openai_api_bridge.core.agent_factory import AgentFactory
+from langchain_openai_api_bridge.core.base_agent_factory import BaseAgentFactory
 from langchain_core.runnables import Runnable
 from langchain_core.language_models import BaseChatModel
 from langchain_core.tools import tool
@@ -14,7 +14,7 @@ def magic_number_tool(input: int) -> int:
     return input + 2
 
 
-class WithInjectorMyAgentFactory(AgentFactory):
+class WithInjectorMyAgentFactory(BaseAgentFactory):
 
     def create_agent(self, llm: BaseChatModel, dto: CreateAgentDto) -> Runnable:
         return create_react_agent(

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-from .agent_factory import AgentFactory`
	`1`	`+from .base_agent_factory import BaseAgentFactory`
`2`	`2`
`3`	`3`	`__all__ = [`
`4`		`- "AgentFactory",`
	`4`	`+ "BaseAgentFactory",`
`5`	`5`	`]`