diracx-cli 0.0.1a22__py3-none-any.whl → 0.0.1a24__py3-none-any.whl

diracx/cli/__init__.py

@@ -1,144 +1,13 @@
-import asyncio
-import json
-import os
-from datetime import datetime, timedelta, timezone
-from typing import Annotated, Optional
+from __future__ import annotations
 
-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
-
-from .utils import AsyncTyper
-
-app = AsyncTyper()
-
-
-async def installation_metadata():
-    async with DiracClient() as api:
-        return await api.well_known.installation_metadata()
-
-
-def vo_callback(vo: str | None) -> str:
-    metadata = asyncio.run(installation_metadata())
-    vos = list(metadata.virtual_organizations)
-    if not vo:
-        raise typer.BadParameter(
-            f"VO must be specified, available options are: {' '.join(vos)}"
-        )
-    if vo not in vos:
-        raise typer.BadParameter(
-            f"Unknown VO {vo}, available options are: {' '.join(vos)}"
-        )
-    return vo
-
-
-@app.async_command()
-async def login(
-    vo: Annotated[
-        Optional[str],
-        typer.Argument(callback=vo_callback, help="Virtual Organization name"),
-    ] = None,
-    group: Optional[str] = typer.Option(
-        None,
-        help="Group name within the VO. If not provided, the default group for the VO will be used.",
-    ),
-    property: Optional[list[str]] = typer.Option(
-        None,
-        help=(
-            "List of properties to add to the default properties of the group. "
-            "If not provided, default properties of the group will be used."
-        ),
-    ),
-):
-    """Login to the DIRAC system using the device flow.
-
-    - If only VO is provided: Uses the default group and its properties for the VO.
-
-    - If VO and group are provided: Uses the specified group and its properties for the VO.
 
-    - If VO and properties are provided: Uses the default group and combines its properties with the
-      provided properties.
+from .auth import app
 
-    - If VO, group, and properties are provided: Uses the specified group and combines its properties with the
-      provided properties.
-    """
-    scopes = [f"vo:{vo}"]
-    if group:
-        scopes.append(f"group:{group}")
-    if property:
-        scopes += [f"property:{p}" for p in property]
-
-    print(f"Logging in with scopes: {scopes}")
-    async with DiracClient() as api:
-        data = await api.auth.initiate_device_flow(
-            client_id=api.client_id,
-            scope=" ".join(scopes),
-        )
-        print("Now go to:", data.verification_uri_complete)
-        expires = datetime.now(tz=timezone.utc) + timedelta(
-            seconds=data.expires_in - 30
-        )
-        while expires > datetime.now(tz=timezone.utc):
-            print(".", end="", flush=True)
-            response = await api.auth.token(device_code=data.device_code, client_id=api.client_id)  # type: ignore
-            if isinstance(response, DeviceFlowErrorResponse):
-                if response.error == "authorization_pending":
-                    # TODO: Setting more than 5 seconds results in an error
-                    # Related to keep-alive disconnects from uvicon (--timeout-keep-alive)
-                    await asyncio.sleep(2)
-                    continue
-                raise RuntimeError(f"Device flow failed with {response}")
-            break
-        else:
-            raise RuntimeError("Device authorization flow expired")
-
-        # Save credentials
-        write_credentials(response)
-        credentials_path = get_diracx_preferences().credentials_path
-        print(f"Saved credentials to {credentials_path}")
-    print("\nLogin successful!")
-
-
-@app.async_command()
-async def whoami():
-    async with DiracClient() as api:
-        user_info = await api.auth.userinfo()
-        # TODO: Add a RICH output format
-        print(json.dumps(user_info.as_dict(), indent=2))
-
-
-@app.async_command()
-async def logout():
-    async with DiracClient() as api:
-        credentials_path = get_diracx_preferences().credentials_path
-        if credentials_path.exists():
-            credentials = read_credentials(credentials_path)
-
-            # Revoke refresh token
-            try:
-                await api.auth.revoke_refresh_token(credentials.refresh_token)
-            except Exception as e:
-                print(f"Error revoking the refresh token {e!r}")
-                pass
-
-            # Remove credentials
-            credentials_path.unlink(missing_ok=True)
-            print(f"Removed credentials from {credentials_path}")
-    print("\nLogout successful!")
-
-
-@app.callback()
-def callback(output_format: Optional[str] = None):
-    if output_format is not None:
-        os.environ["DIRACX_OUTPUT_FORMAT"] = output_format
+__all__ = ("app",)
 
 
 # Load all the sub commands
