diracx-cli 0.0.1a19__py3-none-any.whl → 0.0.1a21__py3-none-any.whl

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/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.dist-info → diracx_cli-0.0.1a21.dist-info}/METADATA

@@ -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
@@ -23,4 +23,3 @@ Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == "testing"
 Provides-Extra: types
 Requires-Dist: types-PyYAML; extra == "types"
-

{diracx_cli-0.0.1a19.dist-info → diracx_cli-0.0.1a21.dist-info}/RECORD

@@ -1,13 +1,13 @@
-diracx/cli/__init__.py,sha256=KO7W7cBEF7vkkJ7uf4lPkWEDJsM7VTwSOsBv3WmQWd4,4575
+diracx/cli/__init__.py,sha256=eenV2ezX845cIvDV2mTKqd23TLwXQBwD6Ho252h8WwA,5407
 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/jobs.py,sha256=wV7-YMI_jUIflj87cBM4yuI2EF9K5mu2WsCG_eakWrg,4725
 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.1a19.dist-info/METADATA,sha256=bZRRlePyXNw6yQV4IA4Omx9Rr9ckQcYwRjE49_Ylx3s,790
-diracx_cli-0.0.1a19.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-diracx_cli-0.0.1a19.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
-diracx_cli-0.0.1a19.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_cli-0.0.1a19.dist-info/RECORD,,
+diracx_cli-0.0.1a21.dist-info/METADATA,sha256=FIGewmFFEy_xHTmXoJQ9WodWOQx2ViJyWK07rcnmBps,795
+diracx_cli-0.0.1a21.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+diracx_cli-0.0.1a21.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
+diracx_cli-0.0.1a21.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_cli-0.0.1a21.dist-info/RECORD,,

{diracx_cli-0.0.1a19.dist-info → diracx_cli-0.0.1a21.dist-info}/WHEEL

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