dm-aioaiagent 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

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/ai_agent.py

@@ -16,7 +16,9 @@ __all__ = ["DMAIAgent"]
 class DMAIAgent:
     agent_name = "AIAgent"
     _allowed_roles = ("user", "ai")
-    MAX_MEMORY_MESSAGES = 20 # Only INT greater than 0
+    _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__(
         self,
@@ -29,6 +31,8 @@ class DMAIAgent:
         input_output_logging: bool = True,
         is_memory_enabled: bool = True,
         max_memory_messages: int = None,
+        response_if_request_fail: str = None,
+        response_if_invalid_image: str = None
     ):
         if not os.getenv("OPENAI_API_KEY"):
             raise EnvironmentError("'OPENAI_API_KEY' environment variable is not set!")
@@ -38,6 +42,8 @@ class DMAIAgent:
         self._input_output_logging = bool(input_output_logging)
         self._is_memory_enabled = bool(is_memory_enabled)
         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")])
@@ -67,14 +73,24 @@ class DMAIAgent:
         state = self._graph.invoke({"input_messages": input_messages, "memory_id": memory_id})
         return state["response"]
 
-    def get_memory_messages(self, memory_id: str = None) -> list[BaseMessage]:
-        return self._memory.get(self._validate_memory_id(memory_id), [])
+    def get_memory_messages(
+        self,
+        memory_id: str = None,
+        *,
+        without_tool_m: bool = False,
+        return_str_m: bool = False
+    ) -> Union[list[BaseMessage], list[str]]:
+        messages = self._memory.get(self._validate_memory_id(memory_id), [])
+        if without_tool_m:
+            messages = [m for m in messages if not (m.type == "tool" or (m.type == "ai" and m.tool_calls))]
+        if return_str_m:
+            messages = [m.content for m in messages]
+        return messages
 
     def clear_memory(self, memory_id: str = None) -> None:
         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):
@@ -91,14 +107,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
 
@@ -137,12 +162,14 @@ 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))
+            self._memory[memory_id] = list(dropwhile(lambda x: isinstance(x, ToolMessage), messages_to_memory))
             state.response = answer
         else:
             state.response = state.messages[len(state.input_messages):]

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/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/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.1.dist-info → dm_aioaiagent-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dm-aioaiagent
-Version: 0.3.1
+Version: 0.3.3
 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.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+dm_aioaiagent/__init__.py,sha256=pq9gL6E1VN4Tkx9PD83AIW9e_-N5REqJeC0TE8bZua4,215
+dm_aioaiagent/ai_agent.py,sha256=TTMSL2B-fdv_q7ytO38kC5fd8uB1Vk71ev7tS5tJMwE,9284
+dm_aioaiagent/async_ai_agent.py,sha256=qg7LZRxC7MSzjjburEX09T5EF15ZXAWAd_9RB8vA0oE,2599
+dm_aioaiagent/image_message_content_builder.py,sha256=mAJnsWdnpYpaFAdcCsVwgWH480Q4WfVEpM-Y6KdjyEc,435
+dm_aioaiagent/types.py,sha256=H2_iICmWr6u9d1-6BtSxdt6qV6Jm8v7Zh8das5kV6I4,989
+dm_aioaiagent-0.3.3.dist-info/METADATA,sha256=i06u5vC73yDmx73r5lUCr0Okw1vtf1FwKJgjpuZiKY0,5032
+dm_aioaiagent-0.3.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+dm_aioaiagent-0.3.3.dist-info/top_level.txt,sha256=CbasLH0KI7zA77XwT6JDCnmRascxKNGvUVV9MgYjHAU,14
+dm_aioaiagent-0.3.3.dist-info/RECORD,,

{dm_aioaiagent-0.3.1.dist-info → dm_aioaiagent-0.3.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dm_aioaiagent-0.3.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-dm_aioaiagent/__init__.py,sha256=8B0XQR-XE2VieU7-LOHCjqDYv0gSYqkgAkj_eq6XAhI,145
-dm_aioaiagent/ai_agent.py,sha256=YqM2KpLZVMqFVWBpmqEzgJSLQSycvB1g9ndxdg2aL4k,7846
-dm_aioaiagent/async_ai_agent.py,sha256=n7OfJUHRwjk92gae9NkpPKQ21Xost2-JsQ0JyzYTXT4,2146
-dm_aioaiagent/types.py,sha256=Xvx0x1GxLAvCot_3CZGgD8BFWwnTEc1lg7moLxkkJoc,587
-dm_aioaiagent-0.3.1.dist-info/METADATA,sha256=BeQ8eugmPWTmAmL7WJwWUc64URWW-5IB6Qg8Fovkq1Q,4299
-dm_aioaiagent-0.3.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-dm_aioaiagent-0.3.1.dist-info/top_level.txt,sha256=CbasLH0KI7zA77XwT6JDCnmRascxKNGvUVV9MgYjHAU,14
-dm_aioaiagent-0.3.1.dist-info/RECORD,,