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

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/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.dist-info → diracx_cli-0.0.1a47.dist-info}/METADATA

@@ -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.dist-info → diracx_cli-0.0.1a47.dist-info}/RECORD

@@ -1,14 +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/auth.py,sha256=kY6cRy6Xv_EkCvtI8-NMAELzSxfzzjWAs69I-IdfGds,5118
 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/internal/legacy.py,sha256=NV28d8_1m3ePL7cEQYQUqXoQDNP1S5jkeilsi7UXAP4,13516
+diracx_cli-0.0.1a47.dist-info/METADATA,sha256=HI6gQuaBE0fXFPehyxYR2velbHIhh9-tdeYm7K6w310,763
+diracx_cli-0.0.1a47.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+diracx_cli-0.0.1a47.dist-info/entry_points.txt,sha256=b1909GHVOkFUiHVglNlpwia4Ug-7Ncrg-8D5xtYVAlw,169
+diracx_cli-0.0.1a47.dist-info/RECORD,,