diracx 0.0.2__tar.gz → 0.0.4__tar.gz

{diracx-0.0.2 → diracx-0.0.4}/.github/workflows/deployment.yml

@@ -35,7 +35,7 @@ jobs:
         # We need extglob for REFERENCE_BRANCH substitution
         shell: bash -l -O extglob {0}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ github.token }}
       - run: |
@@ -82,7 +82,7 @@ jobs:
           # Also build the diracx metapackage
           python -m build --outdir $PWD/dist .
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: diracx-whl
           path: dist/diracx*.whl
@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -111,7 +111,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Download diracx wheels
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
             name: diracx-whl
       - name: "Find wheels"
@@ -172,12 +172,12 @@ jobs:
     if: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
     steps:
       - name: Checkout diracx
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: diracx
 
       - name: Checkout diracx-charts
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: DIRACGrid/diracx-charts
           token: ${{ secrets.CHARTS_UPDATE_TOKEN }}
@@ -236,8 +236,7 @@ jobs:
             - Update image tag to ${{ steps.update-versions.outputs.diracx_version }}
             - Bump chart version from ${{ steps.update-versions.outputs.current_chart_version }} to ${{ steps.update-versions.outputs.new_chart_version }}"
 
-            # Push the commit to main branch
-            git push origin main
+            git push origin master
 
             echo "✅ Successfully pushed chart version ${{ steps.update-versions.outputs.new_chart_version }} and tag ${TAG_NAME}"
           else

{diracx-0.0.2 → diracx-0.0.4}/.github/workflows/integration.yml

@@ -23,7 +23,7 @@ jobs:
         dirac-branch:
           - integration
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: '3.11'
@@ -75,7 +75,7 @@ jobs:
           docker logs diracx 2>&1 | tee /tmp/service-logs/diracx.log
           cd /tmp/DIRACRepo
           ./integration_tests.py logs --no-follow --lines 1000 2>&1 | tee /tmp/service-logs/dirac.log
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         if: ${{ failure() }}
         with:
           name: service-logs-${{ github.job }}

{diracx-0.0.2 → diracx-0.0.4}/.github/workflows/main.yml

@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
-      - uses: prefix-dev/setup-pixi@v0.9.2
+        uses: actions/checkout@v6
+      - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           run-install: false
           post-cleanup: false
-      - uses: prefix-dev/setup-pixi@v0.9.2
+      - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           cache: false
           environments: shellcheck
@@ -52,8 +52,8 @@ jobs:
           - gubbins-cli
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
-      - uses: prefix-dev/setup-pixi@v0.9.2
+        uses: actions/checkout@v6
+      - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           run-install: false
           post-cleanup: false
@@ -64,14 +64,14 @@ jobs:
           rm pixi.toml.bak
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.9.2
+      - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           cache: false
           environments: ${{ matrix.package }}
       - name: Run pytest
         run: pixi run pytest-${{ matrix.package }} --cov-report=xml:coverage.xml --junitxml=report.xml
       - name: Upload coverage report
-        uses: codecov/codecov-action@v5.5.1
+        uses: codecov/codecov-action@v5.5.2
 
   pytest-integration:
     runs-on: ubuntu-latest
@@ -103,8 +103,8 @@ jobs:
           echo "After cleanup:"
           df -h
       - name: Checkout code
-        uses: actions/checkout@v5
-      - uses: prefix-dev/setup-pixi@v0.9.2
+        uses: actions/checkout@v6
+      - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           run-install: false
           post-cleanup: false
@@ -115,7 +115,7 @@ jobs:
           rm pixi.toml.bak
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.9.2
+      - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           cache: false
           environments: ${{ matrix.extension == 'diracx' && 'default' || 'default-gubbins' }}
@@ -167,12 +167,16 @@ jobs:
           demo_args+=("--enable-open-telemetry")
           demo_args+=("--enable-coverage")
           demo_args+=("--exit-when-done")
-          demo_args+=("--set-value" "developer.autoReload=false")
           demo_args+=("--ci-values" "../diracx-charts/demo/ci_values.yaml")
 
           declare -a demo_source_dirs=("$PWD")
 
