diracx 0.0.6__tar.gz → 0.0.8__tar.gz

diracx-0.0.8/.github/scripts/collect-k8s-debug-info.sh

@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+# Collect Kubernetes debug information with GitHub Actions formatting
+# Usage: collect-k8s-debug-info.sh <demo_dir> [service_prefix]
+#   demo_dir: Path to demo directory containing kube.conf
+#   service_prefix: Pod name prefix for main services (default: diracx)
+
+set -euo pipefail
+
+DEMO_DIR="${1:?Usage: $0 <demo_dir> [service_prefix]}"
+SERVICE_PREFIX="${2:-diracx}"
+
+export KUBECONFIG="${DEMO_DIR}/kube.conf"
+export PATH="${DEMO_DIR}:$PATH"
+
+INFRA_PODS="(dex|minio|mysql|rabbitmq|opensearch)"
+
+# Function to output all info for a single pod
+output_pod_info() {
+  local pod_name="$1"
+  local tail_arg=("${@:2}")
+
+  echo "=== Pod Description ==="
+  kubectl describe pod/"${pod_name}" 2>&1 || true
+
+  # Init containers
+  init_containers=$(kubectl get pods "$pod_name" -o jsonpath='{.spec.initContainers[*].name}' 2>/dev/null || true)
+  if [ -n "$init_containers" ]; then
+    echo ""
+    echo "=== Init Container Logs ==="
+    for container_name in $init_containers; do
+      echo "--- $container_name ---"
+      kubectl logs "${pod_name}" -c "${container_name}" "${tail_arg[@]}" 2>&1 || true
+    done
+  fi
+
+  # Main containers
+  echo ""
+  echo "=== Container Logs ==="
+  for container_name in $(kubectl get pods "$pod_name" -o jsonpath='{.spec.containers[*].name}'); do
+    echo "--- $container_name ---"
+    kubectl logs "${pod_name}" -c "${container_name}" "${tail_arg[@]}" 2>&1 || true
+  done
+}
+
+# === JOB SUMMARY ===
+{
+  echo "## 🔍 Integration Test Debug Summary"
+  echo ""
+  echo "### Pod Status"
+  echo '```'
+  kubectl get pods -o wide
+  echo '```'
+  echo ""
+} >> "${GITHUB_STEP_SUMMARY:-/dev/null}"
+
+# === POD STATUS OVERVIEW ===
+echo "::group::📋 Pod Status Overview"
+kubectl get pods -o wide
+echo "::endgroup::"
+
+# === MAIN SERVICE PODS (shown first) ===
+for pod_name in $(kubectl get pods -o json | jq -r '.items[] | .metadata.name' | grep -E "^${SERVICE_PREFIX}-" || true); do
+  echo "::group::🚀 ${pod_name}"
+  output_pod_info "$pod_name"
+  echo "::endgroup::"
+done
+
+# === OTHER APPLICATION PODS ===
+for pod_name in $(kubectl get pods -o json | jq -r '.items[] | .metadata.name' | grep -vE "$INFRA_PODS" | grep -vE "^${SERVICE_PREFIX}-" || true); do
+  if [ -n "$pod_name" ]; then
+    echo "::group::📦 ${pod_name}"
+    output_pod_info "$pod_name"
+    echo "::endgroup::"
+  fi
+done
+
+# === INFRASTRUCTURE PODS ===
+for pod_name in $(kubectl get pods -o json | jq -r '.items[] | .metadata.name' | grep -E "$INFRA_PODS" || true); do
+  echo "::group::🏗️ ${pod_name}"
+  output_pod_info "$pod_name" --tail=100
+  echo "::endgroup::"
+done
+
+# === ERROR SUMMARY WITH ANNOTATIONS ===
+echo "::group::⚠️ Error Summary"
+error_count=0
+for pod_name in $(kubectl get pods -o json | jq -r '.items[] | .metadata.name' | grep -E "^${SERVICE_PREFIX}-" || true); do
+  for container_name in $(kubectl get pods "$pod_name" -o jsonpath='{.spec.containers[*].name}'); do
+    errors=$(kubectl logs "${pod_name}" -c "${container_name}" 2>&1 | grep -iE "(ERROR|CRITICAL|Exception|Traceback)" | head -5 || true)
+    if [ -n "$errors" ]; then
+      echo "Errors in ${pod_name}/${container_name}:"
+      echo "$errors"
+      echo ""
+      # Add annotation (limited to avoid exceeding quota)
+      if [ $error_count -lt 8 ]; then
+        first_error=$(echo "$errors" | head -1 | cut -c1-200)
+        echo "::warning title=Error in ${pod_name}/${container_name}::${first_error}"
+        ((error_count++)) || true
+      fi
+    fi
+  done
+done
+if [ $error_count -eq 0 ]; then
+  echo "No errors found in ${SERVICE_PREFIX} service logs"
+fi
+echo "::endgroup::"
+
+# === CHECK FOR DEMO SUCCESS ===
+if [ ! -f "${DEMO_DIR}/.success" ]; then
+  echo "::error title=Demo Failed::Demo did not complete successfully"
+  {
+    echo ""
+    echo "## ❌ Demo Failed"
+    echo '```'
+    cat "${DEMO_DIR}/.failed" 2>/dev/null || echo "No failure details available"
+    echo '```'
+  } >> "${GITHUB_STEP_SUMMARY:-/dev/null}"
+  cat "${DEMO_DIR}/.failed" 2>/dev/null || true
+  exit 1
+fi
+
+echo "✅ Demo completed successfully"

