diracx-cli 0.0.1a18__tar.gz → 0.0.1a20__tar.gz

{diracx_cli-0.0.1a18 → diracx_cli-0.0.1a20}/PKG-INFO

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

{diracx_cli-0.0.1a18 → diracx_cli-0.0.1a20}/pyproject.toml

@@ -36,6 +36,15 @@ types = [
 [project.scripts]
 dirac = "diracx.cli:app"
 
+[project.entry-points."diracx.cli"]
+jobs = "diracx.cli.jobs:app"
+config = "diracx.cli.config:app"
+
+[project.entry-points."diracx.cli.hidden"]
+internal = "diracx.cli.internal:app"
+
+
+
 [tool.setuptools.packages.find]
 where = ["src"]
 
@@ -58,3 +67,4 @@ asyncio_mode = "auto"
 markers = [
     "enabled_dependencies: List of dependencies which should be available to the FastAPI test client",
 ]
+asyncio_default_fixture_loop_scope = "session"

{diracx_cli-0.0.1a18 → diracx_cli-0.0.1a20}/src/diracx/cli/__init__.py

@@ -8,10 +8,10 @@ import typer
 
 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 . import config, internal, jobs
 from .utils import AsyncTyper
 
 app = 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}")
@@ -115,9 +137,25 @@ def callback(output_format: Optional[str] = None):
         os.environ["DIRACX_OUTPUT_FORMAT"] = output_format
 
 
-app.add_typer(jobs.app, name="jobs")
-app.add_typer(config.app, name="config")
-app.add_typer(internal.app, name="internal", hidden=True)
+# Load all the sub commands
+
+cli_names = set(
+    [entry_point.name for entry_point in select_from_extension(group="diracx.cli")]
+)
+for cli_name in cli_names:
+    entry_point = select_from_extension(group="diracx.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 cli_name in cli_hidden_names:
+    entry_point = select_from_extension(group="diracx.cli.hidden", name=cli_name)[0]
+    app.add_typer(entry_point.load(), name=entry_point.name, hidden=True)
 
 
 if __name__ == "__main__":

{diracx_cli-0.0.1a18 → diracx_cli-0.0.1a20}/src/diracx_cli.egg-info/PKG-INFO

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

diracx_cli-0.0.1a20/src/diracx_cli.egg-info/entry_points.txt

@@ -0,0 +1,9 @@
+[console_scripts]
+dirac = diracx.cli:app
+
+[diracx.cli]
+config = diracx.cli.config:app
+jobs = diracx.cli.jobs:app
+
+[diracx.cli.hidden]
+internal = diracx.cli.internal:app

{diracx_cli-0.0.1a18 → diracx_cli-0.0.1a20}/tests/legacy/cs_sync/integration_test.cfg

@@ -1216,8 +1216,6 @@ Systems
           {
             Default = Operator
             getJobPilotOutput = authenticated
-            getSiteMask = authenticated
-            getSiteMaskStatus = authenticated
             ping = authenticated
             allowSite = SiteManager
             allowSite += Operator

{diracx_cli-0.0.1a18 → diracx_cli-0.0.1a20}/tests/legacy/cs_sync/integration_test.yaml

@@ -858,8 +858,6 @@ Systems:
             allowSite: SiteManager, Operator
             banSite: SiteManager, Operator
             getJobPilotOutput: authenticated
-            getSiteMask: authenticated
-            getSiteMaskStatus: authenticated
             ping: authenticated
           Protocol: https
       URLs:

diracx_cli-0.0.1a18/src/diracx_cli.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-dirac = diracx.cli:app