+          # Download helm/kubectl/kind first
+          ../diracx-charts/run_demo.sh --only-download-deps
+
           if [ ${{ matrix.extension }} == 'gubbins' ]; then
+            demo_args+=("--set-value" "diracx.developer.autoReload=false")
+
             # We have to copy the code to another directory
             # and make it a git repository by itself because otherwise the
             # root in the pyproject do not make sense once mounted
@@ -182,12 +186,19 @@ jobs:
             sed -i 's@../../@@g' /tmp/gubbins/gubbins-*/pyproject.toml
             git init /tmp/gubbins/
 
+            # Copy gubbins-charts to a temporary location and build dependencies
+            cp -r ./extensions/gubbins-charts /tmp/
+            ../diracx-charts/.demo/helm dependency build /tmp/gubbins-charts
+
+            demo_args+=("--extension-chart-path" "/tmp/gubbins-charts")
             demo_args+=("--ci-values" "./extensions/gubbins_values.yaml")
             demo_args+=("--load-docker-image" "gubbins/services:dev")
             demo_source_dirs+=("/tmp/gubbins/")
           elif [ ${{ matrix.extension }} != 'diracx' ]; then
             echo "Unknown extension: ${{ matrix.extension }}"
             exit 1
+          else
+            demo_args+=("--set-value" "developer.autoReload=false")
           fi
 
           # Run the demo with the provided arguments
@@ -218,7 +229,7 @@ jobs:
         run: |
           pixi run -e ${{ matrix.extension == 'diracx' && 'default' || 'default-gubbins' }} python -m diracx.testing coverage collect-demo --demo-dir=../diracx-charts/.demo
       - name: Upload coverage report
-        uses: codecov/codecov-action@v5.5.1
+        uses: codecov/codecov-action@v5.5.2
         with:
           files: ./coverage-pytest.xml,./coverage-demo.xml
 
@@ -230,12 +241,12 @@ jobs:
         package: [diracx, gubbins]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
-      - uses: prefix-dev/setup-pixi@v0.9.2
+        uses: actions/checkout@v6
+      - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           run-install: false
           post-cleanup: false
-      - uses: prefix-dev/setup-pixi@v0.9.2
+      - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           cache: false
           locked: false

{diracx-0.0.2 → diracx-0.0.4}/.github/workflows/update_security_txt_expiry.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -74,7 +74,7 @@ jobs:
 
       - name: Create Pull Request
         if: steps.update_script.outputs.changes_made == 'true'
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "chore(security): Update security.txt expiry date"

{diracx-0.0.2 → diracx-0.0.4}/.github/workflows/vulnerabilities.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           tags: true

{diracx-0.0.2 → diracx-0.0.4}/.pre-commit-config.yaml

@@ -30,14 +30,14 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.14.1'
+    rev: 'v0.14.11'
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.18.2
+    rev: v1.19.1
     hooks:
       - id: mypy
         additional_dependencies:
@@ -56,6 +56,7 @@ repos:
     hooks:
     - id: mdformat
       args: ["--number"]
+      exclude: ^CHANGELOG\.md$
       additional_dependencies:
       - mdformat-mkdocs
       - mdformat-gfm

diracx-0.0.4/CHANGELOG.md

@@ -0,0 +1,45 @@
+# Changelog
+
+## [0.0.4](https://github.com/DIRACGrid/diracx/compare/v0.0.3...v0.0.4) (2026-01-19)
+
+
+### Bug Fixes
+
+* use extension-aware Config discovery in testing fixture ([#727](https://github.com/DIRACGrid/diracx/issues/727)) ([49d0fb8](https://github.com/DIRACGrid/diracx/commit/49d0fb8c2718a5668f330219025832365119d15d))
+
+## [0.0.3](https://github.com/DIRACGrid/diracx/compare/v0.0.2...v0.0.3) (2026-01-19)
+
+
+### Features
+
+* add gubbins-charts Helm chart for gubbins extension ([#691](https://github.com/DIRACGrid/diracx/issues/691)) ([649f318](https://github.com/DIRACGrid/diracx/commit/649f318daa8eeaec177cfde4bc2830a2a89a9058))
+
+
+### Bug Fixes
+
+* do not use Any from pyparsing ([#725](https://github.com/DIRACGrid/diracx/issues/725)) ([b3873a1](https://github.com/DIRACGrid/diracx/commit/b3873a1d8859b670ac61e4d124a91a38f2e9c807))
+* ensure database commits complete before HTTP responses ([#722](https://github.com/DIRACGrid/diracx/issues/722)) ([4685790](https://github.com/DIRACGrid/diracx/commit/46857909b9259c13e8603b2cbaecb212d3229784))
+* exclude CHANGELOG.md from mdformat ([639026a](https://github.com/DIRACGrid/diracx/commit/639026a19605afd8ae94c67f36bd90b5c381b45b))
+* move cern-specific config option from diracx to lhcbdiracx ([#694](https://github.com/DIRACGrid/diracx/issues/694)) ([927d51b](https://github.com/DIRACGrid/diracx/commit/927d51bb8cf21b5e4f82c53b7e04bf0e72435806))
+* support additional config hints ([#690](https://github.com/DIRACGrid/diracx/issues/690)) ([c265a47](https://github.com/DIRACGrid/diracx/commit/c265a47363850662502bb7f0fb8ebbbe94893e85))
+
+
+### Miscellaneous Chores
+
+* release 0.0.3 ([dbc726c](https://github.com/DIRACGrid/diracx/commit/dbc726c2e6ac1ed5555b8144b01fea71b5e897ba))
+
+## [0.0.2](https://github.com/DIRACGrid/diracx/compare/v0.0.1...v0.0.2) (2025-10-22)
+
+### Bug Fixes
+
+- correct release-please integration in deployment workflow ([#683](https://github.com/DIRACGrid/diracx/issues/683)) ([0084328](https://github.com/DIRACGrid/diracx/commit/00843286b49a2a075226ad47af746d03b9413d60))
+
+## [0.0.1](https://github.com/DIRACGrid/diracx/compare/v0.0.1...v0.0.1) (2025-10-22)
+
+### Features
+
+- DiracX is here! This is the companion release of DIRAC v9 and the first non-prerelease version of DiracX.
+
+### Miscellaneous Chores
+
+- release 0.0.1 ([615014d](https://github.com/DIRACGrid/diracx/commit/615014dcf87d985c7b286b1c8d94e4c4520d8463))

{diracx-0.0.2 → diracx-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx
-Version: 0.0.2
+Version: 0.0.4
 Summary: Client installation for users of DiracX installations
 License: GPL-3.0-only
 License-File: LICENSE

{diracx-0.0.2 → diracx-0.0.4}/diracx-core/src/diracx/core/config/schema.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import os
-from datetime import date, datetime
+from datetime import datetime
 from typing import Annotated, Any, MutableMapping, TypeVar
 
 from pydantic import BaseModel as _BaseModel
@@ -35,24 +35,34 @@ class BaseModel(_BaseModel):
         """Apply transformations to interpret the legacy DIRAC CFG format."""
         if not os.environ.get("DIRAC_COMPAT_ENABLE_CS_CONVERSION"):
             return v
+
         # If we're running with DIRAC_COMPAT_ENABLE_CS_CONVERSION set we apply
         # some hacky transformations to the content to ease the transition from
         # a CFG file. This is done by analysing the type hints as strings
         # though ideally we should parse the type hints properly.
+        convertible_hints = {
+            "list[str]",
+            "SerializableSet[str]",
+            "SerializableSet[SecurityProperty]",
+        }
         for field, hint in cls.__annotations__.items():
             # Convert comma separated lists to actual lists
             if hint.startswith("set"):
                 raise NotImplementedError("Use SerializableSet instead!")
-            if hint in {
-                "list[str]",
-                "SerializableSet[str]",
-                "SerializableSet[SecurityProperty]",
-            } and isinstance(v.get(field), str):
+
+            if field not in v:
+                continue
+
+            # Get the base hint without the optional part
+            base_hint = hint.split(" | ")[0].strip()
+
+            # Convert comma-separated strings to lists
+            if base_hint in convertible_hints and isinstance(v[field], str):
                 v[field] = [x.strip() for x in v[field].split(",") if x.strip()]
+
             # If the field is optional and the value is "None" convert it to None
-            if "| None" in hint and field in v:
-                if v[field] == "None":
-                    v[field] = None
+            if "| None" in hint and v[field] == "None":
+                v[field] = None
         return v
 
 
@@ -62,13 +72,6 @@ class UserConfig(BaseModel):
     Email: EmailStr | None = None
     Suspended: list[str] = []
     Quota: int | None = None
-    # TODO: These should be LHCbDIRAC specific
-    CERNAccountType: str | None = None
-    PrimaryCERNAccount: str | None = None
-    CERNPersonId: int | None = None
-
-    # Mapping from VO name to affiliation end date (YYYY-MM-DD)
-    AffiliationEnds: dict[str, date] = Field(default_factory=dict)
 
 
 class GroupConfig(BaseModel):

{diracx-0.0.2 → diracx-0.0.4}/diracx-core/src/diracx/core/settings.py

@@ -175,7 +175,7 @@ class SandboxStoreSettings(ServiceSettingsBase):
     model_config = SettingsConfigDict(env_prefix="DIRACX_SANDBOX_STORE_")
 
     bucket_name: str
-    s3_client_kwargs: dict[str, str]
+    s3_client_kwargs: dict[str, Any]
     auto_create_bucket: bool = False
     url_validity_seconds: int = 5 * 60
     se_name: str = "SandboxSE"

diracx-0.0.4/diracx-core/tests/test_schema_legacy_adaptor.py

@@ -0,0 +1,179 @@
+"""Test the legacy_adaptor functionality in BaseModel for CS conversion."""
+
+from __future__ import annotations
+
+import os
+
+import pytest
+from pydantic import ValidationError
+
+from diracx.core.config.schema import BaseModel, SerializableSet
+from diracx.core.properties import NORMAL_USER, PRODUCTION_MANAGEMENT, SecurityProperty
+
+
+# Note: In the following tests we use BaseModel coming from the config schema module!
+class SimpleModel(BaseModel):
+    """Test model with various field types that should be handled by legacy_adaptor."""
+
+    # Non-optional list
+    required_list: list[str]
+
+    # Optional list
+    optional_list: list[str] | None = None
+
+    # Non-optional SerializableSet
+    required_set: SerializableSet[str]
+
+    # Optional SerializableSet
+    optional_set: SerializableSet[str] | None = None
+
+    # Optional SerializableSet with SecurityProperty
+    optional_security_set: SerializableSet[SecurityProperty] | None = None
+
+
+def test_legacy_adaptor_without_env_var():
+    """Test that legacy_adaptor does nothing when DIRAC_COMPAT_ENABLE_CS_CONVERSION is not set."""
+    # Ensure the env var is not set
+    os.environ.pop("DIRAC_COMPAT_ENABLE_CS_CONVERSION", None)
+
+    with pytest.raises(ValidationError) as exc_info:
+        SimpleModel.model_validate(
+            {
+                "required_list": "item1, item2",
+                "required_set": "item3, item4",
+            }
+        )
+
+    # Verify the error is about type validation
+    errors = exc_info.value.errors()
+    assert any(error["type"] == "list_type" for error in errors)
+
+
+def test_legacy_adaptor_required_list(monkeypatch):
+    """Test that required list[str] fields are converted from comma-separated strings."""
+    monkeypatch.setenv("DIRAC_COMPAT_ENABLE_CS_CONVERSION", "yes")
+
+    model = SimpleModel.model_validate(
+        {
+            "required_list": "xroot, root",
+            "required_set": "item1, item2",
+        }
+    )
+
+    assert model.required_list == ["xroot", "root"]
+    assert model.required_set == {"item1", "item2"}
+
+
+def test_legacy_adaptor_optional_list_with_value(monkeypatch):
+    """Test that optional list[str] | None fields are converted from comma-separated strings.
+
+    This is the failing test case that reproduces the issue from the certification environment.
+    """
+    monkeypatch.setenv("DIRAC_COMPAT_ENABLE_CS_CONVERSION", "yes")
+
+    model = SimpleModel.model_validate(
+        {
+            "required_list": "item1",
+            "required_set": "item2",
+            "optional_list": "xroot, root",
+        }
+    )
+
+    assert model.optional_list == ["xroot", "root"]
+
+
+def test_legacy_adaptor_optional_list_with_none(monkeypatch):
+    """Test that optional list fields can be None."""
+    monkeypatch.setenv("DIRAC_COMPAT_ENABLE_CS_CONVERSION", "yes")
+
+    model = SimpleModel.model_validate(
+        {
+            "required_list": "item1",
+            "required_set": "item2",
+            "optional_list": None,
+        }
+    )
+
+    assert model.optional_list is None
+
+
+def test_legacy_adaptor_optional_set_with_value(monkeypatch):
+    """Test that optional SerializableSet[str] | None fields are converted."""
+    monkeypatch.setenv("DIRAC_COMPAT_ENABLE_CS_CONVERSION", "yes")
+
+    model = SimpleModel.model_validate(
+        {
+            "required_list": "item1",
+            "required_set": "item2",
+            "optional_set": "value1, value2, value3",
+        }
+    )
+
+    assert model.optional_set == {"value1", "value2", "value3"}
+
+
+def test_legacy_adaptor_optional_security_property_set(monkeypatch):
+    """Test that optional SerializableSet[SecurityProperty] | None fields are converted."""
+    monkeypatch.setenv("DIRAC_COMPAT_ENABLE_CS_CONVERSION", "yes")
+
+    model = SimpleModel.model_validate(
+        {
+            "required_list": "item1",
+            "required_set": "item2",
+            "optional_security_set": "NormalUser, ProductionManagement",
+        }
+    )
+
+    assert model.optional_security_set == {
+        NORMAL_USER,
+        PRODUCTION_MANAGEMENT,
+    }
+
+
+def test_legacy_adaptor_whitespace_handling(monkeypatch):
+    """Test that whitespace is properly stripped from comma-separated values."""
+    monkeypatch.setenv("DIRAC_COMPAT_ENABLE_CS_CONVERSION", "yes")
+
+    model = SimpleModel.model_validate(
+        {
+            "required_list": "  item1  ,  item2  ,  item3  ",
+            "required_set": "value1,value2,  value3  ",
+            "optional_list": "xroot,   root,   gsiftp",
+        }
+    )
+
+    assert model.required_list == ["item1", "item2", "item3"]
+    assert model.required_set == {"value1", "value2", "value3"}
+    assert model.optional_list == ["xroot", "root", "gsiftp"]
+
+
+def test_legacy_adaptor_empty_values(monkeypatch):
+    """Test that empty values are properly filtered out."""
+    monkeypatch.setenv("DIRAC_COMPAT_ENABLE_CS_CONVERSION", "yes")
+
+    model = SimpleModel.model_validate(
+        {
+            "required_list": "item1,,item2,,,item3",  # Empty values between commas
+            "required_set": "value1, , value2",  # Empty value with spaces
+        }
+    )
+
+    assert model.required_list == ["item1", "item2", "item3"]
+    assert model.required_set == {"value1", "value2"}
+
+
+def test_legacy_adaptor_already_list(monkeypatch):
+    """Test that fields that are already lists are not modified."""
+    monkeypatch.setenv("DIRAC_COMPAT_ENABLE_CS_CONVERSION", "yes")
+
+    model = SimpleModel.model_validate(
+        {
+            "required_list": ["already", "a", "list"],
+            "required_set": ["already", "a", "list"],
+            "optional_list": ["also", "a", "list"],
+        }
+    )
+
+    assert model.required_list == ["already", "a", "list"]
+    assert model.required_set == {"already", "a", "list"}
+    assert model.optional_list == ["also", "a", "list"]

{diracx-0.0.2 → diracx-0.0.4}/diracx-logic/src/diracx/logic/jobs/sandboxes.py

@@ -2,9 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import logging
-from typing import TYPE_CHECKING, Literal
-
-from pyparsing import Any
+from typing import TYPE_CHECKING, Any, Literal
 
 from diracx.core.exceptions import SandboxAlreadyInsertedError, SandboxNotFoundError
 from diracx.core.models import (

{diracx-0.0.2 → diracx-0.0.4}/diracx-routers/src/diracx/routers/dependencies.py

@@ -12,6 +12,7 @@ __all__ = (
     "AvailableSecurityProperties",
 )
 
+from functools import partial
 from typing import Annotated, TypeVar
 
 from fastapi import Depends
@@ -32,6 +33,10 @@ from diracx.db.sql import TaskQueueDB as _TaskQueueDB
 
 T = TypeVar("T")
 
+# Use scope="function" to ensure DB commits happen before sending HTTP responses
+# This prevents race conditions when DIRAC immediately queries data after DiracX writes it
+DBDepends = partial(Depends, scope="function")
+
 
 def add_settings_annotation(cls: T) -> T:
     """Add a `Depends` annotation to a class that has a `create` classmethod."""
@@ -39,17 +44,17 @@ def add_settings_annotation(cls: T) -> T:
 
 
 # Databases
-AuthDB = Annotated[_AuthDB, Depends(_AuthDB.transaction)]
-JobDB = Annotated[_JobDB, Depends(_JobDB.transaction)]
-JobLoggingDB = Annotated[_JobLoggingDB, Depends(_JobLoggingDB.transaction)]
-PilotAgentsDB = Annotated[_PilotAgentsDB, Depends(_PilotAgentsDB.transaction)]
+AuthDB = Annotated[_AuthDB, DBDepends(_AuthDB.transaction)]
+JobDB = Annotated[_JobDB, DBDepends(_JobDB.transaction)]
+JobLoggingDB = Annotated[_JobLoggingDB, DBDepends(_JobLoggingDB.transaction)]
+PilotAgentsDB = Annotated[_PilotAgentsDB, DBDepends(_PilotAgentsDB.transaction)]
 SandboxMetadataDB = Annotated[
-    _SandboxMetadataDB, Depends(_SandboxMetadataDB.transaction)
+    _SandboxMetadataDB, DBDepends(_SandboxMetadataDB.transaction)
 ]
-TaskQueueDB = Annotated[_TaskQueueDB, Depends(_TaskQueueDB.transaction)]
+TaskQueueDB = Annotated[_TaskQueueDB, DBDepends(_TaskQueueDB.transaction)]
 
 # Opensearch databases
-JobParametersDB = Annotated[_JobParametersDB, Depends(_JobParametersDB.session)]
+JobParametersDB = Annotated[_JobParametersDB, DBDepends(_JobParametersDB.session)]
 
 
 # Miscellaneous

{diracx-0.0.2 → diracx-0.0.4}/diracx-routers/src/diracx/routers/jobs/sandboxes.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
 from http import HTTPStatus
-from typing import Annotated, Literal
+from typing import Annotated, Any, Literal
 
 from fastapi import Body, Depends, HTTPException, Query
-from pyparsing import Any
 
 from diracx.core.exceptions import SandboxAlreadyAssignedError, SandboxNotFoundError
 from diracx.core.models import (

{diracx-0.0.2 → diracx-0.0.4}/diracx-testing/src/diracx/testing/utils.py

@@ -417,13 +417,16 @@ def client_factory(session_client_factory, request):
 def with_config_repo(tmp_path_factory):
     from git import Repo
 
-    from diracx.core.config import Config
+    from diracx.core.extensions import select_from_extension
+
+    # Use extension-aware Config discovery to support extensions that add fields
+    config_class = select_from_extension(group="diracx", name="config")[0].load()
 
     tmp_path = tmp_path_factory.mktemp("cs-repo")
 
     repo = Repo.init(tmp_path, initial_branch="master")
     cs_file = tmp_path / "default.yml"
-    example_cs = Config.model_validate(
+    example_cs = config_class.model_validate(
         {
             "DIRAC": {},
             "Registry": {
@@ -529,7 +532,12 @@ def demo_urls(demo_dir):
     import yaml
 
     helm_values = yaml.safe_load((demo_dir / "values.yaml").read_text())
-    yield helm_values["developer"]["urls"]
+    try:
+        yield helm_values["developer"]["urls"]
+    except KeyError:
+        # If we're testing an extension they will have an umbrella chart so the
+        # URLs are under a "diracx" section corrosponding to the vanilla chart
+        yield helm_values["diracx"]["developer"]["urls"]
 
 
 @pytest.fixture(scope="session")