wasm-cli 1.5.0__tar.gz → 1.5.1__tar.gz

{wasm_cli-1.5.0/src/wasm_cli.egg-info → wasm_cli-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 1.5.0
+Version: 1.5.1
 Summary: Web App System Management - Deploy and manage web applications on Linux servers
 Author: Yago López Prado
 Author-email: Yago López Prado <yago.lopez.adeje@gmail.com>

{wasm_cli-1.5.0 → wasm_cli-1.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wasm-cli"
-version = "1.5.0"
+version = "1.5.1"
 description = "Web App System Management - Deploy and manage web applications on Linux servers"
 readme = "README.md"
 license = { text = "WASM-NCSAL" }

{wasm_cli-1.5.0 → wasm_cli-1.5.1}/setup.py

@@ -9,7 +9,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="wasm-cli",
-    version="1.5.0",
+    version="1.5.1",
     description="Web App System Management - Deploy and manage web applications on Linux servers",
     author="Yago López Prado",
     author_email="yago.lopez.adeje@gmail.com",

{wasm_cli-1.5.0 → wasm_cli-1.5.1}/src/wasm/__init__.py

@@ -15,7 +15,7 @@ from importlib.metadata import version as _installed_version
 #: as an OBS build directory. The single source of truth is the ``version``
 #: field of pyproject.toml; ``scripts/release.py`` keeps this literal and the
 #: distribution packaging files in step with it.
-_FALLBACK_VERSION = "1.5.0"
+_FALLBACK_VERSION = "1.5.1"
 
 try:
     __version__ = _installed_version("wasm-cli")

{wasm_cli-1.5.0 → wasm_cli-1.5.1}/src/wasm/web/api/backup_schedules.py

@@ -29,7 +29,7 @@ import logging
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, HTTPException
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, Field
 
 from wasm.core.exceptions import BackupError
 from wasm.core.utils import domain_to_app_name
@@ -41,6 +41,7 @@ from wasm.managers.backup_scheduler import (
 )
 from wasm.web.api.auth import get_current_session
 from wasm.web.api.deps import WASMErrorRoute, strict_domain
+from wasm.web.pydantic_compat import field_validator
 
 router = APIRouter(route_class=WASMErrorRoute)
 

{wasm_cli-1.5.0 → wasm_cli-1.5.1}/src/wasm/web/api/cron.py

@@ -28,13 +28,14 @@ import logging
 from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, HTTPException, Query
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, Field
 
 from wasm.core.exceptions import ServiceError
 from wasm.managers.backup_scheduler import SCHEDULE_ALIASES
 from wasm.managers.cron_manager import CronJob, CronManager, validate_cron_calendar
 from wasm.web.api.auth import get_current_session
 from wasm.web.api.deps import WASMErrorRoute
+from wasm.web.pydantic_compat import field_validator
 
 router = APIRouter(route_class=WASMErrorRoute)
 

{wasm_cli-1.5.0 → wasm_cli-1.5.1}/src/wasm/web/api/deps.py

@@ -46,6 +46,7 @@ from wasm.core.exceptions import (
 )
 from wasm.validators.domain import validate_domain
 from wasm.web.auth import SCOPE_RANK, ensure_scope, require_auth
+from wasm.web.pydantic_compat import dump_model
 
 #: Status used for a WASMError with no more specific mapping. A manager that
 #: raises anything else is reporting that the operation failed on the server,
@@ -130,11 +131,13 @@ def error_response(exc: WASMError) -> JSONResponse:
     # hint, and the client should not have to know the difference.
     return JSONResponse(
         status_code=status_for(exc),
-        content=ErrorResponse(
-            detail=str(exc),
-            hint=getattr(exc, "details", None) or None,
-            error=type(exc).__name__,
-        ).model_dump(),
+        content=dump_model(
+            ErrorResponse(
+                detail=str(exc),
+                hint=getattr(exc, "details", None) or None,
+                error=type(exc).__name__,
+            )
+        ),
     )
 
 

wasm_cli-1.5.1/src/wasm/web/pydantic_compat.py

@@ -0,0 +1,98 @@
+# Copyright (c) 2024-2026 Yago Lopez Prado
+# Licensed under WASM-NCSAL 1.0 (Commercial use prohibited)
+# https://github.com/Perkybeet/wasm/blob/main/LICENSE
+
+"""
+One import surface for the pydantic names that differ between v1 and v2.
+
+The panel does not choose its pydantic. pip and Fedora install pydantic 2,
+but Ubuntu 24.04 and Debian 12 package ``python3-pydantic`` 1.10, and the
+.deb depends on the distribution package. FastAPI 0.100+ runs on either
+major version, so the rest of the web layer never notices - until a module
+imports a name only one major version has. That is how v1.5.0 shipped:
+``from pydantic import field_validator`` imported cleanly under pip's
+pydantic 2, and ``wasm web start`` died with ImportError on every Ubuntu
+24.04 install.
+
+This module bridges exactly the names the web layer uses, nothing more. It
+is not a copy of pydantic and must not grow into one: a name goes here only
+when the two majors spell it differently, and it keeps v2's spelling with
+v2's semantics on both. ``tests/test_architecture.py`` forbids importing the
+version-specific names from pydantic anywhere else.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+import pydantic
+from pydantic import BaseModel
+
+#: True under pydantic 2. Version detection has to work on both majors, and
+#: ``pydantic.VERSION`` is the one spelling they share.
+PYDANTIC_V2 = int(pydantic.VERSION.split(".")[0]) >= 2
+
+if TYPE_CHECKING or PYDANTIC_V2:
+    from pydantic import field_validator as field_validator
+else:
+    from pydantic import validator as _v1_validator
+
+    def field_validator(
+        field: str, *fields: str, mode: str = "after", check_fields: bool | None = None
+    ) -> Any:
+        """
+        pydantic v2's ``field_validator``, expressed as a v1 ``validator``.
+
+        Only the surface the web layer uses is mapped: ``mode="before"``
+        becomes v1's ``pre=True`` and ``mode="after"`` its default, both of
+        which mean the same thing they mean in v2. ``allow_reuse`` is always
+        set because v1 keeps a global registry of validator names and would
+        otherwise refuse the module on a re-import, which is exactly what a
+        reloading server does.
+
+        The decorated function must take ``(cls, value)`` and nothing else:
+        v2's ``ValidationInfo`` does not exist in v1, so a validator that
+        needs more than the value cannot be bridged and must be refactored
+        not to.
+
+        Args:
+            field: Name of the field to validate.
+            *fields: Further field names, validated by the same function.
+            mode: ``"before"`` or ``"after"``, with v2's meaning. The other
+                v2 modes have no v1 equivalent and are refused.
+            check_fields: Passed through to v1's ``check_fields`` untouched.
+
+        Returns:
+            The decorator, exactly as v2's ``field_validator`` would return.
+
+        Raises:
+            TypeError: When ``mode`` names a v2 mode v1 cannot express.
+        """
+        if mode not in ("before", "after"):
+            raise TypeError(
+                f"field_validator mode {mode!r} has no pydantic v1 equivalent; "
+                "use 'before' or 'after'"
+            )
+        kwargs: dict[str, Any] = {"pre": mode == "before", "allow_reuse": True}
+        if check_fields is not None:
+            kwargs["check_fields"] = check_fields
+        return _v1_validator(field, *fields, **kwargs)
+
+
+def dump_model(model: BaseModel) -> dict[str, Any]:
+    """
+    Serialise a model to a plain dict, whichever pydantic is installed.
+
+    v2 spells this ``model_dump()`` and v1 ``dict()``; each major warns or
+    fails on the other's spelling, so callers use this instead of either.
+
+    Args:
+        model: The model instance to serialise.
+
+    Returns:
+        The model's fields as a dictionary, as the installed pydantic builds
+        it.
+    """
+    if PYDANTIC_V2:
+        return model.model_dump()
+    return model.dict()

{wasm_cli-1.5.0 → wasm_cli-1.5.1/src/wasm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wasm-cli
-Version: 1.5.0
+Version: 1.5.1
 Summary: Web App System Management - Deploy and manage web applications on Linux servers
 Author: Yago López Prado
 Author-email: Yago López Prado <yago.lopez.adeje@gmail.com>

{wasm_cli-1.5.0 → wasm_cli-1.5.1}/src/wasm_cli.egg-info/SOURCES.txt

@@ -131,6 +131,7 @@ src/wasm/web/auth.py
 src/wasm/web/events.py
 src/wasm/web/jobs.py
 src/wasm/web/metrics_collector.py
+src/wasm/web/pydantic_compat.py
 src/wasm/web/server.py
 src/wasm/web/api/__init__.py
 src/wasm/web/api/apps.py