agentic-blocks 0.1.5__tar.gz → 0.1.7__tar.gz

{agentic_blocks-0.1.5/src/agentic_blocks.egg-info → agentic_blocks-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-blocks
-Version: 0.1.5
+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.5 → agentic_blocks-0.1.7}/pyproject.toml

@@ -14,7 +14,7 @@ agentic_blocks = []
 
 [project]
 name = "agentic-blocks"
-version = "0.1.5"
+version = "0.1.7"
 description = "Simple building blocks for agentic AI systems with MCP client and conversation management"
 readme = "README.md"
 requires-python = ">=3.11"

{agentic_blocks-0.1.5 → agentic_blocks-0.1.7}/src/agentic_blocks/llm.py

@@ -48,12 +48,20 @@ def call_llm(
     # Get API key
     if not api_key:
         api_key = os.getenv("OPENAI_API_KEY")
+    if not api_key:
+        api_key = os.getenv("OPENROUTER_API_KEY")
 
     if not api_key and not base_url:
         raise LLMError(
-            "OpenAI API key not found. Set OPENAI_API_KEY environment variable or pass api_key parameter."
+            "API key not found. Set OPENROUTER_API_KEY or OPENAI_API_KEY environment variable or pass api_key parameter."
         )
 
+    if api_key and api_key.startswith("sk-or"):
+        base_url = "https://openrouter.ai/api/v1"
+
+    if base_url and not api_key:
+        api_key = "EMPTY"
+
     # Initialize OpenAI client
     client_kwargs = {}
     if api_key:
@@ -137,10 +145,12 @@ def example_usage():
         # Call with raw message list
         print("\nUsing raw message list:")
         response2 = call_llm(messages_list, tools=tools, temperature=0.5)
-        if hasattr(response2, 'tool_calls') and response2.tool_calls:
+        if hasattr(response2, "tool_calls") and response2.tool_calls:
             print(f"Tool calls requested: {len(response2.tool_calls)}")
             for i, tool_call in enumerate(response2.tool_calls):
-                print(f"  {i+1}. {tool_call.function.name}({tool_call.function.arguments})")
+                print(
+                    f"  {i + 1}. {tool_call.function.name}({tool_call.function.arguments})"
+                )
         else:
             print(f"Response: {response2.content}")
 

{agentic_blocks-0.1.5 → agentic_blocks-0.1.7}/src/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,6 +154,23 @@ class Messages:
 
             self.add_tool_response(tool_call_id, content)
 
+    def add_response_message(self, model_response):
+        """
+        Add a response message (ChatCompletionMessage) to the conversation.
+
+        Args:
+            model_response: A ChatCompletionMessage object with role, content, and potentially tool_calls
+        """
+        # 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."""
         return self.messages
@@ -140,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
 
@@ -172,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")
@@ -180,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
@@ -198,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.5 → agentic_blocks-0.1.7/src/agentic_blocks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-blocks
-Version: 0.1.5
+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