{diracx-0.0.6 → diracx-0.0.8}/.github/workflows/deployment.yml

@@ -5,6 +5,8 @@ on:
     tags:
       - 'v*'
   pull_request:
+    paths-ignore:
+      - 'CHANGELOG.md'
   schedule:
     - cron: '0 10 * * *'
 

{diracx-0.0.6 → diracx-0.0.8}/.github/workflows/generate_pixi_tasks_doc.py

@@ -18,6 +18,8 @@ def get_task_group(task_name):
         return "Client Generation"
     if task_name == "shellcheck":
         return "Shellcheck"
+    if task_name.startswith("generate-settings-"):
+        return "Settings"
     return "Default"
 
 

{diracx-0.0.6 → diracx-0.0.8}/.github/workflows/integration.yml

@@ -7,6 +7,8 @@ on:
   pull_request:
     branches:
       - main
+    paths-ignore:
+      - 'CHANGELOG.md'
 
 defaults:
   run:

{diracx-0.0.6 → diracx-0.0.8}/.github/workflows/main.yml

@@ -7,6 +7,8 @@ on:
   pull_request:
     branches:
       - main
+    paths-ignore:
+      - 'CHANGELOG.md'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -18,11 +20,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-      - uses: prefix-dev/setup-pixi@v0.9.3
+      - uses: prefix-dev/setup-pixi@v0.9.4
         with:
           run-install: false
           post-cleanup: false
-      - uses: prefix-dev/setup-pixi@v0.9.3
+      - uses: prefix-dev/setup-pixi@v0.9.4
         with:
           cache: false
           environments: shellcheck
@@ -53,7 +55,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-      - uses: prefix-dev/setup-pixi@v0.9.3
+      - uses: prefix-dev/setup-pixi@v0.9.4
         with:
           run-install: false
           post-cleanup: false
@@ -64,7 +66,7 @@ jobs:
           rm pixi.toml.bak
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.9.3
+      - uses: prefix-dev/setup-pixi@v0.9.4
         with:
           cache: false
           environments: ${{ matrix.package }}
@@ -104,7 +106,7 @@ jobs:
           df -h
       - name: Checkout code
         uses: actions/checkout@v6
-      - uses: prefix-dev/setup-pixi@v0.9.3
+      - uses: prefix-dev/setup-pixi@v0.9.4
         with:
           run-install: false
           post-cleanup: false