-
 cli_names = set(
     [entry_point.name for entry_point in select_from_extension(group="diracx.cli")]
 )

diracx/cli/__main__.py

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

diracx/cli/auth.py

@@ -0,0 +1,140 @@
+from __future__ import annotations
+
+__all__ = ("app",)
+
+import asyncio
+import json
+import os
+from datetime import datetime, timedelta, timezone
+from typing import Annotated, Optional
+
+import typer
+
+from diracx.client.aio import DiracClient
+from diracx.client.models import DeviceFlowErrorResponse
+from diracx.core.preferences import get_diracx_preferences
+from diracx.core.utils import read_credentials, write_credentials
+
+from .utils import AsyncTyper
+
+app = AsyncTyper()
+
+
+async def installation_metadata():
+    async with DiracClient() as api:
+        return await api.well_known.installation_metadata()
+
+
+def vo_callback(vo: str | None) -> str:
+    metadata = asyncio.run(installation_metadata())
+    vos = list(metadata.virtual_organizations)
+    if not vo:
+        raise typer.BadParameter(
+            f"VO must be specified, available options are: {' '.join(vos)}"
+        )
+    if vo not in vos:
+        raise typer.BadParameter(
+            f"Unknown VO {vo}, available options are: {' '.join(vos)}"
+        )
+    return vo
+
+
+@app.async_command()
+async def login(
+    vo: Annotated[
+        Optional[str],
+        typer.Argument(callback=vo_callback, help="Virtual Organization name"),
+    ] = None,
+    group: Optional[str] = typer.Option(
+        None,
+        help="Group name within the VO. If not provided, the default group for the VO will be used.",
+    ),
+    property: Optional[list[str]] = typer.Option(
+        None,
+        help=(
+            "List of properties to add to the default properties of the group. "
+            "If not provided, default properties of the group will be used."
+        ),
+    ),
+):
+    """Login to the DIRAC system using the device flow.
+
+    - If only VO is provided: Uses the default group and its properties for the VO.
+
+    - If VO and group are provided: Uses the specified group and its properties for the VO.
+
+    - If VO and properties are provided: Uses the default group and combines its properties with the
+      provided properties.
+
+    - If VO, group, and properties are provided: Uses the specified group and combines its properties with the
+      provided properties.
+    """
+    scopes = [f"vo:{vo}"]
+    if group:
+        scopes.append(f"group:{group}")
+    if property:
+        scopes += [f"property:{p}" for p in property]
+
+    print(f"Logging in with scopes: {scopes}")
+    async with DiracClient() as api:
+        data = await api.auth.initiate_device_flow(
+            client_id=api.client_id,
+            scope=" ".join(scopes),
+        )
+        print("Now go to:", data.verification_uri_complete)
+        expires = datetime.now(tz=timezone.utc) + timedelta(
+            seconds=data.expires_in - 30
+        )
+        while expires > datetime.now(tz=timezone.utc):
+            print(".", end="", flush=True)
+            response = await api.auth.token(device_code=data.device_code, client_id=api.client_id)  # type: ignore
+            if isinstance(response, DeviceFlowErrorResponse):
+                if response.error == "authorization_pending":
+                    # TODO: Setting more than 5 seconds results in an error
+                    # Related to keep-alive disconnects from uvicon (--timeout-keep-alive)
+                    await asyncio.sleep(2)
+                    continue
+                raise RuntimeError(f"Device flow failed with {response}")
+            break
+        else:
+            raise RuntimeError("Device authorization flow expired")
+
+        # Save credentials
+        write_credentials(response)
+        credentials_path = get_diracx_preferences().credentials_path
+        print(f"Saved credentials to {credentials_path}")
+    print("\nLogin successful!")
+
+
+@app.async_command()
+async def whoami():
+    async with DiracClient() as api:
+        user_info = await api.auth.userinfo()
+        # TODO: Add a RICH output format
+        print(json.dumps(user_info.as_dict(), indent=2))
+
+
+@app.async_command()
+async def logout():
+    async with DiracClient() as api:
+        credentials_path = get_diracx_preferences().credentials_path
+        if credentials_path.exists():
+            credentials = read_credentials(credentials_path)
+
+            # Revoke refresh token
+            try:
+                await api.auth.revoke_refresh_token(credentials.refresh_token)
+            except Exception as e:
+                print(f"Error revoking the refresh token {e!r}")
+                pass
+
+            # Remove credentials
+            credentials_path.unlink(missing_ok=True)
+            print(f"Removed credentials from {credentials_path}")
+    print("\nLogout successful!")
+
+
+@app.callback()
+def callback(output_format: Optional[str] = None):
+    if output_format is not None:
+        os.environ["DIRACX_OUTPUT_FORMAT"] = output_format

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/internal/__init__.py

