merge

Author: betinacosta

.env_integration_tests.example

@@ -11,6 +11,7 @@ CLOUD_SDK_CFG_ADMS_DEFAULT_RESOURCE=urn:sap:identity:application:provider:name:y
 CLOUD_SDK_CFG_AGW_DEFAULT_LANDSCAPE=your-landscape-here
 CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN=your-tenant-subdomain-here
 CLOUD_SDK_CFG_AGW_DEFAULT_USER_TOKEN=your-user-jwt-here
+CLOUD_SDK_CFG_AGW_DEFAULT_SAMPLE_MCP_TOOL=your-sample-mcp-tool-name-here
 
 # AGENT MEMORY
 CLOUD_SDK_CFG_HANA_AGENT_MEMORY_DEFAULT_APPLICATION_URL=https://your-agent-memory-api-url-here

docs/DEVELOPMENT.md

@@ -34,7 +34,7 @@ Tip:
 ## Type Check
 
 ```bash
-uv run ty check .
+uvx ty check .
 ```
 
 ## Code Quality Checks
@@ -49,7 +49,7 @@ uv run ruff check .
 uv run ruff format --check .
 
 # Type check
-uv run ty check .
+uvx ty check .
 ```
 
 ## Pre-commit Hooks (Recommended)

docs/INTEGRATION_TESTS.md

@@ -62,6 +62,9 @@ CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN=your-tenant-subdomain-here
 # User JWT for token exchange scenarios (get_user_auth)
 # If not set, user auth scenarios are automatically skipped
 CLOUD_SDK_CFG_AGW_DEFAULT_USER_TOKEN=your-user-jwt-here
+
+# Name of a MCP tool available in your environment
+CLOUD_SDK_CFG_AGW_DEFAULT_SAMPLE_MCP_TOOL=your-sample-mcp-tool-name-here
 ```
 
 ### Agent Memory Integration Tests

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sap-cloud-sdk"
-version = "0.28.0"
+version = "0.29.0"
 description = "SAP Cloud SDK for Python"
 readme = "README.md"
 license = "Apache-2.0"

src/sap_cloud_sdk/agentgateway/converters.py

@@ -9,7 +9,7 @@
 
 from typing import TYPE_CHECKING, Any, Callable
 
-from pydantic import create_model
+from pydantic import Field, create_model
 
 from sap_cloud_sdk.agentgateway._models import MCPTool
 
