dm-aioaiagent 0.4.1__tar.gz → 0.4.5__tar.gz

{dm_aioaiagent-0.4.1 → dm_aioaiagent-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dm-aioaiagent
-Version: 0.4.1
+Version: 0.4.5
 Summary: This is my custom aioaiagent client
 Home-page: https://pypi.org/project/dm-aioaiagent
 Author: dimka4621
@@ -17,12 +17,12 @@ Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pydantic<3.0.0,>=2.9.2
 Requires-Dist: langchain~=0.3.0
 Requires-Dist: langchain-core~=0.3.5
+Requires-Dist: langchain-community~=0.3.0
+Requires-Dist: langchain-openai~=0.3.0
+Requires-Dist: langchain-anthropic~=0.3.0
 Requires-Dist: langgraph~=0.2.23
 Requires-Dist: langsmith~=0.1.144
 Requires-Dist: grandalf>=0.8
-Requires-Dist: langchain-community~=0.3.0
-Requires-Dist: langchain-openai~=0.2.0
-Requires-Dist: langchain-anthropic~=0.3.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{dm_aioaiagent-0.4.1 → dm_aioaiagent-0.4.5}/dm_aioaiagent/ai_agent.py

@@ -33,6 +33,7 @@ class DMAIAgent:
         max_memory_messages: int = MAX_MEMORY_MESSAGES,
         save_tools_responses_in_memory: bool = True,
         llm_provider_api_key: str = "",
+        llm_provider_base_url: str = "",
         response_if_request_fail: str = "I can't provide a response right now. Please try again later.",
         response_if_invalid_image: str = "The image is unavailable or the link is incorrect."
     ):
@@ -46,6 +47,7 @@ class DMAIAgent:
         self._temperature = int(temperature)
         self._parallel_tool_calls = bool(parallel_tool_calls)
         self._llm_provider_api_key = str(llm_provider_api_key)
+        self._llm_provider_base_url = str(llm_provider_base_url)
 
         self._memory_messages = []
         self._is_memory_enabled = bool(is_memory_enabled)
