alita-sdk 0.3.433__tar.gz → 0.3.435__tar.gz

{alita_sdk-0.3.433 → alita_sdk-0.3.435}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.433
+Version: 0.3.435
 Summary: SDK for building langchain agents using resources from Alita
 Author-email: Artem Rozumenko <artyom.rozumenko@gmail.com>, Mikalai Biazruchka <mikalai_biazruchka@epam.com>, Roman Mitusov <roman_mitusov@epam.com>, Ivan Krakhmaliuk <lifedj27@gmail.com>, Artem Dubrovskiy <ad13box@gmail.com>
 License-Expression: Apache-2.0

{alita_sdk-0.3.433 → alita_sdk-0.3.435}/alita_sdk/runtime/clients/client.py

@@ -575,7 +575,9 @@ class AlitaClient:
         Args:
             llm: The LLM to use
             instructions: System instructions for the agent
-            tools: Optional list of tools to provide to the agent
+            tools: Optional list of tool configurations (not tool instances) to provide to the agent.
+                   Tool configs will be processed through get_tools() to create tool instances.
+                   Each tool config should have 'type', 'settings', etc.
             chat_history: Optional chat history
             memory: Optional memory/checkpointer
             runtime: Runtime type (default: 'langchain')
@@ -595,9 +597,11 @@ class AlitaClient:
 
         # Create a minimal data structure for predict agent
         # All LLM settings are taken from the passed client instance
+        # Note: 'tools' here are tool CONFIGURATIONS, not tool instances
+        # They will be converted to tool instances by LangChainAssistant via get_tools()
         agent_data = {
             'instructions': instructions,
-            'tools': tools,  # Tools are handled separately in predict agents
+            'tools': tools,  # Tool configs that will be processed by get_tools()
             'variables': variables
         }
         return LangChainAssistant(self, agent_data, llm,

{alita_sdk-0.3.433 → alita_sdk-0.3.435}/alita_sdk/runtime/models/mcp_models.py

@@ -41,7 +41,7 @@ class McpToolkitConfig(BaseModel):
 
     server_name: str = Field(description="MCP server name/identifier")
     connection: McpConnectionConfig = Field(description="MCP connection configuration")
-    timeout: int = Field(default=60, description="Request timeout in seconds", ge=1, le=300)
+    timeout: int = Field(default=60, description="Request timeout in seconds", ge=1, le=3600)
     selected_tools: List[str] = Field(default_factory=list, description="Specific tools to enable (empty = all)")
     enable_caching: bool = Field(default=True, description="Enable tool schema caching")
     cache_ttl: int = Field(default=300, description="Cache TTL in seconds", ge=60, le=3600)

{alita_sdk-0.3.433 → alita_sdk-0.3.435}/alita_sdk/runtime/toolkits/mcp.py

@@ -287,7 +287,8 @@ class McpToolkit(BaseToolkit):
             logger.info(f"Successfully created {len(tools)} MCP tools from toolkit '{toolkit_name}' via direct discovery")
 
         except Exception as e:
-            logger.error(f"Direct discovery failed for MCP toolkit '{toolkit_name}': {e}")
+            logger.error(f"Direct discovery failed for MCP toolkit '{toolkit_name}': {e}", exc_info=True)
+            logger.error(f"Discovery error details - URL: {connection_config.url}, Timeout: {timeout}s")
 
             # Fallback to static mode if available and not already static
             if client and discovery_mode != "static":
@@ -296,14 +297,19 @@ class McpToolkit(BaseToolkit):
             else:
                 logger.warning(f"No fallback available for toolkit '{toolkit_name}' - returning empty tools list")
 
-        # Always add the inspection tool (not subject to selected_tools filtering)
-        inspection_tool = cls._create_inspection_tool(
-            toolkit_name=toolkit_name,
-            connection_config=connection_config
-        )
-        if inspection_tool:
-            tools.append(inspection_tool)
-            logger.info(f"Added MCP inspection tool for toolkit '{toolkit_name}'")
+        # Don't add inspection tool to agent - it's only for internal use by toolkit
+        # inspection_tool = cls._create_inspection_tool(
+        #     toolkit_name=toolkit_name,
+        #     connection_config=connection_config
+        # )
+        # if inspection_tool:
+        #     tools.append(inspection_tool)
+        #     logger.info(f"Added MCP inspection tool for toolkit '{toolkit_name}'")
+
+        # Log final tool count before returning
+        logger.info(f"MCP toolkit '{toolkit_name}' will provide {len(tools)} tools to agent")
+        if len(tools) == 0:
+            logger.warning(f"MCP toolkit '{toolkit_name}' has no tools - discovery may have failed")
 
         return tools
 
@@ -315,16 +321,82 @@ class McpToolkit(BaseToolkit):
         timeout: int
     ) -> List[Dict[str, Any]]:
         """
-        Synchronously discover tools from MCP server using HTTP requests.
-        Returns list of tool dictionaries with name, description, and inputSchema.
+        Synchronously discover tools and prompts from MCP server using HTTP requests.
+        Returns list of tool/prompt dictionaries with name, description, and inputSchema.
+        Prompts are converted to tools that can be invoked.
+        """
+        all_tools = []
+        
+        # Discover regular tools
+        tools_data = cls._discover_mcp_endpoint(
+            endpoint="tools/list",
+            toolkit_name=toolkit_name,
+            connection_config=connection_config,
+            timeout=timeout
+        )
+        all_tools.extend(tools_data)
+        logger.info(f"Discovered {len(tools_data)} tools from MCP toolkit '{toolkit_name}'")
+        
+        # Discover prompts and convert them to tools
+        try:
+            prompts_data = cls._discover_mcp_endpoint(
+                endpoint="prompts/list",
+                toolkit_name=toolkit_name,
+                connection_config=connection_config,
+                timeout=timeout
+            )
+            # Convert prompts to tool format
+            for prompt in prompts_data:
+                prompt_tool = {
+                    "name": f"prompt_{prompt.get('name', 'unnamed')}",
+                    "description": prompt.get('description', f"Execute prompt: {prompt.get('name')}"),
+                    "inputSchema": {
+                        "type": "object",
+                        "properties": {
+                            "arguments": {
+                                "type": "object",
+                                "description": "Arguments for the prompt template",
+                                "properties": {
+                                    arg.get("name"): {
+                                        "type": "string",
+                                        "description": arg.get("description", ""),
+                                        "required": arg.get("required", False)
+                                    }
+                                    for arg in prompt.get("arguments", [])
+                                }
+                            }
+                        }
+                    },
+                    "_mcp_type": "prompt",
+                    "_mcp_prompt_name": prompt.get('name')
+                }
+                all_tools.append(prompt_tool)
+            logger.info(f"Discovered {len(prompts_data)} prompts from MCP toolkit '{toolkit_name}'")
+        except Exception as e:
+            logger.warning(f"Failed to discover prompts from MCP toolkit '{toolkit_name}': {e}")
+        
+        logger.info(f"Total discovered {len(all_tools)} tools+prompts from MCP toolkit '{toolkit_name}'")
+        return all_tools
+
+    @classmethod
+    def _discover_mcp_endpoint(
+        cls,
+        endpoint: str,
+        toolkit_name: str,
+        connection_config: McpConnectionConfig,
+        timeout: int
+    ) -> List[Dict[str, Any]]:
+        """
+        Discover items from a specific MCP endpoint (tools/list or prompts/list).
+        Returns list of dictionaries.
         """
         import time
 
-        # MCP protocol: list_tools request
+        # MCP protocol request
         mcp_request = {
             "jsonrpc": "2.0",
-            "id": f"discover_{int(time.time())}",
-            "method": "tools/list",
+            "id": f"discover_{endpoint.replace('/', '_')}_{int(time.time())}",
+            "method": endpoint,
             "params": {}
         }
 
@@ -336,6 +408,7 @@ class McpToolkit(BaseToolkit):
             headers.update(connection_config.headers)
 
         try:
+            logger.debug(f"Sending MCP {endpoint} request to {connection_config.url}")
             response = requests.post(
                 connection_config.url,
                 json=mcp_request,
@@ -344,6 +417,7 @@ class McpToolkit(BaseToolkit):
             )
 
             if response.status_code != 200:
+                logger.error(f"MCP server returned non-200 status: {response.status_code}")
                 raise Exception(f"HTTP {response.status_code}: {response.text}")
 
             # Check content type and parse accordingly
