alita-sdk 0.3.445__py3-none-any.whl → 0.3.447__py3-none-any.whl

alita_sdk/runtime/toolkits/mcp.py

@@ -402,7 +402,13 @@ class McpToolkit(BaseToolkit):
                 ]
 
             # Create BaseTool instances from discovered metadata
-            # Use session_id from connection_config (passed from UI) instead of discovery
+            # Use session_id from discovery (which may have been created if server requires it)
+            # If discovery returned a session_id, it means a new session was created
+            # Log it so UI can capture and store it
+            if session_id:
+                logger.info(f"[MCP Session] Using session from discovery: {session_id}")
+                logger.info(f"[MCP Session] Session created - server: {canonical_resource(connection_config.url)}, session_id: {session_id}")
+            
             for tool_metadata in tool_metadata_list:
                 server_tool = cls._create_tool_from_dict(
                     tool_dict=tool_metadata,
@@ -410,7 +416,7 @@ class McpToolkit(BaseToolkit):
                     connection_config=connection_config,
                     timeout=timeout,
                     client=client,
-                    session_id=connection_config.session_id  # Use session from connection config
+                    session_id=session_id  # Use session from discovery
                 )
 
                 if server_tool:
@@ -462,20 +468,47 @@ class McpToolkit(BaseToolkit):
         """
         all_tools = []
         
-        # Note: We don't initialize MCP session here because:
-        # 1. Discovery happens before we have OAuth tokens
-        # 2. Sessions are initialized on-demand during first tool call (when we have auth)
-        # 3. Sessions are stored in UI sessionStorage and passed back via mcp_tokens
-        session_id = None
+        # Check if we have a session_id from UI (passed via connection_config)
+        # If not, we'll try discovery without session first, and create one if needed
+        session_id = connection_config.session_id
         
-        # Discover regular tools
-        tools_data = cls._discover_mcp_endpoint(
-            endpoint="tools/list",
-            toolkit_name=toolkit_name,
-            connection_config=connection_config,
-            timeout=timeout,
-            session_id=session_id
-        )
+        # Discover regular tools - if server requires session and we don't have one, this will fail
+        # and we'll catch it below to initialize a session
+        try:
+            tools_data = cls._discover_mcp_endpoint(
+                endpoint="tools/list",
+                toolkit_name=toolkit_name,
+                connection_config=connection_config,
+                timeout=timeout,
+                session_id=session_id
+            )
+        except Exception as discovery_error:
+            # Check if error is due to missing session
+            if "Missing sessionId" in str(discovery_error) and not session_id:
+                logger.info(f"[MCP Session] Server requires session for discovery, initializing...")
+                # Try to initialize session if we have OAuth headers
+                session_id = cls._initialize_mcp_session(
+                    toolkit_name=toolkit_name,
+                    connection_config=connection_config,
+                    timeout=timeout,
+                    extra_headers=connection_config.headers  # Use headers from connection_config
+                )
+                
+                if session_id:
+                    logger.info(f"[MCP Session] Created session for discovery: {session_id}")
+                    # Retry discovery with session
+                    tools_data = cls._discover_mcp_endpoint(
+                        endpoint="tools/list",
+                        toolkit_name=toolkit_name,
+                        connection_config=connection_config,
+                        timeout=timeout,
+                        session_id=session_id
+                    )
+                else:
+                    logger.error(f"[MCP Session] Failed to create session for discovery")
+                    raise discovery_error
+            else:
+                raise
         all_tools.extend(tools_data)
         logger.info(f"Discovered {len(tools_data)} tools from MCP toolkit '{toolkit_name}'")
         

alita_sdk/runtime/tools/mcp_remote_tool.py

@@ -12,7 +12,7 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import Any, Dict, Optional
 
 from .mcp_server_tool import McpServerTool
-from pydantic import Field, computed_field
+from pydantic import Field
 from ..utils.mcp_oauth import (
     McpAuthorizationRequired,
     canonical_resource,
@@ -38,11 +38,20 @@ class McpRemoteTool(McpServerTool):
     prompt_name: Optional[str] = None  # Original prompt name if this is a prompt
     session_id: Optional[str] = Field(default=None, description="MCP session ID for stateful SSE servers")
     
-    @computed_field
-    @property
-    def metadata(self) -> dict:
-        """Return tool metadata including session information for UI."""
-        return self.get_session_metadata()
+    def model_post_init(self, __context: Any) -> None:
+        """Update metadata with session info after model initialization."""
+        super().model_post_init(__context)
+        self._update_metadata_with_session()
+    
+    def _update_metadata_with_session(self):
+        """Update the metadata dict with current session information."""
+        if self.session_id:
+            if self.metadata is None:
+                self.metadata = {}
+            self.metadata.update({
+                'mcp_session_id': self.session_id,
+                'mcp_server_url': canonical_resource(self.server_url)
+            })
     
     def __getstate__(self):
         """Custom serialization for pickle compatibility."""
@@ -201,6 +210,8 @@ class McpRemoteTool(McpServerTool):
                             if session_id:
                                 # Retry the request with session
                                 self.session_id = session_id
+                                # Update metadata so callbacks can access session info
+                                self._update_metadata_with_session()
                                 separator = '&' if '?' in self.server_url else '?'
                                 retry_url = f"{self.server_url}{separator}sessionId={session_id}"
                                 logger.info(f"[MCP Session] Retrying tool call with new session: {session_id}")

{alita_sdk-0.3.445.dist-info → alita_sdk-0.3.447.dist-info}/METADATA

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

@@ -103,7 +103,7 @@ alita_sdk/runtime/toolkits/application.py,sha256=HHAKgwKOckxc7EQG-AV7rz4POOzQJKF
 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=bBfV-iOJ481SzMt14vMgs8BqZzzXwpa3111cGSB3810,46391
+alita_sdk/runtime/toolkits/mcp.py,sha256=J8XiunPA-Wb-1VBQlyzPE4JzsnMB2xHUhVYirhZdkXk,48218
 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=74R0SadMiUJFUe3U5_PJcxzw5m1KMMBiVfVeiowZK6I,13434
@@ -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_remote_tool.py,sha256=12-EaNqvU0qbJ0ur-L34Ssi4J0n0QyNrozI4gSyHaSU,15294
+alita_sdk/runtime/tools/mcp_remote_tool.py,sha256=ypOJE7MhdPAQqIIjtirH4OzVNFbZeZuwy0Sw1H2CQJ0,15866
 alita_sdk/runtime/tools/mcp_server_tool.py,sha256=-xO3H6BM63KaIV1CdcQKPVE0WPigiqOgFZDX7m2_yGs,4419
 alita_sdk/runtime/tools/pgvector_search.py,sha256=NN2BGAnq4SsDHIhUcFZ8d_dbEOM8QwB0UwpsWCYruXU,11692
 alita_sdk/runtime/tools/prompt.py,sha256=nJafb_e5aOM1Rr3qGFCR-SKziU9uCsiP2okIMs9PppM,741
@@ -360,8 +360,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.445.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-alita_sdk-0.3.445.dist-info/METADATA,sha256=eTg9o5vUnq9FRBtfxGhWQEvcFmx1G5UvbJNpwLU1V3Y,19071
-alita_sdk-0.3.445.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alita_sdk-0.3.445.dist-info/top_level.txt,sha256=0vJYy5p_jK6AwVb1aqXr7Kgqgk3WDtQ6t5C-XI9zkmg,10
-alita_sdk-0.3.445.dist-info/RECORD,,
+alita_sdk-0.3.447.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+alita_sdk-0.3.447.dist-info/METADATA,sha256=CDd8WFh0YMw_nYaLEwLlH-MkycbbZZ0cTNSCxYlMfG4,19071
+alita_sdk-0.3.447.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+alita_sdk-0.3.447.dist-info/top_level.txt,sha256=0vJYy5p_jK6AwVb1aqXr7Kgqgk3WDtQ6t5C-XI9zkmg,10
+alita_sdk-0.3.447.dist-info/RECORD,,