Merge remote-tracking branch 'origin/sap_om_poc' into sap_om_poc

Author: Venkatakrishnan774

.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.27.1"
+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

src/sap_cloud_sdk/core/auditlog_ng/__init__.py

@@ -7,6 +7,8 @@
 ready-to-use AuditClient.
 
 Usage:
+    explicit config:
+
     from sap_cloud_sdk.core.auditlog_ng import create_client, AuditLogNGConfig
 
     config = AuditLogNGConfig(
@@ -18,12 +20,24 @@
     )
     client = create_client(config=config)
 
+Usage:
+    resolve from a Destination:
+
+    from sap_cloud_sdk.core.auditlog_ng import create_client
+
+    client = create_client(
+        destination_name="my-audit-destination",
+        destination_instance="my-binding-instance",
+        fragment_name="prod-fragment",    # optional
+    )
+
     # Send an audit event (protobuf message)
     event_id = client.send(event, "DataAccess")
     client.close()
 """
 
 from typing import Optional
+from enum import Enum
 
 from sap_cloud_sdk.core.auditlog_ng.client import AuditClient
 from sap_cloud_sdk.core.auditlog_ng.config import (
@@ -43,9 +57,103 @@
 )
 
 
+class _DestinationProperties(Enum):
+    DEPLOYMENT_ID = "deploymentId"
+    DEPLOYMENT_REGION = "deploymentRegion"
+    NAMESPACE = "namespace"
+
+
+def _get_config_from_destination(
+    destination_name: Optional[str],
+    destination_instance: Optional[str],
+    fragment_name: Optional[str] = None,
+) -> dict[str, str]:
+    """Resolve endpoint, deployment_id and namespace from a named Destination.
+
+    The destination must expose these custom properties:
+
+    - ``deploymentId`` (or ``deploymentRegion`` as fallback when absent/empty)
+    - ``namespace``
+
+    The destination ``url`` is used as the OTLP endpoint.
+    The lookup is always performed at ``ConsumptionLevel.SUBACCOUNT``.
+
+    Args:
+        destination_name: Name of the destination to resolve.
+        destination_instance: Destination service binding instance name,
+            passed as ``instance=`` to ``destination.create_client()``.
+        fragment_name: Optional fragment name merged into the destination
+            before resolution. Wrapped in ``ConsumptionOptions`` when provided.
+
+    Returns:
+        dict with keys ``endpoint``, ``deployment_id``, ``namespace``
+        when destination is found.
+
+    Returns:
+        None: If destination is not found.
+
+    Return:
+        ValueError: If required properties are missing.
+    """
+    # Lazy import — keeps destination an optional dependency; importing auditlog_ng
+    # in environments without the destination package continues to work.
+    from sap_cloud_sdk.destination import (
+        ConsumptionOptions,
+        ConsumptionLevel,
+        create_client as _dest_create_client,
+    )
+
+    dest_client = _dest_create_client(instance=destination_instance)
+    options = (
+        ConsumptionOptions(
+            fragment_name=fragment_name, fragment_level=ConsumptionLevel.SUBACCOUNT
+        )
+        if fragment_name
+        else None
+    )
+
+    destination = dest_client.get_destination(
+        name=destination_name, options=options, level=ConsumptionLevel.SUBACCOUNT
+    )
+
+    if destination is None:
+        return {}
+
+    endpoint = destination.url
+    props = destination.properties
+
+    deployment_id = props.get(_DestinationProperties.DEPLOYMENT_ID.value) or ""
+    if not deployment_id:
+        deployment_id = props.get(_DestinationProperties.DEPLOYMENT_REGION.value) or ""
+    if not deployment_id:
+        raise ValueError(
+            f"Destination '{destination_name}' must provide either the "
+            f"'{_DestinationProperties.DEPLOYMENT_ID.value}' or "
+            f"'{_DestinationProperties.DEPLOYMENT_REGION.value}' property"
+        )
+
+    namespace = props.get(_DestinationProperties.NAMESPACE.value) or ""
+    if not namespace:
+        raise ValueError(
+            f"Destination '{destination_name}' must provide the "
+            f"'{_DestinationProperties.NAMESPACE.value}' property"
+        )
+
+    return {
+        "endpoint": endpoint,
+        "deployment_id": deployment_id,
+        "namespace": namespace,
+    }
+
+
 def create_client(
     *,
     config: Optional[AuditLogNGConfig] = None,
+    # Destination-based resolution
+    destination_name: Optional[str] = "AuditLogV3_Destination",
+    destination_instance: Optional[str] = "default",
+    fragment_name: Optional[str] = None,
+    # Explicit connection parameters
     endpoint: Optional[str] = None,
     deployment_id: Optional[str] = None,
     namespace: Optional[str] = None,
@@ -61,13 +169,30 @@ def create_client(
 ) -> AuditClient:
     """Create an AuditClient for sending audit events over OTLP/gRPC.
 
-    Either pass a pre-built ``config`` **or** the individual keyword arguments.
-    When ``config`` is provided the remaining keyword arguments are ignored.
+    Three mutually exclusive ways to provide configuration (evaluated in order):
+
+    1. **Explicit config object** — pass a pre-built :class:`AuditLogNGConfig`
+       via ``config``; all other keyword arguments are ignored.
+
+    2. **Destination-based resolution** — pass ``destination_name`` and
+       ``destination_instance`` (both required); ``fragment_name`` is optional.
+       The Destination module resolves the named destination at subaccount level
+       and extracts ``endpoint``, ``deployment_id`` (with fallback to
+       ``deploymentRegion``), and ``namespace`` from its properties.
+
+    3. **Explicit keyword arguments** — pass ``endpoint``, ``deployment_id``,
+       and ``namespace`` directly.
 
     Args:
         _telemetry_source: Internal parameter for telemetry. Not for external use.
         config: Optional explicit configuration. If provided, all other
-                keyword arguments are ignored.
+            keyword arguments are ignored.
+        destination_name: Name of the SAP Destination to resolve. Must be
+            combined with ``destination_instance`` to enter the destination path.
+        destination_instance: Destination service binding instance name, passed
+            as ``instance=`` to ``destination.create_client()``. Must be combined
+            with ``destination_name`` to enter the destination path.
+        fragment_name: Optional destination fragment name merged before resolution.
         endpoint: OTLP gRPC endpoint (``host:port``).
         deployment_id: Deployment identifier.
         namespace: Namespace identifier.
@@ -85,16 +210,28 @@ def create_client(
 
     Raises:
         ClientCreationError: If client creation fails.
-        ValueError: If required parameters are missing.
+        ValueError: If required parameters are missing or destination
+            resolution fails.
     """
     try:
         if config is None:
             try:
-                if not endpoint or not deployment_id or not namespace:
-                    raise ValueError(
-                        "endpoint, deployment_id, and namespace are required "
-                        "when config is not provided"
-                    )
+                resolved = _get_config_from_destination(
+                    destination_name=destination_name,
+                    destination_instance=destination_instance,
+                    fragment_name=fragment_name,
+                )
+                if resolved:
+                    endpoint = resolved["endpoint"]
+                    deployment_id = resolved["deployment_id"]
+                    namespace = resolved["namespace"]
+                else:
+                    if not endpoint or not deployment_id or not namespace:
+                        raise ValueError(
+                            "endpoint, deployment_id, and namespace are required "
+                            "when config or valid destination is not provided"
+                        )
+
                 config = AuditLogNGConfig(
                     endpoint=endpoint,
                     deployment_id=deployment_id,