diracx-cli 0.0.1a15__tar.gz → 0.0.1a17__tar.gz

{diracx_cli-0.0.1a15 → diracx_cli-0.0.1a17}/PKG-INFO

@@ -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.1a15 → diracx_cli-0.0.1a17}/src/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-0.0.1a15 → diracx_cli-0.0.1a17}/src/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-0.0.1a15 → diracx_cli-0.0.1a17}/src/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-0.0.1a15 → diracx_cli-0.0.1a17}/src/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 → diracx_cli-0.0.1a17}/src/diracx_cli.egg-info/PKG-INFO

@@ -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.1a15 → diracx_cli-0.0.1a17}/tests/legacy/cs_sync/integration_test.yaml

@@ -52,20 +52,20 @@ Registry:
     DefaultGroup: jenkins_user
     Groups:
       jenkins_fcadmin:
-        Properties: !!set
-          FileCatalogManagement: null
-          NormalUser: null
-        Users: !!set
-          26dbe36e-cf5c-4c52-a834-29a1c904ef74: null
-          a95ab678-3fa4-41b9-b863-fe62ce8064ce: null
-          e2cb28ec-1a1e-40ee-a56d-d899b79879ce: null
+        Properties:
+        - FileCatalogManagement
+        - NormalUser
+        Users:
+        - 26dbe36e-cf5c-4c52-a834-29a1c904ef74
+        - a95ab678-3fa4-41b9-b863-fe62ce8064ce
+        - e2cb28ec-1a1e-40ee-a56d-d899b79879ce
       jenkins_user:
-        Properties: !!set
-          NormalUser: null
-        Users: !!set
-          26dbe36e-cf5c-4c52-a834-29a1c904ef74: null
-          a95ab678-3fa4-41b9-b863-fe62ce8064ce: null
-          e2cb28ec-1a1e-40ee-a56d-d899b79879ce: null
+        Properties:
+        - NormalUser
+        Users:
+        - 26dbe36e-cf5c-4c52-a834-29a1c904ef74
+        - a95ab678-3fa4-41b9-b863-fe62ce8064ce
+        - e2cb28ec-1a1e-40ee-a56d-d899b79879ce
     IdP:
       ClientID: 995ed3b9-d5bd-49d3-a7f4-7fc7dbd5a0cd
       URL: https://jenkins.invalid/
@@ -94,23 +94,23 @@ Registry:
     DefaultGroup: dirac_user
     Groups:
       dirac_admin:
-        Properties: !!set
-          AlarmsManagement: null
-          CSAdministrator: null
-          FullDelegation: null
-          JobAdministrator: null
-          Operator: null
-          ProxyManagement: null
-          ServiceAdministrator: null
-        Users: !!set
-          26b14fc9-6d40-4ca5-b014-6234eaf0fb6e: null
+        Properties:
+        - AlarmsManagement
+        - CSAdministrator
+        - FullDelegation
+        - JobAdministrator
+        - Operator
+        - ProxyManagement
+        - ServiceAdministrator
+        Users:
+        - 26b14fc9-6d40-4ca5-b014-6234eaf0fb6e
       dirac_user:
-        Properties: !!set
-          NormalUser: null
-        Users: !!set
-          26b14fc9-6d40-4ca5-b014-6234eaf0fb6e: null
-          d3adc733-6588-4d6f-8581-5986b02d0c87: null
-          ff2152ff-34f4-4739-b106-3def37e291e3: null
+        Properties:
+        - NormalUser
+        Users:
+        - 26b14fc9-6d40-4ca5-b014-6234eaf0fb6e
+        - d3adc733-6588-4d6f-8581-5986b02d0c87
+        - ff2152ff-34f4-4739-b106-3def37e291e3
     IdP:
       ClientID: 072afab5-ed92-46e0-a61d-4ecbc96e0770
       URL: https://vo.invalid/

{diracx_cli-0.0.1a15 → diracx_cli-0.0.1a17}/tests/legacy/cs_sync/test_cssync.py

@@ -31,7 +31,7 @@ def test_cs_sync(tmp_path, monkeypatch):
     actual_output = yaml.safe_load(output_file.read_text())
     expected_output = yaml.safe_load((file_path / "integration_test.yaml").read_text())
     assert actual_output == expected_output
-    Config.parse_obj(actual_output)
+    Config.model_validate(actual_output)
 
 
 def test_disabled_vos_empty(tmp_path, monkeypatch):

