simple-module-settings 0.0.38__tar.gz → 0.0.39__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simple_module_settings
-Version: 0.0.38
+Version: 0.0.39
 Summary: Runtime settings UI — modules plug their own settings panels into a shared admin view
 Project-URL: Homepage, https://github.com/antosubash/simple_module_python
 Project-URL: Repository, https://github.com/antosubash/simple_module_python
@@ -21,10 +21,10 @@ 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: typer>=0.12
+Requires-Dist: simple-module-core==0.0.39
+Requires-Dist: simple-module-db==0.0.39
+Requires-Dist: simple-module-hosting==0.0.39
+Requires-Dist: typer<0.28,>=0.12
 Description-Content-Type: text/markdown
 
 # simple_module_settings

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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "simple_module_settings"
-version = "0.0.38"
+version = "0.0.39"
 description = "Runtime settings UI — modules plug their own settings panels into a shared admin view"
 readme = "README.md"
 license = "MIT"
@@ -21,10 +21,10 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "simple_module_core==0.0.38",
-    "simple_module_db==0.0.38",
-    "simple_module_hosting==0.0.38",
-    "typer>=0.12",
+    "simple_module_core==0.0.39",
+    "simple_module_db==0.0.39",
+    "simple_module_hosting==0.0.39",
+    "typer>=0.12,<0.28",
 ]
 
 [project.entry-points.simple_module]

{simple_module_settings-0.0.38 → simple_module_settings-0.0.39}/settings/_listing.py

@@ -6,6 +6,7 @@ from simple_module_db import LIKE_ESCAPE_CHAR, like_contains_pattern
 from simple_module_db.stored_settings import SYSTEM_SCOPE_ID, Setting
 from sqlalchemy import func, select
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlmodel import col
 
 from settings._row_masking import out
 from settings.constants import ALL_SCOPES, DEFAULT_PER_PAGE, SCOPE_ALL
@@ -111,6 +112,6 @@ class SettingListing:
     def _scope_stmt(scope: SettingScope, scope_id: str):
         return (
             select(Setting)
-            .where(Setting.scope == scope.value, Setting.scope_id == scope_id)  # ty: ignore[invalid-argument-type]
+            .where(col(Setting.scope) == scope.value, col(Setting.scope_id) == scope_id)
             .order_by(Setting.key)
         )

{simple_module_settings-0.0.38 → simple_module_settings-0.0.39}/settings/_managed_keys.py

@@ -25,11 +25,12 @@ from collections.abc import Awaitable, Callable
 from settings.constants import ERR_MANAGED_KEY_DELETE
 from settings.contracts.registry import SettingsRegistry, clear_route
 from settings.contracts.schemas import SettingScope
+from settings.exceptions import SettingsError
 
 TenantIsLive = Callable[[str], Awaitable[bool]]
 
 
-class ManagedKeyError(Exception):
+class ManagedKeyError(SettingsError):
     """The key is cleared through ``clear_via``, not by deleting its row."""
 
     def __init__(self, key: str, clear_via: str) -> None:

{simple_module_settings-0.0.38 → simple_module_settings-0.0.39}/settings/_unique_write.py

@@ -12,8 +12,10 @@ from simple_module_db.stored_settings import Setting
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from settings.exceptions import SettingsError
 
-class DuplicateSettingError(Exception):
+
+class DuplicateSettingError(SettingsError):
     """A row with this (scope, scope_id, key) already exists."""
 
 

{simple_module_settings-0.0.38 → simple_module_settings-0.0.39}/settings/deps.py

@@ -11,6 +11,7 @@ from __future__ import annotations
 from typing import Annotated
 
 from fastapi import Depends, Request
+from simple_module_core.app_state import get_services
 from simple_module_db.deps import get_db
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -25,7 +26,7 @@ async def get_setting_service(
     request: Request,
     db: AsyncSession = Depends(get_db),
 ) -> SettingService:
-    bus = getattr(getattr(request.app.state, "sm", None), "invalidation", None)
+    bus = getattr(get_services(request.app), "invalidation", None)
 
     async def tenant_is_live(tenant_id: str) -> bool:
         return await is_known_tenant(request, tenant_id)

simple_module_settings-0.0.39/settings/exceptions.py

@@ -0,0 +1,5 @@
+"""Transport-independent settings business failures."""
+
+
+class SettingsError(Exception):
+    """Base for errors raised by settings services."""

{simple_module_settings-0.0.38 → simple_module_settings-0.0.39}/settings/service.py

@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING
 from simple_module_db.stored_settings import SYSTEM_SCOPE_ID, VALUE_TYPE_STRING, Setting
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlmodel import col
 
 from settings._announce import announce
 from settings._listing import SettingListing
@@ -204,9 +205,9 @@ class SettingService(SettingListing):
 
     async def _find(self, scope: SettingScope, scope_id: str, key: str) -> Setting | None:
         stmt = select(Setting).where(
-            Setting.scope == scope.value,  # ty: ignore[invalid-argument-type]
-            Setting.scope_id == scope_id,  # ty: ignore[invalid-argument-type]
-            Setting.key == key,  # ty: ignore[invalid-argument-type]
+            col(Setting.scope) == scope.value,
+            col(Setting.scope_id) == scope_id,
+            col(Setting.key) == key,
         )
         result = await self.db.execute(stmt)
         return result.scalar_one_or_none()

simple_module_settings-0.0.39/tests/test_settings_domain_errors.py

@@ -0,0 +1,10 @@
+"""Settings business failures share a transport-independent base."""
+
+
+def test_settings_errors_share_a_module_base():
+    from settings._managed_keys import ManagedKeyError
+    from settings._unique_write import DuplicateSettingError
+    from settings.exceptions import SettingsError
+
+    assert isinstance(ManagedKeyError("key", "/clear"), SettingsError)
+    assert isinstance(DuplicateSettingError("key"), SettingsError)