alita-sdk 0.3.433__py3-none-any.whl → 0.3.434__py3-none-any.whl

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/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):

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/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.dist-info → alita_sdk-0.3.434.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alita_sdk
-Version: 0.3.433
+Version: 0.3.434
 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.dist-info → alita_sdk-0.3.434.dist-info}/RECORD

@@ -97,13 +97,13 @@ alita_sdk/runtime/langchain/tools/bdd_parser/feature_types.py,sha256=l3AdjSQnNv1
 alita_sdk/runtime/langchain/tools/bdd_parser/parser.py,sha256=1H1Nd_OH5Wx8A5YV1zUghBxo613yPptZ7fqNo8Eg48M,17289
 alita_sdk/runtime/llms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alita_sdk/runtime/llms/preloaded.py,sha256=3AaUbZK3d8fvxAQMjR3ftOoYa0SnkCOL1EvdvDCXIHE,11321
-alita_sdk/runtime/models/mcp_models.py,sha256=1dlZShKR1dMhuqx9OEOdB3yoY9JumRCT0UkjS9bTZbo,2151
+alita_sdk/runtime/models/mcp_models.py,sha256=OdeDsKvB43auvTS1F3O2VBLd1dwe_7zCkhZZjFbICpw,2152
 alita_sdk/runtime/toolkits/__init__.py,sha256=IenSyI2SrXSFuiWT7c8YO_mRFLVE_zNge61U4bpoyPw,631
 alita_sdk/runtime/toolkits/application.py,sha256=HHAKgwKOckxc7EQG-AV7rz4POOzQJKFRr7AGEjmLudE,2688
 alita_sdk/runtime/toolkits/artifact.py,sha256=YChNCX4QhVpaQG7Jk4TS-Wl0Aruc4slQ2K21zh9nNO0,3176
 alita_sdk/runtime/toolkits/configurations.py,sha256=kIDAlnryPQfbZyFxV-9SzN2-Vefzx06TX1BBdIIpN90,141
 alita_sdk/runtime/toolkits/datasource.py,sha256=qk78OdPoReYPCWwahfkKLbKc4pfsu-061oXRryFLP6I,2498
-alita_sdk/runtime/toolkits/mcp.py,sha256=5fdmY5s5lfw4NieovFYr0C9STiCHGFuOtAZ1uFKaj0U,26764
+alita_sdk/runtime/toolkits/mcp.py,sha256=OAxWrd8CL9Y6Gggpu_EtP81FjnhFhyt0-8CyFc9Fzks,30946
 alita_sdk/runtime/toolkits/prompt.py,sha256=WIpTkkVYWqIqOWR_LlSWz3ug8uO9tm5jJ7aZYdiGRn0,1192
 alita_sdk/runtime/toolkits/subgraph.py,sha256=wwUK8JjPXkGzyVZ3tAukmvST6eGbqx_U11rpnmbrvtg,2105
 alita_sdk/runtime/toolkits/tools.py,sha256=YCTjrTJuwj2V2C8ZQqXhFvUbVr7NQcUHZlCQLLvoeGA,10946
@@ -122,7 +122,7 @@ alita_sdk/runtime/tools/llm.py,sha256=iRG_wU4T01LRsjEMPZe5Uah7LiMqDc-vspwkMuQtlt
 alita_sdk/runtime/tools/loop.py,sha256=uds0WhZvwMxDVFI6MZHrcmMle637cQfBNg682iLxoJA,8335
 alita_sdk/runtime/tools/loop_output.py,sha256=U4hO9PCQgWlXwOq6jdmCGbegtAxGAPXObSxZQ3z38uk,8069
 alita_sdk/runtime/tools/mcp_inspect_tool.py,sha256=38X8euaxDbEGjcfp6ElvExZalpZun6QEr6ZEW4nU5pQ,11496