@@ -21,6 +21,8 @@ def mcp_tool_to_langchain(
     mcp_tool: MCPTool,
     call_tool: Callable,
     get_user_token: Callable[[], str],
+    *,
+    omit_none: bool = True,
 ) -> StructuredTool:
     """Convert MCPTool to LangChain StructuredTool.
 
@@ -31,6 +33,8 @@ def mcp_tool_to_langchain(
         mcp_tool: MCPTool object from list_mcp_tools().
         call_tool: Callable to invoke the MCP tool (e.g., agw_client.call_mcp_tool).
         get_user_token: Callable that returns the user's JWT token.
+        omit_none: If True (default), optional parameters with a None value are not
+            forwarded to call_tool. Set to False to forward None values explicitly.
 
     Returns:
         LangChain StructuredTool that invokes the MCP tool.
@@ -66,17 +70,21 @@ def mcp_tool_to_langchain(
         ) from None
 
     async def run(**kwargs) -> str:
+        resolved = (
+            {k: v for k, v in kwargs.items() if v is not None} if omit_none else kwargs
+        )
         return await call_tool(
             mcp_tool,
             user_token=get_user_token,
-            **kwargs,
+            **resolved,
         )
 
     # Build args schema from input_schema
     properties = mcp_tool.input_schema.get("properties", {})
     required = set(mcp_tool.input_schema.get("required", []))
     fields: dict[str, Any] = {
-        k: (str, ...) if k in required else (str | None, None) for k in properties
+        k: (str, ...) if k in required else (str | None, Field(default=None))
+        for k in properties
     }
     args_schema = create_model(f"{mcp_tool.name}_args", **fields) if fields else None
 

src/sap_cloud_sdk/agentgateway/user-guide.md

@@ -52,9 +52,7 @@ config = ClientConfig(timeout=30.0)
 agw_client = create_client(tenant_subdomain="my-tenant", config=config)
 
 # Discover tools (auto-discovered from destination fragments)
-tools = await agw_client.list_mcp_tools()
-
-# Discover tools with user principal propagation
+# Pass user_token to use principal propagation when listing tools
 tools = await agw_client.list_mcp_tools(user_token="user-jwt")
 
 # Invoke a tool (user_token required for principal propagation)
@@ -74,7 +72,7 @@ from sap_cloud_sdk.agentgateway import create_client
 from sap_cloud_sdk.agentgateway.converters import mcp_tool_to_langchain
 
 agw_client = create_client(tenant_subdomain="my-tenant")
-tools = await agw_client.list_mcp_tools()
+tools = await agw_client.list_mcp_tools(user_token="user-jwt")
 
 langchain_tools = [
     mcp_tool_to_langchain(
@@ -89,6 +87,17 @@ langchain_tools = [
 llm_with_tools = llm.bind_tools(langchain_tools)
 ```
 
+By default, optional tool parameters that resolve to `None` are not forwarded to `call_mcp_tool`. Set `omit_none=False` to forward them explicitly:
+
+```python
+mcp_tool_to_langchain(
+    t,
+    agw_client.call_mcp_tool,
+    get_user_token=lambda: request.headers["Authorization"],
+    omit_none=False,
+)
+```
+
 ## Concepts
 
 ### Agent Types

tests/adms/unit/test_client.py

@@ -88,8 +88,8 @@ def _make_httpx_response(
 
 def _make_token_fetcher(config: AdmsConfig) -> IasTokenFetcher:
     fetcher = IasTokenFetcher(config=config)
-    fetcher.get_token = MagicMock(return_value="test-bearer-token")  # type: ignore[method-assign]  # ty: ignore[invalid-assignment]
-    fetcher.exchange_token = MagicMock(return_value="user-bearer-token")  # type: ignore[method-assign]  # ty: ignore[invalid-assignment]
+    fetcher.get_token = MagicMock(return_value="test-bearer-token")  # type: ignore[method-assign]
+    fetcher.exchange_token = MagicMock(return_value="user-bearer-token")  # type: ignore[method-assign]
     return fetcher
 
 
@@ -423,13 +423,13 @@ def test_with_user_jwt_returns_new_instance(self, config):
         http = _make_async_http(config, fetcher)
         mock_user_http = MagicMock(spec=AsyncAdmsHttp)
         mock_user_http._client = AsyncMock(spec=httpx.AsyncClient)
-        http.with_user_jwt = MagicMock(return_value=mock_user_http)  # type: ignore[method-assign]  # ty: ignore[invalid-assignment]
+        http.with_user_jwt = MagicMock(return_value=mock_user_http)  # type: ignore[method-assign]
 
         client = AsyncAdmsClient(http)
         new_client = client.with_user_jwt("my-jwt")
 
         assert new_client is not client
-        http.with_user_jwt.assert_called_once_with("my-jwt")  # type: ignore[union-attr]  # ty: ignore[unresolved-attribute]
+        http.with_user_jwt.assert_called_once_with("my-jwt")  # type: ignore[union-attr]
         assert new_client._http is mock_user_http
 
     @pytest.mark.asyncio

tests/agentgateway/integration/agw_auth.feature

@@ -41,14 +41,17 @@ Feature: Agent Gateway Auth Integration
     And the error message should mention "user_token is required"
 
   Scenario: List MCP tools returns a non-empty list of tools
+    Given I have a valid user token
     When I call list_mcp_tools
     Then the result should be a list of MCPTool
     And the list should be non-empty
     And each tool should have a non-empty name
     And each tool should have a non-empty url
+    And each tool should have a valid input_schema
 
-  Scenario: Call search_workflows tool returns a non-empty result
+  Scenario: Call sample MCP tool returns a non-empty result
     Given I have a valid user token
+    And I have a sample MCP tool name
     When I call list_mcp_tools
-    And I call call_mcp_tool with "search_workflows" and the user token
+    And I call call_mcp_tool with the sample MCP tool and the user token
     Then the tool result should be a non-empty string

tests/agentgateway/integration/test_agw_bdd.py

@@ -5,6 +5,7 @@
     CLOUD_SDK_CFG_AGW_DEFAULT_TENANT_SUBDOMAIN=<tenant-subdomain> \\
     CLOUD_SDK_CFG_AGW_DEFAULT_LANDSCAPE=<landscape> \\
     CLOUD_SDK_CFG_AGW_DEFAULT_USER_TOKEN=<user-jwt> \\
+    CLOUD_SDK_CFG_AGW_DEFAULT_SAMPLE_MCP_TOOL=<tool-name> \\
     CLOUD_SDK_CFG_DESTINATION_DEFAULT_CLIENTID=... \\
     CLOUD_SDK_CFG_DESTINATION_DEFAULT_CLIENTSECRET=... \\
     CLOUD_SDK_CFG_DESTINATION_DEFAULT_URL=... \\
@@ -52,6 +53,7 @@ def __init__(self):
         self.user_token: Optional[str] = None
         self.tools: Optional[list[MCPTool]] = None
         self.tool_result: Optional[str] = None
+        self.sample_mcp_tool_name: Optional[str] = None
 
 
 @pytest.fixture
@@ -78,6 +80,15 @@ def have_valid_user_token(context: ScenarioContext):
     context.user_token = token
 
 
+@given("I have a sample MCP tool name")
+def have_sample_mcp_tool_name(context: ScenarioContext):
+    """Load sample MCP tool name from environment variable."""
+    tool_name = os.environ.get("CLOUD_SDK_CFG_AGW_DEFAULT_SAMPLE_MCP_TOOL", "")
+    if not tool_name:
+        pytest.skip("CLOUD_SDK_CFG_AGW_DEFAULT_SAMPLE_MCP_TOOL is not set — skipping tool scenario")
+    context.sample_mcp_tool_name = tool_name
+
+
 # ==================== WHEN ====================
 
 
@@ -119,18 +130,17 @@ def call_get_user_auth_empty_token(context: ScenarioContext, agw_client: AgentGa
 @when("I call list_mcp_tools")
 def call_list_mcp_tools(context: ScenarioContext, agw_client: AgentGatewayClient):
     """Call list_mcp_tools and store the result."""
-    context.tools = run(agw_client.list_mcp_tools())
+    context.tools = run(agw_client.list_mcp_tools(user_token=context.user_token))
 
 
-@when(parsers.parse('I call call_mcp_tool with "{tool_name}" and the user token'))
-def call_call_mcp_tool(
-    context: ScenarioContext, agw_client: AgentGatewayClient, tool_name: str
-):
-    """Find tool by name from list_mcp_tools result and call it."""
+@when("I call call_mcp_tool with the sample MCP tool and the user token")
+def call_call_mcp_tool_sample(context: ScenarioContext, agw_client: AgentGatewayClient):
+    """Find the sample MCP tool and call it."""
     assert context.tools is not None, "call list_mcp_tools before calling a tool"
-    tool = next((t for t in context.tools if t.name == tool_name), None)
+    assert context.sample_mcp_tool_name is not None
+    tool = next((t for t in context.tools if t.name == context.sample_mcp_tool_name), None)
     if tool is None:
-        pytest.fail(f"Tool '{tool_name}' not found in list_mcp_tools result")
+        pytest.fail(f"Tool '{context.sample_mcp_tool_name}' not found in list_mcp_tools result")
     context.tool_result = run(
         agw_client.call_mcp_tool(tool, user_token=context.user_token)
     )
@@ -237,6 +247,19 @@ def each_tool_has_non_empty_url(context: ScenarioContext):
         )
 
 
+@then("each tool should have a valid input_schema")
+def each_tool_has_valid_input_schema(context: ScenarioContext):
+    """Verify every tool has an input_schema dict with type=object."""
+    assert context.tools is not None
+    for tool in context.tools:
+        assert isinstance(tool.input_schema, dict), (
+            f"Tool '{tool.name}' input_schema is not a dict: {tool.input_schema!r}"
+        )
+        assert tool.input_schema.get("type") == "object", (
+            f"Tool '{tool.name}' input_schema missing type=object: {tool.input_schema}"
+        )
+
+
 @then("the tool result should be a non-empty string")
 def tool_result_is_non_empty_string(context: ScenarioContext):
     """Verify the tool invocation returned a non-empty string."""