diracx_cli-0.0.1a17/tests/test_jobs.py

@@ -0,0 +1,122 @@
+from __future__ import annotations
+
+import json
+import os
+import tempfile
+
+import pytest
+from pytest import raises
+
+from diracx import cli
+from diracx.core.models import ScalarSearchSpec
+from diracx.core.preferences import get_diracx_preferences
+
+TEST_JDL = """
+    Arguments = "jobDescription.xml -o LogLevel=INFO";
+    Executable = "dirac-jobexec";
+    JobGroup = jobGroup;
+    JobName = jobName;
+    JobType = User;
+    LogLevel = INFO;
+    OutputSandbox =
+        {
+            Script1_CodeOutput.log,
+            std.err,
+            std.out
+        };
+    Priority = 1;
+    Site = ANY;
+    StdError = std.err;
+    StdOutput = std.out;
+"""
+
+
+@pytest.fixture
+async def jdl_file():
+    with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8") as temp_file:
+        temp_file.write(TEST_JDL)
+        temp_file.flush()
+        yield temp_file.name
+
+
+async def test_submit(with_cli_login, jdl_file, capfd):
+    """Test submitting a job using a JDL file."""
+
+    with open(jdl_file, "r") as temp_file:
+        await cli.jobs.submit([temp_file])
+
+    cap = capfd.readouterr()
+    assert cap.err == ""
+    assert "Inserted 1 jobs with ids" in cap.out
+
+
+async def test_search(with_cli_login, jdl_file, capfd):
+    """Test searching for jobs."""
+
+    # Submit 20 jobs
+    with open(jdl_file, "r") as temp_file:
+        await cli.jobs.submit([temp_file] * 20)
+
+    cap = capfd.readouterr()
+
+    # By default the output should be in JSON format as capfd is not a TTY
+    await cli.jobs.search()
+    cap = capfd.readouterr()
+    assert cap.err == ""
+    jobs = json.loads(cap.out)
+
+    # There should be 10 jobs by default
+    assert len(jobs) == 10
+    assert "JobID" in jobs[0]
+    assert "JobGroup" in jobs[0]
+
+    # Change per-page to a very large number to get all the jobs at once: the caption should change
+    await cli.jobs.search(per_page=9999)
+    cap = capfd.readouterr()
+    assert cap.err == ""
+    jobs = json.loads(cap.out)
+
+    # There should be 20 jobs at least now
+    assert len(jobs) >= 20
+    assert "JobID" in cap.out
+    assert "JobGroup" in cap.out
+
+    # Search for a job that doesn't exist
+    condition = ScalarSearchSpec(parameter="Status", operator="eq", value="nonexistent")
+    await cli.jobs.search(condition=[condition])
+    cap = capfd.readouterr()
+    assert cap.err == ""
+    assert "[]" == cap.out.strip()
+
+    # Switch to RICH output
+    get_diracx_preferences.cache_clear()
+    os.environ["DIRACX_OUTPUT_FORMAT"] = "RICH"
+
+    await cli.jobs.search()
+    cap = capfd.readouterr()
+    assert cap.err == ""
+
+    with raises(json.JSONDecodeError):
+        json.loads(cap.out)
+
+    assert "JobID" in cap.out
+    assert "JobGroup" in cap.out
+    assert "Showing 0-9 of " in cap.out
+
+    # Change per-page to a very large number to get all the jobs at once: the caption should change
+    await cli.jobs.search(per_page=9999)
+    cap = capfd.readouterr()
+    assert cap.err == ""
+
+    with raises(json.JSONDecodeError):
+        json.loads(cap.out)
+
+    assert "JobID" in cap.out
+    assert "JobGroup" in cap.out
+    assert "Showing all jobs" in cap.out
+
+    # Search for a job that doesn't exist
+    await cli.jobs.search(condition=[condition])
+    cap = capfd.readouterr()
+    assert cap.err == ""
+    assert "No jobs found" in cap.out

diracx_cli-0.0.1a15/tests/test_jobs.py

@@ -1,13 +0,0 @@
-from __future__ import annotations
-
-import json
-
-from diracx import cli
-
-
-async def test_search(with_cli_login, capfd):
-    await cli.jobs.search()
-    cap = capfd.readouterr()
-    assert cap.err == ""
-    # By default the output should be in JSON format as capfd is not a TTY
-    json.loads(cap.out)