diracx-cli 0.0.1a22__tar.gz → 0.0.1a24__tar.gz

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: diracx-cli
-Version: 0.0.1a22
+Version: 0.0.1a24
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -17,7 +17,7 @@ Requires-Dist: diracx-core
 Requires-Dist: gitpython
 Requires-Dist: pydantic>=2.10
 Requires-Dist: rich
-Requires-Dist: typer
+Requires-Dist: typer>=0.12.4
 Requires-Dist: pyyaml
 Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == "testing"

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "gitpython",
     "pydantic>=2.10",
     "rich",
-    "typer",
+    "typer>=0.12.4",
     "pyyaml",
 ]
 dynamic = ["version"]

diracx_cli-0.0.1a24/src/diracx/cli/__init__.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+from diracx.core.extensions import select_from_extension
+
+from .auth import app
+
+__all__ = ("app",)
+
+
+# Load all the sub commands
+cli_names = set(
+    [entry_point.name for entry_point in select_from_extension(group="diracx.cli")]
+)
+for cli_name in cli_names:
+    entry_point = select_from_extension(group="diracx.cli", name=cli_name)[0]
+    app.add_typer(entry_point.load(), name=entry_point.name)
+
+
+cli_hidden_names = set(
+    [
+        entry_point.name
+        for entry_point in select_from_extension(group="diracx.cli.hidden")
+    ]
+)
+for cli_name in cli_hidden_names:
+    entry_point = select_from_extension(group="diracx.cli.hidden", name=cli_name)[0]
+    app.add_typer(entry_point.load(), name=entry_point.name, hidden=True)
+
+
+if __name__ == "__main__":
+    app()

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/src/diracx/cli/__main__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from . import app
 
 if __name__ == "__main__":

diracx_cli-0.0.1a22/src/diracx/cli/__init__.py → diracx_cli-0.0.1a24/src/diracx/cli/auth.py

@@ -1,3 +1,7 @@
+from __future__ import annotations
+
+__all__ = ("app",)
+
 import asyncio
 import json
 import os
@@ -8,7 +12,6 @@ import typer
 
 from diracx.client.aio import DiracClient
 from diracx.client.models import DeviceFlowErrorResponse
-from diracx.core.extensions import select_from_extension
 from diracx.core.preferences import get_diracx_preferences
 from diracx.core.utils import read_credentials, write_credentials
 
@@ -135,28 +138,3 @@ async def logout():
 def callback(output_format: Optional[str] = None):
     if output_format is not None:
         os.environ["DIRACX_OUTPUT_FORMAT"] = output_format
-
-
-# Load all the sub commands
-
-cli_names = set(
-    [entry_point.name for entry_point in select_from_extension(group="diracx.cli")]
-)
-for cli_name in cli_names:
-    entry_point = select_from_extension(group="diracx.cli", name=cli_name)[0]
-    app.add_typer(entry_point.load(), name=entry_point.name)
-
-
-cli_hidden_names = set(
-    [
-        entry_point.name
-        for entry_point in select_from_extension(group="diracx.cli.hidden")
-    ]
-)
-for cli_name in cli_hidden_names:
-    entry_point = select_from_extension(group="diracx.cli.hidden", name=cli_name)[0]
-    app.add_typer(entry_point.load(), name=entry_point.name, hidden=True)
-
-
-if __name__ == "__main__":
-    app()

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/src/diracx/cli/config.py

@@ -1,5 +1,6 @@
 # Can't using PEP-604 with typer: https://github.com/tiangolo/typer/issues/348
 # from __future__ import annotations
+from __future__ import annotations
 
 __all__ = ("dump",)
 

diracx_cli-0.0.1a24/src/diracx/cli/internal/__init__.py

@@ -0,0 +1,8 @@
+from __future__ import annotations
+
+from . import legacy
+from .config import app
+
+__all__ = ("app",)
+
+app.add_typer(legacy.app, name="legacy")

