Cleanups

Author: LucasAlvesSoares

src/sap_cloud_sdk/core/bootstrap.py

@@ -3,6 +3,8 @@
 from typing import Any, List, Optional
 
 from sap_cloud_sdk.core.runtime_context._protocol import ContextProvider
+from sap_cloud_sdk.core.runtime_context._registry import get_registry
+from sap_cloud_sdk.core.runtime_context import IASContextProvider
 
 
 def bootstrap(app: Any, providers: Optional[List[ContextProvider]] = None) -> None:
@@ -40,15 +42,8 @@ def bootstrap(app: Any, providers: Optional[List[ContextProvider]] = None) -> No
         bootstrap(app, providers=[IASContextProvider(), MyCustomProvider()])
     """
     if not providers:
-        from sap_cloud_sdk.core.runtime_context import IASContextProvider
-
         providers = [IASContextProvider()]
 
-    # Ensure all built-in adapters are registered before iterating.
-    _load_builtin_adapters()
-
-    from sap_cloud_sdk.core.runtime_context._registry import get_registry
-
     for adapter in get_registry():
         if adapter.matches(app):
             adapter.attach(app, providers)
@@ -59,11 +54,3 @@ def bootstrap(app: Any, providers: Optional[List[ContextProvider]] = None) -> No
         "Supported frameworks are determined by registered FrameworkAdapters. "
         "For other frameworks, register a FrameworkAdapter or attach the middleware manually."
     )
-
-
-def _load_builtin_adapters() -> None:
-    """Import built-in framework adapter modules to trigger their register() calls."""
-    try:
-        import sap_cloud_sdk.core.runtime_context.starlette  # noqa: F401
-    except ImportError:
-        pass

src/sap_cloud_sdk/core/runtime_context/__init__.py

@@ -39,6 +39,12 @@
 from sap_cloud_sdk.core.runtime_context._providers import IASContextProvider
 from sap_cloud_sdk.core.runtime_context._registry import FrameworkAdapter, register
 
+# Register built-in framework adapters (guarded so missing extras don't break the import).
+try:
+    import sap_cloud_sdk.core.runtime_context.starlette  # noqa: F401
+except ImportError:
+    pass
+
 __all__ = [
     "ContextProvider",
     "FrameworkAdapter",

src/sap_cloud_sdk/core/runtime_context/_registry.py

@@ -1,6 +1,5 @@
 """Framework adapter base class and registry for bootstrap()."""
 
-import importlib.util
 import logging
 from abc import ABC, abstractmethod
 from typing import List
@@ -32,9 +31,7 @@ class FrameworkAdapter(ABC):
     Example::
 
         class FlaskContextAdapter(FrameworkAdapter):
-            framework_name = "flask"
-
-            def matches(self, app) -> bool:
+            def _matches(self, app) -> bool:
                 from flask import Flask
                 return isinstance(app, Flask)
 
@@ -44,19 +41,15 @@ def attach(self, app, providers) -> None:
         register(FlaskContextAdapter())
     """
 
-    #: Import name of the framework (e.g. "starlette", "flask").
-    framework_name: str
-
     def matches(self, app) -> bool:
-        if not self._is_framework_installed():
+        """Return True if this adapter handles *app*'s framework type."""
+        try:
+            return self._matches(app)
+        except ImportError:
             return False
-        return self._matches(app)
 
     @abstractmethod
     def _matches(self, app) -> bool: ...
 
     @abstractmethod
     def attach(self, app, providers: List[ContextProvider]) -> None: ...
-
-    def _is_framework_installed(self) -> bool:
-        return importlib.util.find_spec(self.framework_name) is not None

src/sap_cloud_sdk/core/runtime_context/starlette.py

@@ -60,8 +60,6 @@ async def dispatch(self, request: Request, call_next: Any) -> Response:
 
 
 class _StarletteContextAdapter(FrameworkAdapter):
-    framework_name = "starlette"
-
     def _matches(self, app) -> bool:
         from starlette.applications import Starlette