agentic-blocks 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

agentic_blocks/messages.py

@@ -68,9 +68,11 @@ class Messages:
             tool_call: The tool call dictionary with id, type, function, etc.
         """
         # Check if the latest message is an assistant message with tool_calls
-        if (self.messages 
-            and self.messages[-1].get("role") == "assistant" 
-            and "tool_calls" in self.messages[-1]):
+        if (
+            self.messages
+            and self.messages[-1].get("role") == "assistant"
+            and "tool_calls" in self.messages[-1]
+        ):
             # Append to existing assistant message
             self.messages[-1]["tool_calls"].append(tool_call)
         else:
@@ -82,6 +84,33 @@ class Messages:
             }
             self.messages.append(assistant_message)
 
+    def add_tool_calls(self, tool_calls):
+        """
+        Add multiple tool calls from ChatCompletionMessageFunctionToolCall objects.
+
+        Args:
+            tool_calls: A list of ChatCompletionMessageFunctionToolCall objects or a single object
+        """
+        # Handle single tool call or list of tool calls
+        if not isinstance(tool_calls, list):
+            tool_calls = [tool_calls]
+
+        # Create assistant message with empty content and tool calls
+        assistant_message = {"role": "assistant", "content": "", "tool_calls": []}
+
+        for tool_call in tool_calls:
+            tool_call_dict = {
+                "id": tool_call.id,
+                "type": tool_call.type,
+                "function": {
+                    "name": tool_call.function.name,
+                    "arguments": tool_call.function.arguments,
+                },
+            }
+            assistant_message["tool_calls"].append(tool_call_dict)
+
+        self.messages.append(assistant_message)
+
     def add_tool_response(self, tool_call_id: str, content: str):
         """
         Add a tool response message.
@@ -108,7 +137,7 @@ class Messages:
         for response in tool_responses:
             tool_call_id = response.get("tool_call_id", "unknown")
             is_error = response.get("is_error", False)
-            
+
             if is_error:
                 content = f"Error: {response.get('error', 'Unknown error')}"
             else:
@@ -125,34 +154,22 @@ class Messages:
 
             self.add_tool_response(tool_call_id, content)
 
-    def add_response_message(self, message):
+    def add_response_message(self, model_response):
         """
         Add a response message (ChatCompletionMessage) to the conversation.
 
         Args:
-            message: A ChatCompletionMessage object with role, content, and potentially tool_calls
+            model_response: A ChatCompletionMessage object with role, content, and potentially tool_calls
         """
-        # Convert the ChatCompletionMessage to a dictionary format
-        msg_dict = {"role": message.role}
-        
-        # Add content (handle None case)
-        msg_dict["content"] = message.content or ""
-        
-        # Add tool_calls if present
-        if message.tool_calls:
-            msg_dict["tool_calls"] = []
-            for tool_call in message.tool_calls:
-                tool_call_dict = {
-                    "id": tool_call.id,
-                    "type": tool_call.type,
-                    "function": {
-                        "name": tool_call.function.name,
-                        "arguments": tool_call.function.arguments
-                    }
-                }
-                msg_dict["tool_calls"].append(tool_call_dict)
-        
-        self.messages.append(msg_dict)
+        # If there are tool calls, use add_tool_calls
+        if model_response.tool_calls:
+            self.add_tool_calls(model_response.tool_calls)
+            # If there's also content, update the message content
+            if model_response.content:
+                self.messages[-1]["content"] = model_response.content
+        else:
+            # No tool calls, just add content as assistant message
+            self.add_assistant_message(model_response.content or "")
 
     def get_messages(self) -> List[Dict[str, Any]]:
         """Get the current messages list."""
@@ -169,17 +186,20 @@ class Messages:
             return False
 
         last_message = self.messages[-1]
-        
+
         # Check if the last message is an assistant message with tool calls
         if last_message.get("role") == "assistant" and "tool_calls" in last_message:
             # Check if there are subsequent tool responses
             tool_call_ids = {tc.get("id") for tc in last_message["tool_calls"]}
-            
+
             # Look for tool responses after this message
             for msg in reversed(self.messages):
-                if msg.get("role") == "tool" and msg.get("tool_call_id") in tool_call_ids:
+                if (
+                    msg.get("role") == "tool"
+                    and msg.get("tool_call_id") in tool_call_ids
+                ):
                     tool_call_ids.remove(msg.get("tool_call_id"))
-            
+
             # If there are still unresponded tool call IDs, we have pending calls
             return len(tool_call_ids) > 0
 
@@ -201,7 +221,7 @@ class Messages:
                 for j, tool_call in enumerate(message["tool_calls"], 1):
                     function_name = tool_call.get("function", {}).get("name", "unknown")
                     lines.append(f"   └─ Tool Call {j}: {function_name}")
