diracx-cli 0.0.1a43__py3-none-any.whl → 0.0.1a45__py3-none-any.whl

diracx/cli/auth.py

@@ -124,7 +124,9 @@ async def logout():
 
             # Revoke refresh token
             try:
-                await api.auth.revoke_refresh_token(credentials.refresh_token)
+                await api.auth.revoke_refresh_token_by_refresh_token(
+                    client_id=api.client_id, refresh_token=credentials.refresh_token
+                )
             except Exception as e:
                 print(f"Error revoking the refresh token {e!r}")
                 pass
@@ -132,6 +134,9 @@ async def logout():
             # Remove credentials
             credentials_path.unlink(missing_ok=True)
             print(f"Removed credentials from {credentials_path}")
+        else:
+            print("You are not connected to DiracX, or your credentials are missing.")
+            return
     print("\nLogout successful!")
 
 

diracx/cli/internal/config.py

@@ -24,14 +24,27 @@ from ..utils import AsyncTyper
 app = AsyncTyper()
 
 
+def get_repo_path(config_repo_str: str) -> Path:
+    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo_str)
+    if config_repo.scheme != "git+file" or config_repo.path is None:
+        raise NotImplementedError("Only git+file:// URLs are supported")
+
+    repo_path = Path(config_repo.path)
+
+    return repo_path
+
+
+def get_config_from_repo_path(repo_path: Path) -> Config:
+    return ConfigSource.create_from_url(backend_url=repo_path).read_config()
+
+
 @app.command()
 def generate_cs(config_repo: str):
     """Generate a minimal DiracX configuration repository."""
     # TODO: The use of TypeAdapter should be moved in to typer itself
-    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
-    if config_repo.scheme != "git+file" or config_repo.path is None:
-        raise NotImplementedError("Only git+file:// URLs are supported")
-    repo_path = Path(config_repo.path)
+
+    repo_path = get_repo_path(config_repo)
+
     if repo_path.exists() and list(repo_path.iterdir()):
         typer.echo(f"ERROR: Directory {repo_path} already exists", err=True)
         raise typer.Exit(1)
@@ -60,10 +73,8 @@ def add_vo(
 ):
     """Add a registry entry (vo) to an existing configuration repository."""
     # TODO: The use of TypeAdapter should be moved in to typer itself
-    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
-    if config_repo.scheme != "git+file" or config_repo.path is None:
-        raise NotImplementedError("Only git+file:// URLs are supported")
-    repo_path = Path(config_repo.path)
+    repo_path = get_repo_path(config_repo)
+    config = get_config_from_repo_path(repo_path)
 
     # A VO should at least contain a default group
     new_registry = RegistryConfig(
@@ -77,8 +88,6 @@ def add_vo(
         },
     )
 
-    config = ConfigSource.create_from_url(backend_url=repo_path).read_config()
-
     if vo in config.Registry:
         typer.echo(f"ERROR: VO {vo} already exists", err=True)
         raise typer.Exit(1)
@@ -103,15 +112,11 @@ def add_group(
 ):
     """Add a group to an existing vo in the configuration repository."""
     # TODO: The use of TypeAdapter should be moved in to typer itself
-    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
-    if config_repo.scheme != "git+file" or config_repo.path is None:
-        raise NotImplementedError("Only git+file:// URLs are supported")
-    repo_path = Path(config_repo.path)
+    repo_path = get_repo_path(config_repo)
+    config = get_config_from_repo_path(repo_path)
 
     new_group = GroupConfig(Properties=set(properties), Quota=None, Users=set())
 
-    config = ConfigSource.create_from_url(backend_url=repo_path).read_config()
-
     if vo not in config.Registry:
         typer.echo(f"ERROR: Virtual Organization {vo} does not exist", err=True)
         raise typer.Exit(1)
@@ -139,16 +144,11 @@ def add_user(
 ):
     """Add a user to an existing vo and group."""
     # TODO: The use of TypeAdapter should be moved in to typer itself
-    config_repo = TypeAdapter(ConfigSourceUrl).validate_python(config_repo)
-    if config_repo.scheme != "git+file" or config_repo.path is None:
-        raise NotImplementedError("Only git+file:// URLs are supported")
-
-    repo_path = Path(config_repo.path)
+    repo_path = get_repo_path(config_repo)
+    config = get_config_from_repo_path(repo_path)
 
     new_user = UserConfig(PreferedUsername=preferred_username)
 