@@ -1,192 +1,8 @@
-from pathlib import Path
-from typing import Annotated, Optional
+from __future__ import annotations
 
-import git
-import typer
-import yaml
-from pydantic import TypeAdapter
-
-from diracx.core.config import ConfigSource, ConfigSourceUrl
-from diracx.core.config.schema import (
-    Config,
-    DIRACConfig,
-    GroupConfig,
-    IdpConfig,
-    OperationsConfig,
-    RegistryConfig,
-    UserConfig,
-)
-
-from ..utils import AsyncTyper
 from . import legacy
+from .config import app
 
-app = AsyncTyper()
-app.add_typer(legacy.app, name="legacy")
-
-
-@app.command()
-def generate_cs(config_repo: str):
-    """Generate a minimal DiracX configuration repository."""
-    # TODO: The use of TypeAdapter should be moved in to typer itself
-    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
-    if config_repo.scheme != "git+file" or config_repo.path is None:
-        raise NotImplementedError("Only git+file:// URLs are supported")
-    repo_path = Path(config_repo.path)
-    if repo_path.exists() and list(repo_path.iterdir()):
-        typer.echo(f"ERROR: Directory {repo_path} already exists", err=True)
-        raise typer.Exit(1)
-
-    config = Config(
-        Registry={},
-        DIRAC=DIRACConfig(),
-        Operations={"Defaults": OperationsConfig()},
-    )
-
-    git.Repo.init(repo_path, initial_branch="master")
-    update_config_and_commit(
-        repo_path=repo_path, config=config, message="Initial commit"
-    )
-    typer.echo(f"Successfully created repo in {config_repo}", err=True)
-
-
-@app.command()
-def add_vo(
-    config_repo: str,
-    *,
-    vo: Annotated[str, typer.Option()],
-    default_group: Optional[str] = "user",
-    idp_url: Annotated[str, typer.Option()],
-    idp_client_id: Annotated[str, typer.Option()],
-):
-    """Add a registry entry (vo) to an existing configuration repository."""
-    # TODO: The use of TypeAdapter should be moved in to typer itself
-    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
-    if config_repo.scheme != "git+file" or config_repo.path is None:
-        raise NotImplementedError("Only git+file:// URLs are supported")
-    repo_path = Path(config_repo.path)
-
-    # A VO should at least contain a default group
-    new_registry = RegistryConfig(
-        IdP=IdpConfig(URL=idp_url, ClientID=idp_client_id),
-        DefaultGroup=default_group,
-        Users={},
-        Groups={
-            default_group: GroupConfig(
-                Properties={"NormalUser"}, Quota=None, Users=set()
-            )
-        },
-    )
-
-    config = ConfigSource.create_from_url(backend_url=repo_path).read_config()
-
-    if vo in config.Registry:
-        typer.echo(f"ERROR: VO {vo} already exists", err=True)
-        raise typer.Exit(1)
-
-    config.Registry[vo] = new_registry
-
-    update_config_and_commit(
-        repo_path=repo_path,
-        config=config,
-        message=f"Added vo {vo} registry (default group {default_group} and idp {idp_url})",
-    )
-    typer.echo(f"Successfully added vo to {config_repo}", err=True)
-
-
-@app.command()
-def add_group(
-    config_repo: str,
-    *,
-    vo: Annotated[str, typer.Option()],
-    group: Annotated[str, typer.Option()],
-    properties: list[str] = ["NormalUser"],
-):
-    """Add a group to an existing vo in the configuration repository."""
-    # TODO: The use of TypeAdapter should be moved in to typer itself
-    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
-    if config_repo.scheme != "git+file" or config_repo.path is None:
-        raise NotImplementedError("Only git+file:// URLs are supported")
-    repo_path = Path(config_repo.path)
-
-    new_group = GroupConfig(Properties=set(properties), Quota=None, Users=set())
-
-    config = ConfigSource.create_from_url(backend_url=repo_path).read_config()
+__all__ = ("app",)
 
