fix(cbc): address CI failures — ruff format, ty errors, telemetry counts, version bump

- Bump version to 0.54.0 (required by CI for src/ changes)
- Fix ruff format violations in _models.py and client.py
- Fix ty errors: conftest fixture return type CBCClient, test_models assert-not-None before .version
- Update test_module (15→16) and test_operation (161→163) counts for CBC module/operations

Author: soumyadey

pyproject.toml

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

src/sap_cloud_sdk/cbc/_models.py

@@ -132,7 +132,6 @@ class Entities(_FrozenModel):
     items: list[Entity]
 
 
-
 class EntityContent:
     """Configuration content for an entity.
 
@@ -231,7 +230,11 @@ def get_config_object(self, config_object_id: str) -> ConfigObject | None:
             Matching :class:`ConfigObject`, or ``None`` if not found.
         """
         return next(
-            (co for co in self.config_objects if co.config_object_id == config_object_id),
+            (
+                co
+                for co in self.config_objects
+                if co.config_object_id == config_object_id
+            ),
             None,
         )
 

src/sap_cloud_sdk/cbc/client.py

@@ -106,7 +106,6 @@ class _ClientConfig:
     replace_subdomain: bool
 
 
-
 # ---------------------------------------------------------------------------
 # DefaultClient
 # ---------------------------------------------------------------------------
@@ -230,9 +229,7 @@ def get_consumption_versions(
             tenant_context,
             f"/consumptionVersions?appTenantId={tenant_context.app_tenant_id}",
         )
-        return ConsumptionVersions.model_validate(
-            self._request("GET", url).json()
-        )
+        return ConsumptionVersions.model_validate(self._request("GET", url).json())
 
     def _get_entities(
         self, tenant_context: TenantContext, consumption_version: str
@@ -365,7 +362,9 @@ def _fetch_entity_data(
         )
         response_data = self._request("GET", url).json()
 
-        api_meta = response_data.get("metadata", {}) if isinstance(response_data, dict) else {}
+        api_meta = (
+            response_data.get("metadata", {}) if isinstance(response_data, dict) else {}
+        )
         raw_data = (
             response_data["items"]
             if isinstance(response_data, dict) and "items" in response_data
@@ -414,7 +413,9 @@ def _request(
                 request_url=url,
             )
             error = ApiError.from_response(response.content)
-            exc_class = CBCServerError if response.status_code >= 500 else CBCClientError
+            exc_class = (
+                CBCServerError if response.status_code >= 500 else CBCClientError
+            )
             raise exc_class(error.message, code=error.code, http_context=ctx)
 
         return response

tests/cbc/integration/conftest.py

@@ -18,7 +18,7 @@
 
 import pytest
 
-from sap_cloud_sdk.cbc import DefaultClient, TenantContext, create_client
+from sap_cloud_sdk.cbc import CBCClient, TenantContext, create_client
 from sap_cloud_sdk.cbc.exceptions import CBCConfigError
 
 ENV_CBC_TENANT_ID = "CLOUD_SDK_CBC_CBC_TENANT_ID"
@@ -37,7 +37,7 @@ def cbc_tenant() -> TenantContext:
 
 
 @pytest.fixture(scope="session")
-def cbc_client() -> DefaultClient:
+def cbc_client() -> CBCClient:
     try:
         return create_client()
     except CBCConfigError as exc:

tests/cbc/integration/test_e2e_bdd.py

@@ -59,7 +59,9 @@ def test_configuration_has_config_objects():
     pass
 
 
-@scenario("cbc.feature", "Every entity within each config object has an entity_id and data")
+@scenario(
+    "cbc.feature", "Every entity within each config object has an entity_id and data"
+)
 def test_every_entity_has_id_and_data():
     pass
 
@@ -124,7 +126,9 @@ def assert_entity_ids(ctx: dict):
     config: ConfigData = ctx["config"]
     for co in config.config_objects:
         for ed in co.entities:
-            assert ed.entity_id, f"entity_id missing in config_object={co.config_object_id!r}"
+            assert ed.entity_id, (
+                f"entity_id missing in config_object={co.config_object_id!r}"
+            )
 
 
 @then("every entity data should be accessible as a list or object")

tests/cbc/unit/test_client.py

@@ -11,7 +11,12 @@
 
 from sap_cloud_sdk.cbc.client import DefaultClient, create_client
 from sap_cloud_sdk.cbc.config import ENV_URL, ENV_CERT_PATH, ENV_KEY_PATH
-from sap_cloud_sdk.cbc.exceptions import CBCClientError, CBCConfigError, CBCNetworkError, CBCServerError
+from sap_cloud_sdk.cbc.exceptions import (
+    CBCClientError,
+    CBCConfigError,
+    CBCNetworkError,
+    CBCServerError,
+)
 from sap_cloud_sdk.cbc._models import (
     ConfigData,
     TenantContext,
@@ -42,7 +47,9 @@ def _mock_response(
     )
 
 
-def _make_client(base_url: str = "https://cbc.example.ondemand.com") -> tuple[DefaultClient, MagicMock]:
+def _make_client(
+    base_url: str = "https://cbc.example.ondemand.com",
+) -> tuple[DefaultClient, MagicMock]:
     mock_http = MagicMock(spec=httpx.Client)
     client = DefaultClient(base_url=base_url, http_client=mock_http)
     return client, mock_http
@@ -194,9 +201,7 @@ def test_handles_flat_list_response(self):
 class TestGetConfiguration:
     def test_resolves_latest_version_when_none_given(self):
         client, mock_http = _make_client()
-        versions_response = _mock_response(
-            json_body={"items": [{"version": "v2"}]}
-        )
+        versions_response = _mock_response(json_body={"items": [{"version": "v2"}]})
         entities_response = _mock_response(json_body={"items": []})
         mock_http.request.side_effect = [versions_response, entities_response]
 
@@ -216,7 +221,11 @@ def test_uses_explicit_consumption_version(self):
         entities_response = _mock_response(
             json_body={
                 "items": [
-                    {"entityId": "i1", "entityName": "payment-mode", "configurationObjectId": "payment-config"}
+                    {
+                        "entityId": "i1",
+                        "entityName": "payment-mode",
+                        "configurationObjectId": "payment-config",
+                    }
                 ]
             }
         )

tests/cbc/unit/test_models.py

@@ -68,7 +68,9 @@ def test_returns_latest_by_modified_date(self):
                 self._version("v2", modified=t2),
             ]
         )
-        assert v.latest().version == "v2"
+        result = v.latest()
+        assert result is not None
+        assert result.version == "v2"
 
     def test_returns_latest_by_created_date_when_no_modified(self):
         t1 = datetime(2024, 1, 1, tzinfo=timezone.utc)
@@ -79,13 +81,15 @@ def test_returns_latest_by_created_date_when_no_modified(self):
                 self._version("v2", created=t2),
             ]
         )
