anncsu-sdk 0.0.9.dev15__tar.gz → 0.0.9.dev17__tar.gz

{anncsu_sdk-0.0.9.dev15 → anncsu_sdk-0.0.9.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anncsu-sdk
-Version: 0.0.9.dev15
+Version: 0.0.9.dev17
 Summary: ANNCSU Software Development Kit for API consumption
 Author-email: Francesco Bartoli <francesco.bartoli@geobeyond.it>
 License-File: LICENSE

{anncsu_sdk-0.0.9.dev15 → anncsu_sdk-0.0.9.dev17}/scripts/post_speakeasy_generation.py

@@ -370,10 +370,53 @@ def fix_do_request_kwarg(package_path: Path, dry_run: bool = False) -> list[str]
     return fixed
 
 
+# Speakeasy 1.7+ emits ``from anncsu.common.sdk.utils import unmarshal_json_response``
+# but ``unmarshal_json_response`` is a sub-module whose name collides with the
+# inner function. Python resolves the import to the module, breaking the call
+# with ``TypeError: 'module' object is not callable``. See issue #28.
+UNMARSHAL_IMPORT_PATTERN = re.compile(
+    r"^from anncsu\.common\.sdk\.utils import unmarshal_json_response$",
+    flags=re.MULTILINE,
+)
+UNMARSHAL_IMPORT_REPLACEMENT = (
+    "from anncsu.common.sdk.utils.unmarshal_json_response import "
+    "unmarshal_json_response"
+)
+
+
+def fix_unmarshal_import(package_path: Path, dry_run: bool = False) -> list[str]:
+    """Rewrite the ambiguous package-level ``unmarshal_json_response`` import
+    to the explicit sub-module form used by the pa/coordinate packages."""
+    fixed: list[str] = []
+
+    for py_file in package_path.rglob("*.py"):
+        if "__pycache__" in str(py_file):
+            continue
+
+        content = py_file.read_text()
+        new_content, count = UNMARSHAL_IMPORT_PATTERN.subn(
+            UNMARSHAL_IMPORT_REPLACEMENT, content
+        )
+
+        if count > 0:
+            if not dry_run:
+                py_file.write_text(new_content)
+            rel_path = py_file.relative_to(package_path)
+            fixed.append(str(rel_path))
+            console.print(
+                f"  [green]Fixed unmarshal_json_response import ({count}x):[/green] {rel_path}"
+            )
+
+    return fixed
+
+
 def process_package(
     package_name: str, dry_run: bool = False
-) -> tuple[int, int, int, int]:
-    """Process a single API package. Returns (deleted, modified, fixed, do_request_fixed)."""
+) -> tuple[int, int, int, int, int]:
+    """Process a single API package.
+
+    Returns (deleted, modified, fixed, do_request_fixed, unmarshal_fixed).
+    """
     package_path = SDK_ROOT / package_name
 
     if not package_path.exists():