-            
+
             # Handle tool messages
             elif role == "tool":
                 tool_call_id = message.get("tool_call_id", "unknown")
@@ -209,7 +229,7 @@ class Messages:
                 if len(content) > 200:
                     content = content[:197] + "..."
                 lines.append(f"{i}. {role} [{tool_call_id[:8]}...]: {content}")
-            
+
             # Handle other message types
             else:
                 # Truncate long content for readability
@@ -227,28 +247,28 @@ def example_usage():
     messages = Messages(
         system_prompt="You are a helpful assistant.",
         user_prompt="Hello, how are you?",
-        add_date_and_time=True
+        add_date_and_time=True,
     )
-    
+
     # Add assistant response
     messages.add_assistant_message("I'm doing well, thank you!")
-    
+
     # Add a tool call
     tool_call = {
         "id": "call_123",
         "type": "function",
-        "function": {"name": "get_weather", "arguments": '{"location": "Paris"}'}
+        "function": {"name": "get_weather", "arguments": '{"location": "Paris"}'},
     }
     messages.add_tool_call(tool_call)
-    
+
     # Add tool response
     messages.add_tool_response("call_123", "The weather in Paris is sunny, 22°C")
-    
+
     print("Conversation:")
     print(messages)
-    
+
     print(f"\nHas pending tool calls: {messages.has_pending_tool_calls()}")
 
 
 if __name__ == "__main__":
-    example_usage()
+    example_usage()

{agentic_blocks-0.1.6.dist-info → agentic_blocks-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-blocks
-Version: 0.1.6
+Version: 0.1.7
 Summary: Simple building blocks for agentic AI systems with MCP client and conversation management
 Author-email: Magnus Bjelkenhed <bjelkenhed@gmail.com>
 License: MIT

agentic_blocks-0.1.7.dist-info/RECORD

@@ -0,0 +1,9 @@
+agentic_blocks/__init__.py,sha256=LJy2tzTwX9ZjPw8dqkXOWiude7ZDDIaBIvaLC8U4d_Y,435
+agentic_blocks/llm.py,sha256=CznQ5iNFz_nQsGqjSmtZbCz1YyL6ha1qvnaoFOwsJtk,4868
+agentic_blocks/mcp_client.py,sha256=15mIN_Qw0OVNJAvfgO3jVZS4-AU4TtvEQSFDlL9ruqA,9773
+agentic_blocks/messages.py,sha256=WhZDFYb9afvJH9YcieTvEbPdSOkRcclFkCSiMM-9YjY,9904
+agentic_blocks-0.1.7.dist-info/licenses/LICENSE,sha256=r4IcBaAjTv3-yfjXgDPuRD953Qci0Y0nQn5JfHwLyBY,1073
+agentic_blocks-0.1.7.dist-info/METADATA,sha256=wQIebdtAorFhdsiVKrLi-M_3C60S7qI1oZ9l2ivlLQs,9445
+agentic_blocks-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agentic_blocks-0.1.7.dist-info/top_level.txt,sha256=-1a4RAemqicXLU1rRzw4QHV3KlNeQDNxVs3m2gAT238,15
+agentic_blocks-0.1.7.dist-info/RECORD,,

agentic_blocks-0.1.6.dist-info/RECORD

@@ -1,9 +0,0 @@
-agentic_blocks/__init__.py,sha256=LJy2tzTwX9ZjPw8dqkXOWiude7ZDDIaBIvaLC8U4d_Y,435
-agentic_blocks/llm.py,sha256=CznQ5iNFz_nQsGqjSmtZbCz1YyL6ha1qvnaoFOwsJtk,4868
-agentic_blocks/mcp_client.py,sha256=15mIN_Qw0OVNJAvfgO3jVZS4-AU4TtvEQSFDlL9ruqA,9773
-agentic_blocks/messages.py,sha256=VKfqetR0mKrOnqKxzVzqm42qEKTlK0YNytoy_Oel2Wc,9224
-agentic_blocks-0.1.6.dist-info/licenses/LICENSE,sha256=r4IcBaAjTv3-yfjXgDPuRD953Qci0Y0nQn5JfHwLyBY,1073
-agentic_blocks-0.1.6.dist-info/METADATA,sha256=62GDddF1n1iSVGjlsbJRBHdYDJ1kPjFElsHU8wWb-aw,9445
-agentic_blocks-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agentic_blocks-0.1.6.dist-info/top_level.txt,sha256=-1a4RAemqicXLU1rRzw4QHV3KlNeQDNxVs3m2gAT238,15
-agentic_blocks-0.1.6.dist-info/RECORD,,