diracx_cli-0.0.1a22/src/diracx/cli/internal/__init__.py → diracx_cli-0.0.1a24/src/diracx/cli/internal/config.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 from typing import Annotated, Optional
 
@@ -18,10 +20,8 @@ from diracx.core.config.schema import (
 )
 
 from ..utils import AsyncTyper
-from . import legacy
 
 app = AsyncTyper()
-app.add_typer(legacy.app, name="legacy")
 
 
 @app.command()

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/src/diracx/cli/internal/legacy.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import base64
 import hashlib
 import json
@@ -40,17 +42,6 @@ class ConversionConfig(BaseModel):
     VOs: dict[str, VOConfig]
 
 
-# def parse_args():
-#     parser = argparse.ArgumentParser("Convert the legacy DIRAC CS to the new format")
-#     parser.add_argument("old_file", type=Path)
-#     parser.add_argument("conversion_config", type=Path)
-#     parser.add_argument("repo", type=Path)
-#     args = parser.parse_args()
-
-
-#     main(args.old_file, args.conversion_config, args.repo / DEFAULT_CONFIG_FILE)
-
-
 @app.command()
 def cs_sync(old_file: Path, new_file: Path):
     """Load the old CS and convert it to the new YAML format."""

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/src/diracx/cli/jobs.py

@@ -1,5 +1,6 @@
 # Can't using PEP-604 with typer: https://github.com/tiangolo/typer/issues/348
 # from __future__ import annotations
+from __future__ import annotations
 
 __all__ = ("app",)
 

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/src/diracx_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: diracx-cli
-Version: 0.0.1a22
+Version: 0.0.1a24
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -17,7 +17,7 @@ Requires-Dist: diracx-core
 Requires-Dist: gitpython
 Requires-Dist: pydantic>=2.10
 Requires-Dist: rich
-Requires-Dist: typer
+Requires-Dist: typer>=0.12.4
 Requires-Dist: pyyaml
 Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == "testing"

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/src/diracx_cli.egg-info/SOURCES.txt

@@ -2,11 +2,13 @@ README.md
 pyproject.toml
 src/diracx/cli/__init__.py
 src/diracx/cli/__main__.py
+src/diracx/cli/auth.py
 src/diracx/cli/config.py
 src/diracx/cli/jobs.py
 src/diracx/cli/py.typed
 src/diracx/cli/utils.py
 src/diracx/cli/internal/__init__.py
+src/diracx/cli/internal/config.py
 src/diracx/cli/internal/legacy.py
 src/diracx_cli.egg-info/PKG-INFO
 src/diracx_cli.egg-info/SOURCES.txt

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/src/diracx_cli.egg-info/requires.txt

@@ -5,7 +5,7 @@ diracx-core
 gitpython
 pydantic>=2.10
 rich
-typer
+typer>=0.12.4
 pyyaml
 
 [testing]

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/tests/legacy/cs_sync/test_cssync.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 
 import yaml

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/tests/legacy/test_legacy.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 
 import yaml

{diracx_cli-0.0.1a22 → diracx_cli-0.0.1a24}/tests/test_login.py

@@ -19,7 +19,7 @@ async def test_logout(monkeypatch, capfd, cli_env, with_cli_login):
     assert expected_credentials_path.exists()
 
     # Run the logout command
-    await cli.logout()
+    await cli.auth.logout()
     captured = capfd.readouterr()
     assert "Removed credentials from" in captured.out
     assert "Logout successful!" in captured.out
@@ -29,7 +29,7 @@ async def test_logout(monkeypatch, capfd, cli_env, with_cli_login):
     assert not expected_credentials_path.exists()
 
     # Rerun the logout command, it should not fail
-    await cli.logout()
+    await cli.auth.logout()
     captured = capfd.readouterr()
     assert "Removed credentials from" not in captured.out
     assert "Logout successful!" in captured.out