@@ -407,7 +450,21 @@ def process_package(
     if not do_request_fixed:
         console.print("  [dim]No do_request kwargs to fix[/dim]")
 
-    return len(deleted), len(modified), len(fixed), len(do_request_fixed)
+    # Step 5: Fix unmarshal_json_response import (Issue #28)
+    console.print(
+        "\n[bold]5. Fixing unmarshal_json_response import (Issue #28)...[/bold]"
+    )
+    unmarshal_fixed = fix_unmarshal_import(package_path, dry_run)
+    if not unmarshal_fixed:
+        console.print("  [dim]No unmarshal_json_response imports to fix[/dim]")
+
+    return (
+        len(deleted),
+        len(modified),
+        len(fixed),
+        len(do_request_fixed),
+        len(unmarshal_fixed),
+    )
 
 
 @app.command()
@@ -454,21 +511,36 @@ def main(
     total_modified = 0
     total_fixed = 0
     total_do_request_fixed = 0
+    total_unmarshal_fixed = 0
 
     if all_packages:
         # Process all known API packages
         for pkg in ALL_PACKAGES:
-            deleted, modified, fixed, do_request_fixed = process_package(pkg, dry_run)
+            (
+                deleted,
+                modified,
+                fixed,
+                do_request_fixed,
+                unmarshal_fixed,
+            ) = process_package(pkg, dry_run)
             total_deleted += deleted
             total_modified += modified
             total_fixed += fixed
             total_do_request_fixed += do_request_fixed
+            total_unmarshal_fixed += unmarshal_fixed
     else:
-        deleted, modified, fixed, do_request_fixed = process_package(package, dry_run)
+        (
+            deleted,
+            modified,
+            fixed,
+            do_request_fixed,
+            unmarshal_fixed,
+        ) = process_package(package, dry_run)
         total_deleted = deleted
         total_modified = modified
         total_fixed = fixed
         total_do_request_fixed = do_request_fixed
+        total_unmarshal_fixed = unmarshal_fixed
 
     # Summary
     console.print("\n" + "=" * 50)
@@ -477,6 +549,7 @@ def main(
     console.print(f"  Files modified:      {total_modified}")
     console.print(f"  Fields fixed:        {total_fixed}")
     console.print(f"  do_request fixed:    {total_do_request_fixed}")
+    console.print(f"  unmarshal fixed:     {total_unmarshal_fixed}")
 
     if dry_run:
         console.print(

{anncsu_sdk-0.0.9.dev15 → anncsu_sdk-0.0.9.dev17}/src/anncsu/accessi/accessi.py

@@ -6,7 +6,7 @@ from anncsu.common.sdk import utils
 from anncsu.common.hooks import HookContext
 from anncsu.common.sdk.types import OptionalNullable, UNSET
 from anncsu.common.sdk.utils import get_security_from_env
-from anncsu.common.sdk.utils import unmarshal_json_response
+from anncsu.common.sdk.utils.unmarshal_json_response import unmarshal_json_response
 from typing import Any, Mapping, Optional, Union
 
 

{anncsu_sdk-0.0.9.dev15 → anncsu_sdk-0.0.9.dev17}/src/anncsu/accessi/errors/accesso_validation.py

@@ -133,6 +133,27 @@ class FieldNotAllowedForOperationError(AccessoValidationError):
         )
 
 
+@dataclass
+class SezioneCensimentoRequiredError(AccessoValidationError):
+    """Raised when sezione_censimento is missing for I (insert) or R (replace).
+
+    Per OAS spec: ``sezione_censimento`` has no ``nullable: true`` and is
+    described as "da valorizzare solo per operazione_civico='I','R'".
+    Missing it triggers a server-side rejection like
+    ``Sezione di censimento:   non presente nel Comune <X>``; catching it
+    locally gives a clearer message before the API call.
+    """
+
+    operazione: str
+
+    def __str__(self) -> str:
+        return (
+            f"Il campo 'sezione_censimento' e' obbligatorio per "
+            f"operazione_civico='{self.operazione}'. "
+            f"Per 'S' (soppressione) non deve essere valorizzato."
+        )
+
+
 @dataclass
 class AccessoMaxLengthError(AccessoValidationError):
     """Raised when a string field exceeds its OAS maxLength constraint.
@@ -163,5 +184,6 @@ __all__ = [
     "NumeroMetricoMutexError",
     "FieldNotAllowedForDeleteError",
     "FieldNotAllowedForOperationError",
+    "SezioneCensimentoRequiredError",
     "AccessoMaxLengthError",
 ]

{anncsu_sdk-0.0.9.dev15 → anncsu_sdk-0.0.9.dev17}/src/anncsu/accessi/models/validated.py

@@ -22,6 +22,8 @@ Rules (derived from the OAS spec):
 6. ``coordinate``, when present, is re-validated through the existing
    ``ValidatedCoordinate`` model (Italy bounds, X/Y dependency, metodo
    1-4, maxLength X/Y/Z).
+7. ``sezione_censimento`` is mandatory for ``I`` and ``R`` (OAS field has
+   no ``nullable: true``); rule 4 already forbids it for ``S``.
 """
 
 from __future__ import annotations
@@ -36,6 +38,7 @@ from anncsu.accessi.errors.accesso_validation import (
     NumeroMetricoMutexError,
     OperazioneCivicoError,
     ProgrCivicoRequiredError,
+    SezioneCensimentoRequiredError,
 )
 from anncsu.accessi.models.richiestaoperazione import Accesso
 from anncsu.coordinate.models.validated import ValidatedCoordinate
@@ -120,6 +123,12 @@ class ValidatedAccesso(Accesso):
             if not has_numero and not has_metrico:
                 raise NumeroMetricoMutexError(has_numero=False, has_metrico=False)
 
+        # Rule 7 (issue #30): sezione_censimento required for I/R.
+        # OAS declares the field without ``nullable: true`` — the API rejects
+        # the request server-side if absent. Mirror that contract locally.
+        if op in {"I", "R"} and self._get_value(self.sezione_censimento) is None:
+            raise SezioneCensimentoRequiredError(operazione=op)
+
         # Rule 6: re-validate embedded coordinates via ValidatedCoordinate
         if self.coordinate is not None:
             payload = self.coordinate.model_dump(exclude_unset=True)

{anncsu_sdk-0.0.9.dev15 → anncsu_sdk-0.0.9.dev17}/src/anncsu/accessi/status.py

@@ -6,7 +6,7 @@ from anncsu.common.sdk import utils
 from anncsu.common.hooks import HookContext
 from anncsu.common.sdk.types import OptionalNullable, UNSET
 from anncsu.common.sdk.utils import get_security_from_env
-from anncsu.common.sdk.utils import unmarshal_json_response
+from anncsu.common.sdk.utils.unmarshal_json_response import unmarshal_json_response
 from typing import Any, Mapping, Optional
 
 

{anncsu_sdk-0.0.9.dev15 → anncsu_sdk-0.0.9.dev17}/tests/accessi/test_accesso_validation.py

@@ -39,6 +39,7 @@ from anncsu.accessi.errors.accesso_validation import (
     NumeroMetricoMutexError,
     OperazioneCivicoError,
     ProgrCivicoRequiredError,
+    SezioneCensimentoRequiredError,
 )
 from anncsu.accessi.models.validated import ValidatedAccesso
 from anncsu.coordinate.errors.coordinate_validation import (
@@ -64,13 +65,18 @@ class TestAccessoOperazioneCivicoValidation:
 
     def test_operazione_civico_I_valid(self) -> None:
         """Test that operazione_civico='I' (insert) is accepted."""
-        accesso = ValidatedAccesso(operazione_civico="I", numero="12")
+        accesso = ValidatedAccesso(
+            operazione_civico="I", numero="12", sezione_censimento="9"
+        )
         assert accesso.operazione_civico == "I"
 
     def test_operazione_civico_R_valid(self) -> None:
         """Test that operazione_civico='R' (replace) is accepted."""
         accesso = ValidatedAccesso(
-            operazione_civico="R", progr_civico="1370588", numero="12"
+            operazione_civico="R",
+            progr_civico="1370588",
+            numero="12",
+            sezione_censimento="9",
         )
         assert accesso.operazione_civico == "R"
 
@@ -115,7 +121,9 @@ class TestAccessoProgrCivicoDependency:
 
     def test_insert_without_progr_civico_valid(self) -> None:
         """Test that I (insert) does not require progr_civico (assigned by API)."""
-        accesso = ValidatedAccesso(operazione_civico="I", numero="12")
+        accesso = ValidatedAccesso(
+            operazione_civico="I", numero="12", sezione_censimento="9"
+        )
         assert accesso.progr_civico is None
 
     def test_replace_requires_progr_civico(self) -> None:
@@ -137,7 +145,10 @@ class TestAccessoProgrCivicoDependency:
     def test_replace_with_progr_civico_valid(self) -> None:
         """Test that R with progr_civico is valid."""
         accesso = ValidatedAccesso(
-            operazione_civico="R", progr_civico="1370588", numero="12"
+            operazione_civico="R",
+            progr_civico="1370588",
+            numero="12",
+            sezione_censimento="9",
         )
         assert accesso.progr_civico == "1370588"
 
@@ -157,12 +168,16 @@ class TestAccessoNumeroMetricoMutex:
 
     def test_insert_with_numero_only_valid(self) -> None:
         """Test that I with only numero is valid (civico)."""
-        accesso = ValidatedAccesso(operazione_civico="I", numero="12")
+        accesso = ValidatedAccesso(
+            operazione_civico="I", numero="12", sezione_censimento="9"
+        )
         assert accesso.numero == "12"
 
     def test_insert_with_metrico_only_valid(self) -> None:
         """Test that I with only metrico is valid (metric-identified)."""
-        accesso = ValidatedAccesso(operazione_civico="I", metrico="300")
+        accesso = ValidatedAccesso(
+            operazione_civico="I", metrico="300", sezione_censimento="9"
+        )
         assert accesso.metrico == "300"
 
     def test_insert_with_both_numero_and_metrico_invalid(self) -> None:
@@ -182,14 +197,20 @@ class TestAccessoNumeroMetricoMutex:
     def test_replace_with_numero_only_valid(self) -> None:
         """Test that R with only numero is valid."""
         accesso = ValidatedAccesso(
-            operazione_civico="R", progr_civico="1370588", numero="12"
+            operazione_civico="R",
+            progr_civico="1370588",
+            numero="12",
+            sezione_censimento="9",
         )
         assert accesso.numero == "12"
 
     def test_replace_with_metrico_only_valid(self) -> None:
         """Test that R with only metrico is valid."""
         accesso = ValidatedAccesso(
-            operazione_civico="R", progr_civico="1370588", metrico="300"
+            operazione_civico="R",
+            progr_civico="1370588",
+            metrico="300",
+            sezione_censimento="9",
         )
         assert accesso.metrico == "300"
 
@@ -275,6 +296,68 @@ class TestAccessoFieldsNotAllowedForDelete:
         assert accesso.progr_civico == "1370588"
 
 
+# ---------------------------------------------------------------------------
+# 4b. sezione_censimento required for I/R (Issue #30)
+# ---------------------------------------------------------------------------
+
+
+class TestAccessoSezioneCensimentoRequired:
+    """Tests that ``sezione_censimento`` is mandatory for I and R.
+
+    Per OAS spec the field has no ``nullable: true`` and is described as
+    "da valorizzare solo per operazione_civico='I','R'". Missing it for
+    I or R must fail locally before the API call.
+    """
+
+    def test_insert_without_sezione_censimento_raises(self) -> None:
+        with pytest.raises(ValidationError) as exc_info:
+            ValidatedAccesso(operazione_civico="I", numero="12")
+        cause = get_validation_error_cause(exc_info)
+        assert isinstance(cause, SezioneCensimentoRequiredError)
+        assert "I" in str(cause)
+
+    def test_replace_without_sezione_censimento_raises(self) -> None:
+        with pytest.raises(ValidationError) as exc_info:
+            ValidatedAccesso(operazione_civico="R", progr_civico="1370588", numero="12")
+        cause = get_validation_error_cause(exc_info)
+        assert isinstance(cause, SezioneCensimentoRequiredError)
+        assert "R" in str(cause)
+
+    def test_insert_with_empty_sezione_censimento_raises(self) -> None:
+        """Empty string must be treated as missing (matches _get_value semantics)."""
+        with pytest.raises(ValidationError) as exc_info:
+            ValidatedAccesso(operazione_civico="I", numero="12", sezione_censimento="")
+        cause = get_validation_error_cause(exc_info)
+        assert isinstance(cause, SezioneCensimentoRequiredError)
+
+    def test_insert_with_sezione_censimento_valid(self) -> None:
+        accesso = ValidatedAccesso(
+            operazione_civico="I", numero="12", sezione_censimento="9"
+        )
+        assert accesso.sezione_censimento == "9"
+
+    def test_replace_with_sezione_censimento_valid(self) -> None:
+        accesso = ValidatedAccesso(
+            operazione_civico="R",
+            progr_civico="1370588",
+            numero="12",
+            sezione_censimento="9",
+        )
+        assert accesso.sezione_censimento == "9"
+
+    def test_delete_without_sezione_censimento_still_valid(self) -> None:
+        """Regression: S must NOT require sezione_censimento (Rule 4 still forbids it)."""
+        accesso = ValidatedAccesso(operazione_civico="S", progr_civico="1370588")
+        assert accesso.operazione_civico == "S"
+        assert accesso.sezione_censimento is None
+
+    def test_sezione_censimento_error_is_accesso_validation_error(self) -> None:
+        """The new error must sit under the AccessoValidationError hierarchy
+        so existing ``except AccessoValidationError`` blocks catch it."""
+        err = SezioneCensimentoRequiredError(operazione="I")
+        assert isinstance(err, AccessoValidationError)
+
+
 # ---------------------------------------------------------------------------
 # 5. maxLength constraints from OAS
 # ---------------------------------------------------------------------------
@@ -380,6 +463,7 @@ class TestAccessoCoordinateIntegration:
         accesso = ValidatedAccesso(
             operazione_civico="I",
             numero="12",
+            sezione_censimento="9",
             coordinate={
                 "x": "13.1022000",
                 "y": "41.8847600",
@@ -395,6 +479,7 @@ class TestAccessoCoordinateIntegration:
             ValidatedAccesso(
                 operazione_civico="I",
                 numero="12",
+                sezione_censimento="9",
                 coordinate={
                     "x": "99.0",  # outside Italy bounds (6-18)
                     "y": "41.8847600",
@@ -424,7 +509,9 @@ class TestAccessoCoordinateIntegration:
 
     def test_accesso_without_coordinates_valid(self) -> None:
         """Test that accesso without coordinates is valid (coordinates optional)."""
-        accesso = ValidatedAccesso(operazione_civico="I", numero="12")
+        accesso = ValidatedAccesso(
+            operazione_civico="I", numero="12", sezione_censimento="9"
+        )
         assert accesso.coordinate is None
 
 
@@ -444,6 +531,7 @@ class TestAccessoValidationErrorHierarchy:
             FieldNotAllowedForDeleteError,
             NumeroMetricoMutexError,
             FieldNotAllowedForOperationError,
+            SezioneCensimentoRequiredError,
             AccessoMaxLengthError,
         ):
             assert issubclass(err_class, AccessoValidationError)
@@ -492,6 +580,7 @@ class TestAccessoIntegration:
             operazione_civico="R",
             progr_civico="1370588",
             numero="12",
+            sezione_censimento="9",
             coordinate={
                 "x": "13.1022001",
                 "y": "41.8847601",
@@ -517,6 +606,7 @@ class TestAccessoIntegration:
         accesso = ValidatedAccesso(
             operazione_civico="I",
             metrico="300",
+            sezione_censimento="9",
             coordinate={
                 "x": "13.1022000",
                 "y": "41.8847600",

{anncsu_sdk-0.0.9.dev15 → anncsu_sdk-0.0.9.dev17}/tests/cli/test_accesso.py

@@ -148,6 +148,8 @@ class TestAccessoInsert:
                                 "2000449",
                                 "--numero",
                                 "12",
+                                "--sezione-censimento",
+                                "9",
                             ],
                         )
 
@@ -269,6 +271,8 @@ class TestAccessoUpdate:
                                 "1370588",
                                 "--numero",
                                 "12",
+                                "--sezione-censimento",
+                                "9",
                             ],
                         )
 
@@ -469,6 +473,8 @@ class TestAccessoJsonOutput:
                                 "2000449",
                                 "--numero",
                                 "12",
+                                "--sezione-censimento",
+                                "9",
                                 "--json",
                             ],
                         )
@@ -545,6 +551,8 @@ class TestAccessoInsertDryRun:
                         "2000449",
                         "--numero",
                         "12",
+                        "--sezione-censimento",
+                        "9",
                         "--dry-run",
                     ],
                 )
@@ -606,6 +614,8 @@ class TestAccessoInsertDryRun:
                         "2000449",
                         "--numero",
                         "12",
+                        "--sezione-censimento",
+                        "9",
                         "--dry-run",
                     ],
                 )