-    config = ConfigSource.create_from_url(backend_url=repo_path).read_config()
-
     if vo not in config.Registry:
         typer.echo(f"ERROR: Virtual Organization {vo} does not exist", err=True)
         raise typer.Exit(1)

diracx/cli/internal/legacy.py

@@ -96,7 +96,7 @@ def _apply_fixes(raw):
     raw["DIRAC"].pop("Framework", None)
     raw["DIRAC"].pop("Security", None)
 
-    # This is VOMS specific and no longer reqired
+    # This is VOMS specific and no longer required
     raw["DIRAC"].pop("ConnConf", None)
 
     # Setups are no longer supported

diracx/cli/utils.py

@@ -7,6 +7,7 @@ from functools import wraps
 
 import typer
 from azure.core.exceptions import ClientAuthenticationError
+from httpx import ConnectError
 from rich import print
 
 
@@ -22,6 +23,10 @@ class AsyncTyper(typer.Typer):
                         ":x: [bold red]You are not authenticated. Log in with:[/bold red] "
                         "[bold] dirac login [OPTIONS] [VO] [/bold]"
                     )
+                except ConnectError:
+                    print(
+                        ":x: [bold red]Please configure a valid DiracX server.[/bold red]"
+                    )
 
             self.command(*args, **kwargs)(sync_func)
             return async_func

{diracx_cli-0.0.1a43.dist-info → diracx_cli-0.0.1a45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-cli
-Version: 0.0.1a43
+Version: 0.0.1a45
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -9,17 +9,16 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: System :: Distributed Computing
 Requires-Python: >=3.11
-Description-Content-Type: text/markdown
 Requires-Dist: diraccfg
 Requires-Dist: diracx-api
 Requires-Dist: diracx-client
 Requires-Dist: diracx-core
 Requires-Dist: gitpython
 Requires-Dist: pydantic>=2.10
+Requires-Dist: pyyaml
 Requires-Dist: rich
 Requires-Dist: typer>=0.12.4
-Requires-Dist: pyyaml
 Provides-Extra: testing
-Requires-Dist: diracx-testing; extra == "testing"
+Requires-Dist: diracx-testing; extra == 'testing'
 Provides-Extra: types
-Requires-Dist: types-PyYAML; extra == "types"
+Requires-Dist: types-pyyaml; extra == 'types'

diracx_cli-0.0.1a45.dist-info/RECORD

@@ -0,0 +1,14 @@
+diracx/cli/__init__.py,sha256=HB9Umd1DXskg8lrRY0ZnSaOBVYPD5Pl4PYRWts-ZR0E,808
+diracx/cli/__main__.py,sha256=yGjYWjRcrrp5mJ0xD0v3rc7VIA9bzDib5D7LPAdH4OI,92
+diracx/cli/auth.py,sha256=UZ_vhDv2K9qMH_pSFn-6hA6hL7QmBY1a_DzvLoTp-EQ,5003
+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=--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=zfdqO-ydFSkio2CTIcHXlObAwhBq25WNZgdChkdZ1LE,13548
+diracx_cli-0.0.1a45.dist-info/METADATA,sha256=EWz-8JC4mvAfdgsyYZ7d3939eQ0jRi87TTrz6n5CP_A,763
+diracx_cli-0.0.1a45.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+diracx_cli-0.0.1a45.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
+diracx_cli-0.0.1a45.dist-info/RECORD,,

{diracx_cli-0.0.1a43.dist-info → diracx_cli-0.0.1a45.dist-info}/WHEEL

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

diracx_cli-0.0.1a43.dist-info/RECORD

@@ -1,15 +0,0 @@
-diracx/cli/__init__.py,sha256=HB9Umd1DXskg8lrRY0ZnSaOBVYPD5Pl4PYRWts-ZR0E,808
-diracx/cli/__main__.py,sha256=yGjYWjRcrrp5mJ0xD0v3rc7VIA9bzDib5D7LPAdH4OI,92
-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.1a43.dist-info/METADATA,sha256=VaeBqDoMIktkW2WcbVTNRKjYL7D05UbKoMQpiArqYts,803
-diracx_cli-0.0.1a43.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-diracx_cli-0.0.1a43.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
-diracx_cli-0.0.1a43.dist-info/top_level.txt,sha256=vJx10tdRlBX3rF2Psgk5jlwVGZNcL3m_7iQWwgPXt-U,7
-diracx_cli-0.0.1a43.dist-info/RECORD,,

diracx_cli-0.0.1a43.dist-info/top_level.txt

@@ -1 +0,0 @@
-diracx