Move client generation to pixi

Author: chrisburr

diracx-testing/src/diracx/testing/__init__.py

@@ -13,7 +13,6 @@
     fernet_key,
     private_key_pem,
     pytest_addoption,
-    pytest_collection_modifyitems,
     session_client_factory,
     test_auth_settings,
     test_dev_settings,
@@ -29,7 +28,6 @@
     "do_device_flow_with_dex",
     "test_login",
     "pytest_addoption",
-    "pytest_collection_modifyitems",
     "private_key_pem",
     "fernet_key",
     "test_dev_settings",

diracx-testing/src/diracx/testing/client_generation.py

@@ -2,17 +2,24 @@
 
 __all__ = [
     "regenerate_client",
-    "AUTOREST_VERSION",
 ]
 
+import argparse
 import ast
 import importlib.util
+import shlex
 import subprocess
+import sys
 from pathlib import Path
 
 import git
 
-AUTOREST_VERSION = "6.13.7"
+AUTOREST_VERSION = "3.7.1"
+AUTOREST_CORE_VERSION = "3.10.4"
+AUTOREST_PUGINS = {
+    "@autorest/python": "6.34.1",
+    "@autorest/modelerfour": "4.23.7",
+}
 
 
 def extract_static_all(path):
@@ -109,20 +116,17 @@ def regenerate_client(openapi_spec: Path, client_module: str):
             "Client is currently in a modified state, skipping regeneration"
         )
 
-    cmd = [
-        "autorest",
+    cmd = ["autorest", f"--version={AUTOREST_CORE_VERSION}"]
+    for plugin, version in AUTOREST_PUGINS.items():
+        cmd.append(f"--use={plugin}@{version}")
+    cmd += [
         "--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)
 
@@ -154,3 +158,35 @@ def regenerate_client(openapi_spec: Path, client_module: str):
     if proc.returncode != 0:
         raise AssertionError("Pre-commit failed")
     raise AssertionError("Client was regenerated with changes")
+
+
+def main():
+    from diracx.core.extensions import extensions_by_priority
+
+    parser = argparse.ArgumentParser(
+        description="Regenerate the AutoREST client and run pre-commit checks on it."
+    )
+    parser.parse_args()
+
+    client_extension_name = min(extensions_by_priority(), key=lambda x: x == "diracx")
+
+    cmd = ["npm", "install", "-g", f"autorest@{AUTOREST_VERSION}"]
+    print("Ensuring autorest is installed by running", shlex.join(cmd))
+    subprocess.run(cmd, check=True)
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "pytest",
+        "-pdiracx.testing",
+        "--import-mode=importlib",
+        f"--regenerate-client={client_extension_name}",
+        str(Path(__file__).parent / "client_generation_pytest.py"),
+    ]
+    print("Generating client for", client_extension_name)
+    print("Running:", shlex.join(cmd))
+    subprocess.run(cmd, check=True)
+
+
+if __name__ == "__main__":
+    main()

diracx-client/tests/test_regenerate.py …racx/testing/client_generation_pytest.pydiracx-client/tests/test_regenerate.py renamed to diracx-testing/src/diracx/testing/client_generation_pytest.py diracx-client/tests/test_regenerate.py renamed to diracx-testing/src/diracx/testing/client_generation_pytest.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from diracx.testing.client_generation import AUTOREST_VERSION, regenerate_client
+from diracx.testing.client_generation import regenerate_client
 
 pytestmark = pytest.mark.enabled_dependencies([])
 
@@ -13,7 +13,7 @@ def test_client(client_factory):
         yield client
 
 
-def test_regenerate_client(test_client, tmp_path):
+def test_regenerate_client(test_client, tmp_path, request):
     """Regenerate the AutoREST client and run pre-commit checks on it.
 
     This test is skipped by default, and can be enabled by passing
@@ -25,13 +25,13 @@ def test_regenerate_client(test_client, tmp_path):
 
     WARNING: This test will modify the source code of the client!
     """
+    client_name = request.config.getoption("--regenerate-client")
+    if client_name is None:
+        pytest.skip("--regenerate-client not specified")
+
     r = test_client.get("/api/openapi.json")
     r.raise_for_status()
     openapi_spec = tmp_path / "openapi.json"
     openapi_spec.write_text(r.text)
 
-    regenerate_client(openapi_spec, "diracx.client")
-
-
-if __name__ == "__main__":
-    print(AUTOREST_VERSION)
+    regenerate_client(openapi_spec, f"{client_name}.client")

diracx-testing/src/diracx/testing/utils.py

@@ -43,8 +43,6 @@
 def pytest_addoption(parser):
     parser.addoption(
         "--regenerate-client",
-        action="store_true",
-        default=False,
         help="Regenerate the AutoREST client",
     )
     parser.addoption(
@@ -55,17 +53,6 @@ def pytest_addoption(parser):
     )
 
 
-def pytest_collection_modifyitems(config, items):
-    """Disable the test_regenerate_client if not explicitly asked for."""
-    if config.getoption("--regenerate-client"):
-        # --regenerate-client given in cli: allow client re-generation
-        return
-    skip_regen = pytest.mark.skip(reason="need --regenerate-client option to run")
-    for item in items:
-        if item.name == "test_regenerate_client":
-            item.add_marker(skip_regen)
-
-
 @pytest.fixture(scope="session")
 def private_key_pem() -> str:
     from cryptography.hazmat.primitives import serialization