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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-cli
-Version: 0.0.1a19
+Version: 0.0.1a21
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -15,7 +15,7 @@ Requires-Dist: diracx-api
 Requires-Dist: diracx-client
 Requires-Dist: diracx-core
 Requires-Dist: gitpython
-Requires-Dist: pydantic
+Requires-Dist: pydantic>=2.10
 Requires-Dist: rich
 Requires-Dist: typer
 Requires-Dist: pyyaml

{diracx_cli-0.0.1a19 → diracx_cli-0.0.1a21}/pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
     "diracx-client",
     "diracx-core",
     "gitpython",
-    "pydantic",
+    "pydantic>=2.10",
     "rich",
     "typer",
     "pyyaml",

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

@@ -10,7 +10,7 @@ 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 diracx.core.utils import read_credentials, write_credentials
 
 from .utils import AsyncTyper
 
@@ -38,12 +38,34 @@ def vo_callback(vo: str | None) -> str:
 
 @app.async_command()
 async def login(
-    vo: Annotated[Optional[str], typer.Argument(callback=vo_callback)] = None,
-    group: Optional[str] = None,
+    vo: Annotated[
+        Optional[str],
+        typer.Argument(callback=vo_callback, help="Virtual Organization name"),
+    ] = None,
+    group: Optional[str] = typer.Option(
+        None,
+        help="Group name within the VO. If not provided, the default group for the VO will be used.",
+    ),
     property: Optional[list[str]] = typer.Option(
-        None, help="Override the default(s) with one or more properties"
+        None,
+        help=(
+            "List of properties to add to the default properties of the group. "
+            "If not provided, default properties of the group will be used."
+        ),
     ),
 ):
+    """Login to the DIRAC system using the device flow.
+
+    - If only VO is provided: Uses the default group and its properties for the VO.
+
+    - If VO and group are provided: Uses the specified group and its properties for the VO.
+
+    - If VO and properties are provided: Uses the default group and combines its properties with the
+      provided properties.
+
+    - If VO, group, and properties are provided: Uses the specified group and combines its properties with the
+      provided properties.
+    """
     scopes = [f"vo:{vo}"]
     if group:
         scopes.append(f"group:{group}")
@@ -94,11 +116,11 @@ async def logout():
     async with DiracClient() as api:
         credentials_path = get_diracx_preferences().credentials_path
         if credentials_path.exists():
-            credentials = json.loads(credentials_path.read_text())
+            credentials = read_credentials(credentials_path)
 
             # Revoke refresh token
             try:
-                await api.auth.revoke_refresh_token(credentials["refresh_token"])
+                await api.auth.revoke_refresh_token(credentials.refresh_token)
             except Exception as e:
                 print(f"Error revoking the refresh token {e!r}")
                 pass

{diracx_cli-0.0.1a19 → diracx_cli-0.0.1a21}/src/diracx/cli/jobs.py

@@ -152,7 +152,7 @@ def display_rich(data, content_range: ContentRange) -> None:
 async def submit(jdl: list[FileText]):
     async with DiracClient() as api:
         # api.valid(enforce_https=False)
-        jobs = await api.jobs.submit_bulk_jobs([x.read() for x in jdl])
+        jobs = await api.jobs.submit_bulk_jdl_jobs([x.read() for x in jdl])
     print(
         f"Inserted {len(jobs)} jobs with ids: {','.join(map(str, (job.job_id for job in jobs)))}"
     )

{diracx_cli-0.0.1a19 → diracx_cli-0.0.1a21}/src/diracx_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-cli
-Version: 0.0.1a19
+Version: 0.0.1a21
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -15,7 +15,7 @@ Requires-Dist: diracx-api
 Requires-Dist: diracx-client
 Requires-Dist: diracx-core
 Requires-Dist: gitpython
-Requires-Dist: pydantic
+Requires-Dist: pydantic>=2.10
 Requires-Dist: rich
 Requires-Dist: typer
 Requires-Dist: pyyaml

{diracx_cli-0.0.1a19 → diracx_cli-0.0.1a21}/src/diracx_cli.egg-info/requires.txt

@@ -3,7 +3,7 @@ diracx-api
 diracx-client
 diracx-core
 gitpython
-pydantic
+pydantic>=2.10
 rich
 typer
 pyyaml

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

@@ -1280,6 +1280,7 @@ Systems
           {
             #@@-prod - /C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser - 2023-10-02 12:36:08
             RescheduleDelays = 0
+            MaxRescheduling = 3
           }
         }
       }

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

@@ -801,6 +801,7 @@ Systems:
         Optimizers:
           JobScheduling:
             RescheduleDelays: '0'
+            MaxRescheduling: '3'
       FailoverURLs: {}
       Services:
         Matcher:

{diracx_cli-0.0.1a19 → diracx_cli-0.0.1a21}/tests/test_jobs.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import json
 import os
 import tempfile
+from io import StringIO
 
 import pytest
 from pytest import raises
@@ -51,8 +52,11 @@ 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)
+    with open(jdl_file, "r") as x:
+        what_we_submit = x.read()
+    jdls = [StringIO(what_we_submit) for _ in range(20)]
+
+    await cli.jobs.submit(jdls)
 
     cap = capfd.readouterr()