Merge upstream/main — resolve conflicts, bump version to 0.44.0

- pyproject.toml: version 0.44.0 (minor bump above upstream 0.43.0 for new dpi_ng module);
  keep python-odata (dpi_ng dep) and add cryptography (upstream added)
- test_operation.py: count 252 (249 + 3 new output_management ops from upstream)
- test_module.py: count 16 (upstream added OUTPUT_MANAGEMENT module)

Author: Ashwith-N

.env_integration_tests.example

@@ -80,3 +80,11 @@ CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_HOST=your-objectstore-host-here
 CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_ACCESS_KEY_ID=your-access-key-id-here
 CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_SECRET_ACCESS_KEY=your-secret-access-key-here
 CLOUD_SDK_CFG_OBJECTSTORE_DEFAULT_BUCKET=your-bucket-name-here
+
+# OUTPUT MANAGEMENT
+# For cloud mode (destination-based):
+CLOUD_SDK_OMS_DESTINATION_NAME=your-output-management-destination-name-here
+CLOUD_SDK_OMS_ACCESS_STRATEGY=PROVIDER_ONLY
+CLOUD_SDK_OMS_INSTANCE=default
+# For local mode (no credentials needed):
+# CLOUD_SDK_OMS_TEST_MODE=local

.pre-commit-config.yaml

@@ -9,17 +9,17 @@ repos:
     hooks:
       - id: ruff-format
         name: ruff format
-        entry: uvx ruff format --force-exclude --check
+        entry: uv run ruff format --force-exclude --check
         language: system
         types: [python]
       - id: ruff-check
         name: ruff check
-        entry: uvx ruff check --force-exclude --fix
+        entry: uv run ruff check --force-exclude --fix
         language: system
         types: [python]
       - id: ty-check
         name: ty type check
-        entry: uvx ty check .
+        entry: uv run ty check .
         language: system
         types: [python]
         pass_filenames: false

docs/DEVELOPMENT.md

@@ -34,7 +34,7 @@ Tip:
 ## Type Check
 
 ```bash
-uvx ty check .
+uv run ty check .
 ```
 
 ## Code Quality Checks
@@ -49,9 +49,12 @@ uv run ruff check .
 uv run ruff format --check .
 
 # Type check