@@ -64,7 +66,7 @@ class DMAIAgent:
 
     def run_messages(
         self,
-        messages: InputMessagesType,
+        messages: list[InputMessage],
         *,
         ls_metadata: dict[str, Any] = None,
         ls_tags: list[str] = None,
@@ -125,7 +127,9 @@ class DMAIAgent:
             self._logger.error(e)
             if second_attempt:
                 response = self._response_if_invalid_image if "invalid_image_url" in str(e) else self._response_if_request_fail
-                state["messages"].append(AIMessage(content=response))
+                ai_response = AIMessage(content=response)
+                state["messages"].append(ai_response)
+                state["new_messages"].append(ai_response)
                 return state
             return self._invoke_llm_node(state, second_attempt=True)
         state["messages"].append(ai_response)
@@ -189,21 +193,22 @@ class DMAIAgent:
         return route
 
     def _init_agent(self) -> None:
+        base_kwargs = {
+            "model": self._model,
+            "temperature": self._temperature,
+            "base_url": self._llm_provider_base_url if self._llm_provider_base_url else None
+        }
         if self._llm_provider_api_key:
-            self._llm_provider_api_key = SecretStr(self._llm_provider_api_key)
-
-        if self._model.startswith("gpt"):
-            from langchain_openai import ChatOpenAI
+            base_kwargs["api_key"] = SecretStr(self._llm_provider_api_key)
 
-            api_key = SecretStr(self._llm_provider_api_key or os.getenv("OPENAI_API_KEY"))
-            llm = ChatOpenAI(model_name=self._model, temperature=self._temperature, openai_api_key=api_key)
-        elif self._model.startswith("claude"):
+        if self._model.startswith("claude"):
             from langchain_anthropic import ChatAnthropic
 
-            api_key = SecretStr(self._llm_provider_api_key or os.getenv("ANTHROPIC_API_KEY"))
-            llm = ChatAnthropic(model=self._model, temperature=self._temperature, anthropic_api_key=api_key)
+            llm = ChatAnthropic(**base_kwargs)
         else:
-            raise ValueError(f"{self.__class__.__name__} not support this model: '{self._model}'")
+            from langchain_openai import ChatOpenAI
+
+            llm = ChatOpenAI(**base_kwargs)
 
         if self._is_tools_exists:
             self._tool_map = {t.name: t for t in self._tools}

{dm_aioaiagent-0.4.1 → dm_aioaiagent-0.4.5}/dm_aioaiagent/async_ai_agent.py

@@ -14,13 +14,13 @@ __all__ = ["DMAioAIAgent"]
 
 
 class DMAioAIAgent(DMAIAgent):
-    async def run(self, query: str, **kwargs) -> str:
-        new_messages = await self.run_messages(messages=[{"role": "user", "content": query}], **kwargs)
+    async def run(self, query: str, *args, **kwargs) -> str:
+        new_messages = await self.run_messages(messages=[{"role": "user", "content": query}], *args, **kwargs)
         return new_messages[-1].content
 
     async def run_messages(
         self,
-        messages: InputMessagesType,
+        messages: list[InputMessage],
         *,
         ls_metadata: dict[str, Any] = None,
         ls_tags: list[str] = None,
@@ -51,7 +51,9 @@ class DMAioAIAgent(DMAIAgent):
             self._logger.error(e)
             if second_attempt:
                 response = self._response_if_invalid_image if "invalid_image_url" in str(e) else self._response_if_request_fail
-                state["messages"].append(AIMessage(content=response))
+                ai_response = AIMessage(content=response)
+                state["messages"].append(ai_response)
+                state["new_messages"].append(ai_response)
                 return state
             return await self._invoke_llm_node(state, second_attempt=True)
         state["messages"].append(ai_response)

{dm_aioaiagent-0.4.1 → dm_aioaiagent-0.4.5}/dm_aioaiagent/types.py

@@ -3,7 +3,7 @@ from typing_extensions import TypedDict
 from langchain_core.messages import BaseMessage
 
 
-class ImageMessageTextMessage(TypedDict):
+class ImageMessageTextItem(TypedDict):
     type: Literal['text']
     text: str
 
@@ -15,7 +15,7 @@ class ImageMessageImageItem(TypedDict):
 
 class ImageMessage(TypedDict):
     role: Literal["user"]
-    content: list[Union[ImageMessageTextMessage, ImageMessageImageItem]]
+    content: list[Union[ImageMessageTextItem, ImageMessageImageItem]]
 
 
 class TextMessage(TypedDict):
@@ -23,8 +23,8 @@ class TextMessage(TypedDict):
     content: str
 
 
-InputMessagesType = list[Union[TextMessage, ImageMessage, BaseMessage]]
+InputMessage = Union[TextMessage, ImageMessage, BaseMessage]
 
 class State(TypedDict):
-    messages: InputMessagesType
+    messages: list[InputMessage]
     new_messages: list[BaseMessage]

{dm_aioaiagent-0.4.1 → dm_aioaiagent-0.4.5}/dm_aioaiagent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dm-aioaiagent
-Version: 0.4.1
+Version: 0.4.5
 Summary: This is my custom aioaiagent client
 Home-page: https://pypi.org/project/dm-aioaiagent
 Author: dimka4621
@@ -17,12 +17,12 @@ Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pydantic<3.0.0,>=2.9.2
 Requires-Dist: langchain~=0.3.0
 Requires-Dist: langchain-core~=0.3.5
+Requires-Dist: langchain-community~=0.3.0
+Requires-Dist: langchain-openai~=0.3.0
+Requires-Dist: langchain-anthropic~=0.3.0
 Requires-Dist: langgraph~=0.2.23
 Requires-Dist: langsmith~=0.1.144
 Requires-Dist: grandalf>=0.8
-Requires-Dist: langchain-community~=0.3.0
-Requires-Dist: langchain-openai~=0.2.0
-Requires-Dist: langchain-anthropic~=0.3.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{dm_aioaiagent-0.4.1 → dm_aioaiagent-0.4.5}/dm_aioaiagent.egg-info/requires.txt

@@ -3,9 +3,9 @@ python-dotenv>=1.0.0
 pydantic<3.0.0,>=2.9.2
 langchain~=0.3.0
 langchain-core~=0.3.5
+langchain-community~=0.3.0
+langchain-openai~=0.3.0
+langchain-anthropic~=0.3.0
 langgraph~=0.2.23
 langsmith~=0.1.144
 grandalf>=0.8
-langchain-community~=0.3.0
-langchain-openai~=0.2.0
-langchain-anthropic~=0.3.0

{dm_aioaiagent-0.4.1 → dm_aioaiagent-0.4.5}/setup.py

@@ -8,7 +8,7 @@ def readme():
 
 setup(
     name='dm-aioaiagent',
-    version='v0.4.1',
+    version='v0.4.5',
     author='dimka4621',
     author_email='mismartconfig@gmail.com',
     description='This is my custom aioaiagent client',
@@ -22,12 +22,12 @@ setup(
         'pydantic>=2.9.2, < 3.0.0',
         'langchain~=0.3.0',
         'langchain-core~=0.3.5',
+        'langchain-community~=0.3.0',
+        'langchain-openai~=0.3.0',
+        'langchain-anthropic~=0.3.0',
         'langgraph~=0.2.23',
         'langsmith~=0.1.144',
         'grandalf>=0.8',
-        'langchain-community~=0.3.0',
-        'langchain-openai~=0.2.0',
-        'langchain-anthropic~=0.3.0'
     ],
     classifiers=[
         'Programming Language :: Python :: 3.8',