praisonaiagents 0.0.66__py3-none-any.whl → 0.0.67__py3-none-any.whl

praisonaiagents/mcp/__init__.py

@@ -0,0 +1,6 @@
+"""
+Model Context Protocol (MCP) integration for PraisonAI Agents.
+"""
+from .mcp import MCP
+
+__all__ = ["MCP"]

praisonaiagents/mcp/mcp.py

@@ -4,7 +4,9 @@ import queue
 import time
 import inspect
 import shlex
-from typing import Dict, Any, List, Optional, Callable, Iterable, Union
+import logging
+import os
+from typing import Any, List, Optional, Callable, Iterable, Union
 from functools import wraps, partial
 
 from mcp import ClientSession, StdioServerParameters
@@ -128,7 +130,7 @@ class MCP:
         ```
     """
     
-    def __init__(self, command_or_string=None, args=None, *, command=None, **kwargs):
+    def __init__(self, command_or_string=None, args=None, *, command=None, timeout=60, debug=False, **kwargs):
         """
         Initialize the MCP connection and get tools.
         
@@ -136,8 +138,11 @@ class MCP:
             command_or_string: Either:
                              - The command to run the MCP server (e.g., Python path)
                              - A complete command string (e.g., "/path/to/python /path/to/app.py")
+                             - For NPX: 'npx' command with args for smithery tools
             args: Arguments to pass to the command (when command_or_string is the command)
             command: Alternative parameter name for backward compatibility
+            timeout: Timeout in seconds for MCP server initialization and tool calls (default: 60)
+            debug: Enable debug logging for MCP operations (default: False)
             **kwargs: Additional parameters for StdioServerParameters
         """
         # Handle backward compatibility with named parameter 'command'
@@ -168,9 +173,24 @@ class MCP:
         # Wait for initialization
         if not self.runner.initialized.wait(timeout=30):
             print("Warning: MCP initialization timed out")
+            
+        # Store additional parameters
+        self.timeout = timeout
+        self.debug = debug
+        
+        if debug:
+            logging.getLogger("mcp-wrapper").setLevel(logging.DEBUG)
+        
+        # Automatically detect if this is an NPX command
+        self.is_npx = cmd == 'npx' or (isinstance(cmd, str) and os.path.basename(cmd) == 'npx')
         
-        # Generate tool functions immediately and store them
-        self._tools = self._generate_tool_functions()
+        # For NPX-based MCP servers, use a different approach
+        if self.is_npx:
+            self._function_declarations = []
+            self._initialize_npx_mcp_tools(cmd, arguments)
+        else:
+            # Generate tool functions immediately and store them
+            self._tools = self._generate_tool_functions()
     
     def _generate_tool_functions(self) -> List[Callable]:
         """
@@ -264,6 +284,27 @@ class MCP:
         
         return wrapper
     
+    def _initialize_npx_mcp_tools(self, cmd, arguments):
+        """Initialize the NPX MCP tools by extracting tool definitions."""
+        try:
+            # For NPX tools, we'll use the same approach as regular MCP tools
+            # but we need to handle the initialization differently
+            if self.debug:
+                logging.debug(f"Initializing NPX MCP tools with command: {cmd} {' '.join(arguments)}")
+            
+            # Generate tool functions using the regular MCP approach
+            self._tools = self._generate_tool_functions()
+            
+            if self.debug:
+                logging.debug(f"Generated {len(self._tools)} NPX MCP tools")
+                
+        except Exception as e:
+            if self.debug:
+                logging.error(f"Failed to initialize NPX MCP tools: {e}")
+            raise RuntimeError(f"Failed to initialize NPX MCP tools: {e}")
+    
+
+    
     def __iter__(self) -> Iterable[Callable]:
         """
         Allow the MCP instance to be used directly as an iterable of tools.

{praisonaiagents-0.0.66.dist-info → praisonaiagents-0.0.67.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: praisonaiagents
-Version: 0.0.66
+Version: 0.0.67
 Summary: Praison AI agents for completing complex tasks with Self Reflection Agents
 Author: Mervin Praison
 Requires-Dist: pydantic

{praisonaiagents-0.0.66.dist-info → praisonaiagents-0.0.67.dist-info}/RECORD

@@ -11,7 +11,8 @@ praisonaiagents/knowledge/chunking.py,sha256=FzoNY0q8MkvG4gADqk4JcRhmH3lcEHbRdon
 praisonaiagents/knowledge/knowledge.py,sha256=fQNREDiwdoisfIxJBLVkteXgq_8Gbypfc3UaZbxf5QY,13210
 praisonaiagents/llm/__init__.py,sha256=ttPQQJQq6Tah-0updoEXDZFKWtJAM93rBWRoIgxRWO8,689
 praisonaiagents/llm/llm.py,sha256=6QMRW47fgFozibzaqxa3dwxlD756rMLCRjL3eNsw8QQ,74088
-praisonaiagents/mcp/mcp.py,sha256=xvORgbsbsdaY_j3jKCP8BH3ERoKi_ZK8zM57mobC2Ac,10488
+praisonaiagents/mcp/__init__.py,sha256=IkYdrAK1bDQDm_0t3Wjt63Zwv3_IJgqz84Wqz9GH2iQ,111
+praisonaiagents/mcp/mcp.py,sha256=7EJo2Eyw89ePQzeKUzRZgW3E2ztLkMwQj2lCjFlzecQ,12281
 praisonaiagents/memory/memory.py,sha256=I8dOTkrl1i-GgQbDcrFOsSruzJ7MiI6Ys37DK27wrUs,35537
 praisonaiagents/process/__init__.py,sha256=lkYbL7Hn5a0ldvJtkdH23vfIIZLIcanK-65C0MwaorY,52
 praisonaiagents/process/process.py,sha256=HPw84OhnKQW3EyrDkpoQu0DcpxThbrzR2hWUgwQh9Pw,59955
@@ -38,7 +39,7 @@ praisonaiagents/tools/xml_tools.py,sha256=iYTMBEk5l3L3ryQ1fkUnNVYK-Nnua2Kx2S0dxN
 praisonaiagents/tools/yaml_tools.py,sha256=uogAZrhXV9O7xvspAtcTfpKSQYL2nlOTvCQXN94-G9A,14215
 praisonaiagents/tools/yfinance_tools.py,sha256=s2PBj_1v7oQnOobo2fDbQBACEHl61ftG4beG6Z979ZE,8529
 praisonaiagents/tools/train/data/generatecot.py,sha256=H6bNh-E2hqL5MW6kX3hqZ05g9ETKN2-kudSjiuU_SD8,19403
-praisonaiagents-0.0.66.dist-info/METADATA,sha256=mZDRbV3kjDru4ehwjOVkMLJAKZeYq79yZB_8VjQDzUA,830
-praisonaiagents-0.0.66.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-praisonaiagents-0.0.66.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.66.dist-info/RECORD,,
+praisonaiagents-0.0.67.dist-info/METADATA,sha256=sGyO2OxLcuZGGmq-2WZHg9RIvSB1tLPFOUpEst8VeU0,830
+praisonaiagents-0.0.67.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+praisonaiagents-0.0.67.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.67.dist-info/RECORD,,

{praisonaiagents-0.0.66.dist-info → praisonaiagents-0.0.67.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any