diracx-testing 0.0.1a33__py3-none-any.whl → 0.0.1a35__py3-none-any.whl

diracx/testing/client_generation.py

@@ -0,0 +1,156 @@
+from __future__ import annotations
+
+__all__ = [
+    "regenerate_client",
+    "AUTOREST_VERSION",
+]
+
+import ast
+import importlib.util
+import subprocess
+from pathlib import Path
+
+import git
+
+AUTOREST_VERSION = "6.13.7"
+
+
+def extract_static_all(path):
+    tree = ast.parse(path.read_text(), filename=path)
+
+    name_to_module = {}
+    for node in tree.body:
+        if isinstance(node, ast.ImportFrom):
+            # Skip wildcard imports (like 'from ... import *')
+            for alias in node.names:
+                if alias.name == "*":
+                    continue
+                # Use the alias if available, otherwise the original name.
+                local_name = alias.asname if alias.asname else alias.name
+                name_to_module[local_name] = node.module
+
+    # Look for the first top-level assignment to __all__
+    for node in tree.body:
+        if not isinstance(node, ast.Assign):
+            continue
+        for target in node.targets:
+            if not (isinstance(target, ast.Name) and target.id == "__all__"):
+                continue
+            return {
+                name: name_to_module.get(name) for name in ast.literal_eval(node.value)
+            }
+    raise NotImplementedError("__all__ not found")
+
+
+def fixup_models_init(generated_dir, extension_name):
+    """Workaround for https://github.com/python/mypy/issues/15300."""
+    models_init_path = generated_dir / "models" / "__init__.py"
+    # Enums cannot be extended, so we don't need to patch them
+    object_names = {
+        name
+        for name, module in extract_static_all(models_init_path).items()
+        if module != "_enums"
+    }
+
+    patch_module = "diracx.client._generated.models._patch"
+    spec = importlib.util.find_spec(patch_module)
+    if spec is None or spec.origin is None:
+        raise ImportError(f"Cannot locate {patch_module} package")
+    missing = set(extract_static_all(Path(spec.origin))) - set(object_names)
+    missing_formatted = "\n".join(f'            "{name}",' for name in missing)
+
+    with models_init_path.open("a") as fh:
+        fh.write(
+            "if TYPE_CHECKING:\n"
+            "    __all__.extend(\n"
+            "        [\n"
+            f"{missing_formatted}"
+            "        ]\n"
+            "    )\n"
+        )
+
+
+def regenerate_client(openapi_spec: Path, client_module: str):
+    """Regenerate the AutoREST client and run pre-commit checks on it.
+
+    This test is skipped by default, and can be enabled by passing
+    --regenerate-client to pytest. It is intended to be run manually
+    when the API changes.
+
+    The reason this is a test is that it is the only way to get access to the
+    test_client fixture, which is required to get the OpenAPI spec.
+
+    WARNING: This test will modify the source code of the client!
+    """
+    spec = importlib.util.find_spec(client_module)
+    if spec is None:
+        raise ImportError("Cannot locate client_module package")
+    if spec.origin is None:
+        raise ImportError(
+            "Cannot locate client_module package, did you forget the __init__.py?"
+        )
+    client_root = Path(spec.origin).parent
+
+    assert client_root.is_dir()
+    assert client_root.name == "client"
+    assert (client_root / "_generated").is_dir()
+    extension_name = client_root.parent.name
+
+    repo_root = client_root.parents[3]
+    if extension_name == "gubbins":
+        # Gubbins is special because it has a different structure due to being
+        # in a subdirectory of diracx
+        repo_root = repo_root.parents[1]
+    assert (repo_root / ".git").is_dir()
+    repo = git.Repo(repo_root)
+    generated_dir = client_root / "_generated"
+    if repo.is_dirty(path=generated_dir):
+        raise AssertionError(
+            "Client is currently in a modified state, skipping regeneration"
+        )
+
+    cmd = [
+        "autorest",
+        "--python",
+        f"--input-file={openapi_spec}",
+        "--models-mode=msrest",
+        "--namespace=_generated",
+        f"--output-folder={client_root}",
+    ]
+
+    # This is required to be able to work offline
+    # TODO: if offline, find the version already installed
+    # and use it
+    # cmd += [f"--use=@autorest/python@{AUTOREST_VERSION}"]
+
+    # ruff: disable=S603
+    subprocess.run(cmd, check=True)
+
+    if extension_name != "diracx":
+        # For now we don't support extending the models in extensions. To make
+        # this clear manually remove the automatically generated _patch.py file
+        # and fixup the __init__.py file to use the diracx one.
+        (generated_dir / "models" / "_patch.py").unlink()
+        models_init_path = generated_dir / "models" / "__init__.py"
+        models_init = models_init_path.read_text()
+        assert models_init.count("from ._patch import") == 4
+        models_init = models_init.replace(
+            "from ._patch import",
+            "from diracx.client._generated.models._patch import",
+        )
+        models_init_path.write_text(models_init)
+
+    fixup_models_init(generated_dir, extension_name)
+
+    cmd = ["pre-commit", "run", "--all-files"]
+    print("Running pre-commit...")
+    subprocess.run(cmd, check=False, cwd=repo_root)
+    print("Re-running pre-commit...")
+    proc = subprocess.run(cmd, check=False, cwd=repo_root)
+    if proc.returncode == 0 and not repo.is_dirty(path=generated_dir):
+        return
+    # Show the diff to aid debugging
+    print(repo.git.diff(generated_dir))
+    if proc.returncode != 0:
+        raise AssertionError("Pre-commit failed")
+    raise AssertionError("Client was regenerated with changes")

