diracx-cli 0.0.1a15__py3-none-any.whl → 0.0.1a17__py3-none-any.whl

diracx/cli/internal/__init__.py

@@ -4,7 +4,7 @@ from typing import Annotated, Optional
 import git
 import typer
 import yaml
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 
 from diracx.core.config import ConfigSource, ConfigSourceUrl
 from diracx.core.config.schema import (
@@ -25,13 +25,11 @@ app.add_typer(legacy.app, name="legacy")
 
 
 @app.command()
-def generate_cs(
-    config_repo: str,
-):
+def generate_cs(config_repo: str):
     """Generate a minimal DiracX configuration repository"""
-    # TODO: The use of parse_obj_as should be moved in to typer itself
-    config_repo = parse_obj_as(ConfigSourceUrl, config_repo)
-    if config_repo.scheme != "git+file":
+    # 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()):
@@ -62,8 +60,10 @@ def add_vo(
 ):
     """Add a registry entry (vo) to an existing configuration repository"""
 
-    # TODO: The use of parse_obj_as should be moved in to typer itself
-    config_repo = parse_obj_as(ConfigSourceUrl, config_repo)
+    # 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
@@ -104,8 +104,10 @@ def add_group(
 ):
     """Add a group to an existing vo in the configuration repository"""
 
-    # TODO: The use of parse_obj_as should be moved in to typer itself
-    config_repo = parse_obj_as(ConfigSourceUrl, config_repo)
+    # 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())
@@ -139,8 +141,10 @@ def add_user(
 ):
     """Add a user to an existing vo and group"""
 
-    # TODO: The use of parse_obj_as should be moved in to typer itself
-    config_repo = parse_obj_as(ConfigSourceUrl, config_repo)
+    # 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)
 
@@ -184,6 +188,8 @@ def update_config_and_commit(repo_path: Path, config: Config, message: str):
     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.dict(exclude_unset=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

@@ -79,14 +79,16 @@ def cs_sync(old_file: Path, new_file: Path):
 
     _apply_fixes(raw)
 
-    config = Config.parse_obj(raw)
-    new_file.write_text(yaml.safe_dump(config.dict(exclude_unset=True)))
+    config = Config.model_validate(raw)
+    new_file.write_text(
+        yaml.safe_dump(config.model_dump(exclude_unset=True, mode="json"))
+    )
 
 
 def _apply_fixes(raw):
     """Modify raw in place to make any layout changes between the old and new structure"""
 
-    conv_config = ConversionConfig.parse_obj(raw["DiracX"]["CsSync"])
+    conv_config = ConversionConfig.model_validate(raw["DiracX"]["CsSync"])
 
     raw.pop("DiracX", None)
     # Remove dips specific parts from the CS
@@ -119,7 +121,7 @@ def _apply_fixes(raw):
 
     for vo, vo_meta in conv_config.VOs.items():
         raw["Registry"][vo] = {
-            "IdP": vo_meta.IdP,
+            "IdP": vo_meta.IdP.model_dump(),
             "DefaultGroup": vo_meta.DefaultGroup,
             "Users": {},
             "Groups": {},

diracx/cli/jobs.py

@@ -4,7 +4,8 @@
 __all__ = ("app",)
 
 import json
-from typing import Annotated
+import re
+from typing import Annotated, cast
 
 from rich.console import Console
 from rich.table import Table
@@ -52,29 +53,66 @@ async def search(
     ],
     condition: Annotated[list[SearchSpec], Option(parser=parse_condition)] = [],
     all: bool = False,
+    page: int = 1,
+    per_page: int = 10,
 ):
     async with DiracClient() as api:
-        jobs = await api.jobs.search(
+        jobs, content_range = await api.jobs.search(
             parameters=None if all else parameter,
             search=condition if condition else None,
+            page=page,
+            per_page=per_page,
+            cls=lambda _, jobs, headers: (
+                jobs,
+                ContentRange(headers.get("Content-Range", "jobs")),
+            ),
         )
-    display(jobs, "jobs")
 
-
-def display(data, unit: str):
+    display(jobs, cast(ContentRange, content_range))
+
+
+class ContentRange:
+    unit: str | None = None
+    start: int | None = None
+    end: int | None = None
+    total: int | None = None
+
+    def __init__(self, header: str):
+        if match := re.fullmatch(r"(\w+) (\d+-\d+|\*)/(\d+|\*)", header):
+            self.unit, range, total = match.groups()
+            self.total = int(total)
+            if range != "*":
+                self.start, self.end = map(int, range.split("-"))
+        elif match := re.fullmatch(r"\w+", header):
+            self.unit = match.group()
+
+    @property
+    def caption(self):
+        if self.start is None and self.end is None:
+            range_str = "all"
+        else:
+            range_str = (
+                f"{self.start if self.start is not None else 'unknown'}-"
+                f"{self.end if self.end is not None else 'unknown'} "
+                f"of {self.total or 'unknown'}"
+            )
+        return f"Showing {range_str} {self.unit}"
+
+
+def display(data, content_range: ContentRange):
     output_format = get_diracx_preferences().output_format
     match output_format:
         case OutputFormats.JSON:
             print(json.dumps(data, indent=2))
         case OutputFormats.RICH:
-            display_rich(data, unit)
+            display_rich(data, content_range)
         case _:
             raise NotImplementedError(output_format)
 
 
-def display_rich(data, unit: str) -> None:
+def display_rich(data, content_range: ContentRange) -> None:
     if not data:
-        print(f"No {unit} found")
+        print(f"No {content_range.unit} found")
         return
 
     console = Console()
@@ -83,7 +121,7 @@ def display_rich(data, unit: str) -> None:
         table = Table(
             "Parameter",
             "Value",
-            caption=f"Showing {len(data)} of {len(data)} {unit}",
+            caption=content_range.caption,
             caption_justify="right",
         )
         for job in data:
@@ -93,7 +131,7 @@ def display_rich(data, unit: str) -> None:
     else:
         table = Table(
             *columns,
-            caption=f"Showing {len(data)} of {len(data)} {unit}",
+            caption=content_range.caption,
             caption_justify="right",
         )
         for job in data:

diracx/cli/utils.py

@@ -6,6 +6,8 @@ from asyncio import run
 from functools import wraps
 
 import typer
+from azure.core.exceptions import ClientAuthenticationError
+from rich import print
 
 
 class AsyncTyper(typer.Typer):
@@ -13,7 +15,13 @@ class AsyncTyper(typer.Typer):
         def decorator(async_func):
             @wraps(async_func)
             def sync_func(*_args, **_kwargs):
-                return run(async_func(*_args, **_kwargs))
+                try:
+                    return run(async_func(*_args, **_kwargs))
+                except ClientAuthenticationError:
+                    print(
+                        ":x: [bold red]You are not authenticated. Log in with:[/bold red] "
+                        "[bold] dirac login [OPTIONS] [VO] [/bold]"
+                    )
 
             self.command(*args, **kwargs)(sync_func)
             return async_func

{diracx_cli-0.0.1a15.dist-info → diracx_cli-0.0.1a17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-cli
-Version: 0.0.1a15
+Version: 0.0.1a17
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

diracx_cli-0.0.1a17.dist-info/RECORD

@@ -0,0 +1,13 @@
+diracx/cli/__init__.py,sha256=HI6-8S6JFU4hjX7DHy9c4jwUp7PVKwCxflcJCqqtu3M,4059
+diracx/cli/__main__.py,sha256=SM9tEc-fiW7cDHTKQRwgKobe5FfijHLYiAWfWaIM_zg,56
+diracx/cli/config.py,sha256=r5Lq_SN-1t3IzGAeS57ZzS-ukLhP6PMnmTXNld2pZXU,818
+diracx/cli/jobs.py,sha256=H1aQGFjaVLG2BShZO0cU3103QiuD1DR81cpm7drQ5Fs,4419
+diracx/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+diracx/cli/utils.py,sha256=NwhMMHwveKOdW2aoSqpnLnfOKhPnjmPPLpX69naPAzc,855
+diracx/cli/internal/__init__.py,sha256=w61dnlJtwMs13AhWBWP6J4iSMSIc3hU-FVLDhaPYysM,6576
+diracx/cli/internal/legacy.py,sha256=LuFzEi-d7Ayl1G3oiBNfuLXIYshdW37YR9Vh6lN_3No,10905
+diracx_cli-0.0.1a17.dist-info/METADATA,sha256=WHITVK7OOws_P3JbwCcv9SLNpRioRBBoguuqSSerHFo,792
+diracx_cli-0.0.1a17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+diracx_cli-0.0.1a17.dist-info/entry_points.txt,sha256=pKKS950WHHoO6teZZXkWztX2XZFZSH6uh9BKY1PA-jg,41
+diracx_cli-0.0.1a17.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_cli-0.0.1a17.dist-info/RECORD,,

diracx_cli-0.0.1a15.dist-info/RECORD

@@ -1,13 +0,0 @@
-diracx/cli/__init__.py,sha256=HI6-8S6JFU4hjX7DHy9c4jwUp7PVKwCxflcJCqqtu3M,4059
-diracx/cli/__main__.py,sha256=SM9tEc-fiW7cDHTKQRwgKobe5FfijHLYiAWfWaIM_zg,56
-diracx/cli/config.py,sha256=r5Lq_SN-1t3IzGAeS57ZzS-ukLhP6PMnmTXNld2pZXU,818
-diracx/cli/jobs.py,sha256=wTkp_MUnyrq-AFpfN3A42M-INRfI21qdnMHvXE7F8FQ,3165
-diracx/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diracx/cli/utils.py,sha256=m04ADEsXuE2D1-R_-arGAv6JH6mlREFfBqY3KJOnGYc,488
-diracx/cli/internal/__init__.py,sha256=17PDFFNhppYPPq6KPmMxnOG3N6sP3apewpk8VjjHTYY,6041
-diracx/cli/internal/legacy.py,sha256=qiO73vIh2LPM6jma6G2RcLINwX6ZP5i1rhYBVMMYOuE,10849
-diracx_cli-0.0.1a15.dist-info/METADATA,sha256=BhPh3pif5nauh7Xn-vu0Qn1Ll5SMwquFQ_92BP5qXXU,792
-diracx_cli-0.0.1a15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-diracx_cli-0.0.1a15.dist-info/entry_points.txt,sha256=pKKS950WHHoO6teZZXkWztX2XZFZSH6uh9BKY1PA-jg,41
-diracx_cli-0.0.1a15.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_cli-0.0.1a15.dist-info/RECORD,,