-    if vo not in config.Registry:
-        typer.echo(f"ERROR: Virtual Organization {vo} does not exist", err=True)
-        raise typer.Exit(1)
-
-    if group in config.Registry[vo].Groups.keys():
-        typer.echo(f"ERROR: Group {group} already exists in {vo}", err=True)
-        raise typer.Exit(1)
-
-    config.Registry[vo].Groups[group] = new_group
-
-    update_config_and_commit(
-        repo_path=repo_path, config=config, message=f"Added group {group} in {vo}"
-    )
-    typer.echo(f"Successfully added group to {config_repo}", err=True)
-
-
-@app.command()
-def add_user(
-    config_repo: str,
-    *,
-    vo: Annotated[str, typer.Option()],
-    groups: Annotated[Optional[list[str]], typer.Option("--group")] = None,
-    sub: Annotated[str, typer.Option()],
-    preferred_username: Annotated[str, typer.Option()],
-):
-    """Add a user to an existing vo and group."""
-    # TODO: The use of TypeAdapter should be moved in to typer itself
-    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
-    if config_repo.scheme != "git+file" or config_repo.path is None:
-        raise NotImplementedError("Only git+file:// URLs are supported")
-
-    repo_path = Path(config_repo.path)
-
-    new_user = UserConfig(PreferedUsername=preferred_username)
-
-    config = ConfigSource.create_from_url(backend_url=repo_path).read_config()
-
-    if vo not in config.Registry:
-        typer.echo(f"ERROR: Virtual Organization {vo} does not exist", err=True)
-        raise typer.Exit(1)
-
-    if sub in config.Registry[vo].Users:
-        typer.echo(f"ERROR: User {sub} already exists", err=True)
-        raise typer.Exit(1)
-
-    config.Registry[vo].Users[sub] = new_user
-
-    if not groups:
-        groups = [config.Registry[vo].DefaultGroup]
-
-    for group in set(groups):
-        if group not in config.Registry[vo].Groups:
-            typer.echo(f"ERROR: Group {group} does not exist in {vo}", err=True)
-            raise typer.Exit(1)
-        if sub in config.Registry[vo].Groups[group].Users:
-            typer.echo(f"ERROR: User {sub} already exists in group {group}", err=True)
-            raise typer.Exit(1)
-
-        config.Registry[vo].Groups[group].Users.add(sub)
-
-    update_config_and_commit(
-        repo_path=repo_path,
-        config=config,
-        message=f"Added user {sub} ({preferred_username}) to vo {vo} and groups {groups}",
-    )
-    typer.echo(f"Successfully added user to {config_repo}", err=True)
-
-
-def update_config_and_commit(repo_path: Path, config: Config, message: str):
-    """Update the yaml file in the repo and commit it."""
-    repo = git.Repo(repo_path)
-    yaml_path = repo_path / "default.yml"
-    typer.echo(f"Writing back configuration to {yaml_path}", err=True)
-    yaml_path.write_text(
-        yaml.safe_dump(config.model_dump(exclude_unset=True, mode="json"))
-    )
-    repo.index.add([yaml_path.relative_to(repo_path)])
-    repo.index.commit(message)
+app.add_typer(legacy.app, name="legacy")