@@ -115,7 +117,7 @@ jobs:
           rm pixi.toml.bak
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.9.3
+      - uses: prefix-dev/setup-pixi@v0.9.4
         with:
           cache: false
           environments: ${{ matrix.extension == 'diracx' && 'default' || 'default-gubbins' }}
@@ -205,23 +207,8 @@ jobs:
           set -x
           ../diracx-charts/run_demo.sh "${demo_args[@]}" "${demo_source_dirs[@]}"
       - name: Debugging information
-        run: |
-          DIRACX_DEMO_DIR=$PWD/../diracx-charts/.demo
-          export KUBECONFIG=${DIRACX_DEMO_DIR}/kube.conf
-          export PATH=${DIRACX_DEMO_DIR}:$PATH
-          kubectl get pods
-          for pod_name in $(kubectl get pods -o json | jq -r '.items[] | .metadata.name' | grep -vE '(dex|minio|mysql|rabbitmq|opensearch)'); do
-            echo "${pod_name}"
-            kubectl describe pod/"${pod_name}" || true
-            for container_name in $(kubectl get pods $pod_name -o jsonpath='{.spec.initContainers[*].name} {.spec.containers[*].name}'); do
-              echo $pod_name $container_name
-              kubectl logs "${pod_name}" -c "${container_name}" || true
-            done
-          done
-          if [ ! -f "${DIRACX_DEMO_DIR}/.success" ]; then
-            cat "${DIRACX_DEMO_DIR}/.failed"
-            exit 1
-          fi
+        if: always()
+        run: .github/scripts/collect-k8s-debug-info.sh "$PWD/../diracx-charts/.demo" "${{ matrix.extension == 'gubbins' && 'gubbins' || 'diracx' }}"
       - name: Run pytest
         run: |
           pixi run pytest-${{ matrix.extension }} --demo-dir="$PWD/../diracx-charts/" --cov-report=xml:coverage-pytest.xml --junitxml=report.xml
@@ -242,11 +229,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-      - uses: prefix-dev/setup-pixi@v0.9.3
+      - uses: prefix-dev/setup-pixi@v0.9.4
         with:
           run-install: false
           post-cleanup: false
-      - uses: prefix-dev/setup-pixi@v0.9.3
+      - uses: prefix-dev/setup-pixi@v0.9.4
         with:
           cache: false
           locked: false

{diracx-0.0.6 → diracx-0.0.8}/.github/workflows/update_chart_version.py

