diracx-cli 0.0.1a10__py3-none-any.whl → 0.0.1a12__py3-none-any.whl

diracx/cli/__init__.py

@@ -11,7 +11,7 @@ from diracx.client.models import DeviceFlowErrorResponse
 from diracx.core.preferences import get_diracx_preferences
 from diracx.core.utils import write_credentials
 
-from . import internal, jobs
+from . import config, internal, jobs
 from .utils import AsyncTyper
 
 app = AsyncTyper()
@@ -54,7 +54,6 @@ async def login(
     async with DiracClient() as api:
         data = await api.auth.initiate_device_flow(
             client_id=api.client_id,
-            audience="Dirac server",
             scope=" ".join(scopes),
         )
         print("Now go to:", data.verification_uri_complete)
@@ -116,6 +115,7 @@ def callback(output_format: Optional[str] = None):
 
 
 app.add_typer(jobs.app, name="jobs")
+app.add_typer(config.app, name="config")
 app.add_typer(internal.app, name="internal", hidden=True)
 
 

diracx/cli/config.py

@@ -0,0 +1,33 @@
+# Can't using PEP-604 with typer: https://github.com/tiangolo/typer/issues/348
+# from __future__ import annotations
+
+__all__ = ("dump",)
+
+import json
+
+from rich import print_json
+
+from diracx.client.aio import DiracClient
+from diracx.core.preferences import OutputFormats, get_diracx_preferences
+
+from .utils import AsyncTyper
+
+app = AsyncTyper()
+
+
+@app.async_command()
+async def dump():
+    async with DiracClient() as api:
+        config = await api.config.serve_config()
+        display(config)
+
+
+def display(data):
+    output_format = get_diracx_preferences().output_format
+    match output_format:
+        case OutputFormats.JSON:
+            print(json.dumps(data, indent=2))
+        case OutputFormats.RICH:
+            print_json(data=data)
+        case _:
+            raise NotImplementedError(output_format)

diracx/cli/internal/legacy.py

@@ -289,9 +289,9 @@ def generate_helm_values(
     # Sandboxstore settings
     # TODO: Integrate minio for production use (ingress, etc)
     # By default, take the server hostname and prepend "sandboxes"
-    diracx_settings[
-        "DIRACX_SANDBOX_STORE_BUCKET_NAME"
-    ] = f"{diracx_hostname.split('.')[0]}-sandboxes"
+    diracx_settings["DIRACX_SANDBOX_STORE_BUCKET_NAME"] = (
+        f"{diracx_hostname.split('.')[0]}-sandboxes"
+    )
     diracx_settings["DIRACX_SANDBOX_STORE_S3_CLIENT_KWARGS"] = json.dumps(
         {
             "endpoint_url": "FILL ME",

diracx/cli/jobs.py

@@ -62,13 +62,14 @@ async def search(
 
 
 def display(data, unit: str):
-    match get_diracx_preferences().output_format:
+    output_format = get_diracx_preferences().output_format
+    match output_format:
         case OutputFormats.JSON:
             print(json.dumps(data, indent=2))
         case OutputFormats.RICH:
             display_rich(data, unit)
         case _:
-            raise NotImplementedError(format)
+            raise NotImplementedError(output_format)
 
 
 def display_rich(data, unit: str) -> None:

{diracx_cli-0.0.1a10.dist-info → diracx_cli-0.0.1a12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diracx-cli
-Version: 0.0.1a10
+Version: 0.0.1a12
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

diracx_cli-0.0.1a12.dist-info/RECORD

@@ -0,0 +1,13 @@
+diracx/cli/__init__.py,sha256=o1QUsW_KBdEc06o7QlxUggDMXrdDeitgWKSf93pAcr4,3989
+diracx/cli/__main__.py,sha256=SM9tEc-fiW7cDHTKQRwgKobe5FfijHLYiAWfWaIM_zg,56
+diracx/cli/config.py,sha256=r5Lq_SN-1t3IzGAeS57ZzS-ukLhP6PMnmTXNld2pZXU,818
+diracx/cli/jobs.py,sha256=wTkp_MUnyrq-AFpfN3A42M-INRfI21qdnMHvXE7F8FQ,3165
+diracx/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+diracx/cli/utils.py,sha256=m04ADEsXuE2D1-R_-arGAv6JH6mlREFfBqY3KJOnGYc,488
+diracx/cli/internal/__init__.py,sha256=17PDFFNhppYPPq6KPmMxnOG3N6sP3apewpk8VjjHTYY,6041
+diracx/cli/internal/legacy.py,sha256=qiO73vIh2LPM6jma6G2RcLINwX6ZP5i1rhYBVMMYOuE,10849
+diracx_cli-0.0.1a12.dist-info/METADATA,sha256=2Lyhr-8s30h--Mml9ZCPQZjK7B8rlXA5537ABPhi7iM,792
+diracx_cli-0.0.1a12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+diracx_cli-0.0.1a12.dist-info/entry_points.txt,sha256=pKKS950WHHoO6teZZXkWztX2XZFZSH6uh9BKY1PA-jg,41
+diracx_cli-0.0.1a12.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_cli-0.0.1a12.dist-info/RECORD,,

{diracx_cli-0.0.1a10.dist-info → diracx_cli-0.0.1a12.dist-info}/WHEEL

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

diracx_cli-0.0.1a10.dist-info/RECORD

@@ -1,12 +0,0 @@
-diracx/cli/__init__.py,sha256=VJNGMc9-zVB6xgHPPxvjpMy9mGf5hytQCPUnjp309_Q,3977
-diracx/cli/__main__.py,sha256=SM9tEc-fiW7cDHTKQRwgKobe5FfijHLYiAWfWaIM_zg,56
-diracx/cli/jobs.py,sha256=QqU4A1Bdyw3P9rm0YhoG7NmF2BKVx67eO-HSmp_BhVU,3124
-diracx/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-diracx/cli/utils.py,sha256=m04ADEsXuE2D1-R_-arGAv6JH6mlREFfBqY3KJOnGYc,488
-diracx/cli/internal/__init__.py,sha256=17PDFFNhppYPPq6KPmMxnOG3N6sP3apewpk8VjjHTYY,6041
-diracx/cli/internal/legacy.py,sha256=U1OdqpzY-8DuSDTNESjqKmab7i16G6UEFpap4n1B6XA,10847
-diracx_cli-0.0.1a10.dist-info/METADATA,sha256=m6xhkqFMpXc3sbKUfhxPiyaj1ZCYRQzm9PJC2S1MCVs,792
-diracx_cli-0.0.1a10.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-diracx_cli-0.0.1a10.dist-info/entry_points.txt,sha256=pKKS950WHHoO6teZZXkWztX2XZFZSH6uh9BKY1PA-jg,41
-diracx_cli-0.0.1a10.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_cli-0.0.1a10.dist-info/RECORD,,