diracx/cli/internal/config.py

@@ -0,0 +1,192 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Annotated, Optional
+
+import git
+import typer
+import yaml
+from pydantic import TypeAdapter
+
+from diracx.core.config import ConfigSource, ConfigSourceUrl
+from diracx.core.config.schema import (
+    Config,
+    DIRACConfig,
+    GroupConfig,
+    IdpConfig,
+    OperationsConfig,
+    RegistryConfig,
+    UserConfig,
+)
+
+from ..utils import AsyncTyper
+
+app = AsyncTyper()
+
+
+@app.command()
+def generate_cs(config_repo: str):
+    """Generate a minimal DiracX configuration repository."""
+    # TODO: The use of TypeAdapter should be moved in to typer itself
+    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
+    if config_repo.scheme != "git+file" or config_repo.path is None:
+        raise NotImplementedError("Only git+file:// URLs are supported")
+    repo_path = Path(config_repo.path)
+    if repo_path.exists() and list(repo_path.iterdir()):
+        typer.echo(f"ERROR: Directory {repo_path} already exists", err=True)
+        raise typer.Exit(1)
+
+    config = Config(
+        Registry={},
+        DIRAC=DIRACConfig(),
+        Operations={"Defaults": OperationsConfig()},
+    )
+
+    git.Repo.init(repo_path, initial_branch="master")
+    update_config_and_commit(
+        repo_path=repo_path, config=config, message="Initial commit"
+    )
+    typer.echo(f"Successfully created repo in {config_repo}", err=True)
+
+
+@app.command()
+def add_vo(
+    config_repo: str,
+    *,
+    vo: Annotated[str, typer.Option()],
+    default_group: Optional[str] = "user",
+    idp_url: Annotated[str, typer.Option()],
+    idp_client_id: Annotated[str, typer.Option()],
+):
+    """Add a registry entry (vo) to an existing configuration repository."""
+    # TODO: The use of TypeAdapter should be moved in to typer itself
+    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
+    if config_repo.scheme != "git+file" or config_repo.path is None:
+        raise NotImplementedError("Only git+file:// URLs are supported")
+    repo_path = Path(config_repo.path)
+
+    # A VO should at least contain a default group
+    new_registry = RegistryConfig(
+        IdP=IdpConfig(URL=idp_url, ClientID=idp_client_id),
+        DefaultGroup=default_group,
+        Users={},
+        Groups={
+            default_group: GroupConfig(
+                Properties={"NormalUser"}, Quota=None, Users=set()
+            )
+        },
+    )
+
+    config = ConfigSource.create_from_url(backend_url=repo_path).read_config()
+
+    if vo in config.Registry:
+        typer.echo(f"ERROR: VO {vo} already exists", err=True)
+        raise typer.Exit(1)
+
+    config.Registry[vo] = new_registry
+
+    update_config_and_commit(
+        repo_path=repo_path,
+        config=config,
+        message=f"Added vo {vo} registry (default group {default_group} and idp {idp_url})",
+    )
+    typer.echo(f"Successfully added vo to {config_repo}", err=True)
+
+
+@app.command()
+def add_group(
+    config_repo: str,
+    *,
+    vo: Annotated[str, typer.Option()],
+    group: Annotated[str, typer.Option()],
+    properties: list[str] = ["NormalUser"],
+):
+    """Add a group to an existing vo in the configuration repository."""
+    # TODO: The use of TypeAdapter should be moved in to typer itself
+    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
+    if config_repo.scheme != "git+file" or config_repo.path is None:
+        raise NotImplementedError("Only git+file:// URLs are supported")
+    repo_path = Path(config_repo.path)
+
+    new_group = GroupConfig(Properties=set(properties), Quota=None, Users=set())
+
+    config = ConfigSource.create_from_url(backend_url=repo_path).read_config()
+
+    if vo not in config.Registry:
+        typer.echo(f"ERROR: Virtual Organization {vo} does not exist", err=True)
+        raise typer.Exit(1)
+
+    if group in config.Registry[vo].Groups.keys():
+        typer.echo(f"ERROR: Group {group} already exists in {vo}", err=True)
+        raise typer.Exit(1)
+
+    config.Registry[vo].Groups[group] = new_group
+
+    update_config_and_commit(
+        repo_path=repo_path, config=config, message=f"Added group {group} in {vo}"
+    )
+    typer.echo(f"Successfully added group to {config_repo}", err=True)
+
+
+@app.command()
+def add_user(
+    config_repo: str,
+    *,
+    vo: Annotated[str, typer.Option()],
+    groups: Annotated[Optional[list[str]], typer.Option("--group")] = None,
+    sub: Annotated[str, typer.Option()],
+    preferred_username: Annotated[str, typer.Option()],
+):
+    """Add a user to an existing vo and group."""
+    # TODO: The use of TypeAdapter should be moved in to typer itself
+    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
+    if config_repo.scheme != "git+file" or config_repo.path is None:
+        raise NotImplementedError("Only git+file:// URLs are supported")
+
+    repo_path = Path(config_repo.path)
+
+    new_user = UserConfig(PreferedUsername=preferred_username)
+
+    config = ConfigSource.create_from_url(backend_url=repo_path).read_config()
+
+    if vo not in config.Registry:
+        typer.echo(f"ERROR: Virtual Organization {vo} does not exist", err=True)
+        raise typer.Exit(1)
+
+    if sub in config.Registry[vo].Users:
+        typer.echo(f"ERROR: User {sub} already exists", err=True)
+        raise typer.Exit(1)
+
+    config.Registry[vo].Users[sub] = new_user
+
+    if not groups:
+        groups = [config.Registry[vo].DefaultGroup]
+
+    for group in set(groups):
+        if group not in config.Registry[vo].Groups:
+            typer.echo(f"ERROR: Group {group} does not exist in {vo}", err=True)
+            raise typer.Exit(1)
+        if sub in config.Registry[vo].Groups[group].Users:
+            typer.echo(f"ERROR: User {sub} already exists in group {group}", err=True)
+            raise typer.Exit(1)
+
+        config.Registry[vo].Groups[group].Users.add(sub)
+
+    update_config_and_commit(
+        repo_path=repo_path,
+        config=config,
+        message=f"Added user {sub} ({preferred_username}) to vo {vo} and groups {groups}",
+    )
+    typer.echo(f"Successfully added user to {config_repo}", err=True)
+
+
+def update_config_and_commit(repo_path: Path, config: Config, message: str):
+    """Update the yaml file in the repo and commit it."""
+    repo = git.Repo(repo_path)
+    yaml_path = repo_path / "default.yml"
+    typer.echo(f"Writing back configuration to {yaml_path}", err=True)
+    yaml_path.write_text(
+        yaml.safe_dump(config.model_dump(exclude_unset=True, mode="json"))
+    )
+    repo.index.add([yaml_path.relative_to(repo_path)])
+    repo.index.commit(message)

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/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.dist-info → diracx_cli-0.0.1a24.dist-info}/METADATA

