dm-aioaiagent 0.3.2__tar.gz → 0.3.4__tar.gz

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dm-aioaiagent
-Version: 0.3.2
+Version: 0.3.4
 Summary: This is my custom aioaiagent client
 Home-page: https://pypi.org/project/dm-aioaiagent
 Author: dimka4621
@@ -18,6 +18,7 @@ Requires-Dist: pydantic<3.0.0,>=2.9.2
 Requires-Dist: langchain~=0.3.0
 Requires-Dist: langchain-core~=0.3.5
 Requires-Dist: langgraph~=0.2.23
+Requires-Dist: grandalf>=0.8
 Requires-Dist: langchain-community~=0.3.0
 Requires-Dist: langchain-openai~=0.2.0
 
@@ -137,6 +138,34 @@ if __name__ == "__main__":
     asyncio.run(main())
 ```
 
+### Image vision
+
+```python
+from dm_aioaiagent import DMAIAgent, ImageMessageContentBuilder
+
+def main():
+    # create an agent
+    ai_agent = DMAIAgent(agent_name="image_vision", model="gpt-4o")
+
+    # create an image message content
+    # NOTE: text argument is optional
+    img_content = ImageMessageContentBuilder(image_url="https://your.domain/image",
+                                             text="Hello, what is shown in the photo?")
+
+    # define the conversation message
+    messages = [
+        {"role": "user", "content": "Hello!"},
+        {"role": "user", "content": img_content},
+    ]
+
+    # call an agent
+    answer = ai_agent.run(messages)
+
+
+if __name__ == "__main__":
+   main()
+```
+
 ### Set custom logger
 
 _If you want set up custom logger_

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/README.md

@@ -114,6 +114,34 @@ if __name__ == "__main__":
     asyncio.run(main())
 ```
 
+### Image vision
+
+```python
+from dm_aioaiagent import DMAIAgent, ImageMessageContentBuilder
+
+def main():
+    # create an agent
+    ai_agent = DMAIAgent(agent_name="image_vision", model="gpt-4o")
+
+    # create an image message content
+    # NOTE: text argument is optional
+    img_content = ImageMessageContentBuilder(image_url="https://your.domain/image",
+                                             text="Hello, what is shown in the photo?")
+
+    # define the conversation message
+    messages = [
+        {"role": "user", "content": "Hello!"},
+        {"role": "user", "content": img_content},
+    ]
+
+    # call an agent
+    answer = ai_agent.run(messages)
+
+
+if __name__ == "__main__":
+   main()
+```
+
 ### Set custom logger
 
 _If you want set up custom logger_

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/dm_aioaiagent/__init__.py

@@ -2,4 +2,5 @@ from dotenv import load_dotenv
 load_dotenv()
 from .ai_agent import DMAIAgent
 from .async_ai_agent import DMAioAIAgent
+from .image_message_content_builder import ImageMessageContentBuilder
 from .types import Message

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/dm_aioaiagent/ai_agent.py

@@ -1,4 +1,5 @@
 import os
+from pydantic import SecretStr
 from itertools import dropwhile
 from threading import Thread
 from langchain_openai import ChatOpenAI
@@ -16,6 +17,8 @@ __all__ = ["DMAIAgent"]
 class DMAIAgent:
     agent_name = "AIAgent"
     _allowed_roles = ("user", "ai")
+    _response_if_request_fail = "I can't provide a response right now. Please try again later."
+    _response_if_invalid_image = "The image is unavailable or the link is incorrect."
     MAX_MEMORY_MESSAGES = 20  # Only INT greater than 0
 
     def __init__(
@@ -28,20 +31,29 @@ class DMAIAgent:
         agent_name: str = None,
         input_output_logging: bool = True,
         is_memory_enabled: bool = True,
+        save_tools_responses_in_memory: bool = True,
         max_memory_messages: int = None,
+        response_if_request_fail: str = None,
+        response_if_invalid_image: str = None,
+        openai_api_key: str = None
     ):
-        if not os.getenv("OPENAI_API_KEY"):
+        if openai_api_key is None and not os.getenv("OPENAI_API_KEY"):
             raise EnvironmentError("'OPENAI_API_KEY' environment variable is not set!")
 
         self._logger = DMLogger(agent_name or self.agent_name)
         self._is_tools_exists = bool(tools)
         self._input_output_logging = bool(input_output_logging)
         self._is_memory_enabled = bool(is_memory_enabled)
+        self._save_tools_responses_in_memory = bool(save_tools_responses_in_memory)
         self._max_memory_messages = self._validate_max_memory_messages(max_memory_messages)