diracx/testing/dummy_osdb.py

@@ -26,5 +26,5 @@ class DummyOSDB(BaseOSDB):
         self.index_prefix = f"dummy_{secrets.token_hex(8)}"
         super().__init__(*args, **kwargs)
 
-    def index_name(self, doc_id: int) -> str:
+    def index_name(self, vo: str, doc_id: int) -> str:
         return f"{self.index_prefix}-{doc_id // 1e6:.0f}m"

diracx/testing/mock_osdb.py

@@ -86,7 +86,7 @@ class MockOSDBMixin:
         async with self._sql_db.engine.begin() as conn:
             await conn.run_sync(self._sql_db.metadata.create_all)
 
-    async def upsert(self, doc_id, document) -> None:
+    async def upsert(self, vo, doc_id, document) -> None:
         async with self._sql_db:
             values = {}
             for key, value in document.items():

{diracx_testing-0.0.1a33.dist-info → diracx_testing-0.0.1a35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-testing
-Version: 0.0.1a33
+Version: 0.0.1a35
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

diracx_testing-0.0.1a35.dist-info/RECORD

@@ -0,0 +1,12 @@
+diracx/testing/__init__.py,sha256=nGbnGP8m53N9rqHR-hyqDa5vetcsmnQp806HadV6_dE,984
+diracx/testing/client_generation.py,sha256=vegOUVQPcB7NTUFDr0HbasH5eByKQvLh_xYqKBYajzk,5539
+diracx/testing/dummy_osdb.py,sha256=ptLrrreOHJBKMV7S1pR_k83jl-aLKvw7bFZufB6570Y,916
+diracx/testing/entrypoints.py,sha256=ql7byyUOnUBdDoiN5xznlUTQSbD1YCNy4UF5t9MBhgc,2330
+diracx/testing/mock_osdb.py,sha256=2pl9yKV1-e5kzf6meBZnhoc1i0ySAJ8IdnP3r1bOwcI,6033
+diracx/testing/osdb.py,sha256=m6mUBLnGOoQLTCIBie9P2GhmLMybrgzIrlIYfhF1_Ss,3230
+diracx/testing/routers.py,sha256=UW-TnikMQgcNxF5sUZD5DWoucGiCpP6s8mYmuahDiSc,979
+diracx/testing/utils.py,sha256=T3tTzEOhmibcIu6TPwvoaZ6lFgHlU0t9FDHSetKP5EI,24341
+diracx_testing-0.0.1a35.dist-info/METADATA,sha256=AG67paeB_J7uwKUOlbf8E0KOOM0G3Ssgel2mMp5Ohmk,634
+diracx_testing-0.0.1a35.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+diracx_testing-0.0.1a35.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_testing-0.0.1a35.dist-info/RECORD,,

diracx_testing-0.0.1a33.dist-info/RECORD

@@ -1,11 +0,0 @@
-diracx/testing/__init__.py,sha256=nGbnGP8m53N9rqHR-hyqDa5vetcsmnQp806HadV6_dE,984
-diracx/testing/dummy_osdb.py,sha256=bNk3LF8KgMuQx3RVFNYuw4hMmpG2A80sZ58rEZqHo7M,907
-diracx/testing/entrypoints.py,sha256=ql7byyUOnUBdDoiN5xznlUTQSbD1YCNy4UF5t9MBhgc,2330
-diracx/testing/mock_osdb.py,sha256=hHuvmQZ3212SaSGX11dQv4ki3ZWsmqJZFYwdn6kg2MA,6029
-diracx/testing/osdb.py,sha256=m6mUBLnGOoQLTCIBie9P2GhmLMybrgzIrlIYfhF1_Ss,3230
-diracx/testing/routers.py,sha256=UW-TnikMQgcNxF5sUZD5DWoucGiCpP6s8mYmuahDiSc,979
-diracx/testing/utils.py,sha256=T3tTzEOhmibcIu6TPwvoaZ6lFgHlU0t9FDHSetKP5EI,24341
-diracx_testing-0.0.1a33.dist-info/METADATA,sha256=KY5UVLn9WSrGR0sNw1aX7LpviZncixfvmn4dN2DVmv4,634
-diracx_testing-0.0.1a33.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-diracx_testing-0.0.1a33.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_testing-0.0.1a33.dist-info/RECORD,,