diracx-cli 0.0.6__py3-none-any.whl → 0.0.8__py3-none-any.whl

diracx/cli/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from diracx.core.extensions import select_from_extension
+from diracx.core.extensions import DiracEntryPoint, select_from_extension
 
 from .auth import app
 
@@ -9,21 +9,26 @@ __all__ = ("app",)
 
 # Load all the sub commands
 cli_names = set(
-    [entry_point.name for entry_point in select_from_extension(group="diracx.cli")]
+    [
+        entry_point.name
+        for entry_point in select_from_extension(group=DiracEntryPoint.CLI)
+    ]
 )
 for cli_name in cli_names:
-    entry_point = select_from_extension(group="diracx.cli", name=cli_name)[0]
+    entry_point = select_from_extension(group=DiracEntryPoint.CLI, name=cli_name)[0]
     app.add_typer(entry_point.load(), name=entry_point.name)
 
 
 cli_hidden_names = set(
     [
         entry_point.name
-        for entry_point in select_from_extension(group="diracx.cli.hidden")
+        for entry_point in select_from_extension(group=DiracEntryPoint.HIDDEN_CLI)
     ]
 )
 for cli_name in cli_hidden_names:
-    entry_point = select_from_extension(group="diracx.cli.hidden", name=cli_name)[0]
+    entry_point = select_from_extension(
+        group=DiracEntryPoint.HIDDEN_CLI, name=cli_name
+    )[0]
     app.add_typer(entry_point.load(), name=entry_point.name, hidden=True)
 
 

diracx/cli/internal/legacy.py

@@ -21,7 +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 diracx.core.extensions import DiracEntryPoint, select_from_extension
 
 from ..utils import AsyncTyper
 
@@ -77,9 +77,9 @@ def cs_sync(old_file: Path, new_file: Path):
         )
 
     _apply_fixes(raw)
-    config_class: Config = select_from_extension(group="diracx", name="config")[
-        0
-    ].load()
+    config_class: Config = select_from_extension(
+        group=DiracEntryPoint.CORE, 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"))
@@ -264,7 +264,7 @@ def generate_helm_values(
 
     from diracx.core.extensions import select_from_extension
 
-    for entry_point in select_from_extension(group="diracx.dbs.sql"):
+    for entry_point in select_from_extension(group=DiracEntryPoint.SQL_DB):
         db_name = entry_point.name
         db_config = all_db_configs.get(db_name, {})
 
@@ -310,7 +310,7 @@ def generate_helm_values(
         },
     }
 
-    for entry_point in select_from_extension(group="diracx.dbs.os"):
+    for entry_point in select_from_extension(group=DiracEntryPoint.OS_DB):
         db_name = entry_point.name
         db_config = all_db_configs.get(db_name, {})
 

diracx/cli/jobs.py

@@ -13,7 +13,11 @@ from rich.table import Table
 from typer import FileText, Option
 
 from diracx.client.aio import AsyncDiracClient
-from diracx.core.models import ScalarSearchOperator, SearchSpec, VectorSearchOperator
+from diracx.core.models.search import (
+    ScalarSearchOperator,
+    SearchSpec,
+    VectorSearchOperator,
+)
 from diracx.core.preferences import OutputFormats, get_diracx_preferences
 
 from .utils import AsyncTyper

{diracx_cli-0.0.6.dist-info → diracx_cli-0.0.8.dist-info}/METADATA

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

{diracx_cli-0.0.6.dist-info → diracx_cli-0.0.8.dist-info}/RECORD

@@ -1,14 +1,14 @@
-diracx/cli/__init__.py,sha256=HB9Umd1DXskg8lrRY0ZnSaOBVYPD5Pl4PYRWts-ZR0E,808
+diracx/cli/__init__.py,sha256=X1nuw3PX5aouWKCBqwyPEJa8ofZy503RHK823yuT1A4,889
 diracx/cli/__main__.py,sha256=yGjYWjRcrrp5mJ0xD0v3rc7VIA9bzDib5D7LPAdH4OI,92
 diracx/cli/auth.py,sha256=QkwzHCXCAKRCPOOSL_8m-fEEtFy3IXLBxzLYn0aAEmk,5110
 diracx/cli/config.py,sha256=LDoFT4x0VF0QAU2_y-fkZWQwD7yMYmyiM7VJFLK79GQ,863
-diracx/cli/jobs.py,sha256=ev3Zm6WH9g5MVT5EXbfSwHamiQUcatT4bYUrxx4c8BE,4729
+diracx/cli/jobs.py,sha256=0GboQ_XCk8mAjy1NZhdlu2bDlkoVrrrXUGGbVCdPDaA,4753
 diracx/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 diracx/cli/utils.py,sha256=--kP1lOO4yky81nxmej8IQz1v6njxn_WYol5O9LcJ04,1063
 diracx/cli/internal/__init__.py,sha256=KZrzVcKu3YhNev2XF2KA2nttAa9ONU3CVUgatVMonJ4,143
 diracx/cli/internal/config.py,sha256=T5bf9brG1oCQkQ6D7Em4z7Fk--2Q-nPtUbe2jv-syUU,6079
-diracx/cli/internal/legacy.py,sha256=NV28d8_1m3ePL7cEQYQUqXoQDNP1S5jkeilsi7UXAP4,13516
-diracx_cli-0.0.6.dist-info/METADATA,sha256=G_Ynyie35C1iLKDiPVovTMlT5Z2adRR8a0CVBLtvygQ,760
-diracx_cli-0.0.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-diracx_cli-0.0.6.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
-diracx_cli-0.0.6.dist-info/RECORD,,
+diracx/cli/internal/legacy.py,sha256=esdSzhY4kImEWrUavrrVidrAYD71d061bmOOaM3v9vQ,13557
+diracx_cli-0.0.8.dist-info/METADATA,sha256=W61Kv0a2-nUC-z5XPm7cWEZo6QRs7Prd2J_mBreCyyc,760
+diracx_cli-0.0.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+diracx_cli-0.0.8.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
+diracx_cli-0.0.8.dist-info/RECORD,,