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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-cli
-Version: 0.0.1a17
+Version: 0.0.1a19
 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.1a17 → diracx_cli-0.0.1a19}/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 = [
@@ -36,6 +36,15 @@ types = [
 [project.scripts]
 dirac = "diracx.cli:app"
 
+[project.entry-points."diracx.cli"]
+jobs = "diracx.cli.jobs:app"
+config = "diracx.cli.config:app"
+
+[project.entry-points."diracx.cli.hidden"]
+internal = "diracx.cli.internal:app"
+
+
+
 [tool.setuptools.packages.find]
 where = ["src"]
 
@@ -58,3 +67,4 @@ asyncio_mode = "auto"
 markers = [
     "enabled_dependencies: List of dependencies which should be available to the FastAPI test client",
 ]
+asyncio_default_fixture_loop_scope = "session"

{diracx_cli-0.0.1a17 → diracx_cli-0.0.1a19}/src/diracx/cli/__init__.py

@@ -8,10 +8,10 @@ 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 write_credentials
 
-from . import config, internal, jobs
 from .utils import AsyncTyper
 
 app = AsyncTyper()
@@ -115,9 +115,25 @@ def callback(output_format: Optional[str] = None):
         os.environ["DIRACX_OUTPUT_FORMAT"] = output_format
 
 
-app.add_typer(jobs.app, name="jobs")
-app.add_typer(config.app, name="config")
-app.add_typer(internal.app, name="internal", hidden=True)
+# Load all the sub commands
+
+cli_names = set(
+    [entry_point.name for entry_point in select_from_extension(group="diracx.cli")]
+)
+for cli_name in cli_names:
+    entry_point = select_from_extension(group="diracx.cli", name=cli_name)[0]
+    app.add_typer(entry_point.load(), name=entry_point.name)
+
+
+cli_hidden_names = set(
+    [
+        entry_point.name
+        for entry_point in select_from_extension(group="diracx.cli.hidden")
+    ]
+)
+for cli_name in cli_hidden_names:
+    entry_point = select_from_extension(group="diracx.cli.hidden", name=cli_name)[0]
+    app.add_typer(entry_point.load(), name=entry_point.name, hidden=True)
 
 
 if __name__ == "__main__":

{diracx_cli-0.0.1a17 → diracx_cli-0.0.1a19}/src/diracx/cli/internal/__init__.py

@@ -26,7 +26,7 @@ app.add_typer(legacy.app, name="legacy")
 
 @app.command()
 def generate_cs(config_repo: str):
-    """Generate a minimal DiracX configuration repository"""
+    """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:
@@ -58,8 +58,7 @@ 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"""
-
+    """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:
@@ -102,8 +101,7 @@ def add_group(
     group: Annotated[str, typer.Option()],
     properties: list[str] = ["NormalUser"],
 ):
-    """Add a group to an existing vo in the configuration repository"""
-
+    """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:
@@ -139,8 +137,7 @@ def add_user(
     sub: Annotated[str, typer.Option()],
     preferred_username: Annotated[str, typer.Option()],
 ):
-    """Add a user to an existing vo and group"""
-
+    """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:
@@ -184,7 +181,7 @@ 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)

{diracx_cli-0.0.1a17 → diracx_cli-0.0.1a19}/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"
@@ -86,8 +86,7 @@ def cs_sync(old_file: Path, new_file: Path):
 
 
 def _apply_fixes(raw):
-    """Modify raw in place to make any layout changes between the old and new structure"""
-
+    """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)
@@ -184,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.1a17 → diracx_cli-0.0.1a19}/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.1a17 → diracx_cli-0.0.1a19}/src/diracx_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-cli
-Version: 0.0.1a17
+Version: 0.0.1a19
 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.1a19/src/diracx_cli.egg-info/entry_points.txt

@@ -0,0 +1,9 @@
+[console_scripts]
+dirac = diracx.cli:app
+
+[diracx.cli]
+config = diracx.cli.config:app
+jobs = diracx.cli.jobs:app
+
+[diracx.cli.hidden]
+internal = diracx.cli.internal:app

{diracx_cli-0.0.1a17 → diracx_cli-0.0.1a19}/tests/legacy/cs_sync/integration_test.cfg

@@ -1216,8 +1216,6 @@ Systems
           {
             Default = Operator
             getJobPilotOutput = authenticated
-            getSiteMask = authenticated
-            getSiteMaskStatus = authenticated
             ping = authenticated
             allowSite = SiteManager
             allowSite += Operator

{diracx_cli-0.0.1a17 → diracx_cli-0.0.1a19}/tests/legacy/cs_sync/integration_test.yaml

@@ -858,8 +858,6 @@ Systems:
             allowSite: SiteManager, Operator
             banSite: SiteManager, Operator
             getJobPilotOutput: authenticated
-            getSiteMask: authenticated
-            getSiteMaskStatus: authenticated
             ping: authenticated
           Protocol: https
       URLs:

{diracx_cli-0.0.1a17 → diracx_cli-0.0.1a19}/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

diracx_cli-0.0.1a17/src/diracx_cli.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-dirac = diracx.cli:app