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

agentic_blocks/utils/tools_utils.py

@@ -18,16 +18,23 @@ def langchain_tool_to_openai_format(tool) -> Dict[str, Any]:
     """
     schema = tool.args_schema.model_json_schema()
     
+    # Build parameters object, including $defs if present
+    parameters = {
+        "type": "object",
+        "properties": schema.get("properties", {}),
+        "required": schema.get("required", [])
+    }
+    
+    # Include $defs if present in the schema
+    if "$defs" in schema:
+        parameters["$defs"] = schema["$defs"]
+    
     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", [])
-            }
+            "parameters": parameters
         }
     }
 
@@ -43,4 +50,134 @@ def langchain_tools_to_openai_format(tools: List) -> List[Dict[str, Any]]:
         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]
+    return [langchain_tool_to_openai_format(tool) for tool in tools]
+
+
+def create_tool_registry(tools: List) -> Dict[str, Any]:
+    """
+    Create a registry mapping tool names to LangChain tool instances.
+    
+    Args:
+        tools: List of langchain_core.tools.structured.StructuredTool instances
+        
+    Returns:
+        Dictionary mapping tool names to tool instances
+    """
+    return {tool.name: tool for tool in tools}
+
+
+def execute_tool_call(tool_call: Dict[str, Any], tool_registry: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    Execute a single tool call using LangChain tool registry.
+    
+    Args:
+        tool_call: Dictionary with 'tool_name', 'arguments', and 'tool_call_id' keys
+        tool_registry: Registry mapping tool names to tool instances
+        
+    Returns:
+        Dictionary with 'tool_call_id', 'result', and 'is_error' keys
+    """
+    tool_name = tool_call.get('tool_name')
+    arguments = tool_call.get('arguments', {})
+    tool_call_id = tool_call.get('tool_call_id')
+    
+    try:
+        if tool_name not in tool_registry:
+            raise ValueError(f"Tool '{tool_name}' not found in registry")
+        
+        tool = tool_registry[tool_name]
+        result = tool.invoke(arguments)
+        
+        return {
+            'tool_call_id': tool_call_id,
+            'result': result,
+            'is_error': False
+        }
+    except Exception as e:
+        return {
+            'tool_call_id': tool_call_id,
+            'result': f"Error executing tool '{tool_name}': {str(e)}",
+            'is_error': True
+        }
+
+
+def execute_pending_tool_calls(messages, tool_registry: Dict[str, Any]) -> List[Dict[str, Any]]:
+    """
+    Execute all pending tool calls from a Messages instance and add responses back.
+    
+    Args:
+        messages: Messages instance with pending tool calls
+        tool_registry: Registry mapping tool names to tool instances
+        
+    Returns:
+        List of execution results compatible with Messages.add_tool_responses format
+    """
+    pending_tool_calls = messages.get_pending_tool_calls()
+    results = []
+    
+    for tool_call in pending_tool_calls:
+        result = execute_tool_call(tool_call, tool_registry)
+        
+        # Convert to format expected by Messages.add_tool_responses
+        if result['is_error']:
+            tool_response = {
+                'tool_call_id': result['tool_call_id'],
+                'is_error': True,
+                'error': result['result']
+            }
+        else:
+            tool_response = {
+                'tool_call_id': result['tool_call_id'],
+                'is_error': False,
+                'tool_response': result['result']
+            }
+        
+        results.append(tool_response)
+        
+        # Add tool response back to messages using individual method
+        if result['is_error']:
+            messages.add_tool_response(result['tool_call_id'], result['result'])
+        else:
+            messages.add_tool_response(result['tool_call_id'], str(result['result']))
+    
+    return results
+
+
+def execute_and_add_tool_responses(messages, tool_registry: Dict[str, Any]) -> List[Dict[str, Any]]:
+    """
+    Execute all pending tool calls and add them using Messages.add_tool_responses batch method.
+    
+    Args:
+        messages: Messages instance with pending tool calls
+        tool_registry: Registry mapping tool names to tool instances
+        
+    Returns:
+        List of execution results compatible with Messages.add_tool_responses format
+    """
+    pending_tool_calls = messages.get_pending_tool_calls()
+    results = []
+    
+    for tool_call in pending_tool_calls:
+        result = execute_tool_call(tool_call, tool_registry)
+        
+        # Convert to format expected by Messages.add_tool_responses
+        if result['is_error']:
+            tool_response = {
+                'tool_call_id': result['tool_call_id'],
+                'is_error': True,
+                'error': result['result']
+            }
+        else:
+            tool_response = {
+                'tool_call_id': result['tool_call_id'],
+                'is_error': False,
+                'tool_response': result['result']
+            }
+        
+        results.append(tool_response)
+    
+    # Add all responses at once using the batch method
+    if results:
+        messages.add_tool_responses(results)
+    
+    return results

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-blocks
-Version: 0.1.10
+Version: 0.1.12
 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.10.dist-info → agentic_blocks-0.1.12.dist-info}/RECORD

@@ -2,9 +2,9 @@ agentic_blocks/__init__.py,sha256=LJy2tzTwX9ZjPw8dqkXOWiude7ZDDIaBIvaLC8U4d_Y,43
 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/utils/tools_utils.py,sha256=p1q0qcyQqAEYxoGNbWTRcn4R9CpTH0QkdWOc7OiGveg,5931
+agentic_blocks-0.1.12.dist-info/licenses/LICENSE,sha256=r4IcBaAjTv3-yfjXgDPuRD953Qci0Y0nQn5JfHwLyBY,1073
+agentic_blocks-0.1.12.dist-info/METADATA,sha256=vcmqy_lp9Nr5jirQeSHwqcx8hOoknXilYiJ9DYvtuxQ,11944
+agentic_blocks-0.1.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agentic_blocks-0.1.12.dist-info/top_level.txt,sha256=-1a4RAemqicXLU1rRzw4QHV3KlNeQDNxVs3m2gAT238,15
+agentic_blocks-0.1.12.dist-info/RECORD,,