cleanup: simplify defensive guards + remove stale migration comments

Author: antosubash

framework/hosting/simple_module_hosting/_inertia_shared.py

@@ -24,6 +24,8 @@ def build_i18n_block(scope: Scope, request: Request) -> dict:
       from what was last served on this session.
     * Full page loads and locale transitions ship the complete dict.
     """
+    # Test fixtures sometimes build a bare FastAPI with a partial app.state.sm
+    # stub (e.g. permissions-only, no i18n); guard both lookups to keep them usable.
     sm = getattr(request.app.state, "sm", None)
     registry = getattr(sm, "i18n_registry", None) if sm is not None else None
     locale = getattr(request.state, "locale", None)

framework/hosting/simple_module_hosting/app_builder.py

@@ -214,8 +214,6 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
 
     mount_module_static_dirs(app, modules)
 
-    # Typed singleton container. Loose app.state.* keys remain for the
-    # duration of the staged migration; consumers read from app.state.sm.*.
     app.state.sm = Services(
         settings=settings,
         db=db_state,

framework/hosting/simple_module_hosting/i18n_deps.py

@@ -16,10 +16,10 @@ async def get_translator(request: Request) -> Translator:
 
     ``request.state.locale`` is populated by LocaleMiddleware.
     """
-    registry = request.app.state.sm.i18n_registry
-    default_locale = request.app.state.sm.settings.i18n_default_locale
+    sm = request.app.state.sm
+    default_locale = sm.settings.i18n_default_locale
     locale = getattr(request.state, "locale", default_locale)
-    return Translator(registry, locale=locale, default_locale=default_locale)
+    return Translator(sm.i18n_registry, locale=locale, default_locale=default_locale)
 
 
 TranslatorDep = Annotated[Translator, Depends(get_translator)]

framework/hosting/tests/test_app.py

@@ -17,7 +17,6 @@ async def test_returns_fastapi_instance(self, settings: Settings):
         assert isinstance(app, FastAPI)
 
     async def test_app_state_has_registries(self, app: FastAPI):
-        # After Task 10, loose keys are removed. Access via app.state.sm.* instead.
         assert hasattr(app.state, "sm")
         sm = app.state.sm
         assert sm.menu_registry is not None
@@ -85,7 +84,6 @@ async def test_app_state_has_sm_services(
 
         sm = app.state.sm
         assert isinstance(sm, Services)
-        # All registries and state are accessed via app.state.sm.* after Task 10.
         assert sm.settings is not None
         assert sm.db is not None
         assert sm.event_bus is not None

modules/auth/tests/test_deps.py

@@ -4,6 +4,7 @@
 
 import importlib.resources
 from pathlib import Path
+from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
@@ -53,7 +54,7 @@ async def test_raises_403_when_missing_permission(self, app):
         check_fn = dep.dependency
 
         request = MagicMock()
-        request.app.state.perm_registry = app.state.sm.permissions
+        request.app.state.sm = SimpleNamespace(permissions=app.state.sm.permissions)
 
         user = UserContext(id="u1", email="u@test.com", name="User", roles=["viewer"])
 
@@ -67,7 +68,7 @@ async def test_admin_bypasses_permission_check(self, app):
         check_fn = dep.dependency
 
         request = MagicMock()
-        request.app.state.perm_registry = app.state.sm.permissions
+        request.app.state.sm = SimpleNamespace(permissions=app.state.sm.permissions)
 
         admin_user = UserContext(id="a1", email="admin@test.com", name="Admin", roles=["admin"])
         await check_fn(request, _translator(), admin_user)
@@ -80,7 +81,7 @@ async def test_multiple_permissions_any_match(self, app):
         check_fn = dep.dependency
 
         request = MagicMock()
-        request.app.state.perm_registry = app.state.sm.permissions
+        request.app.state.sm = SimpleNamespace(permissions=app.state.sm.permissions)
 
         admin = UserContext(id="a1", email="a@t.com", name="Admin", roles=["admin"])
         await check_fn(request, _translator(), admin)
@@ -90,7 +91,7 @@ async def test_non_admin_without_permission_fails(self, app):
         check_fn = dep.dependency
 
         request = MagicMock()
-        request.app.state.perm_registry = app.state.sm.permissions
+        request.app.state.sm = SimpleNamespace(permissions=app.state.sm.permissions)
 
         user = UserContext(id="u1", email="u@t.com", name="User", roles=["user"])
         with pytest.raises(HTTPException) as exc_info:

modules/dashboard/dashboard/stats.py

@@ -95,10 +95,7 @@ async def _count_products(db: AsyncSession) -> int:
 def _get_module_info(app: FastAPI) -> list[dict[str, str]]:
     # Reads from the module list discovered once at startup, avoiding
     # expensive entry-point rescans on every request.
-    modules = app.state.sm.modules if hasattr(app.state, "sm") else None
-    if modules is None:
-        return []
-    return [{"name": m.meta.name, "status": "loaded"} for m in modules]
+    return [{"name": m.meta.name, "status": "loaded"} for m in app.state.sm.modules]
 
 
 async def _run_health_checks(app: FastAPI) -> list[dict[str, str]]:

modules/users/users/roles_cache.py

@@ -52,8 +52,7 @@ async def get_roles_cache(app: FastAPI) -> list[RoleSummary]:
     covers scenarios where startup ran before the ``users_role`` table had any
     rows. Once populated, subsequent calls are O(1) attribute reads.
     """
-    users = getattr(app.state, "users", None)
-    cached = users.roles_cache if users is not None else []
+    cached = app.state.users.roles_cache
     if cached:
         return cached
     return await refresh_roles_cache(app)