diracx-cli 0.0.1a16__py3-none-any.whl → 0.0.1a18__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,
-):
-    """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/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/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.dist-info → diracx_cli-0.0.1a18.dist-info}/METADATA

@@ -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
@@ -20,7 +20,7 @@ Requires-Dist: rich
 Requires-Dist: typer
 Requires-Dist: pyyaml
 Provides-Extra: testing
-Requires-Dist: diracx-testing ; extra == 'testing'
+Requires-Dist: diracx-testing; extra == "testing"
 Provides-Extra: types
-Requires-Dist: types-PyYAML ; extra == 'types'
+Requires-Dist: types-PyYAML; extra == "types"
 

diracx_cli-0.0.1a18.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=rv3sa6Cz32y2wvKR7yV7mT719VOMm8qZ1nZFviNF98E,4721
+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.1a18.dist-info/METADATA,sha256=9ucMoiWh8Zqf0OmnhyjxI4AcTOFVQjX0MfLF2ppAZlU,790
+diracx_cli-0.0.1a18.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+diracx_cli-0.0.1a18.dist-info/entry_points.txt,sha256=pKKS950WHHoO6teZZXkWztX2XZFZSH6uh9BKY1PA-jg,41
+diracx_cli-0.0.1a18.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_cli-0.0.1a18.dist-info/RECORD,,

{diracx_cli-0.0.1a16.dist-info → diracx_cli-0.0.1a18.dist-info}/WHEEL

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

diracx_cli-0.0.1a16.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=H1aQGFjaVLG2BShZO0cU3103QiuD1DR81cpm7drQ5Fs,4419
-diracx/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diracx/cli/utils.py,sha256=NwhMMHwveKOdW2aoSqpnLnfOKhPnjmPPLpX69naPAzc,855
-diracx/cli/internal/__init__.py,sha256=17PDFFNhppYPPq6KPmMxnOG3N6sP3apewpk8VjjHTYY,6041
-diracx/cli/internal/legacy.py,sha256=qiO73vIh2LPM6jma6G2RcLINwX6ZP5i1rhYBVMMYOuE,10849
-diracx_cli-0.0.1a16.dist-info/METADATA,sha256=T-3BwwSBhj85cqTxaHIkyC3bS9VATqkIxGkdZ2Ae09w,792
-diracx_cli-0.0.1a16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-diracx_cli-0.0.1a16.dist-info/entry_points.txt,sha256=pKKS950WHHoO6teZZXkWztX2XZFZSH6uh9BKY1PA-jg,41
-diracx_cli-0.0.1a16.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_cli-0.0.1a16.dist-info/RECORD,,