@@ -364,14 +438,17 @@ class McpToolkit(BaseToolkit):
             if "error" in data:
                 raise Exception(f"MCP Error: {data['error']}")
 
-            # Parse MCP response and extract tools
-            tools_data = data.get("result", {}).get("tools", [])
-            logger.info(f"Discovered {len(tools_data)} tools from MCP toolkit '{toolkit_name}'")
-
-            return tools_data
+            # Parse MCP response - different endpoints return different keys
+            result = data.get("result", {})
+            if endpoint == "tools/list":
+                return result.get("tools", [])
+            elif endpoint == "prompts/list":
+                return result.get("prompts", [])
+            else:
+                return result.get("items", [])
 
         except Exception as e:
-            logger.error(f"Failed to discover tools from MCP toolkit '{toolkit_name}': {e}")
+            logger.error(f"Failed to discover from {endpoint} on MCP toolkit '{toolkit_name}': {e}")
             raise
 
     @staticmethod
@@ -406,7 +483,7 @@ class McpToolkit(BaseToolkit):
         timeout: int,
         client
     ) -> Optional[BaseTool]:
-        """Create a BaseTool from a tool dictionary (from direct HTTP discovery)."""
+        """Create a BaseTool from a tool/prompt dictionary (from direct HTTP discovery)."""
         try:
             # Store toolkit_max_length in local variable to avoid contextual access issues
             max_length_value = cls.toolkit_max_length
@@ -415,16 +492,22 @@ class McpToolkit(BaseToolkit):
             clean_prefix = clean_string(toolkit_name, max_length_value)
 
             full_tool_name = f'{clean_prefix}{TOOLKIT_SPLITTER}{tool_dict.get("name", "unknown")}'
+            
+            # Check if this is a prompt (converted to tool)
+            is_prompt = tool_dict.get("_mcp_type") == "prompt"
+            item_type = "prompt" if is_prompt else "tool"
 
             return McpServerTool(
                 name=full_tool_name,
-                description=f"MCP tool '{tool_dict.get('name')}' from toolkit '{toolkit_name}': {tool_dict.get('description', '')}",
+                description=f"MCP {item_type} '{tool_dict.get('name')}' from toolkit '{toolkit_name}': {tool_dict.get('description', '')}",
                 args_schema=McpServerTool.create_pydantic_model_from_schema(
                     tool_dict.get("inputSchema", {})
                 ),
                 client=client,
                 server=toolkit_name,
-                tool_timeout_sec=timeout
+                tool_timeout_sec=timeout,
+                is_prompt=is_prompt,
+                prompt_name=tool_dict.get("_mcp_prompt_name") if is_prompt else None
             )
         except Exception as e:
             logger.error(f"Failed to create MCP tool '{tool_dict.get('name')}' from toolkit '{toolkit_name}': {e}")
@@ -588,6 +671,10 @@ class McpToolkit(BaseToolkit):
 
     def get_tools(self) -> List[BaseTool]:
         """Get the list of tools provided by this toolkit."""
+        logger.info(f"MCP toolkit '{self.toolkit_name}' returning {len(self.tools)} tools")
+        if len(self.tools) > 0:
+            tool_names = [t.name if hasattr(t, 'name') else str(t) for t in self.tools]
+            logger.info(f"MCP toolkit '{self.toolkit_name}' tools: {tool_names}")
         return self.tools
 
     async def refresh_tools(self):
@@ -648,15 +735,26 @@ def get_tools(tool_config: dict, alita_client, llm=None, memory_store=None) -> L
         logger.error("MCP toolkit configuration missing required 'url'")
         return []
 
+    # Type conversion for numeric settings that may come as strings from config
+    def safe_int(value, default):
+        """Convert value to int, handling string inputs."""
+        if value is None:
+            return default
+        try:
+            return int(value)
+        except (ValueError, TypeError):
+            logger.warning(f"Invalid integer value '{value}', using default {default}")
+            return default
+
     return McpToolkit.get_toolkit(
         url=url,
         headers=headers,
-        timeout=settings.get('timeout', 60),
+        timeout=safe_int(settings.get('timeout'), 60),
         discovery_mode=settings.get('discovery_mode', 'dynamic'),
-        discovery_interval=settings.get('discovery_interval', 300),
+        discovery_interval=safe_int(settings.get('discovery_interval'), 300),
         selected_tools=settings.get('selected_tools', []),
         enable_caching=settings.get('enable_caching', True),
-        cache_ttl=settings.get('cache_ttl', 300),
+        cache_ttl=safe_int(settings.get('cache_ttl'), 300),
         toolkit_name=toolkit_name,
         client=alita_client
     ).get_tools()

