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

diracx/cli/auth.py

@@ -11,7 +11,7 @@ from typing import Annotated, Optional
 
 import typer
 
-from diracx.client.aio import DiracClient
+from diracx.client.aio import AsyncDiracClient
 from diracx.client.models import DeviceFlowErrorResponse
 from diracx.core.preferences import get_diracx_preferences
 from diracx.core.utils import read_credentials, write_credentials
@@ -22,8 +22,8 @@ app = AsyncTyper()
 
 
 async def installation_metadata():
-    async with DiracClient() as api:
-        return await api.well_known.installation_metadata()
+    async with AsyncDiracClient() as api:
+        return await api.well_known.get_installation_metadata()
 
 
 def vo_callback(vo: str | None) -> str:
@@ -77,7 +77,7 @@ async def login(
         scopes += [f"property:{p}" for p in property]
 
     print(f"Logging in with scopes: {scopes}")
-    async with DiracClient() as api:
+    async with AsyncDiracClient() as api:
         data = await api.auth.initiate_device_flow(
             client_id=api.client_id,
             scope=" ".join(scopes),
@@ -109,7 +109,7 @@ async def login(
 
 @app.async_command()
 async def whoami():
-    async with DiracClient() as api:
+    async with AsyncDiracClient() as api:
         user_info = await api.auth.userinfo()
         # TODO: Add a RICH output format
         print(json.dumps(user_info.as_dict(), indent=2))
@@ -117,7 +117,7 @@ async def whoami():
 
 @app.async_command()
 async def logout():
-    async with DiracClient() as api:
+    async with AsyncDiracClient() as api:
         credentials_path = get_diracx_preferences().credentials_path
         if credentials_path.exists():
             credentials = read_credentials(credentials_path)

diracx/cli/config.py

@@ -8,7 +8,7 @@ import json
 
 from rich import print_json
 
-from diracx.client.aio import DiracClient
+from diracx.client.aio import AsyncDiracClient
 from diracx.core.preferences import OutputFormats, get_diracx_preferences
 
 from .utils import AsyncTyper
@@ -18,7 +18,7 @@ app = AsyncTyper()
 
 @app.async_command()
 async def dump():
-    async with DiracClient() as api:
+    async with AsyncDiracClient() as api:
         config = await api.config.serve_config()
         display(config)
 

diracx/cli/jobs.py

@@ -12,7 +12,7 @@ from rich.console import Console
 from rich.table import Table
 from typer import FileText, Option
 
-from diracx.client.aio import DiracClient
+from diracx.client.aio import AsyncDiracClient
 from diracx.core.models import ScalarSearchOperator, SearchSpec, VectorSearchOperator
 from diracx.core.preferences import OutputFormats, get_diracx_preferences
 
@@ -66,7 +66,7 @@ async def search(
     per_page: int = 10,
 ):
     search_specs = [parse_condition(cond) for cond in condition]
-    async with DiracClient() as api:
+    async with AsyncDiracClient() as api:
         jobs, content_range = await api.jobs.search(
             parameters=None if all else parameter,
             search=search_specs if search_specs else None,
@@ -151,7 +151,7 @@ def display_rich(data, content_range: ContentRange) -> None:
 
 @app.async_command()
 async def submit(jdl: list[FileText]):
-    async with DiracClient() as api:
+    async with AsyncDiracClient() as api:
         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.1a32.dist-info → diracx_cli-0.0.1a34.dist-info}/METADATA

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

{diracx_cli-0.0.1a32.dist-info → diracx_cli-0.0.1a34.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=B-M2oF6wDvQSwtVl6eLsdFF9mdii28xDJ6b9z3u4GIA,4760
-diracx/cli/config.py,sha256=-QPTTuH83epgFviO_af_DJBVjRakIrc6MbxkHg1KLlI,853
-diracx/cli/jobs.py,sha256=o-AH5MUtPTpccHtFtmWkn36yMGo6FIKQrua5nAJgHvQ,4714
+diracx/cli/auth.py,sha256=FXpZQATi0P_xZCLCqQJ_h-hszqShd-4SD1zQ03-PXPU,4789
+diracx/cli/config.py,sha256=LDoFT4x0VF0QAU2_y-fkZWQwD7yMYmyiM7VJFLK79GQ,863
+diracx/cli/jobs.py,sha256=ev3Zm6WH9g5MVT5EXbfSwHamiQUcatT4bYUrxx4c8BE,4729
 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=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.1a34.dist-info/METADATA,sha256=C3vNUL3FeYWSdKO7OoaIJ2jw0TxpqQhwWvecdgXz4Io,803
+diracx_cli-0.0.1a34.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+diracx_cli-0.0.1a34.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
+diracx_cli-0.0.1a34.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
+diracx_cli-0.0.1a34.dist-info/RECORD,,