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

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/.gitignore

@@ -7,8 +7,6 @@ build/
 .venv/
 *.egg
 
-# UV
-uv.lock
 
 # Node
 node_modules/
@@ -65,3 +63,4 @@ host/client_app/.playwright-cli/*
 .qa/
 .verify/
 /openapi.json
+qa-shots/

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: simple_module_settings
-Version: 0.0.37
+Version: 0.0.38
 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,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.37
-Requires-Dist: simple-module-db==0.0.37
-Requires-Dist: simple-module-hosting==0.0.37
+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
 Description-Content-Type: text/markdown
 
@@ -55,7 +55,7 @@ class OrdersModule(ModuleBase):
     meta = ModuleMeta(name="orders")
 
     def register_settings(self, app: FastAPI) -> None:
-        from settings.registration import register_module_settings
+        from simple_module_core.module_settings import register_module_settings
         from orders.settings import OrdersSettings
         from orders.services import OrdersServices
 
@@ -64,7 +64,7 @@ class OrdersModule(ModuleBase):
         )
 ```
 
-That surfaces the module's settings fields under `/settings/modules`, hydrated from the DB store at startup. The settings class is a `pydantic_settings.BaseSettings` with the module's `SM_<PREFIX>_*` env-var defaults.
+That surfaces the module's settings fields under `/admin/settings/`, hydrated from the DB store at startup. The settings class is normally a `simple_module_core.settings_base.DbBackedSettings` (DB is the only source). Registration and hydration live in the framework (#500); this module adds the admin editor, hot reload and the key/value API. `settings.registration`, `settings.module_registry` and `settings.hydrate` are deprecated re-exports.
 
 ## Depends on
 

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/README.md

@@ -26,7 +26,7 @@ class OrdersModule(ModuleBase):
     meta = ModuleMeta(name="orders")
 
     def register_settings(self, app: FastAPI) -> None:
-        from settings.registration import register_module_settings
+        from simple_module_core.module_settings import register_module_settings
         from orders.settings import OrdersSettings
         from orders.services import OrdersServices
 
@@ -35,7 +35,7 @@ class OrdersModule(ModuleBase):
         )
 ```
 
-That surfaces the module's settings fields under `/settings/modules`, hydrated from the DB store at startup. The settings class is a `pydantic_settings.BaseSettings` with the module's `SM_<PREFIX>_*` env-var defaults.
+That surfaces the module's settings fields under `/admin/settings/`, hydrated from the DB store at startup. The settings class is normally a `simple_module_core.settings_base.DbBackedSettings` (DB is the only source). Registration and hydration live in the framework (#500); this module adds the admin editor, hot reload and the key/value API. `settings.registration`, `settings.module_registry` and `settings.hydrate` are deprecated re-exports.
 
 ## Depends on
 

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

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

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

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

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/_announce.py

@@ -9,8 +9,9 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from simple_module_db.callbacks import register_on_commit
+from simple_module_db.stored_settings import SCOPE_SYSTEM, SCOPE_TENANT
 
-from settings.constants import INVALIDATION_CHANNEL, SCOPE_SYSTEM, SCOPE_TENANT
+from settings.constants import INVALIDATION_CHANNEL
 from settings.contracts.invalidation import invalidation_key
 
 if TYPE_CHECKING:

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/_field_meta.py

@@ -8,7 +8,7 @@ this field?" questions live together and are testable without a FastAPI app.
 from __future__ import annotations
 
 import re
-from typing import Any
+from typing import Any, Literal, get_args, get_origin
 
 from pydantic_settings import BaseSettings
 
@@ -71,6 +71,11 @@ def choices_for(info) -> list[str] | None:
     if isinstance(declared, (list, tuple)) and declared:
         return [str(choice) for choice in declared]
 
+    if get_origin(info.annotation) is Literal:
+        options = get_args(info.annotation)
+        if options and all(isinstance(o, str) for o in options):
+            return list(options)
+
     for constraint in info.metadata:
         pattern = getattr(constraint, "pattern", None)
         if not isinstance(pattern, str):

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

@@ -3,18 +3,13 @@
 from __future__ import annotations
 
 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 settings._row_masking import out
-from settings.constants import (
-    ALL_SCOPES,
-    DEFAULT_PER_PAGE,
-    SCOPE_ALL,
-    SYSTEM_SCOPE_ID,
-)
+from settings.constants import ALL_SCOPES, DEFAULT_PER_PAGE, SCOPE_ALL
 from settings.contracts.schemas import SettingOut, SettingScope
-from settings.models import Setting
 
 
 class SettingListing:
@@ -116,6 +111,6 @@ class SettingListing:
     def _scope_stmt(scope: SettingScope, scope_id: str):
         return (
             select(Setting)
-            .where(Setting.scope == scope.value, Setting.scope_id == scope_id)
+            .where(Setting.scope == scope.value, Setting.scope_id == scope_id)  # ty: ignore[invalid-argument-type]
             .order_by(Setting.key)
         )

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/_module_settings.py

@@ -12,11 +12,10 @@ from typing import Any
 
 from fastapi import FastAPI
 from pydantic_settings import BaseSettings
-
-from settings._field_meta import choices_for, env_readable_var, resolve_default
+from simple_module_core.module_settings import get_module_settings_registry
 
 # Re-exported: callers reach for ``SECRET_MASK`` / ``is_secret_field`` here.
-from settings._secrets import (  # noqa: F401
+from simple_module_core.secret_fields import (  # noqa: F401
     _NEVER_SECRET_TYPES,
     SECRET_MASK,
     annotation_holds_secret,
@@ -26,8 +25,14 @@ from settings._secrets import (  # noqa: F401
     is_secret_field,
     mask,
 )
+from simple_module_core.settings_hydrate import (
+    env_supplied_fields,
+    input_type_for_field,
+    value_type_for_field,
+)
+
+from settings._field_meta import choices_for, env_readable_var, resolve_default
 from settings.env_vars import env_prefix_for
-from settings.hydrate import env_supplied_fields, input_type_for_field, value_type_for_field
 from settings.service import SettingService
 
 
@@ -49,7 +54,7 @@ class ModuleSettingField:
     The bundled module settings classes declare no ``env_prefix`` — they are
     constructed from pydantic defaults and hydrated from the DB — so their
     ``SM_*`` vars are never consulted. Reporting a leftover
-    ``SM_USERS_SMTP_HOST`` as the live source would invert the very question
+    ``SM_MAIL_SMTP_HOST`` as the live source would invert the very question
     this screen answers. Classes that *do* declare one (the host's ``Settings``
     with ``SM_``, and anything from the module scaffold) report ``env`` for
     real, because for them pydantic really does read it.
@@ -168,6 +173,7 @@ def _field_view(
         or named_secret
         or any(embeds_credential(v) for v in (raw_value, default, raw_env))
     )
+    group = extra.get("group")
     return ModuleSettingField(
         name=name,
         env_var=env_var,
@@ -177,7 +183,7 @@ def _field_view(
         is_secret=secret,
         type=value_type,
         requires_restart=bool(extra.get("requires_restart", False)),
-        group=extra.get("group"),
+        group=group if isinstance(group, str) else None,
         env_set=env_set,
         db_override=name in overridden,
         env_readable=live_env_var is not None,
@@ -198,7 +204,7 @@ def collect_module_settings(
     """Return a sorted, serializable view of every module's BaseSettings.
 
     Folds in both ``app.state.sm.modules`` (plugin modules) and additional
-    packages registered via ``app.state.settings.module_registry`` (e.g.
+    packages registered in the framework's module-settings registry (e.g.
     ``"host"``) that aren't backed by a ``ModuleBase`` instance.
 
     ``overrides`` maps package -> field names carrying a stored override. It
@@ -209,8 +215,7 @@ def collect_module_settings(
     views: list[ModuleSettingsView] = []
     seen: set[str] = set()
 
-    settings_services = getattr(app.state, "settings", None)
-    registry = getattr(settings_services, "module_registry", None)
+    registry = get_module_settings_registry(app)
 
     def _manage_url(package: str) -> str | None:
         return registry.manage_url(package) if registry is not None else None

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/_row_masking.py

@@ -2,17 +2,18 @@
 
 Split out of ``service`` so the "is this a secret, and is this write the mask
 being echoed back?" question lives in one file, next to the field-level rules in
-``_secrets`` that it delegates to. ``service`` imports these; nothing else
+``simple_module_core.secret_fields`` that it delegates to. ``service`` imports these; nothing else
 should need to, because the point of funnelling every read through ``out`` is
 that there is no second way to serialize a row.
 """
 
 from __future__ import annotations
 
-from settings._secrets import conceals_secret
+from simple_module_core.secret_fields import conceals_secret
+from simple_module_db.stored_settings import Setting
+
 from settings.constants import SENSITIVE_KEYS, SENSITIVE_PLACEHOLDER
 from settings.contracts.schemas import SettingOut
-from settings.models import Setting
 
 
 def is_masked(entity: Setting) -> bool:
@@ -21,7 +22,7 @@ def is_masked(entity: Setting) -> bool:
     :data:`SENSITIVE_KEYS` names the one key the hosting layer owns
     (``host.secret_key``). Everything else is judged by the same name/value
     rule the module editor uses, because the store is the *same data* seen
-    through a different screen: an override named ``users.smtp_password``, or
+    through a different screen: an override named ``mail.smtp_password``, or
     any override holding a ``postgresql://user:pw@host/db``, was rendered in
     clear text in the browse table and pre-filled into the edit form purely
     because the allowlist had a single entry in it.

simple_module_settings-0.0.38/settings/_secrets.py

@@ -0,0 +1,17 @@
+"""Re-export of :mod:`simple_module_core.secret_fields` (moved there in #500)."""
+
+from __future__ import annotations
+
+from simple_module_core.secret_fields import (  # noqa: F401
+    _NEVER_SECRET_TYPES,
+    _SECRET_PATTERNS,
+    _TYPED_SECRET_KEYS,
+    SECRET_MASK,
+    annotation_holds_secret,
+    conceals_secret,
+    embeds_credential,
+    is_named_secret,
+    is_secret_field,
+    mask,
+    register_typed_secrets,
+)

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

@@ -8,11 +8,10 @@ savepoint, leaving the request's transaction (and its session) usable.
 
 from __future__ import annotations
 
+from simple_module_db.stored_settings import Setting
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from settings.models import Setting
-
 
 class DuplicateSettingError(Exception):
     """A row with this (scope, scope_id, key) already exists."""

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/cli.py

@@ -14,10 +14,10 @@ from collections.abc import Mapping
 import typer
 from fastapi import FastAPI
 from simple_module_core.dotenv import find_env_file, parse_dotenv
+from simple_module_core.module_settings import module_settings_registry
+from simple_module_core.settings_hydrate import value_type_for_field
 
-from settings.constants import MODULE_PACKAGE
 from settings.env_vars import env_prefix_for
-from settings.hydrate import value_type_for_field
 from settings.store import SettingsStore
 
 app = typer.Typer(help="Settings module administration.", no_args_is_help=True)
@@ -35,7 +35,7 @@ async def import_from_env_impl(
     """
     if environ is None:
         environ = {**parse_dotenv(find_env_file()), **os.environ}
-    registry = getattr(app_inst.state, MODULE_PACKAGE).module_registry
+    registry = module_settings_registry(app_inst)
     count = 0
     for package, cls in registry.items():
         prefix = env_prefix_for(package)
@@ -71,7 +71,7 @@ def import_from_env() -> None:
             if n == 0 and find_env_file().is_file():
                 typer.echo(
                     "Hint: variables must be named SM_<MODULE>_<FIELD> "
-                    "(e.g. SM_USERS_SMTP_PORT); none in the environment or .env matched."
+                    "(e.g. SM_MAIL_SMTP_PORT); none in the environment or .env matched."
                 )
         return 0
 

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/constants.py

@@ -10,6 +10,28 @@ from __future__ import annotations
 
 from typing import Final
 
+# Re-exported (#500): these now live with the table in the framework.
+from simple_module_db.stored_settings import (  # noqa: F401
+    ALL_VALUE_TYPES,
+    DESCRIPTION_MAX_LENGTH,
+    KEY_MAX_LENGTH,
+    SCOPE_ID_MAX_LENGTH,
+    SCOPE_MAX_LENGTH,
+    SCOPE_SYSTEM,
+    SCOPE_TENANT,
+    SCOPE_USER,
+    SYSTEM_SCOPE_ID,
+    TABLE_SETTING,
+    UQ_SCOPE_KEY,
+    VALUE_MAX_LENGTH,
+    VALUE_TYPE_BOOL,
+    VALUE_TYPE_FLOAT,
+    VALUE_TYPE_INT,
+    VALUE_TYPE_JSON,
+    VALUE_TYPE_MAX_LENGTH,
+    VALUE_TYPE_STRING,
+)
+
 # ── Module identity ──────────────────────────────────────────────────
 MODULE_NAME: Final = "Settings"
 MODULE_PACKAGE: Final = "settings"
@@ -17,30 +39,10 @@ ENV_PREFIX: Final = "SM_SETTINGS_"
 LOCALE_NAMESPACE: Final = MODULE_PACKAGE
 
 # ── Scopes ───────────────────────────────────────────────────────────
-# Precedence high → low when resolving a key: USER > TENANT > SYSTEM.
-SCOPE_SYSTEM: Final = "system"
-SCOPE_TENANT: Final = "tenant"
-SCOPE_USER: Final = "user"
+# Scope, value-type, table and field-limit constants moved to
+# ``simple_module_db.stored_settings`` with the table itself (#500); they are
+# re-exported from the import block at the top of this file.
 ALL_SCOPES: Final = (SCOPE_SYSTEM, SCOPE_TENANT, SCOPE_USER)
-# scope_id is empty for SYSTEM; empty string (not NULL) so composite unique
-# works uniformly on SQLite and PostgreSQL (NULL breaks uniqueness on PG).
-SYSTEM_SCOPE_ID: Final = ""
-
-# ── Value types ──────────────────────────────────────────────────────
-# Values are always stored as strings; ``value_type`` tells consumers how
-# to interpret the bytes and lets the UI pick the right input control.
-VALUE_TYPE_STRING: Final = "string"
-VALUE_TYPE_BOOL: Final = "bool"
-VALUE_TYPE_INT: Final = "int"
-VALUE_TYPE_FLOAT: Final = "float"
-VALUE_TYPE_JSON: Final = "json"
-ALL_VALUE_TYPES: Final = (
-    VALUE_TYPE_STRING,
-    VALUE_TYPE_BOOL,
-    VALUE_TYPE_INT,
-    VALUE_TYPE_FLOAT,
-    VALUE_TYPE_JSON,
-)
 
 # ── Secrets ──────────────────────────────────────────────────────────
 # Keys whose stored value must never leave the settings API or the raw
@@ -104,16 +106,6 @@ INVALIDATION_CHANNEL: Final = "settings.values"
 
 # ── Database ─────────────────────────────────────────────────────────
 DB_SCHEMA: Final = MODULE_PACKAGE
-TABLE_SETTING: Final = "settings_setting"
-UQ_SCOPE_KEY: Final = "uq_settings_setting_scope_scope_id_key"
-
-# ── Field limits ─────────────────────────────────────────────────────
-KEY_MAX_LENGTH: Final = 200
-VALUE_MAX_LENGTH: Final = 4000
-DESCRIPTION_MAX_LENGTH: Final = 2000
-SCOPE_MAX_LENGTH: Final = 10
-SCOPE_ID_MAX_LENGTH: Final = 255
-VALUE_TYPE_MAX_LENGTH: Final = 10
 
 # ── Inertia page component names ─────────────────────────────────────
 PAGE_BROWSE: Final = f"{MODULE_NAME}/Browse"

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/contracts/accessor.py

@@ -23,7 +23,8 @@ import json
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Any, Final
 
-from settings.constants import SYSTEM_SCOPE_ID
+from simple_module_db.stored_settings import SYSTEM_SCOPE_ID
+
 from settings.contracts.registry import SettingsRegistry
 from settings.contracts.schemas import (
     BOOL_LITERALS_FALSE,

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/contracts/registry.py

@@ -58,6 +58,8 @@ class SettingDefinition:
     of offering a text box for an opaque id. ``description_key`` is the i18n
     key the tenant settings page translates ``description`` with (the English
     ``description`` stays the fallback when the key is missing or unset).
+    ``label_key`` does the same for the row's title (the raw ``key`` is the
+    fallback).
     ``clear_via`` names the route that owns clearing the key (e.g. an upload
     route that also reaps the stored file): the generic DELETE routes answer
     422 pointing there while the tenant exists. A platform operator may still
@@ -76,6 +78,7 @@ class SettingDefinition:
     clear_via: str | Mapping[SettingScope, str] = ""
     upload_url: str = ""
     description_key: str = ""
+    label_key: str = ""
 
 
 def clear_route(definition: SettingDefinition, scope: SettingScope | str) -> str:

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/contracts/schemas.py

@@ -7,13 +7,8 @@ from datetime import datetime
 from enum import StrEnum
 
 from pydantic import ConfigDict, model_validator
-from sqlmodel import Field, SQLModel
-
-from settings.constants import (
+from simple_module_db.stored_settings import (
     DESCRIPTION_MAX_LENGTH,
-    ERR_SCOPED_REQUIRES_ID,
-    ERR_SYSTEM_SCOPE_NO_ID,
-    ERR_VALUE_MISMATCH,
     KEY_MAX_LENGTH,
     SCOPE_ID_MAX_LENGTH,
     SCOPE_SYSTEM,
@@ -27,6 +22,9 @@ from settings.constants import (
     VALUE_TYPE_JSON,
     VALUE_TYPE_STRING,
 )
+from sqlmodel import Field, SQLModel
+
+from settings.constants import ERR_SCOPED_REQUIRES_ID, ERR_SYSTEM_SCOPE_NO_ID, ERR_VALUE_MISMATCH
 
 _BOOL_LITERALS = frozenset(
     {"true", "false", "1", "0", "t", "f", "yes", "no", "y", "n", "on", "off"}
@@ -92,7 +90,7 @@ def _validate_value_matches_type(value: str, value_type: SettingValueType) -> No
 class SettingOut(SQLModel):
     """A setting returned by the API."""
 
-    model_config = ConfigDict(from_attributes=True)
+    model_config = ConfigDict(from_attributes=True)  # ty: ignore[invalid-assignment]
 
     id: int
     scope: SettingScope

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/endpoints/api.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from fastapi import APIRouter, Depends, HTTPException, Query, Request
+from simple_module_db.stored_settings import SYSTEM_SCOPE_ID
 from simple_module_hosting.permissions import RequiresPermission
 
 from settings._unique_write import DuplicateSettingError
@@ -28,7 +29,6 @@ from settings.constants import (
     STATUS_NO_CONTENT,
     STATUS_NOT_FOUND,
     STATUS_UNPROCESSABLE,
-    SYSTEM_SCOPE_ID,
 )
 from settings.contracts.schemas import (
     SettingCreate,

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/endpoints/module_api.py

@@ -11,6 +11,8 @@ from typing import Any
 
 from fastapi import APIRouter, Depends, FastAPI, HTTPException, Request, Response, status
 from pydantic import ValidationError
+from simple_module_core.module_settings import module_settings_registry
+from simple_module_core.settings_hydrate import hydrate_settings
 from simple_module_hosting.i18n_deps import TranslatorDep
 from simple_module_hosting.permissions import RequiresPermission
 
@@ -20,10 +22,9 @@ from settings._module_settings import (
     overrides_by_package,
 )
 from settings._module_settings_props import serialize
-from settings.constants import MODULE_PACKAGE, PERM_DELETE, PERM_EDIT, PERM_VIEW
+from settings.constants import PERM_DELETE, PERM_EDIT, PERM_VIEW
 from settings.contracts.events import SettingsReloaded
 from settings.deps import get_setting_service
-from settings.hydrate import hydrate_settings
 from settings.reload import EnvPinnedError, apply_changes_and_reload
 from settings.service import SettingService
 from settings.store import SettingsStore
@@ -94,7 +95,7 @@ async def update_module(
     t: TranslatorDep,
     service: SettingService = Depends(get_setting_service),
 ) -> dict[str, Any]:
-    registry = getattr(request.app.state, MODULE_PACKAGE).module_registry
+    registry = module_settings_registry(request.app)
     if registry.get(package) is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Unknown module package")
     if registry.manage_url(package) is not None:
@@ -146,7 +147,7 @@ async def clear_module_field(
     request: Request,
     service: SettingService = Depends(get_setting_service),
 ) -> Response:
-    registry = getattr(request.app.state, MODULE_PACKAGE).module_registry
+    registry = module_settings_registry(request.app)
     cls = registry.get(package)
     if cls is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Unknown module package")

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/endpoints/views.py

@@ -10,10 +10,10 @@ strings below match what ``pages/*.tsx`` declare.
 from __future__ import annotations
 
 import asyncio
-import math
 
 from fastapi import APIRouter, Depends, HTTPException, Request
 from pydantic import ValidationError
+from simple_module_db.pagination import clamp_page
 from simple_module_hosting.i18n_deps import TranslatorDep
 from simple_module_hosting.inertia_deps import InertiaDep
 from simple_module_hosting.inertia_utils import redirect_back_with_errors, validation_errors_to_dict
@@ -107,7 +107,7 @@ async def browse(
     # A page past the end (stale ?page= link, or the last row on it was just
     # deleted) is clamped and re-queried — otherwise the client gets an empty
     # list with a nonzero total and renders a blank table.
-    number = min(query.page, max(1, math.ceil(total / query.per_page)))
+    number = clamp_page(query.page, total, query.per_page)
     if number != query.page:
         items, total = await service.list_filtered(
             query.scope_filter, query.q, number, query.per_page

simple_module_settings-0.0.38/settings/hydrate.py

@@ -0,0 +1,36 @@
+"""Deprecated: hydration moved to the framework (#500).
+
+``simple_module_core.settings_hydrate`` holds the hydrator and field helpers;
+the sync worker twin is ``simple_module_db.stored_settings.hydrate_settings_sync``.
+Kept as a re-export until 0.1.0; ``simple_module_core.deprecation`` enforces the date.
+"""
+
+from __future__ import annotations
+
+from simple_module_core.deprecation import deprecated_module
+from simple_module_core.settings_hydrate import (
+    RELATED_FIELDS_CTX,
+    build_settings,
+    env_supplied_fields,
+    hydrate_settings,
+    input_type_for_field,
+    value_type_for_field,
+)
+from simple_module_db.stored_settings import hydrate_settings_sync
+
+__all__ = [
+    "RELATED_FIELDS_CTX",
+    "build_settings",
+    "env_supplied_fields",
+    "hydrate_settings",
+    "hydrate_settings_sync",
+    "input_type_for_field",
+    "value_type_for_field",
+]
+
+deprecated_module(
+    "settings.hydrate",
+    remove_in="0.1.0",
+    use="simple_module_core.settings_hydrate (hydrate_settings_sync: "
+    "simple_module_db.stored_settings)",
+)

{simple_module_settings-0.0.37 → simple_module_settings-0.0.38}/settings/known_keys.py

@@ -17,9 +17,9 @@ from typing import Any
 
 from fastapi import FastAPI
 from fastapi.encoders import jsonable_encoder
+from simple_module_core.secret_fields import conceals_secret, mask
 
 from settings._module_settings import collect_module_settings
-from settings._secrets import conceals_secret, mask
 
 
 def _from_field(package: str, field) -> dict[str, Any]: