WIP

Author: chrisburr

src/diracx/client/_patch.py

@@ -173,7 +173,8 @@ def refresh_token(
     )
 
     if response.status_code != 200:
-        location.unlink()
+        # Think more
+        # location.unlink()
         raise RuntimeError(
             f"An issue occured while refreshing your access token: {response.json()['detail']}"
         )

src/diracx/routers/dependencies.py

@@ -16,9 +16,11 @@
 from diracx.core.config import Config as _Config
 from diracx.core.config import ConfigSource
 from diracx.core.properties import SecurityProperty
+from diracx.db.os import JobParametersDB as _JobParametersDB
 from diracx.db.sql import AuthDB as _AuthDB
 from diracx.db.sql import JobDB as _JobDB
 from diracx.db.sql import JobLoggingDB as _JobLoggingDB
+from diracx.db.sql import SandboxMetadataDB as _SandboxMetadataDB
 
 T = TypeVar("T")
 
@@ -28,10 +30,16 @@ def add_settings_annotation(cls: T) -> T:
     return Annotated[cls, Depends(cls.create)]  # type: ignore
 
 
-# Databases
+# SQL Databases
 AuthDB = Annotated[_AuthDB, Depends(_AuthDB.transaction)]
 JobDB = Annotated[_JobDB, Depends(_JobDB.transaction)]
 JobLoggingDB = Annotated[_JobLoggingDB, Depends(_JobLoggingDB.transaction)]
+SandboxMetadataDB = Annotated[
+    _SandboxMetadataDB, Depends(_SandboxMetadataDB.transaction)
+]
+
+# OpenSearch Databases
+JobParametersDB = Annotated[_JobParametersDB, Depends(_JobParametersDB.session)]
 
 # Miscellaneous
 Config = Annotated[_Config, Depends(ConfigSource.create)]

src/diracx/routers/job_manager/__init__.py

@@ -27,7 +27,7 @@
 )
 
 from ..auth import UserInfo, has_properties, verify_dirac_access_token
-from ..dependencies import JobDB, JobLoggingDB
+from ..dependencies import JobDB, JobLoggingDB, JobParametersDB
 from ..fastapi_classes import DiracxRouter
 
 MAX_PARAMETRIC_JOBS = 20
@@ -353,6 +353,7 @@ async def get_job_status_history_bulk(
 async def search(
     config: Annotated[Config, Depends(ConfigSource.create)],
     job_db: JobDB,
+    job_parameters_db: JobParametersDB,
     user_info: Annotated[UserInfo, Depends(verify_dirac_access_token)],
     page: int = 0,
     per_page: int = 100,

tests/cli/conftest.py

@@ -11,6 +11,7 @@
 def cli_env(monkeypatch, tmp_path, demo_dir):
     """Set up the environment for the CLI"""
     # HACK: Find the URL of the demo DiracX instance
+    # TODO: Make a preferences file when launching the demo
     helm_values = yaml.safe_load((demo_dir / "values.yaml").read_text())
     host_url = helm_values["dex"]["config"]["issuer"].rsplit(":", 1)[0]
     diracx_url = f"{host_url}:8000"