xpander-sdk 2.0.227__py3-none-any.whl → 2.0.228__py3-none-any.whl

xpander_sdk/modules/backend/frameworks/agno.py

@@ -1005,8 +1005,19 @@ async def _resolve_agent_tools(agent: Agent, task: Optional[Task] = None, auth_e
                     # 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 isinstance(task.user_tokens[graph_item.id], dict):
+                            graph_item_headers = task.user_tokens[graph_item.id]
+                            if "Authorization" in graph_item_headers:
+                                mcp.api_key = graph_item_headers["Authorization"]
+                            for k in graph_item_headers:
+                                if k != "Authorization":
+                                    if not mcp.headers or not isinstance(mcp.headers, dict):
+                                        mcp.headers = {}
+                                    mcp.headers[k] = graph_item_headers[k]
+                        else:
+                            mcp.api_key = task.user_tokens[graph_item.id]
+                    
+                    if not mcp.api_key:
                         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)")
                         
@@ -1024,7 +1035,17 @@ async def _resolve_agent_tools(agent: Agent, task: Optional[Task] = None, auth_e
                 # 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 isinstance(task.user_tokens[graph_item.id], dict):
+                        graph_item_headers = task.user_tokens[graph_item.id]
+                        if "Authorization" in graph_item_headers:
+                            mcp.api_key = graph_item_headers["Authorization"]
+                        for k in graph_item_headers:
+                            if k != "Authorization":
+                                if not mcp.headers or not isinstance(mcp.headers, dict):
+                                    mcp.headers = {}
+                                mcp.headers[k] = graph_item_headers[k]
+                    else:
+                        mcp.api_key = task.user_tokens[graph_item.id]
                 
                 if not mcp.headers:
                     mcp.headers = {}

{xpander_sdk-2.0.227.dist-info → xpander_sdk-2.0.228.dist-info}/METADATA

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

{xpander_sdk-2.0.227.dist-info → xpander_sdk-2.0.228.dist-info}/RECORD

@@ -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=q0ImRrPYpYpGhZE2J0XqCYmXgZECRpgVqAGCkCVleDY,45336
+xpander_sdk/modules/backend/frameworks/agno.py,sha256=sGJJCIKTfrBDHkyY9AG6Dsa7kEypEyRayJQfEsTIEPI,46699
 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
@@ -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.227.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-xpander_sdk-2.0.227.dist-info/METADATA,sha256=GsWF2uvdIA45EhMTa_hv_zGPnpLRDyTkLNjwI7T_kHg,17952
-xpander_sdk-2.0.227.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-xpander_sdk-2.0.227.dist-info/top_level.txt,sha256=UCjnxQpsMy5Zoe7lmRuVDO6DI2V_6PgRFfm4oizRbVs,12
-xpander_sdk-2.0.227.dist-info/RECORD,,
+xpander_sdk-2.0.228.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+xpander_sdk-2.0.228.dist-info/METADATA,sha256=aaggfiz8oURfeC5P8fxRkWYqWddO5L2nfulGybb_10E,17952
+xpander_sdk-2.0.228.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+xpander_sdk-2.0.228.dist-info/top_level.txt,sha256=UCjnxQpsMy5Zoe7lmRuVDO6DI2V_6PgRFfm4oizRbVs,12
+xpander_sdk-2.0.228.dist-info/RECORD,,