xpander-sdk 2.0.212__tar.gz → 2.0.213__tar.gz

{xpander_sdk-2.0.212 → xpander_sdk-2.0.213}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xpander-sdk
-Version: 2.0.212
+Version: 2.0.213
 Summary: xpander.ai Backend-as-a-service for AI Agents - SDK
 Home-page: https://www.xpander.ai
 Author: xpanderAI

{xpander_sdk-2.0.212 → xpander_sdk-2.0.213}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="xpander-sdk",
-    version="2.0.212",
+    version="2.0.213",
     author="xpanderAI",
     author_email="dev@xpander.ai",
     description="xpander.ai Backend-as-a-service for AI Agents - SDK",

{xpander_sdk-2.0.212 → xpander_sdk-2.0.213}/src/xpander_sdk/modules/agents/sub_modules/agent.py

@@ -419,6 +419,7 @@ class Agent(XPanderSharedModel):
         title: Optional[str] = None,
         think_mode: Optional[ThinkMode] = ThinkMode.Default,
         disable_attachment_injection: Optional[bool] = False,
+        user_tokens: Optional[Dict] = None
     ) -> Task:
         """
         Asynchronously create a new task and link it to this agent.
@@ -443,6 +444,7 @@ class Agent(XPanderSharedModel):
             title (Optional[str]): Optional task title.
             think_mode (Optional[ThinkMode]): Optional task think mode, defaults to "default".
             disable_attachment_injection (Optional[bool]): Optional selection if to disable attachment injection to the context window.
+            user_tokens: Optional[Dict]: User tokens to be passed and injected for MCP Auth
 
         Returns:
             Task: Created Task object linked to this agent.
@@ -477,6 +479,7 @@ class Agent(XPanderSharedModel):
                     "title": title,
                     "think_mode": think_mode.value,
                     "disable_attachment_injection": disable_attachment_injection,
+                    "user_tokens": user_tokens,
                 },
             )
             return Task(**created_task, configuration=self.configuration)

{xpander_sdk-2.0.212 → xpander_sdk-2.0.213}/src/xpander_sdk/modules/backend/frameworks/agno.py

@@ -980,19 +980,30 @@ async def _resolve_agent_tools(agent: Agent, task: Optional[Task] = None, auth_e
                 if not task:
                     raise ValueError("MCP server with OAuth authentication detected but task not sent")
                 
-                if not task.input.user or not task.input.user.id:
-                    raise ValueError("MCP server with OAuth authentication detected but user id not set on the task (task.input.user.id)")
-                
-                auth_result: MCPOAuthGetTokenResponse = await authenticate_mcp_server(mcp_server=mcp,task=task,user_id=task.input.user.id, auth_events_callback=auth_events_callback)
-                if auth_result and auth_result.data and isinstance(auth_result.data, MCPOAuthGetTokenGenericResponse) and auth_result.data.message:
-                    raise ValueError(f"MCP authentication failed: {auth_result.data.message}")
-                if not auth_result:
-                    raise ValueError("MCP Server authentication failed")
-                if auth_result.type != MCPOAuthResponseType.TOKEN_READY:
-                    raise ValueError("MCP Server authentication timeout")
-                mcp.api_key = auth_result.data.access_token
+                # check if we have user tokens for this mcp
+                graph_item = next((gi for gi in agent.graph.items if gi.type == AgentGraphItemType.MCP and gi.settings and gi.settings.mcp_settings and gi.settings.mcp_settings.url and gi.settings.mcp_settings.url == mcp.url), None)
+                if graph_item and task.user_tokens and isinstance(task.user_tokens, dict) and graph_item.id in task.user_tokens:
+                    mcp.api_key = task.user_tokens[graph_item.id]
+                else:
+                    if not task.input.user or not task.input.user.id:
+                        raise ValueError("MCP server with OAuth authentication detected but user id not set on the task (task.input.user.id)")
+                    
+                    auth_result: MCPOAuthGetTokenResponse = await authenticate_mcp_server(mcp_server=mcp,task=task,user_id=task.input.user.id, auth_events_callback=auth_events_callback)
+                    if auth_result and auth_result.data and isinstance(auth_result.data, MCPOAuthGetTokenGenericResponse) and auth_result.data.message:
+                        raise ValueError(f"MCP authentication failed: {auth_result.data.message}")
+                    if not auth_result:
+                        raise ValueError("MCP Server authentication failed")
+                    if auth_result.type != MCPOAuthResponseType.TOKEN_READY:
+                        raise ValueError("MCP Server authentication timeout")
+                    mcp.api_key = auth_result.data.access_token
             
             if mcp.api_key:
+                
+                # check if we have user tokens for this mcp
+                graph_item = next((gi for gi in agent.graph.items if gi.type == AgentGraphItemType.MCP and gi.settings and gi.settings.mcp_settings and gi.settings.mcp_settings.url and gi.settings.mcp_settings.url == mcp.url), None)
+                if graph_item and task.user_tokens and isinstance(task.user_tokens, dict) and graph_item.id in task.user_tokens:
+                    mcp.api_key = task.user_tokens[graph_item.id]
+                
                 if not mcp.headers:
                     mcp.headers = {}
                 mcp.headers["Authorization"] = f"Bearer {mcp.api_key}"

{xpander_sdk-2.0.212 → xpander_sdk-2.0.213}/src/xpander_sdk/modules/tasks/sub_modules/task.py

@@ -186,6 +186,7 @@ class Task(XPanderSharedModel):
     title: Optional[str] = (None,)
     think_mode: Optional[ThinkMode] = ThinkMode.Default
     disable_attachment_injection: Optional[bool] = False
+    user_tokens: Optional[Dict] = None
     deep_planning: Optional[DeepPlanning] = Field(default_factory=DeepPlanning)
     execution_attempts: Optional[int] = 1
 

{xpander_sdk-2.0.212 → xpander_sdk-2.0.213}/src/xpander_sdk/modules/tasks/tasks_module.py

@@ -240,6 +240,7 @@ class Tasks(ModuleBase):
         title: Optional[str] = None,
         think_mode: Optional[ThinkMode] = ThinkMode.Default,
         disable_attachment_injection: Optional[bool] = False,
+        user_tokens: Optional[Dict] = None
     ) -> Task:
         """
         Asynchronously create a new task for a specific agent.
@@ -268,6 +269,7 @@ class Tasks(ModuleBase):
             title (Optional[str]): Optional task title.
             think_mode (Optional[ThinkMode]): Optional task think mode, defaults to "default".
             disable_attachment_injection (Optional[bool]): Optional selection if to disable attachment injection to the context window.
+            user_tokens: Optional[Dict]: User tokens to be passed and injected for MCP Auth
 
         Returns:
             Task: Newly created task object containing all initial configuration data.
@@ -313,6 +315,7 @@ class Tasks(ModuleBase):
                     "title": title,
                     "think_mode": think_mode.value,
                     "disable_attachment_injection": disable_attachment_injection,
+                    "user_tokens": user_tokens
                 },
             )
             return Task(**created_task, configuration=self.configuration)

{xpander_sdk-2.0.212 → xpander_sdk-2.0.213}/src/xpander_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xpander-sdk
-Version: 2.0.212
+Version: 2.0.213
 Summary: xpander.ai Backend-as-a-service for AI Agents - SDK
 Home-page: https://www.xpander.ai
 Author: xpanderAI