diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index d04d29f..4eec8a1 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v5 with: repository: SAFEHR-data/PIXL - ref: e29f4b15c3b9d21c9a6e08c272aca7773311b32c # pragma: allowlist secret + ref: 367da6956fa10e3768e03fb0645904348f015a08 # pragma: allowlist secret path: PIXL - name: Checkout private SQL scripts uses: actions/checkout@v5 diff --git a/Dockerfile b/Dockerfile index a3d80df..96ddd34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.13-slim-bookworm@sha256:8092ae2ef67061f9db412458dbdce44dbf16748fb3cae5cdbd020f467a9712d0 AS waveform_base +FROM python:3.13.18-slim-bookworm@sha256:281d39ff02e3b389401586134ff9e6572954687822a58055ec07a60ded4e0b7f AS waveform_base LABEL authors="Stephen Thompson, Jeremy Stein" # Cron is really small. For the sake of not having to reinstall it all the time, # put it on both images even though we only need it on exporter. @@ -10,8 +10,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libkrb5-3 \ libltdl7 && \ apt-get autoremove --yes && apt-get clean --yes && rm -rf /var/lib/apt/lists/* -# uv image label "0.12.5" -COPY --from=ghcr.io/astral-sh/uv@sha256:e85be844203885286c60ffad8a858d48afb6c5a5c237ca0e67f12e74b8f174b1 /uv /uvx /bin/ +COPY --from=ghcr.io/astral-sh/uv:0.13.6@sha256:af22a52f5eafef3d78e551599d405c02df61919d18028f0cea8eda93bc9986d0 /uv /uvx /bin/ ARG UVCACHE=/root/.cache/uv COPY PIXL /PIXL WORKDIR /app diff --git a/config.EXAMPLE/hasher.env.EXAMPLE b/config.EXAMPLE/hasher.env.EXAMPLE index 4ba99da..4f7bd97 100644 --- a/config.EXAMPLE/hasher.env.EXAMPLE +++ b/config.EXAMPLE/hasher.env.EXAMPLE @@ -14,6 +14,9 @@ AZURE_KEY_VAULT_NAME= # and can be fixed and is not secret itself AZURE_KEY_VAULT_SECRET_NAME="waveform-secret-key" # pragma: allowlist secret +# Hasher needs this to point to different keyvaults +AZURE_KEY_VAULT_SUFFIX=vault.azure.net + # en/disable telemetry in the hasher OTEL_SDK_DISABLED=true OTEL_EXPORTER_OTLP_ENDPOINT="http://lgtm:4318" diff --git a/monitoring/Dockerfile b/monitoring/Dockerfile index 023ad6c..caa8122 100644 --- a/monitoring/Dockerfile +++ b/monitoring/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.13-slim-bookworm@sha256:8092ae2ef67061f9db412458dbdce44dbf16748fb3cae5cdbd020f467a9712d0 AS supercronic_base +FROM python:3.13.18-slim-bookworm@sha256:281d39ff02e3b389401586134ff9e6572954687822a58055ec07a60ded4e0b7f AS supercronic_base LABEL authors="Stephen Thompson, Jeremy Stein" RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -23,8 +23,7 @@ RUN case "${TARGETARCH}" in \ && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \ && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic -# uv image label "0.12.5" -COPY --from=ghcr.io/astral-sh/uv@sha256:e85be844203885286c60ffad8a858d48afb6c5a5c237ca0e67f12e74b8f174b1 /uv /uvx /bin/ +COPY --from=ghcr.io/astral-sh/uv:0.13.6@sha256:af22a52f5eafef3d78e551599d405c02df61919d18028f0cea8eda93bc9986d0 /uv /uvx /bin/ ARG UVCACHE=/root/.cache/uv WORKDIR /app diff --git a/uv.lock b/uv.lock index 92a3903..85530cd 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 3 +revision = 5 requires-python = ">=3.13" resolution-markers = [ "python_full_version >= '3.14'", @@ -127,70 +127,27 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/49/9a/417b3a533e01953a7c618884df2cb05a71e7b68bdbce4fbdb62349d2a2e8/azure_identity-1.25.3-py3-none-any.whl", hash = "sha256:f4d0b956a8146f30333e071374171f3cfa7bdb8073adb8c3814b65567aa7447c", size = 192138, upload-time = "2026-03-13T01:12:22.951Z" }, ] -[[package]] -name = "azure-keyvault" -version = "4.2.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "azure-keyvault-certificates" }, - { name = "azure-keyvault-keys" }, - { name = "azure-keyvault-secrets" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/4e/8a/63cbc6b580d82ceb8e5f1fc740d5e85248110fcc3b1df02bc73ee19bd115/azure-keyvault-4.2.0.zip", hash = "sha256:731add108a3e29ab4fd501a3c477256c286c34d0996b383fb6a3945462933761", size = 13376, upload-time = "2022-03-29T18:48:49.419Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/7c/a1/38e3c3ed438fbe8b486e2a4b9c1be586eed9206319d995f8b304ea2501f4/azure_keyvault-4.2.0-py2.py3-none-any.whl", hash = "sha256:16b29039244cbe8b940c98a0d795626d76d2a579cb9b8c559983ad208082c0de", size = 4334, upload-time = "2022-03-29T18:48:47.525Z" }, -] - -[[package]] -name = "azure-keyvault-certificates" -version = "4.10.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "azure-core" }, - { name = "isodate" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/2c/bc/07497d7118178729f59043153083bcdfdfc9629a365cbc5bc5690b4ff21b/azure_keyvault_certificates-4.10.0.tar.gz", hash = "sha256:004ff47a73152f9f40f678e5a07719b753a3ca86f0460bfeaaf6a23304872e05", size = 179157, upload-time = "2025-06-16T22:52:24.547Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fc/03/71cfb1ee68a625ca1c211a3b18e1051a4dd9fe8774329e48bb3c67afcf86/azure_keyvault_certificates-4.10.0-py3-none-any.whl", hash = "sha256:fa76cbc329274cb5f4ab61b0ed7d209d44377df4b4d6be2fd01e741c2fbb83a9", size = 155683, upload-time = "2025-06-16T22:52:26.02Z" }, -] - -[[package]] -name = "azure-keyvault-keys" -version = "4.11.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "azure-core" }, - { name = "cryptography" }, - { name = "isodate" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/69/ed/450c9389d76be1a95a056528ec2b832a3721858dd47b1f4eb12dab7060a1/azure_keyvault_keys-4.11.0.tar.gz", hash = "sha256:f257b1917a2c3a88983e3f5675a6419449eb262318888d5b51e1cb3bed79779a", size = 241309, upload-time = "2025-06-16T22:52:04.296Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c3/ac/fa42e6b316712604a63bf7b3cb60d619d92890e038b87e1b4bba7437bc36/azure_keyvault_keys-4.11.0-py3-none-any.whl", hash = "sha256:fa5febd5805f0fed4c0a1d13c9096081c72a6fa36ccae1299a137f34280eda53", size = 191303, upload-time = "2025-06-16T22:52:06.1Z" }, -] - [[package]] name = "azure-keyvault-secrets" -version = "4.10.0" +version = "4.11.3" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "azure-core" }, { name = "isodate" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/97/e5/3074e581b6e8923c4a1f2e42192ea6f390bb52de3600c68baaaed529ef05/azure_keyvault_secrets-4.10.0.tar.gz", hash = "sha256:666fa42892f9cee749563e551a90f060435ab878977c95265173a8246d546a36", size = 129695, upload-time = "2025-06-16T22:52:20.986Z" } +sdist = { url = "https://files.pythonhosted.org/packages/57/a4/7b0e582c8b2c97e1ea91d67ef831fa0c5e566a0dda9f6aa45054be47720d/azure_keyvault_secrets-4.11.3.tar.gz", hash = "sha256:193ba3cf9912ae776fb1ba40d147aa3cbfcf5cda5e0e2e35ef8fbe4c78db1217", size = 132370, upload-time = "2026-10-02T21:35:42.783Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/26/94/7c902e966b28e7cb5080a8e0dd6bffc22ba44bc907f09c4c633d2b7c4f6a/azure_keyvault_secrets-4.10.0-py3-none-any.whl", hash = "sha256:9dbde256077a4ee1a847646671580692e3f9bea36bcfc189c3cf2b9a94eb38b9", size = 125237, upload-time = "2025-06-16T22:52:22.489Z" }, + { url = "https://files.pythonhosted.org/packages/dc/8e/726acb7b6cd8d28cafd06531d6daf7e390667ebbbc4ff39f7cfc5bd75652/azure_keyvault_secrets-4.11.3-py3-none-any.whl", hash = "sha256:c77cc80f33d07e1b8cbbda5e7b6b8a1da1471ca917796f9895603a0c2b5f9c2f", size = 105234, upload-time = "2026-10-02T21:35:44.243Z" }, ] [[package]] name = "certifi" -version = "2025.11.12" +version = "2026.10.23" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a2/8c/58f469717fa48465e4a50c014a0400602d3c437d7c0c468e17ada824da3a/certifi-2025.11.12.tar.gz", hash = "sha256:d8ab5478f2ecd78af242878415affce761ca6bc54a22a27e026d7c25357c3316", size = 160538, upload-time = "2025-11-12T02:54:51.517Z" } +sdist = { url = "https://files.pythonhosted.org/packages/fd/11/b524cbd9bbdaca58608e4cf4053fd463417549e1959fa8d3aa18319f9555/certifi-2026.10.23.tar.gz", hash = "sha256:a9895e6e2758b371e0545e321a3a8fd1fcfd9829ada8824a936dfb16aaaf36cd", size = 136225, upload-time = "2026-10-23T11:36:16.478Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/70/7d/9bc192684cea499815ff478dfcdc13835ddf401365057044fb721ec6bddb/certifi-2025.11.12-py3-none-any.whl", hash = "sha256:97de8790030bbd5c2d96b7ec782fc2f7820ef8dba6db909ccf95449f2d062d4b", size = 159438, upload-time = "2025-11-12T02:54:49.735Z" }, + { url = "https://files.pythonhosted.org/packages/32/d1/a3652fe2c19134d0d15922177821d863cbd7e842d53a21bbe7e8e3a1b5ac/certifi-2026.10.23-py3-none-any.whl", hash = "sha256:e9b54de76e530bb6cf0ccd036787103acb58fd42ba930ea8bf948ddbaa2f61d1", size = 135082, upload-time = "2026-10-23T11:36:14.763Z" }, ] [[package]] @@ -350,12 +307,12 @@ sdist = { url = "https://files.pythonhosted.org/packages/bd/df/c9b4e25dce00f6349 [[package]] name = "core" -version = "0.2.0rc0" +version = "0.3.0rc0" source = { directory = "../PIXL/pixl_core" } dependencies = [ { name = "aio-pika" }, { name = "azure-identity" }, - { name = "azure-keyvault" }, + { name = "azure-keyvault-secrets" }, { name = "fastapi" }, { name = "jsonpickle" }, { name = "loguru" }, @@ -385,7 +342,7 @@ dependencies = [ requires-dist = [ { name = "aio-pika", specifier = "==9.6.2" }, { name = "azure-identity", specifier = "==1.25.3" }, - { name = "azure-keyvault", specifier = "==4.2.0" }, + { name = "azure-keyvault-secrets", specifier = "==4.11.3" }, { name = "fastapi", specifier = "==0.135.3" }, { name = "jsonpickle", specifier = "==4.1.1" }, { name = "loguru", specifier = "==0.7.3" },