fix: resolve CI failures after upstream merge

- Remove _SERVICE_BINDING_ROOT_ENV from _customer.py (replaced by resolve_base_mount); update test_customer.py to use string literal
- Apply ruff formatting to _customer.py, _mcp_session.py, agw_client.py
- Bump version 0.31.0 → 0.32.0 (src/ modified)

Author: KoblerS

pyproject.toml

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

src/sap_cloud_sdk/agentgateway/_customer.py

@@ -99,7 +99,10 @@ def detect_customer_agent_credentials() -> str | None:
                     continue
             credentials_path = os.path.join(entry.path, _CREDENTIALS_FILE)
             if os.path.isfile(credentials_path):
-                logger.debug("Customer credentials found via servicebinding.io type scan: %s", credentials_path)
+                logger.debug(
+                    "Customer credentials found via servicebinding.io type scan: %s",
+                    credentials_path,
+                )
                 return credentials_path
 
     return None

src/sap_cloud_sdk/agentgateway/_mcp_session.py

@@ -13,7 +13,9 @@
 logger = logging.getLogger(__name__)
 
 
-async def invoke_mcp_tool(tool: MCPTool, auth_token: str, timeout: float, **kwargs) -> str:
+async def invoke_mcp_tool(
+    tool: MCPTool, auth_token: str, timeout: float, **kwargs
+) -> str:
     """Open an MCP session, call a tool, and return its text result.
 
     Handles McpError from both initialize() and call_tool(), and checks

src/sap_cloud_sdk/agentgateway/agw_client.py

@@ -521,7 +521,9 @@ async def call_mcp_tool(
                 )
 
                 if isinstance(tool, str):
-                    tool = await self._resolve_tool_by_name(tool, ord_id, user_token, app_tid)
+                    tool = await self._resolve_tool_by_name(
+                        tool, ord_id, user_token, app_tid
+                    )
 
                 # Resolve user_token if provided (optional for customer flow)
                 if user_token:
@@ -545,7 +547,9 @@ async def call_mcp_tool(
                 logger.warning("app_tid parameter ignored for LoB agent flow")
 
             if isinstance(tool, str):
-                tool = await self._resolve_tool_by_name(tool, ord_id, user_token, app_tid)
+                tool = await self._resolve_tool_by_name(
+                    tool, ord_id, user_token, app_tid
+                )
 
             auth = await self.get_user_auth(user_token, app_tid)
             return await call_mcp_tool_lob(
@@ -584,7 +588,9 @@ async def _resolve_tool_by_name(
         Raises:
             AgentGatewaySDKError: If no tool with that name is found.
         """
-        tools = await self.list_mcp_tools(user_token=user_token, app_tid=app_tid, ord_id=ord_id)
+        tools = await self.list_mcp_tools(
+            user_token=user_token, app_tid=app_tid, ord_id=ord_id
+        )
         match = next((t for t in tools if t.name == tool_name), None)
         if match is None:
             available = ", ".join(t.name for t in tools[:10])

tests/agentgateway/unit/test_customer.py

@@ -14,7 +14,6 @@
     _build_mcp_url,
     _resolve_dependency,
     _CREDENTIALS_PATH_ENV,
-    _SERVICE_BINDING_ROOT_ENV,
     _BINDING_TYPE,
     _BINDING_TYPE_FILE,
     _CREDENTIALS_FILE,
@@ -59,7 +58,7 @@ def test_detect_from_env_var_path(self, tmp_path):
 
     def test_detect_from_env_var_path_file_not_exists(self, tmp_path):
         """Return None when env var path doesn't exist."""
-        env = {_CREDENTIALS_PATH_ENV: "/nonexistent/path", _SERVICE_BINDING_ROOT_ENV: str(tmp_path)}
+        env = {_CREDENTIALS_PATH_ENV: "/nonexistent/path", "SERVICE_BINDING_ROOT": str(tmp_path)}
         with patch.dict(os.environ, env, clear=False):
             result = detect_customer_agent_credentials()
             assert result is None
@@ -68,7 +67,7 @@ def test_detect_from_service_binding_root(self, tmp_path):
         """Detect credentials by scanning SERVICE_BINDING_ROOT for a binding with matching type file."""
         creds_file = self._make_binding(tmp_path)
 
-        env = {_SERVICE_BINDING_ROOT_ENV: str(tmp_path)}
+        env = {"SERVICE_BINDING_ROOT": str(tmp_path)}
         with patch.dict(os.environ, env, clear=False):
             os.environ.pop(_CREDENTIALS_PATH_ENV, None)
             result = detect_customer_agent_credentials()
@@ -80,7 +79,7 @@ def test_detect_from_default_path(self, tmp_path):
 
         with patch.dict(os.environ, {}, clear=False):
             os.environ.pop(_CREDENTIALS_PATH_ENV, None)
-            os.environ.pop(_SERVICE_BINDING_ROOT_ENV, None)
+            os.environ.pop("SERVICE_BINDING_ROOT", None)
             with patch("sap_cloud_sdk.agentgateway._customer._DEFAULT_BINDING_ROOT", str(tmp_path)):
                 result = detect_customer_agent_credentials()
                 assert result == str(creds_file)
@@ -92,7 +91,7 @@ def test_skips_binding_with_wrong_type(self, tmp_path):
         (wrong_dir / _BINDING_TYPE_FILE).write_text("something-else")
         (wrong_dir / _CREDENTIALS_FILE).write_text('{"clientid": "wrong"}')
 
-        env = {_SERVICE_BINDING_ROOT_ENV: str(tmp_path)}
+        env = {"SERVICE_BINDING_ROOT": str(tmp_path)}
         with patch.dict(os.environ, env, clear=False):
             os.environ.pop(_CREDENTIALS_PATH_ENV, None)
             result = detect_customer_agent_credentials()
@@ -104,14 +103,14 @@ def test_service_binding_root_takes_priority_over_default(self, tmp_path):
         sbr_dir.mkdir()
         creds_file = self._make_binding(sbr_dir)
 
-        with patch.dict(os.environ, {_SERVICE_BINDING_ROOT_ENV: str(sbr_dir)}, clear=False):
+        with patch.dict(os.environ, {"SERVICE_BINDING_ROOT": str(sbr_dir)}, clear=False):
             os.environ.pop(_CREDENTIALS_PATH_ENV, None)
             result = detect_customer_agent_credentials()
             assert result == str(creds_file)
 
     def test_no_credentials_returns_none(self, tmp_path):
         """Return None when no binding with matching type is found."""
-        env = {_SERVICE_BINDING_ROOT_ENV: str(tmp_path)}
+        env = {"SERVICE_BINDING_ROOT": str(tmp_path)}
         with patch.dict(os.environ, env, clear=False):
             os.environ.pop(_CREDENTIALS_PATH_ENV, None)
             result = detect_customer_agent_credentials()
@@ -128,7 +127,7 @@ def test_env_var_takes_priority_over_service_binding_root(self, tmp_path):
 
         env = {
             _CREDENTIALS_PATH_ENV: str(creds_file),
-            _SERVICE_BINDING_ROOT_ENV: str(sbr_dir),
+            "SERVICE_BINDING_ROOT": str(sbr_dir),
         }
         with patch.dict(os.environ, env, clear=False):
             result = detect_customer_agent_credentials()