-alita_sdk/runtime/tools/mcp_server_tool.py,sha256=y6y0j3JeUajNatpsLVJfP0JEknhlRcDRJ0PlJ3Ch8fA,6626
+alita_sdk/runtime/tools/mcp_server_tool.py,sha256=HPlEppCbNafee41wSxZL1wnVyYCiOwdMD_dy0eE9IUs,7505
 alita_sdk/runtime/tools/pgvector_search.py,sha256=NN2BGAnq4SsDHIhUcFZ8d_dbEOM8QwB0UwpsWCYruXU,11692
 alita_sdk/runtime/tools/prompt.py,sha256=nJafb_e5aOM1Rr3qGFCR-SKziU9uCsiP2okIMs9PppM,741
 alita_sdk/runtime/tools/router.py,sha256=p7e0tX6YAWw2M2Nq0A_xqw1E2P-Xz1DaJvhUstfoZn4,1584
@@ -140,7 +140,7 @@ alita_sdk/runtime/utils/streamlit.py,sha256=yIb4YIGH8HRAXZtZlywjxI07Xdcb5eUt7rMA
 alita_sdk/runtime/utils/toolkit_runtime.py,sha256=MU63Fpxj0b5_r1IUUc0Q3-PN9VwL7rUxp2MRR4tmYR8,5136
 alita_sdk/runtime/utils/toolkit_utils.py,sha256=n11byeV6uLHAT7D8lPgIA0FE7tergbaRfbrwTWh5Twk,5447
 alita_sdk/runtime/utils/utils.py,sha256=PJK8A-JVIzY1IowOjGG8DIqsIiEFe65qDKvFcjJCKWA,1041
-alita_sdk/tools/__init__.py,sha256=DzhwEeQNk27oMTq1UWWuyYqjOBT-ypWR2XByxBN1bks,11232
+alita_sdk/tools/__init__.py,sha256=uQzvtnyOsgfdHl3pdo2LqK49Hb3SKFXDBXW_szN2R3k,10992
 alita_sdk/tools/base_indexer_toolkit.py,sha256=hK1Q2dvNctZCw2K1-khlQrR1Q0JDQviZjqDUiqpnazg,27180
 alita_sdk/tools/code_indexer_toolkit.py,sha256=2VkOC8JfBDc25_jp-NWyMYqpaYRETIzTJFLrIYrfBpE,7814
 alita_sdk/tools/elitea_base.py,sha256=34fmVdYgd2YXifU5LFNjMQysr4OOIZ6AOZjq4GxLgSw,34417
@@ -358,8 +358,8 @@ alita_sdk/tools/zephyr_scale/api_wrapper.py,sha256=kT0TbmMvuKhDUZc0i7KO18O38JM9S
 alita_sdk/tools/zephyr_squad/__init__.py,sha256=0ne8XLJEQSLOWfzd2HdnqOYmQlUliKHbBED5kW_Vias,2895
 alita_sdk/tools/zephyr_squad/api_wrapper.py,sha256=kmw_xol8YIYFplBLWTqP_VKPRhL_1ItDD0_vXTe_UuI,14906
 alita_sdk/tools/zephyr_squad/zephyr_squad_cloud_client.py,sha256=R371waHsms4sllHCbijKYs90C-9Yu0sSR3N4SUfQOgU,5066
-alita_sdk-0.3.433.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-alita_sdk-0.3.433.dist-info/METADATA,sha256=EIfa8_iHpAyNV8f5hADnzfRQEKDglXU7--aHZ8qxcxU,19071
-alita_sdk-0.3.433.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alita_sdk-0.3.433.dist-info/top_level.txt,sha256=0vJYy5p_jK6AwVb1aqXr7Kgqgk3WDtQ6t5C-XI9zkmg,10
-alita_sdk-0.3.433.dist-info/RECORD,,
+alita_sdk-0.3.434.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+alita_sdk-0.3.434.dist-info/METADATA,sha256=tZmEkQg9ESX7Hmuz9VQHVx4Pt66g1qSn5acxirMxFtE,19071
+alita_sdk-0.3.434.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+alita_sdk-0.3.434.dist-info/top_level.txt,sha256=0vJYy5p_jK6AwVb1aqXr7Kgqgk3WDtQ6t5C-XI9zkmg,10
+alita_sdk-0.3.434.dist-info/RECORD,,