diracx-cli 0.0.1a16__tar.gz → 0.0.1a18__tar.gz

{diracx_cli-0.0.1a16 → diracx_cli-0.0.1a18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-cli
-Version: 0.0.1a16
+Version: 0.0.1a18
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -8,7 +8,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: System :: Distributed Computing
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: diraccfg
 Requires-Dist: diracx-api

{diracx_cli-0.0.1a16 → diracx_cli-0.0.1a18}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "diracx-cli"
 description = "TODO"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 keywords = []
 license = {text = "GPL-3.0-only"}
 classifiers = [

{diracx_cli-0.0.1a16 → diracx_cli-0.0.1a18}/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,
-):
-    """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":
+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()):
@@ -60,10 +58,11 @@ def add_vo(
     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 parse_obj_as should be moved in to typer itself
-    config_repo = parse_obj_as(ConfigSourceUrl, config_repo)
+    """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
@@ -102,10 +101,11 @@ def add_group(
     group: Annotated[str, typer.Option()],
     properties: list[str] = ["NormalUser"],
 ):
-    """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)
+    """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())
@@ -137,10 +137,11 @@ def add_user(
     sub: Annotated[str, typer.Option()],
     preferred_username: Annotated[str, typer.Option()],
 ):
-    """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)
+    """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)
 
@@ -180,10 +181,12 @@ def add_user(
 
 
 def update_config_and_commit(repo_path: Path, config: Config, message: str):
-    """Update the yaml file in the repo and commit it"""
+    """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.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.1a16 → diracx_cli-0.0.1a18}/src/diracx/cli/internal/legacy.py

@@ -53,7 +53,7 @@ class ConversionConfig(BaseModel):
 
 @app.command()
 def cs_sync(old_file: Path, new_file: Path):
-    """Load the old CS and convert it to the new YAML format"""
+    """Load the old CS and convert it to the new YAML format."""
     if not os.environ.get("DIRAC_COMPAT_ENABLE_CS_CONVERSION"):
         raise RuntimeError(
             "DIRAC_COMPAT_ENABLE_CS_CONVERSION must be set for the conversion to be possible"
@@ -79,14 +79,15 @@ 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"])
+    """Modify raw in place to make any layout changes between the old and new structure."""
+    conv_config = ConversionConfig.model_validate(raw["DiracX"]["CsSync"])
 
     raw.pop("DiracX", None)
     # Remove dips specific parts from the CS
@@ -119,7 +120,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": {},
@@ -182,15 +183,15 @@ def generate_helm_values(
     ),
     output_file: Path = Option(help="Where to dump the yam file"),
 ):
-    """Generate an initial values.yaml to run a DiracX installation
-    compatible with a DIRAC instance. The file is not complete, and needs
-    manual editing"""
+    """Generate an initial values.yaml to run a DiracX installation.
 
+    The file generated is not complete, and needs manual editing.
+    """
     helm_values = {
         "developer": {"enabled": False},
-        "init-cs": {"enabled": True},
-        "init-secrets": {"enabled": True},
-        "init-sql": {"enabled": False, "env": {}},
+        "initCs": {"enabled": True},
+        "initSecrets": {"enabled": True},
+        "initSql": {"enabled": False, "env": {}},
         "cert-manager": {"enabled": False},
         "cert-manager-issuer": {"enabled": False},
         "minio": {"enabled": False},

{diracx_cli-0.0.1a16 → diracx_cli-0.0.1a18}/src/diracx/cli/jobs.py

@@ -20,6 +20,12 @@ from .utils import AsyncTyper
 app = AsyncTyper()
 
 
+available_operators = (
+    f"Scalar operators: {', '.join([op.value for op in ScalarSearchOperator])}. "
+    f"Vector operators: {', '.join([op.value for op in VectorSearchOperator])}."
+)
+
+
 def parse_condition(value: str) -> SearchSpec:
     parameter, operator, rest = value.split(" ", 2)
     if operator in set(ScalarSearchOperator):
@@ -51,15 +57,18 @@ async def search(
         "Owner",
         "LastUpdateTime",
     ],
-    condition: Annotated[list[SearchSpec], Option(parser=parse_condition)] = [],
+    condition: Annotated[
+        list[str], Option(help=f'Example: "JobID eq 1000". {available_operators}')
+    ] = [],
     all: bool = False,
     page: int = 1,
     per_page: int = 10,
 ):
+    search_specs = [parse_condition(cond) for cond in condition]
     async with DiracClient() as api:
         jobs, content_range = await api.jobs.search(
             parameters=None if all else parameter,
-            search=condition if condition else None,
+            search=search_specs if search_specs else None,
             page=page,
             per_page=per_page,
             cls=lambda _, jobs, headers: (

{diracx_cli-0.0.1a16 → diracx_cli-0.0.1a18}/src/diracx_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-cli
-Version: 0.0.1a16
+Version: 0.0.1a18
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -8,7 +8,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: System :: Distributed Computing
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: diraccfg
 Requires-Dist: diracx-api

{diracx_cli-0.0.1a16 → diracx_cli-0.0.1a18}/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.1a16 → diracx_cli-0.0.1a18}/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.1a16 → diracx_cli-0.0.1a18}/tests/test_jobs.py

@@ -8,7 +8,6 @@ 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 = """
@@ -41,7 +40,6 @@ async def jdl_file():
 
 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])
 
@@ -52,7 +50,6 @@ async def test_submit(with_cli_login, jdl_file, capfd):
 
 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)
@@ -82,8 +79,7 @@ async def test_search(with_cli_login, jdl_file, capfd):
     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])
+    await cli.jobs.search(condition=["Status eq nonexistent"])
     cap = capfd.readouterr()
     assert cap.err == ""
     assert "[]" == cap.out.strip()
@@ -116,7 +112,7 @@ async def test_search(with_cli_login, jdl_file, capfd):
     assert "Showing all jobs" in cap.out
 
     # Search for a job that doesn't exist
-    await cli.jobs.search(condition=[condition])
+    await cli.jobs.search(condition=["Status eq nonexistent"])
     cap = capfd.readouterr()
     assert cap.err == ""
     assert "No jobs found" in cap.out