+        self._response_if_request_fail = str(response_if_request_fail or self._response_if_request_fail)
+        self._response_if_invalid_image = str(response_if_invalid_image or self._response_if_invalid_image)
 
         prompt = ChatPromptTemplate.from_messages([SystemMessage(content=system_message),
                                                    MessagesPlaceholder(variable_name="messages")])
-        llm = ChatOpenAI(model=str(model), temperature=int(temperature))
+        if openai_api_key:
+            openai_api_key = SecretStr(openai_api_key)
+        llm = ChatOpenAI(model_name=str(model), temperature=int(temperature), openai_api_key=openai_api_key)
         if self._is_tools_exists:
             self._tool_map = {t.name: t for t in tools}
             llm = llm.bind_tools(tools)
@@ -85,7 +97,6 @@ class DMAIAgent:
         self._memory[self._validate_memory_id(memory_id)] = []
 
     def _prepare_messages_node(self, state: State) -> State:
-        state.memory_id = self._validate_memory_id(state.memory_id)
         state.input_messages = state.input_messages or [{"role": "user", "content": ""}]
         for item in state.input_messages:
             if isinstance(item, dict):
@@ -102,14 +113,23 @@ class DMAIAgent:
                 state.messages.append(item)
 
         if self._input_output_logging:
-            self._logger.debug(f"Query:\n{state.messages[-1].content}", memory_id=state.memory_id)
+            log_kwargs = {} if state.memory_id is None else {"memory_id": state.memory_id}
+            self._logger.debug(f"Query:\n{state.messages[-1].content}", **log_kwargs)
         if self._is_memory_enabled:
             state.messages = self.get_memory_messages(state.memory_id) + state.messages
         return state
 
-    def _invoke_llm_node(self, state: State) -> State:
+    def _invoke_llm_node(self, state: State, second_attempt: bool = False) -> State:
         self._logger.debug("Run node: Invoke LLM")
-        ai_response = self._agent.invoke({"messages": state.messages})
+        try:
+            ai_response = self._agent.invoke({"messages": state.messages})
+        except Exception as e:
+            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))
+                return state
+            return self._invoke_llm_node(state, second_attempt=True)
         state.messages.append(ai_response)
         return state
 
@@ -148,12 +168,21 @@ class DMAIAgent:
     def _exit_node(self, state: State) -> State:
         answer = state.messages[-1].content
         if self._input_output_logging:
-            self._logger.debug(f"Answer:\n{answer}", memory_id=state.memory_id)
+            log_kwargs = {} if state.memory_id is None else {"memory_id": state.memory_id}
+            self._logger.debug(f"Answer:\n{answer}", **log_kwargs)
 
         if self._is_memory_enabled:
+            memory_id = self._validate_memory_id(state.memory_id)
             messages_to_memory = state.messages[-self._max_memory_messages:]
-            # drop ToolsMessages from start of list
-            self._memory[state.memory_id] = list(dropwhile(lambda x: isinstance(x, ToolMessage), messages_to_memory))
+            if self._save_tools_responses_in_memory:
+                # drop ToolsMessages from start of list
+                self._memory[memory_id] = list(dropwhile(lambda x: isinstance(x, ToolMessage), messages_to_memory))
+            else:
+                self._memory[memory_id] = []
+                for mes in messages_to_memory:
+                    if isinstance(mes, ToolMessage) or (isinstance(mes, AIMessage) and mes.tool_calls):
+                        continue
+                    self._memory[memory_id].append(mes)
             state.response = answer
         else:
             state.response = state.messages[len(state.input_messages):]

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/dm_aioaiagent/async_ai_agent.py

@@ -1,6 +1,6 @@
 import sys
 import asyncio
-from langchain_core.messages import ToolMessage
+from langchain_core.messages import AIMessage, ToolMessage
 
 from .ai_agent import DMAIAgent
 from .types import *
@@ -18,9 +18,17 @@ class DMAioAIAgent(DMAIAgent):
         state = await self._graph.ainvoke({"input_messages": input_messages, "memory_id": memory_id})
         return state["response"]
 
-    async def _invoke_llm_node(self, state: State) -> State:
+    async def _invoke_llm_node(self, state: State, second_attempt: bool = False) -> State:
         self._logger.debug("Run node: Invoke LLM")
-        ai_response = await self._agent.ainvoke({"messages": state.messages})
+        try:
+            ai_response = await self._agent.ainvoke({"messages": state.messages})
+        except Exception as e:
+            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))
+                return state
+            return await self._invoke_llm_node(state, second_attempt=True)
         state.messages.append(ai_response)
         return state
 