@@ -656,6 +666,8 @@ class TestAccessoInsertDryRun:
                         "2000449",
                         "--numero",
                         "12",
+                        "--sezione-censimento",
+                        "9",
                         "--dry-run",
                         "--json",
                     ],

{anncsu_sdk-0.0.9.dev15 → anncsu_sdk-0.0.9.dev17}/tests/test_post_speakeasy_generation.py

@@ -125,3 +125,83 @@ class TestFixDoRequestKwarg:
         post_gen_module.fix_do_request_kwarg(pkg_dir, dry_run=False)
 
         assert target.read_text() == '            error_status_codes=["400", "5XX"],\n'
+
+
+BAD_UNMARSHAL_IMPORT = "from anncsu.common.sdk.utils import unmarshal_json_response\n"
+GOOD_UNMARSHAL_IMPORT = (
+    "from anncsu.common.sdk.utils.unmarshal_json_response import "
+    "unmarshal_json_response\n"
+)
+
+
+class TestFixUnmarshalImport:
+    """Issue #28: ``from anncsu.common.sdk.utils import unmarshal_json_response``
+    resolves to the sub-module, not the function. The post-gen script must
+    rewrite it to the explicit ``from utils.unmarshal_json_response import
+    unmarshal_json_response`` form used by the pa/coordinate packages."""
+
+    def test_rewrites_unmarshal_import(self, post_gen_module, tmp_path):
+        pkg_dir = tmp_path / "fake_pkg"
+        pkg_dir.mkdir()
+        target = pkg_dir / "endpoint.py"
+        target.write_text(BAD_UNMARSHAL_IMPORT)
+
+        fixed = post_gen_module.fix_unmarshal_import(pkg_dir, dry_run=False)
+
+        assert "endpoint.py" in fixed
+        assert target.read_text() == GOOD_UNMARSHAL_IMPORT
+
+    def test_leaves_already_correct_import_unchanged(self, post_gen_module, tmp_path):
+        pkg_dir = tmp_path / "fake_pkg"
+        pkg_dir.mkdir()
+        target = pkg_dir / "endpoint.py"
+        target.write_text(GOOD_UNMARSHAL_IMPORT)
+
+        fixed = post_gen_module.fix_unmarshal_import(pkg_dir, dry_run=False)
+
+        assert fixed == []
+        assert target.read_text() == GOOD_UNMARSHAL_IMPORT
+
+    def test_dry_run_does_not_modify_file(self, post_gen_module, tmp_path):
+        pkg_dir = tmp_path / "fake_pkg"
+        pkg_dir.mkdir()
+        target = pkg_dir / "endpoint.py"
+        target.write_text(BAD_UNMARSHAL_IMPORT)
+
+        post_gen_module.fix_unmarshal_import(pkg_dir, dry_run=True)
+
+        assert target.read_text() == BAD_UNMARSHAL_IMPORT
+
+    def test_no_match_returns_empty_list(self, post_gen_module, tmp_path):
+        pkg_dir = tmp_path / "fake_pkg"
+        pkg_dir.mkdir()
+        target = pkg_dir / "models.py"
+        target.write_text("class Foo:\n    pass\n")
+
+        fixed = post_gen_module.fix_unmarshal_import(pkg_dir, dry_run=False)
+
+        assert fixed == []
+
+
+class TestUnmarshalImportResolvesToFunction:
+    """Integration check: after the fix is applied to the accessi package,
+    the imported ``unmarshal_json_response`` must be a callable (function),
+    not a module. This catches the runtime symptom directly."""
+
+    def test_accessi_unmarshal_is_callable(self):
+        import importlib
+
+        mod = importlib.import_module("anncsu.accessi.accessi")
+        assert callable(mod.unmarshal_json_response), (
+            "anncsu.accessi.accessi.unmarshal_json_response must be a "
+            "function, not a module — see issue #28."
+        )
+
+    def test_status_unmarshal_is_callable(self):
+        import importlib
+
+        mod = importlib.import_module("anncsu.accessi.status")
+        assert callable(mod.unmarshal_json_response), (
+            "anncsu.accessi.status.unmarshal_json_response must be a "
+            "function, not a module — see issue #28."
+        )