@@ -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.1a24.dist-info/RECORD

@@ -0,0 +1,15 @@
+diracx/cli/__init__.py,sha256=HB9Umd1DXskg8lrRY0ZnSaOBVYPD5Pl4PYRWts-ZR0E,808
+diracx/cli/__main__.py,sha256=yGjYWjRcrrp5mJ0xD0v3rc7VIA9bzDib5D7LPAdH4OI,92
+diracx/cli/auth.py,sha256=N9rBvRgyUeznTqG0Ck2pylClvXwR3IR6OyP4mTA50BA,4733
+diracx/cli/config.py,sha256=-QPTTuH83epgFviO_af_DJBVjRakIrc6MbxkHg1KLlI,853
+diracx/cli/jobs.py,sha256=qxV7y_WVtYzO6h55lgbWgk_ZC9eN1i1hIFHTpwxC9mE,4760
+diracx/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+diracx/cli/utils.py,sha256=NwhMMHwveKOdW2aoSqpnLnfOKhPnjmPPLpX69naPAzc,855
+diracx/cli/internal/__init__.py,sha256=KZrzVcKu3YhNev2XF2KA2nttAa9ONU3CVUgatVMonJ4,143
+diracx/cli/internal/config.py,sha256=xPT7lnJ3QPqJgaNJuMoUpV6CIIxZY_d7HKFb4uINb_8,6552
+diracx/cli/internal/legacy.py,sha256=AQJnLZZDNmE1N6Vd6WdjG8kZPFWufBSez4Hhi0aQZYc,10538
+diracx_cli-0.0.1a24.dist-info/METADATA,sha256=7O65DRbTkxA7kC0K2Z2JDS1N7oHYWefW_IwAslI9eMo,803
+diracx_cli-0.0.1a24.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+diracx_cli-0.0.1a24.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
+diracx_cli-0.0.1a24.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_cli-0.0.1a24.dist-info/RECORD,,

