diracx-cli 0.0.1a45__tar.gz → 0.0.1a47__tar.gz

{diracx_cli-0.0.1a45 → diracx_cli-0.0.1a47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx-cli
-Version: 0.0.1a45
+Version: 0.0.1a47
 Summary: TODO
 License: GPL-3.0-only
 Classifier: Intended Audience :: Science/Research
@@ -17,7 +17,7 @@ Requires-Dist: gitpython
 Requires-Dist: pydantic>=2.10
 Requires-Dist: pyyaml
 Requires-Dist: rich
-Requires-Dist: typer>=0.12.4
+Requires-Dist: typer>=0.15.4
 Provides-Extra: testing
 Requires-Dist: diracx-testing; extra == 'testing'
 Provides-Extra: types

{diracx_cli-0.0.1a45 → diracx_cli-0.0.1a47}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "gitpython",
     "pydantic>=2.10",
     "rich",
-    "typer>=0.12.4",
+    "typer>=0.15.4",
     "pyyaml",
 ]
 dynamic = ["version"]

{diracx_cli-0.0.1a45 → diracx_cli-0.0.1a47}/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.1a45 → diracx_cli-0.0.1a47}/src/diracx/cli/internal/legacy.py

@@ -95,6 +95,7 @@ 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 required
     raw["DIRAC"].pop("ConnConf", None)
@@ -210,7 +211,6 @@ def generate_helm_values(
         },
         "rabbitmq": {"enabled": False},
         "mysql": {"enabled": False},
-        "global": {"images": {"services": "FILL ME"}, "storageClassName": "FILL ME"},
     }
 
     cfg = diraccfg.CFG().loadFromBuffer(public_cfg.read_text())
@@ -264,8 +264,7 @@ def generate_helm_values(
 
     from diracx.core.extensions import select_from_extension
 
-    for entry_point in select_from_extension(group="diracx.db.sql"):
-
+    for entry_point in select_from_extension(group="diracx.dbs.sql"):
         db_name = entry_point.name
         db_config = all_db_configs.get(db_name, {})
 
@@ -284,9 +283,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
 
@@ -311,7 +310,7 @@ def generate_helm_values(
         },
     }
 
-    for entry_point in select_from_extension(group="diracx.db.os"):
+    for entry_point in select_from_extension(group="diracx.dbs.os"):
         db_name = entry_point.name
         db_config = all_db_configs.get(db_name, {})
 

{diracx_cli-0.0.1a45 → diracx_cli-0.0.1a47}/tests/legacy/cs_sync/integration_test.cfg

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