{alita_sdk-0.3.433 → alita_sdk-0.3.435}/alita_sdk/runtime/tools/mcp_server_tool.py

@@ -18,6 +18,8 @@ class McpServerTool(BaseTool):
     client: Any = Field(default=None, exclude=True)  # Exclude from serialization
     server: str
     tool_timeout_sec: int = 60
+    is_prompt: bool = False  # Flag to indicate if this is a prompt tool
+    prompt_name: Optional[str] = None  # Original prompt name if this is a prompt
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
@@ -140,14 +142,31 @@ class McpServerTool(BaseTool):
         return create_model(model_name, **fields)
 
     def _run(self, *args, **kwargs):
-        call_data = {
-            "server": self.server,
-            "tool_timeout_sec": self.tool_timeout_sec,
-            "tool_call_id": str(uuid.uuid4()),
-            "params": {
-                "name": self.name.rsplit(TOOLKIT_SPLITTER)[1] if TOOLKIT_SPLITTER in self.name else self.name,
-                "arguments": kwargs
+        # Extract the actual tool/prompt name (remove toolkit prefix)
+        actual_name = self.name.rsplit(TOOLKIT_SPLITTER)[1] if TOOLKIT_SPLITTER in self.name else self.name
+        
+        if self.is_prompt:
+            # For prompts, use prompts/get endpoint
+            call_data = {
+                "server": self.server,
+                "tool_timeout_sec": self.tool_timeout_sec,
+                "tool_call_id": str(uuid.uuid4()),
+                "method": "prompts/get",
+                "params": {
+                    "name": self.prompt_name or actual_name.replace("prompt_", ""),
+                    "arguments": kwargs.get("arguments", kwargs)
+                }
+            }
+        else:
+            # For regular tools, use tools/call endpoint
+            call_data = {
+                "server": self.server,
+                "tool_timeout_sec": self.tool_timeout_sec,
+                "tool_call_id": str(uuid.uuid4()),
+                "params": {
+                    "name": actual_name,
+                    "arguments": kwargs
+                }
             }
-        }
         
         return self.client.mcp_tool_call(call_data)

{alita_sdk-0.3.433 → alita_sdk-0.3.435}/alita_sdk/tools/__init__.py

@@ -131,15 +131,9 @@ def get_tools(tools_list, alita, llm, store: Optional[BaseStore] = None, *args,
                 logger.error(f"Error getting ADO repos tools: {e}")
             continue
 
-        # Handle MCP toolkit (located in runtime/toolkits)
+        # Skip MCP toolkit - it's handled by runtime/toolkits/tools.py to avoid duplicate loading
         if tool_type == 'mcp':
-            try:
-                from alita_sdk.runtime.toolkits.mcp import get_tools as mcp_get_tools
-                tools.extend(mcp_get_tools(tool, alita, llm))
-                logger.debug(f"Successfully loaded MCP tools")
-            except Exception as e:
-                logger.error(f"Error getting MCP tools: {e}")
-                raise ToolException(f"Error getting MCP tools: {e}")
+            logger.debug(f"Skipping MCP toolkit '{tool.get('toolkit_name')}' - handled by runtime toolkit system")
             continue
 
         # Handle standard tools

{alita_sdk-0.3.433 → alita_sdk-0.3.435}/alita_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.433
+Version: 0.3.435
 Summary: SDK for building langchain agents using resources from Alita
 Author-email: Artem Rozumenko <artyom.rozumenko@gmail.com>, Mikalai Biazruchka <mikalai_biazruchka@epam.com>, Roman Mitusov <roman_mitusov@epam.com>, Ivan Krakhmaliuk <lifedj27@gmail.com>, Artem Dubrovskiy <ad13box@gmail.com>
 License-Expression: Apache-2.0

{alita_sdk-0.3.433 → alita_sdk-0.3.435}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "alita_sdk"
-version = "0.3.433"
+version = "0.3.435"
 description = "SDK for building langchain agents using resources from Alita"
 readme = "README.md"
 requires-python = ">=3.10"