-uvx ty check .
+uv run ty check .
 ```
 
+> **Linter versions are pinned.** `ruff` and `ty` are pinned to exact versions in the
+> `pyproject.toml` `[dependency-groups] dev` section (and locked in `uv.lock`) for consistent runs across local and CI.
+
 ## Pre-commit Hooks (Recommended)
 
 Automatically run quality checks before each commit using pre-commit hooks.

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sap-cloud-sdk"
-version = "0.40.0"
+version = "0.44.0"
 description = "SAP Cloud SDK for Python"
 readme = "README.md"
 license = "Apache-2.0"
@@ -10,34 +10,35 @@ authors = [
 requires-python = ">=3.11"
 dependencies = [
     "minio~=7.2.16",
-    "setuptools~=80.9.0",
+    "setuptools>=83.0",
     "requests>=2.33.0",
     "requests-oauthlib~=2.0.0",
     "pydantic~=2.12.3",
     "hatchling~=1.27.0",
-    "opentelemetry-exporter-otlp-proto-grpc~=1.42.1",
-    "opentelemetry-exporter-otlp-proto-http~=1.42.1",
+    "opentelemetry-exporter-otlp-proto-grpc~=1.43.0",
+    "opentelemetry-exporter-otlp-proto-http~=1.43.0",
     "traceloop-sdk~=0.61.0",
     "opentelemetry-instrumentation-langchain>=0.61.0",
     "httpx>=0.27.0",
     "PyJWT>=2.13.0",
-    "protobuf>=4.25.0",
+    "protobuf>=7.0.0",
     "protovalidate>=0.13.0",
     "grpcio>=1.60.0",
-    "opentelemetry-api>=1.42.1",
-    "opentelemetry-sdk>=1.42.1",
-    "opentelemetry-instrumentation-httpx~=0.63b1",
-    "opentelemetry-instrumentation-requests~=0.63b1",
-    "opentelemetry-instrumentation-grpc~=0.63b1",
-    "opentelemetry-instrumentation-logging~=0.63b1",
-    "opentelemetry-instrumentation-starlette~=0.63b1",
-    "opentelemetry-instrumentation-fastapi~=0.63b1",
-    "opentelemetry-instrumentation-aiohttp-client~=0.63b1",
-    "opentelemetry-instrumentation-sqlalchemy~=0.63b1",
-    "opentelemetry-instrumentation-django~=0.63b1",
-    "opentelemetry-instrumentation-flask~=0.63b1",
+    "opentelemetry-api>=1.43.0",
+    "opentelemetry-sdk>=1.43.0",
+    "opentelemetry-instrumentation-httpx~=0.64b0",
+    "opentelemetry-instrumentation-requests~=0.64b0",
+    "opentelemetry-instrumentation-grpc~=0.64b0",
+    "opentelemetry-instrumentation-logging~=0.64b0",
+    "opentelemetry-instrumentation-starlette~=0.64b0",
+    "opentelemetry-instrumentation-fastapi~=0.64b0",
+    "opentelemetry-instrumentation-aiohttp-client~=0.64b0",
+    "opentelemetry-instrumentation-sqlalchemy~=0.64b0",
+    "opentelemetry-instrumentation-django~=0.64b0",
+    "opentelemetry-instrumentation-flask~=0.64b0",
     "mcp>=1.1.0",
     "python-odata>=0.7.0",
+    "cryptography>=46.0.3",
 ]
 
 [project.optional-dependencies]
@@ -64,9 +65,9 @@ dev = [
     "pytest-asyncio>=1.0.0",
     "pytest-bdd>=7.2.0",
     "python-dotenv>=1.0.0",
-    "ty>=0.0.21",
+    "ty==0.0.64",
     "cryptography>=46.0.3",
-    "ruff>=0.8.0",
+    "ruff==0.16.0",
     "starlette>=0.40.0",
     "anyio>=3.6.2",
     "httpx>=0.27.0",

src/sap_cloud_sdk/__init__.py

@@ -1,5 +1,5 @@
 # SAP Cloud SDK for Python
 
-from sap_cloud_sdk.core.bootstrap import bootstrap
+from sap_cloud_sdk.core.bootstrap import bootstrap, TelemetryConfig
 
-__all__ = ["bootstrap"]
+__all__ = ["bootstrap", "TelemetryConfig"]

src/sap_cloud_sdk/adms/user-guide.md

@@ -45,6 +45,7 @@ relation = client.relations.create(
 
 # Upload bytes to the presigned URL (outside SDK)
 import requests
+
 upload_url = relation.document.document_content_upload_urls[0]
 requests.put(upload_url, data=open("Invoice.pdf", "rb"))
 ```
@@ -82,6 +83,7 @@ client = create_client(user_jwt=request.headers["Authorization"].split()[1])
 ```python
 from sap_cloud_sdk.adms import create_client, TokenCache
 
+
 # By default tokens are cached in-process via InMemoryTokenCache.
 # For multi-instance deployments (Kyma replicas > 1, CF instances > 1),
 # implement your own TokenCache subclass backed by the shared cache your
@@ -91,13 +93,21 @@ class MySharedCache(TokenCache):
     def set(self, key, token, ttl_seconds): ...
     def delete(self, key): ...
 
+
 client = create_client(token_cache=MySharedCache())
 ```
 
 ## Async Client
 
 ```python
-from sap_cloud_sdk.adms import create_async_client, BaseType, CreateDocumentInput, CreateDocumentRelationInput, RelationQueryOptions
+from sap_cloud_sdk.adms import (
+    create_async_client,
+    BaseType,
+    CreateDocumentInput,
+    CreateDocumentRelationInput,
+    RelationQueryOptions,
+)
+
 
 async def main():
     async with create_async_client() as client:
@@ -203,6 +213,7 @@ job = client.jobs.start_zip_download(params)
 
 # Poll until terminal state
 import time
+
 while not job.job_status or not job.job_status.is_terminal():
     time.sleep(2)
     job = client.jobs.get_status(job.job_id)

src/sap_cloud_sdk/agent_decorators/user-guide.md

@@ -21,6 +21,7 @@ from sap_cloud_sdk.agent_decorators import (
 ```python
 from sap_cloud_sdk.agent_decorators import prompt_section, agent_model
 
