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

agentic_blocks/llm.py

@@ -24,7 +24,7 @@ def call_llm(
     model: str = "gpt-4o-mini",
     base_url: Optional[str] = None,
     **kwargs,
-) -> str:
+) -> Any:
     """
     Call an LLM completion API with the provided messages.
 
@@ -37,7 +37,7 @@ def call_llm(
         **kwargs: Additional parameters to pass to OpenAI API
 
     Returns:
-        The assistant's response content as a string
+        The complete message object from the OpenAI API response
 
     Raises:
         LLMError: If API call fails or configuration is invalid
@@ -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:
@@ -86,8 +94,8 @@ def call_llm(
         # Make completion request
         response = client.chat.completions.create(**completion_params)
 
-        # Extract and return response content
-        return response.choices[0].message.content or ""
+        # Return the complete message object
+        return response.choices[0].message
 
     except Exception as e:
         raise LLMError(f"Failed to call LLM API: {e}")
@@ -132,12 +140,19 @@ def example_usage():
         # Call with Messages object
         print("Using Messages object:")
         response1 = call_llm(messages_obj, temperature=0.7)
-        print(f"Response: {response1}")
+        print(f"Response: {response1.content}")
 
         # Call with raw message list
         print("\nUsing raw message list:")
         response2 = call_llm(messages_list, tools=tools, temperature=0.5)
-        print(f"Response: {response2}")
+        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})"
+                )
+        else:
+            print(f"Response: {response2.content}")
 
     except LLMError as e:
         print(f"Error: {e}")

agentic_blocks/messages.py

@@ -125,6 +125,35 @@ class Messages:
 
             self.add_tool_response(tool_call_id, content)
 
+    def add_response_message(self, message):
+        """
+        Add a response message (ChatCompletionMessage) to the conversation.
+
+        Args:
+            message: 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)
+
     def get_messages(self) -> List[Dict[str, Any]]:
         """Get the current messages list."""
         return self.messages

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

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

agentic_blocks-0.1.4.dist-info/RECORD

@@ -1,9 +0,0 @@
-agentic_blocks/__init__.py,sha256=LJy2tzTwX9ZjPw8dqkXOWiude7ZDDIaBIvaLC8U4d_Y,435
-agentic_blocks/llm.py,sha256=uXNowV-uGq7G9igqgR-AgERhsYv_myTXFzOUeMjERc8,4253
-agentic_blocks/mcp_client.py,sha256=15mIN_Qw0OVNJAvfgO3jVZS4-AU4TtvEQSFDlL9ruqA,9773
-agentic_blocks/messages.py,sha256=rwcb_goGwfPiDIzl6Up46pAl-5Kw5aFb0uqd6pQtJPY,8162
-agentic_blocks-0.1.4.dist-info/licenses/LICENSE,sha256=r4IcBaAjTv3-yfjXgDPuRD953Qci0Y0nQn5JfHwLyBY,1073
-agentic_blocks-0.1.4.dist-info/METADATA,sha256=ec0HsLSkTeR91sqeNL8rwokCFe8VksPEcrRZ-kO-8Do,9445
-agentic_blocks-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agentic_blocks-0.1.4.dist-info/top_level.txt,sha256=-1a4RAemqicXLU1rRzw4QHV3KlNeQDNxVs3m2gAT238,15
-agentic_blocks-0.1.4.dist-info/RECORD,,