diracx-cli 0.0.1a44__tar.gz → 0.0.1a46__tar.gz

diracx_cli-0.0.1a46/.gitignore

@@ -0,0 +1,98 @@
+# Python
+*.py[cod]
+
+# Conda
+.conda
+
+# C extensions
+*.so
+var
+sdist
+lib
+lib64
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+develop-eggs
+.installed.cfg
+*.whl
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+.ruff_cache
+.mypy_cache
+
+# Eclipse
+.project
+.pydevproject
+.pyproject
+.settings
+.metadata
+
+#VSCode
+.vscode
+.env
+
+# Vim
+.*.sw[a-z]
+*.un~
+Session.vim
+*~
+
+# Intellij
+.idea/
+LHCbDIRAC.iml
+
+# MaxOSX files
+.DS_Store
+
+# test stuff
+.pytest_cache
+.cache
+__pycache__
+pytests.xml
+nosetests.xml
+coverage.xml
+Local_*
+.hypothesis
+*.gz
+htmlcov/
+*.xml.temp
+
+#remove in case we want a specific LHCb one
+.pylintrc
+
+# docs
+# this is auto generated
+docs/source/CodeDocumentation/
+docs/source/AdministratorGuide/Configuration/ExampleConfig.rst
+docs/source/AdministratorGuide/CommandReference
+docs/source/UserGuide/CommandReference
+docs/_build
+docs/source/_build
+
+
+# CMT junk
+/*/*/x86_64-*-*-*/
+*/*/cmt/Makefile
+
+# pixi environments
+.pixi
+pixi.lock
+*.egg-info

{diracx_cli-0.0.1a44 → diracx_cli-0.0.1a46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-cli
-Version: 0.0.1a44
+Version: 0.0.1a46
 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: rich
-Requires-Dist: typer>=0.12.4
 Requires-Dist: pyyaml
+Requires-Dist: rich
+Requires-Dist: typer>=0.15.4
 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.1a44 → diracx_cli-0.0.1a46}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "gitpython",
     "pydantic>=2.10",
     "rich",
-    "typer>=0.12.4",
+    "typer>=0.15.4",
     "pyyaml",
 ]
 dynamic = ["version"]
@@ -45,16 +45,19 @@ internal = "diracx.cli.internal:app"
 
 
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
 [build-system]
-requires = ["setuptools>=61", "wheel", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
 
-[tool.setuptools_scm]
+[tool.hatch.version.raw-options]
 root = ".."
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/diracx"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 addopts = [

{diracx_cli-0.0.1a44 → diracx_cli-0.0.1a46}/src/diracx/cli/auth.py

@@ -12,7 +12,9 @@ from typing import Annotated, Optional
 import typer
 
 from diracx.client.aio import AsyncDiracClient
-from diracx.client.models import DeviceFlowErrorResponse
+
+# See https://github.com/DIRACGrid/diracx/issues/578
+from diracx.client.models import DeviceFlowErrorResponse  # type: ignore [attr-defined]
 from diracx.core.preferences import get_diracx_preferences
 from diracx.core.utils import read_credentials, write_credentials
 
@@ -88,7 +90,9 @@ async def login(
         )
         while expires > datetime.now(tz=timezone.utc):
             print(".", end="", flush=True)
-            response = await api.auth.get_oidc_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-0.0.1a44 → diracx_cli-0.0.1a46}/src/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-0.0.1a44 → diracx_cli-0.0.1a46}/src/diracx/cli/internal/legacy.py

@@ -95,8 +95,9 @@ def _apply_fixes(raw):
     raw["DIRAC"].pop("Extensions", None)
     raw["DIRAC"].pop("Framework", None)
     raw["DIRAC"].pop("Security", None)
+    raw["DIRAC"].pop("PreferredURLPatterns", 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
@@ -265,7 +266,6 @@ def generate_helm_values(
     from diracx.core.extensions import select_from_extension
 
     for entry_point in select_from_extension(group="diracx.db.sql"):
-
         db_name = entry_point.name
         db_config = all_db_configs.get(db_name, {})
 
@@ -284,9 +284,9 @@ def generate_helm_values(
         if "Password" in db_config:
             sql_dbs["dbs"][db_name]["password"] = db_config.get("Password")
         if "Host" in db_config or "Port" in db_config:
-            sql_dbs["dbs"][db_name][
-                "host"
-            ] = f"{db_config.get('Host', default_db_host)}:{db_config.get('Port', default_db_port)}"
+            sql_dbs["dbs"][db_name]["host"] = (
+                f"{db_config.get('Host', default_db_host)}:{db_config.get('Port', default_db_port)}"
+            )
         if not sql_dbs["dbs"][db_name]:
             sql_dbs["dbs"][db_name] = None
 

{diracx_cli-0.0.1a44 → diracx_cli-0.0.1a46}/tests/legacy/cs_sync/integration_test.cfg

@@ -1,6 +1,7 @@
 DIRAC
 {
   VirtualOrganization = vo
+  PreferredURLPatterns = .*\.main\.invalid/.*
   Configuration
   {
     Name = Production

diracx_cli-0.0.1a44/setup.cfg

@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-

diracx_cli-0.0.1a44/src/diracx_cli.egg-info/PKG-INFO

@@ -1,25 +0,0 @@
-Metadata-Version: 2.4
-Name: diracx-cli
-Version: 0.0.1a44
-Summary: TODO
-License: GPL-3.0-only
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-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: rich
-Requires-Dist: typer>=0.12.4
-Requires-Dist: pyyaml
-Provides-Extra: testing
-Requires-Dist: diracx-testing; extra == "testing"
-Provides-Extra: types
-Requires-Dist: types-PyYAML; extra == "types"

diracx_cli-0.0.1a44/src/diracx_cli.egg-info/SOURCES.txt

@@ -1,27 +0,0 @@
-README.md
-pyproject.toml
-src/diracx/cli/__init__.py
-src/diracx/cli/__main__.py
-src/diracx/cli/auth.py
-src/diracx/cli/config.py
-src/diracx/cli/jobs.py
-src/diracx/cli/py.typed
-src/diracx/cli/utils.py
-src/diracx/cli/internal/__init__.py
-src/diracx/cli/internal/config.py
-src/diracx/cli/internal/legacy.py
-src/diracx_cli.egg-info/PKG-INFO
-src/diracx_cli.egg-info/SOURCES.txt
-src/diracx_cli.egg-info/dependency_links.txt
-src/diracx_cli.egg-info/entry_points.txt
-src/diracx_cli.egg-info/requires.txt
-src/diracx_cli.egg-info/top_level.txt
-tests/test_internal.py
-tests/test_jobs.py
-tests/test_login.py
-tests/legacy/test_legacy.py
-tests/legacy/cs_sync/integration_test.cfg
-tests/legacy/cs_sync/integration_test.yaml
-tests/legacy/cs_sync/integration_test_buggy.cfg
-tests/legacy/cs_sync/integration_test_secret.cfg
-tests/legacy/cs_sync/test_cssync.py

diracx_cli-0.0.1a44/src/diracx_cli.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

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

@@ -1,9 +0,0 @@
-[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.1a44/src/diracx_cli.egg-info/requires.txt

@@ -1,15 +0,0 @@
-diraccfg
-diracx-api
-diracx-client
-diracx-core
-gitpython
-pydantic>=2.10
-rich
-typer>=0.12.4
-pyyaml
-
-[testing]
-diracx-testing
-
-[types]
-types-PyYAML

diracx_cli-0.0.1a44/src/diracx_cli.egg-info/top_level.txt

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