dm_aioaiagent-0.3.4/dm_aioaiagent/image_message_content_builder.py

@@ -0,0 +1,15 @@
+class ImageMessageContentBuilder(list):
+    def __init__(self, image_url: str, text: str = None):
+        content = []
+        if isinstance(text, str):
+            content.append({
+                "type": "text",
+                "text": text
+            })
+        content.append({
+            "type": "image_url",
+            "image_url": {
+                "url": image_url
+            }
+        })
+        super().__init__(content)

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/dm_aioaiagent/types.py

@@ -4,12 +4,33 @@ from pydantic import BaseModel, Field
 from langchain_core.messages import BaseMessage
 
 
-class Message(TypedDict):
+class ImageMessageTextMessage(TypedDict):
+    type: Literal['text']
+    text: str
+
+
+class ImageMessageImageItem(TypedDict):
+    type: Literal['image_url']
+    image_url: dict
+
+
+ImageMessageContent = list[Union[ImageMessageTextMessage, ImageMessageImageItem]]
+
+
+class ImageMessage(TypedDict):
+    role: Literal["user"]
+    content: ImageMessageContent
+
+
+class TextMessage(TypedDict):
     role: Literal["user", "ai"]
     content: str
 
 
+Message = Union[TextMessage, ImageMessage]
+
 InputMessagesType = list[Union[Message, BaseMessage]]
+
 ResponseType = Union[str, list[BaseMessage]]
 
 

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/dm_aioaiagent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dm-aioaiagent
-Version: 0.3.2
+Version: 0.3.4
 Summary: This is my custom aioaiagent client
 Home-page: https://pypi.org/project/dm-aioaiagent
 Author: dimka4621
@@ -18,6 +18,7 @@ Requires-Dist: pydantic<3.0.0,>=2.9.2
 Requires-Dist: langchain~=0.3.0
 Requires-Dist: langchain-core~=0.3.5
 Requires-Dist: langgraph~=0.2.23
+Requires-Dist: grandalf>=0.8
 Requires-Dist: langchain-community~=0.3.0
 Requires-Dist: langchain-openai~=0.2.0
 
@@ -137,6 +138,34 @@ if __name__ == "__main__":
     asyncio.run(main())
 ```
 
+### Image vision
+
+```python
+from dm_aioaiagent import DMAIAgent, ImageMessageContentBuilder
+
+def main():
+    # create an agent
+    ai_agent = DMAIAgent(agent_name="image_vision", model="gpt-4o")
+
+    # create an image message content
+    # NOTE: text argument is optional
+    img_content = ImageMessageContentBuilder(image_url="https://your.domain/image",
+                                             text="Hello, what is shown in the photo?")
+
+    # define the conversation message
+    messages = [
+        {"role": "user", "content": "Hello!"},
+        {"role": "user", "content": img_content},
+    ]
+
+    # call an agent
+    answer = ai_agent.run(messages)
+
+
+if __name__ == "__main__":
+   main()
+```
+
 ### Set custom logger
 
 _If you want set up custom logger_

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/dm_aioaiagent.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ setup.py
 dm_aioaiagent/__init__.py
 dm_aioaiagent/ai_agent.py
 dm_aioaiagent/async_ai_agent.py
+dm_aioaiagent/image_message_content_builder.py
 dm_aioaiagent/types.py
 dm_aioaiagent.egg-info/PKG-INFO
 dm_aioaiagent.egg-info/SOURCES.txt

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/dm_aioaiagent.egg-info/requires.txt

@@ -4,5 +4,6 @@ pydantic<3.0.0,>=2.9.2
 langchain~=0.3.0
 langchain-core~=0.3.5
 langgraph~=0.2.23
+grandalf>=0.8
 langchain-community~=0.3.0
 langchain-openai~=0.2.0

{dm_aioaiagent-0.3.2 → dm_aioaiagent-0.3.4}/setup.py

@@ -8,7 +8,7 @@ def readme():
 
 setup(
     name='dm-aioaiagent',
-    version='v0.3.2',
+    version='v0.3.4',
     author='dimka4621',
     author_email='mismartconfig@gmail.com',
     description='This is my custom aioaiagent client',
@@ -23,6 +23,7 @@ setup(
         'langchain~=0.3.0',
         'langchain-core~=0.3.5',
         'langgraph~=0.2.23',
+        'grandalf>=0.8',
         'langchain-community~=0.3.0',
         'langchain-openai~=0.2.0',
     ],