+
 # Define a prompt with a coded default
 @prompt_section(
     key="prompts.system",
@@ -30,6 +31,7 @@ from sap_cloud_sdk.agent_decorators import prompt_section, agent_model
 def system_prompt() -> str:
     return "You are a helpful assistant."
 
+
 # Define the model selection
 @agent_model(key="config.model", label="LLM Model")
 def model_name() -> str:
@@ -45,6 +47,7 @@ Expose a prompt section for editing.
 ```python
 from sap_cloud_sdk.agent_decorators import prompt_section
 
+
 @prompt_section(
     key="prompts.identity",
     label="Agent Identity",
@@ -62,6 +65,7 @@ Expose a configuration value for editing.
 ```python
 from sap_cloud_sdk.agent_decorators import agent_config
 
+
 @agent_config(
     key="config.temperature",
     label="Temperature",
@@ -78,6 +82,7 @@ Expose a model selection. The `description` parameter is optional.
 ```python
 from sap_cloud_sdk.agent_decorators import agent_model
 
+
 @agent_model(
     key="config.model",
     label="Default Model",
@@ -93,6 +98,7 @@ def default_model() -> str:
 from sap_cloud_sdk.agent_decorators.exceptions import AgentDecoratorError
 
 try:
+
     @prompt_section(key="", label="L", description="D")
     def bad():
         return ""

src/sap_cloud_sdk/agent_memory/user-guide.md

@@ -714,6 +714,7 @@ elif total <= PAGE_SIZE:
         agent_id="my-agent", invoker_id="user-123", limit=total
     )
 else:
+
     def iter_all_memories(client, agent_id, invoker_id, page_size=PAGE_SIZE):
         offset = 0
         while True:
@@ -781,7 +782,8 @@ The default `threshold` of `0.6` may be too strict for your data. Try a lower va
 
 ```python
 results = client.search_memories(
-    agent_id="my-agent", invoker_id="user-123",
+    agent_id="my-agent",
+    invoker_id="user-123",
     query="user display preferences",
     threshold=0.3,
 )
@@ -933,10 +935,10 @@ from sap_cloud_sdk.agent_memory.factory.langgraph_checkpoint import create_check
     key="config.checkpointer.ttl_seconds",
     label="Thread TTL (seconds)",
     description="Evict inactive conversation threads after this period of "
-                "inactivity. Set to 0 to disable eviction.",
+    "inactivity. Set to 0 to disable eviction.",
 )
 def thread_ttl_seconds() -> int:
-    return 3600 # 1 hour
+    return 3600  # 1 hour
 
 
 class MyAgent:

src/sap_cloud_sdk/agentgateway/__init__.py

@@ -55,6 +55,7 @@
 from sap_cloud_sdk.agentgateway._models import (
     AuthResult,
     MCPTool,
+    MCPToolFilter,
     Agent,
     AgentCard,
     AgentCardFilter,
@@ -78,6 +79,7 @@
     # Data models
     "AuthResult",
     "MCPTool",
+    "MCPToolFilter",
     "Agent",
     "AgentCard",
     "AgentCardFilter",

src/sap_cloud_sdk/agentgateway/_customer.py

@@ -32,6 +32,7 @@
     CustomerCredentials,
     IntegrationDependency,
     MCPTool,
+    MCPToolFilter,
 )
 from sap_cloud_sdk.agentgateway._token_cache import _TokenCache
 from sap_cloud_sdk.agentgateway.exceptions import AgentGatewaySDKError
@@ -642,7 +643,7 @@ async def _list_server_tools(
         async with streamable_http_client(url, http_client=http_client) as (
             read,
             write,
-            _,
+            *_,
         ):
             async with ClientSession(read, write) as session:
                 init_result = await session.initialize()
@@ -672,10 +673,30 @@ async def _list_server_tools(
                 ]
 
 
+def _log_mcp_server_error(ord_id: str, exc: BaseException) -> None:
+    # Unwrap ExceptionGroup from anyio to surface the real HTTP error body
+    if isinstance(exc, BaseExceptionGroup):
+        for inner in exc.exceptions:
+            _log_mcp_server_error(ord_id, inner)
+        return
+    if isinstance(exc, httpx.HTTPStatusError):
+        logger.error(
+            "Failed to load tools from %s (HTTP %d): %s",
+            ord_id,
+            exc.response.status_code,
+            exc.response.text[:500],
+        )
+    else:
+        logger.exception(
+            "Failed to load tools from %s — skipping", ord_id, exc_info=exc
+        )
+
+
 async def get_mcp_tools_customer(
     credentials: CustomerCredentials,
     system_token: str,
     timeout: float,
+    filter: MCPToolFilter | None = None,
 ) -> list[MCPTool]:
     """List all MCP tools from servers defined in credentials.
 
@@ -686,19 +707,24 @@ async def get_mcp_tools_customer(
         credentials: Customer credentials with integrationDependencies.
         system_token: Pre-fetched raw system token for authentication.
         timeout: HTTP timeout in seconds for MCP server calls.
+        filter: Optional MCPToolFilter narrowing results by tool name or ORD ID.
+            If None or empty, all tools are included.
 
     Returns:
         List of MCPTool objects from all servers.
-
-    Raises:
-        AgentGatewaySDKError: If integrationDependencies is empty.
     """
+    f = filter or MCPToolFilter()
     dependencies = credentials.integration_dependencies
 
     if not dependencies:
-        raise AgentGatewaySDKError(
+        logger.warning(
             "integrationDependencies is empty in credentials — no MCP servers configured."
         )
+        return []
+
+    if f.ord_ids:
+        ord_ids_set = set(f.ord_ids)
+        dependencies = [d for d in dependencies if d.ord_id in ord_ids_set]
 
     logger.info("Discovering tools from %d MCP server(s)", len(dependencies))
 
@@ -717,8 +743,13 @@ async def get_mcp_tools_customer(
             server_tools = await _list_server_tools(url, system_token, timeout)
             tools.extend(server_tools)
             logger.debug("Loaded %d tool(s) from %s", len(server_tools), dep.ord_id)
-        except Exception:
-            logger.exception("Failed to load tools from %s — skipping", dep.ord_id)
+        except Exception as exc:
+            _log_mcp_server_error(dep.ord_id, exc)
+
+    # Post-fetch filter: tool names are only known after fetching
+    if f.names:
+        names_set = set(f.names)
+        tools = [t for t in tools if t.name in names_set]
 
     logger.info(
         "Loaded %d MCP tool(s) from %d server(s)", len(tools), len(dependencies)
@@ -758,7 +789,7 @@ async def call_mcp_tool_customer(
         async with streamable_http_client(tool.url, http_client=http_client) as (
             read,
             write,
-            _,
+            *_,
         ):
             async with ClientSession(read, write) as session:
                 await session.initialize()
@@ -769,4 +800,9 @@ async def call_mcp_tool_customer(
                     return ""
 
                 first = result.content[0]
-                return str(getattr(first, "text", ""))
+                text = str(getattr(first, "text", ""))
+
+                if result.isError:
+                    logger.error("Tool '%s' returned an error: %s", tool.name, text)
+
+                return text