-        assert v.latest().version == "v2"
+        result = v.latest()
+        assert result is not None
+        assert result.version == "v2"
 
     def test_returns_last_item_when_no_dates(self):
-        v = ConsumptionVersions(
-            items=[self._version("v1"), self._version("v2")]
-        )
-        assert v.latest().version == "v2"
+        v = ConsumptionVersions(items=[self._version("v1"), self._version("v2")])
+        result = v.latest()
+        assert result is not None
+        assert result.version == "v2"
 
 
 # ---------------------------------------------------------------------------

tests/core/unit/telemetry/test_module.py

@@ -55,8 +55,9 @@ def test_module_in_collection(self):
     def test_all_modules_present(self):
         """Test that all expected modules are present."""
         all_modules = list(Module)
-        assert len(all_modules) == 15
+        assert len(all_modules) == 16
         assert Module.ADMS in all_modules
+        assert Module.CBC in all_modules
         assert Module.AGENT_MEMORY in all_modules
         assert Module.AGENTGATEWAY in all_modules
         assert Module.AICORE in all_modules

tests/core/unit/telemetry/test_operation.py

@@ -216,5 +216,6 @@ def test_operation_count(self):
         all_operations = list(Operation)
         # 3 auditlog + 12 destination + 10 certificate + 10 fragment + 8 objectstore
         # + 2 extensibility + 7 aicore + 23 dms + 6 agentgateway + 13 agent_memory
-        # + 5 data_anonymization + 52 adms + 6 print + 1 bootstrap + 3 output_management = 161
-        assert len(all_operations) == 161
+        # + 5 data_anonymization + 52 adms + 6 print + 1 bootstrap + 3 output_management
+        # + 2 cbc = 163
+        assert len(all_operations) == 163