{diracx_cli-0.0.1a22.dist-info → diracx_cli-0.0.1a24.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

diracx_cli-0.0.1a22.dist-info/RECORD

@@ -1,13 +0,0 @@
-diracx/cli/__init__.py,sha256=eenV2ezX845cIvDV2mTKqd23TLwXQBwD6Ho252h8WwA,5407
-diracx/cli/__main__.py,sha256=SM9tEc-fiW7cDHTKQRwgKobe5FfijHLYiAWfWaIM_zg,56
-diracx/cli/config.py,sha256=r5Lq_SN-1t3IzGAeS57ZzS-ukLhP6PMnmTXNld2pZXU,818
-diracx/cli/jobs.py,sha256=wV7-YMI_jUIflj87cBM4yuI2EF9K5mu2WsCG_eakWrg,4725
-diracx/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diracx/cli/utils.py,sha256=NwhMMHwveKOdW2aoSqpnLnfOKhPnjmPPLpX69naPAzc,855
-diracx/cli/internal/__init__.py,sha256=DCKzknHUEvo7PYiatZis15-gkxhga5WU4cyVZ6LCkmA,6578
-diracx/cli/internal/legacy.py,sha256=bhq8vfHoL0fZGhtye0EqMsucwepOYpQkj3UGe-rHNhY,10882
-diracx_cli-0.0.1a22.dist-info/METADATA,sha256=k9WJtMesgKGxEfkv5yKXy7vCfpkPD2wREsYKgLZbk1k,795
-diracx_cli-0.0.1a22.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-diracx_cli-0.0.1a22.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
-diracx_cli-0.0.1a22.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_cli-0.0.1a22.dist-info/RECORD,,