xpander-sdk 2.0.211__py3-none-any.whl → 2.0.213__py3-none-any.whl

xpander_sdk/models/orchestrations.py

@@ -276,6 +276,8 @@ class OrchestrationNode(XPanderSharedModel):
         input_type: Expected input format. Defaults to Text.
         input_schema: JSON schema for structured input validation.
         input_instructions: Instructions to use for structured input.
+        agentic_context_input_instructions: Instructions to use for agentic context injection.
+        agentic_context_output_instructions: Instructions to use for agentic context update.
     """
 
     type: OrchestrationNodeType
@@ -304,3 +306,5 @@ class OrchestrationNode(XPanderSharedModel):
     input_type: Optional[OutputFormat] = OutputFormat.Text
     input_schema: Optional[Dict] = None
     input_instructions: Optional[str] = None
+    agentic_context_input_instructions: Optional[str] = None
+    agentic_context_output_instructions: Optional[str] = None

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/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/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/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.211.dist-info → xpander_sdk-2.0.213.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xpander-sdk
-Version: 2.0.211
+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.211.dist-info → xpander_sdk-2.0.213.dist-info}/RECORD

@@ -16,7 +16,7 @@ xpander_sdk/models/events.py,sha256=HnootQSUIIRM4BIdaTbuPUEJ55hLVtA7KDCSsnHeBKw,
 xpander_sdk/models/frameworks.py,sha256=-7W_m5cvgS1qLp0gGAFP4noNWT82IT1ZqtQv5WuOC2k,2939
 xpander_sdk/models/generic.py,sha256=yw5rBRdZ-6ucTI4AwtskenddepOooiFRM--9xx5jrL8,681
 xpander_sdk/models/notifications.py,sha256=3tK4Z2gmA6YxRtqsWgzjiVISgJyHvmjTooiRgzrj5zY,3373
-xpander_sdk/models/orchestrations.py,sha256=yHg5dcmOBUJqlNtidnPdwiRWD_yQHET28un3NUwSTm0,11646
+xpander_sdk/models/orchestrations.py,sha256=c-A6GHGfAneWUKniIFiwTP9f4mBo27rKcNlcgHJ8TxQ,11957
 xpander_sdk/models/shared.py,sha256=gW88kA_UslNinUjtQKpLVF0sHDZnckwLWexRapxPivU,3125
 xpander_sdk/models/user.py,sha256=_FTG0JO6iTrbcvJp-BBJ6nuj281zhyQB5ldQkBCyYDU,749
 xpander_sdk/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,7 +27,7 @@ xpander_sdk/modules/agents/models/agent.py,sha256=9foTMH4UOfgT9mPfObpeRxHEJButyQ
 xpander_sdk/modules/agents/models/agent_list.py,sha256=byEayS2uLwDKaVT3lAHltrFocQFKpr8XEwQ6NTEEEMo,4081
 xpander_sdk/modules/agents/models/knowledge_bases.py,sha256=YimpjVJxWe8YTbGMD6oGQOA_YV8ztHQHTTBOaBB44ZM,1037
 xpander_sdk/modules/agents/sub_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xpander_sdk/modules/agents/sub_modules/agent.py,sha256=Mio5H9yoHKEnGtcDJB-87Unn9o88XWLzrr1QAAQhxJo,36948
+xpander_sdk/modules/agents/sub_modules/agent.py,sha256=xMO_e8_sU--EVnPZDttyB-vo_t2Mmg84W_umTzfRIxg,37131
 xpander_sdk/modules/agents/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/agents/utils/generic.py,sha256=XbG4OeHMQo4gVYCsasMlW_b8OoqS1xL3MlUZSjXivu0,81
 xpander_sdk/modules/backend/__init__.py,sha256=-NjikuZgHBhOM9xHML2vKsG0ICX9S2RKHktrWaODCBE,171
@@ -36,7 +36,7 @@ xpander_sdk/modules/backend/events_registry.py,sha256=d0V-lsz3I3G1QB643EM1i-a5oJ
 xpander_sdk/modules/backend/decorators/__init__.py,sha256=ub9c8G0Ll6AuCvfcFB6rqR8iamMJxtcW7QjWw3WSkPU,106
 xpander_sdk/modules/backend/decorators/on_auth_event.py,sha256=Xt_x9nncujMcF_SgM5hG6M-iZ6B-rDS97EPmgZkGdMk,4715
 xpander_sdk/modules/backend/frameworks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xpander_sdk/modules/backend/frameworks/agno.py,sha256=VQlFVhfz4NXPaQNzBXZLWXIJ2j_0UFDmozRFdY8emfE,42760
+xpander_sdk/modules/backend/frameworks/agno.py,sha256=9uk2Ht-prT-2otEIfai5Rz2_hGi9wKrhf5GeNnTwCOo,43836
 xpander_sdk/modules/backend/frameworks/dispatch.py,sha256=ht9hT5-cHATofQbWsbWeTARx51Hne3TNNNjw6KECRtA,1814
 xpander_sdk/modules/backend/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/backend/utils/mcp_oauth.py,sha256=5sYJcw557V3pSgutxUFzkBp5YxUJFUoB1V1rEe814pc,5430
@@ -62,12 +62,12 @@ xpander_sdk/modules/knowledge_bases/sub_modules/knowledge_base.py,sha256=0HTUYjC
 xpander_sdk/modules/knowledge_bases/sub_modules/knowledge_base_document_item.py,sha256=oLQApvsd573ZfYGV7Ji4XB5bNUyUFIeZWPIhZS1DIM4,1815
 xpander_sdk/modules/knowledge_bases/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xpander_sdk/modules/tasks/tasks_module.py,sha256=wOMegfNQ4qoY7PEII5828SjWrP0Jocg2TRsFOaaCmW0,20444
+xpander_sdk/modules/tasks/tasks_module.py,sha256=Hn-Gkhv3gaj_sKAc6qYI1r18tV8UDez-J_FVJWFhhZg,20626
 xpander_sdk/modules/tasks/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/tasks/models/task.py,sha256=pYzXg0jnE6ft4pVFvxiVexO5eMUFkg1VxXybzFtL1ys,4483
 xpander_sdk/modules/tasks/models/tasks_list.py,sha256=8V1T0vCtGN79qLMPwe37pOA7Wvuf8pbJNOhWL0BPo-8,5126
 xpander_sdk/modules/tasks/sub_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xpander_sdk/modules/tasks/sub_modules/task.py,sha256=zRDHsE_LnYYa3OC79wVQqeRnpAogddHVI2R6-3IepJ4,37920
+xpander_sdk/modules/tasks/sub_modules/task.py,sha256=0OsZnoP91od46jw5qln_nVqrK0gDre4q0UFQ47qbjA4,37959
 xpander_sdk/modules/tasks/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/modules/tasks/utils/files.py,sha256=KqqwSQSrwim2-H3XP5wOadDDfngAyEI034tA7Oon-vc,3631
 xpander_sdk/modules/tools_repository/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -90,8 +90,8 @@ xpander_sdk/utils/generic.py,sha256=XrRj2-L8c0YWpfPdDyXE-pVL-6lKF9VpyZzKHQ4wuCc,
 xpander_sdk/utils/tools.py,sha256=lyFkq2yP7DxBkyXYVlnFRwDhQCvf0fZZMDm5fBycze4,1244
 xpander_sdk/utils/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xpander_sdk/utils/agents/compactization_agent.py,sha256=S_U1dSmDC7I0JUsp_THUYjfutEI5QMBaMPJEXGp0_Sw,14389
-xpander_sdk-2.0.211.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-xpander_sdk-2.0.211.dist-info/METADATA,sha256=pI60oWddX14WdaIMOX4x-qRbMG37kZAWb5rNG5dWZcc,17952
-xpander_sdk-2.0.211.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-xpander_sdk-2.0.211.dist-info/top_level.txt,sha256=UCjnxQpsMy5Zoe7lmRuVDO6DI2V_6PgRFfm4oizRbVs,12
-xpander_sdk-2.0.211.dist-info/RECORD,,
+xpander_sdk-2.0.213.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+xpander_sdk-2.0.213.dist-info/METADATA,sha256=4kBDIXQ7zHVN-6mjpgq6PUjYs_yme_fNHiP_ELFBlvQ,17952
+xpander_sdk-2.0.213.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+xpander_sdk-2.0.213.dist-info/top_level.txt,sha256=UCjnxQpsMy5Zoe7lmRuVDO6DI2V_6PgRFfm4oizRbVs,12
+xpander_sdk-2.0.213.dist-info/RECORD,,