@@ -221,7 +221,7 @@ def lookup_dependency_chart_version(
 
 
 def main() -> None:
-    """Main function."""
+    """Run the Main."""
     parser = argparse.ArgumentParser(
         description="Update chart versions for DiracX release"
     )

{diracx-0.0.6 → diracx-0.0.8}/.gitignore

@@ -96,3 +96,7 @@ docs/source/_build
 .pixi
 pixi.lock
 *.egg-info
+docs/templates/_builtin_markdown.jinja
+
+# docs site
+site

{diracx-0.0.6 → diracx-0.0.8}/.pre-commit-config.yaml

@@ -8,7 +8,7 @@ default_language_version:
   python: python3
 
 ci:
-  skip: [generate-pixi-docs]
+  skip: [generate-pixi-docs, settings-doc-check]
 
 default_stages: [pre-commit]
 
@@ -30,9 +30,9 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.14.13'
+    rev: "v0.14.14"
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: ["--fix", "--show-fixes"]
       - id: ruff-format
 
@@ -51,29 +51,35 @@ repos:
           - boto3-stubs[essential]
         exclude: ^(diracx-client/src/diracx/client/_generated|diracx-[a-z]+/tests/|diracx-testing/|build|extensions/gubbins/gubbins-client/src/gubbins/client/_generated)
 
-  - repo: https://github.com/executablebooks/mdformat
+  - repo: https://github.com/hukkin/mdformat
     rev: 1.0.0
     hooks:
-    - id: mdformat
-      args: ["--number"]
-      exclude: ^CHANGELOG\.md$
-      additional_dependencies:
-      - mdformat-mkdocs
-      - mdformat-gfm
-      - mdformat-black
+      - id: mdformat
+        args: ["--number"]
+        exclude: ^CHANGELOG\.md$
+        additional_dependencies:
+          - mdformat-mkdocs
+          - mdformat-gfm
 
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.1
     hooks:
-    - id: codespell
-      args: ["-w"]
+      - id: codespell
+        args: ["-w"]
+
+  - repo: https://github.com/adamchainz/blacken-docs
+    rev: 1.20.0
+    hooks:
+      - id: blacken-docs
+        additional_dependencies:
+          - black==22.12.0
 
   - repo: local
     hooks:
       - id: check-lollygag
         name: check for lollygag
         types: [python]
-        entry: '(?i)lollygag'
+        entry: "(?i)lollygag"
         language: pygrep
         files: ^diracx
 
@@ -84,4 +90,13 @@ repos:
         entry: pixi run -e default python .github/workflows/generate_pixi_tasks_doc.py
         language: system
         pass_filenames: false
-        files: ^pixi\.toml$|^pixi\.lock$   # only run if pixi files change
+        files: ^pixi\.toml$|^pixi\.lock$ # only run if pixi files change
+
+  - repo: local
+    hooks:
+      - id: settings-doc-check
+        name: Generate settings documentation
+        entry: pixi run -e default python scripts/generate_settings_docs.py
+        language: system
+        pass_filenames: false
+        files: ^(diracx-.*/src/diracx/.*/settings\.py|docs/.*\.j2|docs/templates/.*\.jinja|scripts/generate_settings_docs\.py)$

diracx-0.0.8/CHANGELOG.md

@@ -0,0 +1,111 @@
+# Changelog
+
+## [0.0.8](https://github.com/DIRACGrid/diracx/compare/v0.0.7...v0.0.8) (2026-02-02)
+
+
+### Features
+
+* allow git commit hash usage in config source revision ([#726](https://github.com/DIRACGrid/diracx/issues/726)) ([8b8b687](https://github.com/DIRACGrid/diracx/commit/8b8b687dc7a72a5a3bb904a338969351e64e6173))
+* disallow relative paths with any depth other than zero ([82e7d15](https://github.com/DIRACGrid/diracx/commit/82e7d15effdf3b7d6807b9d287ca7f0549402f6e))
+
+
+### Bug Fixes
+
+* add ci skip settings-doc-check ([ccb1f48](https://github.com/DIRACGrid/diracx/commit/ccb1f489902a45ceea2524ec3213968641db5e2e))
+* added a StrEnum for Entrypoints to avoid spelling mistakes ([#744](https://github.com/DIRACGrid/diracx/issues/744)) ([19bfadc](https://github.com/DIRACGrid/diracx/commit/19bfadc1c473626dfe9f3a6489248c098056186e))
+* annoying wrapper script ([ccb1f48](https://github.com/DIRACGrid/diracx/commit/ccb1f489902a45ceea2524ec3213968641db5e2e))
+* cleanups ([ccb1f48](https://github.com/DIRACGrid/diracx/commit/ccb1f489902a45ceea2524ec3213968641db5e2e))
+* cs conversion takes into account all the parent classes ([#753](https://github.com/DIRACGrid/diracx/issues/753)) ([b742a34](https://github.com/DIRACGrid/diracx/commit/b742a34150d9d925460de4db2c5eba0cb5eafd49))
+* format ([0440a9c](https://github.com/DIRACGrid/diracx/commit/0440a9cecba1b2302630b5aae707b6162954332d))
+* format settings doc files ([ccb1f48](https://github.com/DIRACGrid/diracx/commit/ccb1f489902a45ceea2524ec3213968641db5e2e))
+* formatting ([0440a9c](https://github.com/DIRACGrid/diracx/commit/0440a9cecba1b2302630b5aae707b6162954332d))
+* formatting and remove caching ([4ed2709](https://github.com/DIRACGrid/diracx/commit/4ed2709980338cb0e423ef5630bdf6796e4c7250))
+* improve pytest-integration debugging output ([#740](https://github.com/DIRACGrid/diracx/issues/740)) ([d691175](https://github.com/DIRACGrid/diracx/commit/d691175438db532bd833ceecf1ad36ea3de29a5d))
+* reorder imports ([4ed2709](https://github.com/DIRACGrid/diracx/commit/4ed2709980338cb0e423ef5630bdf6796e4c7250))
+* set exclude=True on computed field ([4ed2709](https://github.com/DIRACGrid/diracx/commit/4ed2709980338cb0e423ef5630bdf6796e4c7250))
+* skip CI on release-please PRs ([#759](https://github.com/DIRACGrid/diracx/issues/759)) ([f236f61](https://github.com/DIRACGrid/diracx/commit/f236f6185db30c0a7faa7fce7f280697484087eb)), closes [#685](https://github.com/DIRACGrid/diracx/issues/685)
+* update tasks ([ccb1f48](https://github.com/DIRACGrid/diracx/commit/ccb1f489902a45ceea2524ec3213968641db5e2e))
+* use batched DB deletes with SKIP LOCKED for sandbox cleanup ([#739](https://github.com/DIRACGrid/diracx/issues/739)) ([584d4e6](https://github.com/DIRACGrid/diracx/commit/584d4e62a87d1b2ffbf739e80fe44f9c0fb92c9a))
+* well that didn't work ([ccb1f48](https://github.com/DIRACGrid/diracx/commit/ccb1f489902a45ceea2524ec3213968641db5e2e))
+
+
+### Miscellaneous Chores
+
+* release 0.0.8 ([80f1a37](https://github.com/DIRACGrid/diracx/commit/80f1a376d8e9e51fab4f6b45d1e5bf66e73f8d4e))
+
+## [0.0.7](https://github.com/DIRACGrid/diracx/compare/v0.0.6...v0.0.7) (2026-01-20)
+
+
+### Bug Fixes
+
+* add logging and retry for cache population failures ([#736](https://github.com/DIRACGrid/diracx/issues/736)) ([b899a8d](https://github.com/DIRACGrid/diracx/commit/b899a8d207a42b232fbe4062f329a32d64c37ec3))
+* require fastapi>=0.121.0 for Depends scope parameter ([#737](https://github.com/DIRACGrid/diracx/issues/737)) ([fb15f9c](https://github.com/DIRACGrid/diracx/commit/fb15f9c5bb9d36568e37f0fae7a2a78995f02d51))
+
+## [0.0.6](https://github.com/DIRACGrid/diracx/compare/v0.0.5...v0.0.6) (2026-01-20)
+
+
+### Bug Fixes
+
+* use correct argument name for update_chart_version.py ([84390f0](https://github.com/DIRACGrid/diracx/commit/84390f0ec66bae4db342864da52810b26955c4bd))
+
+## [0.0.5](https://github.com/DIRACGrid/diracx/compare/v0.0.4...v0.0.5) (2026-01-20)
+
+
+### Features
+
+* add logging for error conditions and edge cases ([#734](https://github.com/DIRACGrid/diracx/issues/734)) ([2c8b5c6](https://github.com/DIRACGrid/diracx/commit/2c8b5c682f17270e341deaf23cd4a7b4b7c4dd0a))
+* extend update_chart_version.py for downstream charts ([#731](https://github.com/DIRACGrid/diracx/issues/731)) ([b1a293b](https://github.com/DIRACGrid/diracx/commit/b1a293b01ad062d162afdfb5377a76c95eb09913))
+
+
+### Bug Fixes
+
+* use YAML parser for chart version to handle comments ([9516971](https://github.com/DIRACGrid/diracx/commit/95169716206bb476f450fff8fd228ada649fef5b))
+
+
+### Miscellaneous Chores
+
+* release 0.0.5 ([c0f166b](https://github.com/DIRACGrid/diracx/commit/c0f166bf29e1ed0ac2b5aa89ebb39ac60cfe23d3))
+
+## [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.6 → diracx-0.0.8}/PKG-INFO

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

diracx-0.0.8/diracx-cli/src/diracx/cli/__init__.py

@@ -0,0 +1,36 @@
+from __future__ import annotations
+
+from diracx.core.extensions import DiracEntryPoint, select_from_extension
+
+from .auth import app
+
+__all__ = ("app",)
+
+
+# Load all the sub commands
+cli_names = set(
+    [
+        entry_point.name
+        for entry_point in select_from_extension(group=DiracEntryPoint.CLI)
+    ]
+)
+for cli_name in cli_names:
+    entry_point = select_from_extension(group=DiracEntryPoint.CLI, name=cli_name)[0]
+    app.add_typer(entry_point.load(), name=entry_point.name)
+
+
+cli_hidden_names = set(
+    [
+        entry_point.name
+        for entry_point in select_from_extension(group=DiracEntryPoint.HIDDEN_CLI)
+    ]
+)
+for cli_name in cli_hidden_names:
+    entry_point = select_from_extension(
+        group=DiracEntryPoint.HIDDEN_CLI, name=cli_name
+    )[0]
+    app.add_typer(entry_point.load(), name=entry_point.name, hidden=True)
+
+
+if __name__ == "__main__":
+    app()

{diracx-0.0.6 → diracx-0.0.8}/diracx-cli/src/diracx/cli/internal/legacy.py

@@ -21,7 +21,7 @@ from typer import Option
 
 from diracx.core.config import Config
 from diracx.core.config.schema import Field, SupportInfo
-from diracx.core.extensions import select_from_extension
+from diracx.core.extensions import DiracEntryPoint, select_from_extension
 
 from ..utils import AsyncTyper
 
@@ -77,9 +77,9 @@ def cs_sync(old_file: Path, new_file: Path):
         )
 
     _apply_fixes(raw)
-    config_class: Config = select_from_extension(group="diracx", name="config")[
-        0
-    ].load()
+    config_class: Config = select_from_extension(
+        group=DiracEntryPoint.CORE, name="config"
+    )[0].load()
     config = config_class.model_validate(raw)
     new_file.write_text(
         yaml.safe_dump(config.model_dump(exclude_unset=True, mode="json"))
@@ -264,7 +264,7 @@ def generate_helm_values(
 
     from diracx.core.extensions import select_from_extension
 
-    for entry_point in select_from_extension(group="diracx.dbs.sql"):
+    for entry_point in select_from_extension(group=DiracEntryPoint.SQL_DB):
         db_name = entry_point.name
         db_config = all_db_configs.get(db_name, {})
 
@@ -310,7 +310,7 @@ def generate_helm_values(
         },
     }
 
-    for entry_point in select_from_extension(group="diracx.dbs.os"):
+    for entry_point in select_from_extension(group=DiracEntryPoint.OS_DB):
         db_name = entry_point.name
         db_config = all_db_configs.get(db_name, {})
 

{diracx-0.0.6 → diracx-0.0.8}/diracx-cli/src/diracx/cli/jobs.py

@@ -13,7 +13,11 @@ from rich.table import Table
 from typer import FileText, Option
 
 from diracx.client.aio import AsyncDiracClient
-from diracx.core.models import ScalarSearchOperator, SearchSpec, VectorSearchOperator
+from diracx.core.models.search import (
+    ScalarSearchOperator,
+    SearchSpec,
+    VectorSearchOperator,
+)
 from diracx.core.preferences import OutputFormats, get_diracx_preferences
 
 from .utils import AsyncTyper