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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anncsu-sdk
-Version: 0.0.9.dev15
+Version: 0.0.9.dev16
 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.dev16}/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.dev16}/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.dev16}/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.dev16}/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."
+        )