agentic-blocks 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

agentic_blocks/llm.py

@@ -9,6 +9,7 @@ from dotenv import load_dotenv
 from openai import OpenAI
 
 from agentic_blocks.messages import Messages
+from agentic_blocks.utils.tools_utils import langchain_tools_to_openai_format
 
 
 class LLMError(Exception):
@@ -19,7 +20,7 @@ class LLMError(Exception):
 
 def call_llm(
     messages: Union[Messages, List[Dict[str, Any]]],
-    tools: Optional[List[Dict[str, Any]]] = None,
+    tools: Optional[Union[List[Dict[str, Any]], List]] = None,
     api_key: Optional[str] = None,
     model: str = "gpt-4o-mini",
     base_url: Optional[str] = None,
@@ -30,7 +31,7 @@ def call_llm(
 
     Args:
         messages: Either a Messages instance or a list of message dicts
-        tools: Optional list of tools in OpenAI function calling format
+        tools: Optional list of tools in OpenAI function calling format or LangChain StructuredTools
         api_key: OpenAI API key (if not provided, loads from .env OPENAI_API_KEY)
         model: Model name to use for completion
         base_url: Base URL for the API (useful for VLLM or other OpenAI-compatible servers)
@@ -79,6 +80,15 @@ def call_llm(
     if not conversation_messages:
         raise LLMError("No messages provided for completion.")
 
+    # Handle tools parameter - convert LangChain tools if needed
+    openai_tools = None
+    if tools:
+        # Check if it's a list of LangChain StructuredTools
+        if tools and hasattr(tools[0], 'args_schema'):
+            openai_tools = langchain_tools_to_openai_format(tools)
+        else:
+            openai_tools = tools
+
     try:
         # Prepare completion parameters
         completion_params = {
@@ -87,8 +97,8 @@ def call_llm(
             **kwargs,
         }
 
-        if tools:
-            completion_params["tools"] = tools
+        if openai_tools:
+            completion_params["tools"] = openai_tools
             completion_params["tool_choice"] = "auto"
 
         # Make completion request

agentic_blocks/messages.py

@@ -205,6 +205,51 @@ class Messages:
 
         return False
 
+    def get_pending_tool_calls(self) -> List[Dict[str, Any]]:
+        """
+        Get pending tool calls that need execution, formatted for MCPClient.call_tool().
+
+        Returns:
+            List of dictionaries with 'tool_name', 'arguments', and 'tool_call_id' keys
+        """
+        pending_calls = []
+        
+        if not self.messages:
+            return pending_calls
+
+        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:
+            # Get tool call IDs that have responses
+            responded_tool_call_ids = set()
+            for msg in reversed(self.messages):
+                if msg.get("role") == "tool" and msg.get("tool_call_id"):
+                    responded_tool_call_ids.add(msg.get("tool_call_id"))
+
+            # Find tool calls that don't have responses
+            for tool_call in last_message["tool_calls"]:
+                tool_call_id = tool_call.get("id")
+                if tool_call_id not in responded_tool_call_ids:
+                    function_info = tool_call.get("function", {})
+                    tool_name = function_info.get("name")
+                    arguments_str = function_info.get("arguments", "{}")
+                    
+                    # Parse arguments JSON string to dict
+                    import json
+                    try:
+                        arguments = json.loads(arguments_str)
+                    except json.JSONDecodeError:
+                        arguments = {}
+                    
+                    pending_calls.append({
+                        "tool_name": tool_name,
+                        "arguments": arguments,
+                        "tool_call_id": tool_call_id
+                    })
+
+        return pending_calls
+
     def __str__(self) -> str:
         """Return messages in a simple, readable format."""
         if not self.messages:

agentic_blocks/utils/tools_utils.py

@@ -0,0 +1,46 @@
+"""
+Utilities for working with tools across different formats.
+"""
+
+from typing import Dict, Any, List
+
+
+def langchain_tool_to_openai_format(tool) -> Dict[str, Any]:
+    """
+    Convert a LangChain StructuredTool to OpenAI function calling format.
+    
+    Args:
+        tool: A langchain_core.tools.structured.StructuredTool instance
+        
+    Returns:
+        Dictionary in OpenAI function calling format, compatible with 
+        MCPClient.list_tools() output and call_llm() tools parameter
+    """
+    schema = tool.args_schema.model_json_schema()
+    
+    return {
+        "type": "function",
+        "function": {
+            "name": schema.get("title", tool.name),
+            "description": schema.get("description", ""),
+            "parameters": {
+                "type": "object",
+                "properties": schema.get("properties", {}),
+                "required": schema.get("required", [])
+            }
+        }
+    }
+
+
+def langchain_tools_to_openai_format(tools: List) -> List[Dict[str, Any]]:
+    """
+    Convert a list of LangChain StructuredTools to OpenAI function calling format.
+    
+    Args:
+        tools: List of langchain_core.tools.structured.StructuredTool instances
+        
+    Returns:
+        List of dictionaries in OpenAI function calling format, compatible with 
+        MCPClient.list_tools() output and call_llm() tools parameter
+    """
+    return [langchain_tool_to_openai_format(tool) for tool in tools]

{agentic_blocks-0.1.8.dist-info → agentic_blocks-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-blocks
-Version: 0.1.8
+Version: 0.1.10
 Summary: Simple building blocks for agentic AI systems with MCP client and conversation management
 Author-email: Magnus Bjelkenhed <bjelkenhed@gmail.com>
 License: MIT
@@ -23,6 +23,7 @@ Requires-Dist: mcp
 Requires-Dist: requests
 Requires-Dist: python-dotenv
 Requires-Dist: openai
+Requires-Dist: langchain-core
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Provides-Extra: dev

agentic_blocks-0.1.10.dist-info/RECORD

@@ -0,0 +1,10 @@
+agentic_blocks/__init__.py,sha256=LJy2tzTwX9ZjPw8dqkXOWiude7ZDDIaBIvaLC8U4d_Y,435
+agentic_blocks/llm.py,sha256=q2Utx2NiffLrp7VHmQIRZtBtrnQSMFtqCeYs9ynj0Ww,5335
+agentic_blocks/mcp_client.py,sha256=15mIN_Qw0OVNJAvfgO3jVZS4-AU4TtvEQSFDlL9ruqA,9773
+agentic_blocks/messages.py,sha256=dxaR_-IiH8n7pZygFDiUt8n7mMOm--FRuN-xCQEuewo,11758
+agentic_blocks/utils/tools_utils.py,sha256=9l8uJobUo8DaipKTrIS_Ztaheggd0QkqiQanpXJW4dw,1451
+agentic_blocks-0.1.10.dist-info/licenses/LICENSE,sha256=r4IcBaAjTv3-yfjXgDPuRD953Qci0Y0nQn5JfHwLyBY,1073
+agentic_blocks-0.1.10.dist-info/METADATA,sha256=TUtbZhPOcUfqCOj_Z3WEHlhyL_kX4SqGz-Nhf1ehESU,11944
+agentic_blocks-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agentic_blocks-0.1.10.dist-info/top_level.txt,sha256=-1a4RAemqicXLU1rRzw4QHV3KlNeQDNxVs3m2gAT238,15
+agentic_blocks-0.1.10.dist-info/RECORD,,

agentic_blocks-0.1.8.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=WhZDFYb9afvJH9YcieTvEbPdSOkRcclFkCSiMM-9YjY,9904
-agentic_blocks-0.1.8.dist-info/licenses/LICENSE,sha256=r4IcBaAjTv3-yfjXgDPuRD953Qci0Y0nQn5JfHwLyBY,1073
-agentic_blocks-0.1.8.dist-info/METADATA,sha256=tVHFAuCPukOxAegfZG8XMrwSOugY4tKwCOkKdFU3kCI,11913
-agentic_blocks-0.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agentic_blocks-0.1.8.dist-info/top_level.txt,sha256=-1a4RAemqicXLU1rRzw4QHV3KlNeQDNxVs3m2gAT238,15
-agentic_blocks-0.1.8.dist-info/RECORD,,