diracx-cli 0.0.1a29__py3-none-any.whl → 0.0.1a32__py3-none-any.whl

diracx/cli/auth.py

@@ -88,7 +88,7 @@ async def login(
         )
         while expires > datetime.now(tz=timezone.utc):
             print(".", end="", flush=True)
-            response = await api.auth.token(device_code=data.device_code, client_id=api.client_id)  # type: ignore
+            response = await api.auth.get_oidc_token(device_code=data.device_code, client_id=api.client_id)  # type: ignore
             if isinstance(response, DeviceFlowErrorResponse):
                 if response.error == "authorization_pending":
                     # TODO: Setting more than 5 seconds results in an error

diracx/cli/internal/legacy.py

@@ -21,6 +21,7 @@ from typer import Option
 
 from diracx.core.config import Config
 from diracx.core.config.schema import Field, SupportInfo
+from diracx.core.extensions import select_from_extension
 
 from ..utils import AsyncTyper
 
@@ -76,8 +77,10 @@ def cs_sync(old_file: Path, new_file: Path):
         )
 
     _apply_fixes(raw)
-
-    config = Config.model_validate(raw)
+    config_class: Config = select_from_extension(group="diracx", name="config")[
+        0
+    ].load()
+    config = config_class.model_validate(raw)
     new_file.write_text(
         yaml.safe_dump(config.model_dump(exclude_unset=True, mode="json"))
     )
@@ -361,6 +364,13 @@ def generate_helm_values(
     diracx_settings["DIRACX_SANDBOX_STORE_BUCKET_NAME"] = (
         f"{diracx_hostname.split('.')[0]}-sandboxes"
     )
+    try:
+        diracx_settings["DIRACX_SANDBOX_STORE_SE_NAME"] = cfg["Systems"][
+            "WorkloadManagement"
+        ]["Services"]["SandboxStore"]["LocalSE"]
+    except KeyError:
+        pass
+
     diracx_settings["DIRACX_SANDBOX_STORE_S3_CLIENT_KWARGS"] = json.dumps(
         {
             "endpoint_url": "FILL ME",

diracx/cli/jobs.py

@@ -152,8 +152,7 @@ def display_rich(data, content_range: ContentRange) -> None:
 @app.async_command()
 async def submit(jdl: list[FileText]):
     async with DiracClient() as api:
-        # api.valid(enforce_https=False)
-        jobs = await api.jobs.submit_bulk_jdl_jobs([x.read() for x in jdl])
+        jobs = await api.jobs.submit_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.1a29.dist-info → diracx_cli-0.0.1a32.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: diracx-cli
-Version: 0.0.1a29
+Version: 0.0.1a32
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research

{diracx_cli-0.0.1a29.dist-info → diracx_cli-0.0.1a32.dist-info}/RECORD

@@ -1,15 +1,15 @@
 diracx/cli/__init__.py,sha256=HB9Umd1DXskg8lrRY0ZnSaOBVYPD5Pl4PYRWts-ZR0E,808
 diracx/cli/__main__.py,sha256=yGjYWjRcrrp5mJ0xD0v3rc7VIA9bzDib5D7LPAdH4OI,92
-diracx/cli/auth.py,sha256=e3jl1iGplZrPBXvFM1j1D59BdoyE34wZsSEkDDjUg2Q,4751
+diracx/cli/auth.py,sha256=B-M2oF6wDvQSwtVl6eLsdFF9mdii28xDJ6b9z3u4GIA,4760
 diracx/cli/config.py,sha256=-QPTTuH83epgFviO_af_DJBVjRakIrc6MbxkHg1KLlI,853
-diracx/cli/jobs.py,sha256=qxV7y_WVtYzO6h55lgbWgk_ZC9eN1i1hIFHTpwxC9mE,4760
+diracx/cli/jobs.py,sha256=o-AH5MUtPTpccHtFtmWkn36yMGo6FIKQrua5nAJgHvQ,4714
 diracx/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 diracx/cli/utils.py,sha256=NwhMMHwveKOdW2aoSqpnLnfOKhPnjmPPLpX69naPAzc,855
 diracx/cli/internal/__init__.py,sha256=KZrzVcKu3YhNev2XF2KA2nttAa9ONU3CVUgatVMonJ4,143
 diracx/cli/internal/config.py,sha256=xPT7lnJ3QPqJgaNJuMoUpV6CIIxZY_d7HKFb4uINb_8,6552
-diracx/cli/internal/legacy.py,sha256=sbiWdvIWTLDE4gnuZQJ00xCf1th2rYffPtMsl9X--lU,13181
-diracx_cli-0.0.1a29.dist-info/METADATA,sha256=bz3kol5pJx2L4OfdGP3JnpTJc664z0NOK9L67nfz2pM,803
-diracx_cli-0.0.1a29.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-diracx_cli-0.0.1a29.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
-diracx_cli-0.0.1a29.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_cli-0.0.1a29.dist-info/RECORD,,
+diracx/cli/internal/legacy.py,sha256=Wzfdgjbt9xxUK6MkCrEGNXdMOJzkvUGJh2MnD2j_2QE,13547
+diracx_cli-0.0.1a32.dist-info/METADATA,sha256=eHhg3iqfRhU0dAe6l3aiSQqtSXVacn9_hJ2mDUbrRkw,803
+diracx_cli-0.0.1a32.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+diracx_cli-0.0.1a32.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
+diracx_cli-0.0.1a32.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_cli-0.0.1a32.dist-info/RECORD,,

{diracx_cli-0.0.1a29.dist-info → diracx_cli-0.0.1a32.dist-info}/WHEEL

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