simple-module-feature-flags 0.0.38__tar.gz → 0.0.39__tar.gz

{simple_module_feature_flags-0.0.38 → simple_module_feature_flags-0.0.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simple_module_feature_flags
-Version: 0.0.38
+Version: 0.0.39
 Summary: Simple feature-flag module with per-tenant overrides and a consumer API for simple_module
 Project-URL: Homepage, https://github.com/antosubash/simple_module_python
 Project-URL: Repository, https://github.com/antosubash/simple_module_python
@@ -21,9 +21,9 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
-Requires-Dist: simple-module-core==0.0.38
-Requires-Dist: simple-module-db==0.0.38
-Requires-Dist: simple-module-hosting==0.0.38
+Requires-Dist: simple-module-core==0.0.39
+Requires-Dist: simple-module-db==0.0.39
+Requires-Dist: simple-module-hosting==0.0.39
 Description-Content-Type: text/markdown
 
 # simple_module_feature_flags

{simple_module_feature_flags-0.0.38 → simple_module_feature_flags-0.0.39}/feature_flags/module.py

@@ -29,6 +29,7 @@ from feature_flags.constants import (
 )
 
 if TYPE_CHECKING:
+    from simple_module_core.events import EventBus
     from sqlalchemy.ext.asyncio import AsyncSession
 
 _logger = logging.getLogger(__name__)
@@ -67,6 +68,13 @@ class FeatureFlagsModule(ModuleBase):
         i18n_audience="admin",
     )
 
+    def register_event_handlers(self, bus: EventBus, app: FastAPI | None = None) -> None:
+        from simple_module_core.tenant_events import TenantDeleted
+
+        from feature_flags.tenant_cleanup import purge_tenant_data
+
+        bus.subscribe_durable(TenantDeleted, purge_tenant_data)
+
     def register_routes(self, api_router: APIRouter, view_router: APIRouter) -> None:
         from feature_flags.endpoints.api import router as api
         from feature_flags.endpoints.views import router as views

{simple_module_feature_flags-0.0.38 → simple_module_feature_flags-0.0.39}/feature_flags/service.py

@@ -12,6 +12,7 @@ from collections.abc import Callable
 from simple_module_core.feature_flags import FeatureFlagDefinition, FeatureFlagRegistry
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlmodel import col
 
 from feature_flags.constants import SCOPE_SYSTEM, SCOPE_TENANT, SYSTEM_SCOPE_ID
 from feature_flags.contracts.schemas import FeatureFlagOverrideOut, FeatureFlagView
@@ -151,9 +152,9 @@ class FeatureFlagService:
     async def _find(self, scope: str, scope_id: str, name: str) -> FeatureFlagOverride | None:
         result = await self.db.execute(
             select(FeatureFlagOverride).where(
-                FeatureFlagOverride.scope == scope,  # ty: ignore[invalid-argument-type]
-                FeatureFlagOverride.scope_id == scope_id,  # ty: ignore[invalid-argument-type]
-                FeatureFlagOverride.name == name,  # ty: ignore[invalid-argument-type]
+                col(FeatureFlagOverride.scope) == scope,
+                col(FeatureFlagOverride.scope_id) == scope_id,
+                col(FeatureFlagOverride.name) == name,
             )
         )
         return result.scalar_one_or_none()

simple_module_feature_flags-0.0.39/feature_flags/tenant_cleanup.py

@@ -0,0 +1,18 @@
+"""Durable cleanup of tenant-scoped feature flag overrides."""
+
+from simple_module_core.durable_events import DurableContext
+from simple_module_core.tenant_events import TenantDeleted
+from sqlmodel import col, delete
+
+from feature_flags.constants import SCOPE_TENANT
+from feature_flags.models import FeatureFlagOverride
+
+
+async def purge_tenant_data(event: TenantDeleted, ctx: DurableContext) -> None:
+    """Keep system/other tenants' overrides; acknowledge with the worker transaction."""
+    await ctx.db.execute(
+        delete(FeatureFlagOverride).where(
+            col(FeatureFlagOverride.scope) == SCOPE_TENANT,
+            col(FeatureFlagOverride.scope_id) == event.tenant_id,
+        )
+    )

{simple_module_feature_flags-0.0.38 → simple_module_feature_flags-0.0.39}/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simple-module-py/feature_flags",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "private": true,
   "description": "Frontend assets for the FeatureFlags module",
   "peerDependencies": {

{simple_module_feature_flags-0.0.38 → simple_module_feature_flags-0.0.39}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_feature_flags"
-version = "0.0.38"
+version = "0.0.39"
 description = "Simple feature-flag module with per-tenant overrides and a consumer API for simple_module"
 readme = "README.md"
 license = "MIT"
@@ -21,9 +21,9 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "simple_module_core==0.0.38",
-    "simple_module_db==0.0.38",
-    "simple_module_hosting==0.0.38",
+    "simple_module_core==0.0.39",
+    "simple_module_db==0.0.39",
+    "simple_module_hosting==0.0.39",
 ]
 
 [project.entry-points.simple_module]

simple_module_feature_flags-0.0.39/tests/test_feature_flags_tenant_cleanup.py

@@ -0,0 +1,34 @@
+"""Tenant deletion purges tenant overrides without touching other scopes."""
+
+from feature_flags.constants import SCOPE_SYSTEM, SCOPE_TENANT
+from feature_flags.models import FeatureFlagOverride
+from feature_flags.module import FeatureFlagsModule
+from simple_module_core.durable_events import DurableContext, event_key
+from simple_module_core.events import EventBus
+from simple_module_core.tenant_events import TenantDeleted
+from sqlmodel import select
+
+
+async def test_durable_tenant_cleanup_is_scoped_idempotent_and_transactional(db_session):
+    bus = EventBus()
+    FeatureFlagsModule().register_event_handlers(bus)
+    names = bus.durable.handler_names(TenantDeleted)
+    assert len(names) == 1
+    subscription = bus.durable.lookup(event_key(TenantDeleted), names[0])
+    assert subscription is not None
+    scopes = [(SCOPE_TENANT, "deleted"), (SCOPE_TENANT, "other"), (SCOPE_SYSTEM, "deleted")]
+    for scope, scope_id in scopes:
+        db_session.add(FeatureFlagOverride(scope=scope, scope_id=scope_id, name="test.flag"))
+    await db_session.commit()
+    event = TenantDeleted(tenant_id="deleted", slug="deleted", name="Deleted")
+    ctx = DurableContext(db=db_session, attempt=1)
+    await subscription.handler(event, ctx)
+    await db_session.rollback()
+    assert len((await db_session.execute(select(FeatureFlagOverride))).scalars().all()) == 3
+    await subscription.handler(event, ctx)
+    await subscription.handler(event, DurableContext(db=db_session, attempt=2))
+    rows = (await db_session.execute(select(FeatureFlagOverride))).scalars().all()
+    assert {(row.scope, row.scope_id) for row in rows} == {
+        (SCOPE_TENANT, "other"),
+        (SCOPE_SYSTEM, "deleted"),
+    }