0F;+%4?p
K|Hc2f5%@2((6nLz
literal 0
HcmV?d00001
From d03903ed2b36fac216b563586afaa4a0edd9d9a8 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Wed, 8 May 2024 13:45:06 +0000
Subject: [PATCH 18/55] Fix python3.10 problem with Self type
---
.gitignore | 3 +++
tad/core/config.py | 9 ++++++---
tad/tests/conftest.py | 3 +--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 48f43e76..d8ab9c17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,6 @@ __pypackages__/
#mypyr
.mypy_cache/
+
+# macos
+.DS_Store
diff --git a/tad/core/config.py b/tad/core/config.py
index 51e82e94..3fe570bc 100644
--- a/tad/core/config.py
+++ b/tad/core/config.py
@@ -1,6 +1,6 @@
import secrets
import warnings
-from typing import Annotated, Any, Literal, Self
+from typing import Annotated, Any, Literal, TypeVar
from pydantic import (
AnyUrl,
@@ -13,6 +13,9 @@
from tad.core.exceptions import SettingsError
+# Self type is not available in Python 3.10 so create our own with TypeVar
+SelfSettings = TypeVar("SelfSettings", bound="Settings")
+
def parse_cors(v: Any) -> list[str] | str:
if isinstance(v, str) and not v.startswith("["):
@@ -81,14 +84,14 @@ def _check_default_secret(self, var_name: str, value: str | None) -> None:
raise SettingsError(message)
@model_validator(mode="after")
- def _enforce_non_default_secrets(self) -> Self:
+ def _enforce_non_default_secrets(self: SelfSettings) -> SelfSettings:
self._check_default_secret("SECRET_KEY", self.SECRET_KEY)
self._check_default_secret("APP_DATABASE_PASSWORD", self.APP_DATABASE_PASSWORD)
return self
@model_validator(mode="after")
- def _enforce_database_rules(self) -> Self:
+ def _enforce_database_rules(self: SelfSettings) -> SelfSettings:
if self.ENVIRONMENT != "local" and self.APP_DATABASE_SCHEME == "sqlite":
raise SettingsError("SQLite is not supported in production") # noqa: TRY003
return self
diff --git a/tad/tests/conftest.py b/tad/tests/conftest.py
index 2115d941..8bc5bfe8 100644
--- a/tad/tests/conftest.py
+++ b/tad/tests/conftest.py
@@ -6,9 +6,8 @@
from tad.main import app
-# todo(berry): add database fixtures
-
+# todo(berry): add database fixtures
@pytest.fixture(scope="module")
def client() -> Generator[TestClient, None, None]:
with TestClient(app, raise_server_exceptions=True) as c:
From 734c66041a20e23c49ea5df39b8cb94f499d499a Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Wed, 8 May 2024 13:51:06 +0000
Subject: [PATCH 19/55] Fix docker build
---
.github/workflows/ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8267c31..207dd234 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -170,6 +170,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
+ file: ./tad/Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
From 292cf89ab535aa7dc6cb55bbbe225a20c025b6cb Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Wed, 8 May 2024 14:31:53 +0000
Subject: [PATCH 20/55] Add sonarcloud exclusion of tests and alembic
---
.github/workflows/codeql.yml | 32 --------------------------------
README.md | 1 +
sonar-project.properties | 4 +++-
3 files changed, 4 insertions(+), 33 deletions(-)
delete mode 100644 .github/workflows/codeql.yml
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index f61a4d06..00000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "CodeQL"
-
-on:
- push:
- branches: [ "main" ]
- pull_request:
- branches: [ "main" ]
-
-jobs:
- analyze:
- name: Analyze (python)
- runs-on: 'ubuntu-latest'
- timeout-minutes: 360
- permissions:
- security-events: write
- packages: read
- actions: read
- contents: read
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v4
-
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v3
- with:
- languages: python
-
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v3
- with:
- category: "/language:python"
diff --git a/README.md b/README.md
index e72892f8..d6cd7bad 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
+[](https://sonarcloud.io/summary/new_code?id=ai-validation-team_tad)
TAD is a modern tool to apply technical and non-technical tests for an AI model.
diff --git a/sonar-project.properties b/sonar-project.properties
index bdd24016..d05f6bf2 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -12,6 +12,8 @@ sonar.sources=.
# Encoding of the source code. Default is default system encoding
sonar.sourceEncoding=UTF-8
-sonar.python.version=3.11
+sonar.python.version=3.10,3.11,3.12
sonar.python.coverage.reportPaths=coverage.xml
+
+sonar.coverage.exclusions="tad/alembic/*","tad/tests/*"
From bca492c804e0f6a73a5322ee5c0736e981685e57 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Wed, 8 May 2024 14:42:44 +0000
Subject: [PATCH 21/55] Add package cleaner for github
---
.github/workflows/package.yml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 .github/workflows/package.yml
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
new file mode 100644
index 00000000..b4e2c30e
--- /dev/null
+++ b/.github/workflows/package.yml
@@ -0,0 +1,20 @@
+name: "Clean up package versions"
+on:
+ schedule:
+ - cron: "0 4 * * *"
+ workflow_dispatch:
+
+jobs:
+ clenaup-package-versions:
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ permissions:
+ packages: write
+ steps:
+ - uses: actions/delete-package-versions@v5
+ with:
+ package-name: 'tad'
+ package-type: 'container'
+ min-versions-to-keep: 0
+ ignore-versions: 'main'
+ delete-only-untagged-versions: true
From 8891b873e5f04317252dae82469ffe8d5b937b21 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Wed, 8 May 2024 14:58:20 +0000
Subject: [PATCH 22/55] Set correct labels for docker image
---
.github/workflows/ci.yml | 3 +++
tad/Dockerfile | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 207dd234..d9d1ad9a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -165,6 +165,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ env:
+ DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
- name: Build and push Docker image
uses: docker/build-push-action@v5
@@ -174,6 +176,7 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
+ annotations: ${{ steps.meta.outputs.annotations }}
platforms: linux/amd64,linux/arm64,darwin/amd64
- name: Run Trivy vulnerability scanner
diff --git a/tad/Dockerfile b/tad/Dockerfile
index 2a3c9ecf..809ad599 100644
--- a/tad/Dockerfile
+++ b/tad/Dockerfile
@@ -4,7 +4,10 @@ FROM --platform=$BUILDPLATFORM python:${PYTHON_VERSION} AS project-base
LABEL maintainer=ai-validatie@minbzk.nl \
organization=MinBZK \
- license=EUPL-1.2
+ license=EUPL-1.2 \
+ org.opencontainers.image.description="Transparency of Algorithmic Decision making" \
+ org.opencontainers.image.source=https://github.com/MinBZK/tad \
+ org.opencontainers.image.licenses=EUPL-1.2
ENV PYTHONUNBUFFERED=1 \
PYTHONDONTWRITEBYTECODE=1 \
From e5be9cac0080de7ea0edf552cd193c2f230e5a51 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Wed, 8 May 2024 15:21:57 +0000
Subject: [PATCH 23/55] Add badges for sonarcloud
---
README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index d6cd7bad..7b72eca4 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
# Transparency of Algorithmic Decision making (TAD)
-
-
+
+)
+[](https://sonarcloud.io/summary/new_code?id=ai-validation-team_tad)
+
-
-[](https://sonarcloud.io/summary/new_code?id=ai-validation-team_tad)
TAD is a modern tool to apply technical and non-technical tests for an AI model.
From b21bd45abcc8b281056ffc0c3a957c5f8cbcbf46 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Wed, 8 May 2024 15:52:41 +0000
Subject: [PATCH 24/55] Renamed actions
---
.github/workflows/ci.yml | 6 ++--
...ckage.yml => cleanup-package-schedule.yml} | 4 +--
.github/workflows/first-interaction.yml | 2 +-
.github/workflows/pr-close.yml | 33 +++++++++++++++++++
.../{stale.yml => stale-pr-schedule.yml} | 2 +-
5 files changed, 39 insertions(+), 8 deletions(-)
rename .github/workflows/{package.yml => cleanup-package-schedule.yml} (86%)
create mode 100644 .github/workflows/pr-close.yml
rename .github/workflows/{stale.yml => stale-pr-schedule.yml} (97%)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9d1ad9a..f5d8c48d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: CI
+name: continuous-integration
on:
push:
@@ -173,14 +173,13 @@ jobs:
with:
context: .
file: ./tad/Dockerfile
- push: ${{ github.event_name != 'pull_request' }}
+ push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
annotations: ${{ steps.meta.outputs.annotations }}
platforms: linux/amd64,linux/arm64,darwin/amd64
- name: Run Trivy vulnerability scanner
- if: github.event_name != 'pull_request'
uses: aquasecurity/trivy-action@master
with:
image-ref: ${{ steps.meta.outputs.tags }}
@@ -194,7 +193,6 @@ jobs:
TRIVY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
- name: Upload Trivy scan results to GitHub Security tab
- if: github.event_name != 'pull_request'
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'trivy-results.sarif'
diff --git a/.github/workflows/package.yml b/.github/workflows/cleanup-package-schedule.yml
similarity index 86%
rename from .github/workflows/package.yml
rename to .github/workflows/cleanup-package-schedule.yml
index b4e2c30e..0f86154a 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/cleanup-package-schedule.yml
@@ -1,11 +1,11 @@
-name: "Clean up package versions"
+name: cleanup-package-schedule
on:
schedule:
- cron: "0 4 * * *"
workflow_dispatch:
jobs:
- clenaup-package-versions:
+ cleanup-package-versions:
runs-on: ubuntu-latest
timeout-minutes: 10
permissions:
diff --git a/.github/workflows/first-interaction.yml b/.github/workflows/first-interaction.yml
index 4dfd169a..edad6119 100644
--- a/.github/workflows/first-interaction.yml
+++ b/.github/workflows/first-interaction.yml
@@ -1,4 +1,4 @@
-name: Greetings
+name: first-interaction
on: [pull_request, issues]
diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
new file mode 100644
index 00000000..735bcbbf
--- /dev/null
+++ b/.github/workflows/pr-close.yml
@@ -0,0 +1,33 @@
+name: pr-close
+
+on:
+ pull_request:
+ types:
+ - closed
+ workflow_dispatch:
+ inputs:
+ pr_number:
+ description: 'PR Number'
+ required: true
+ type: string
+
+jobs:
+ cleanup-package-versions:
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ permissions:
+ packages: write
+ steps:
+ - uses: actions/delete-package-versions@v5
+ if: ${{ github.event_name != 'pull_request' }}
+ with:
+ package-name: 'tad'
+ package-type: 'container'
+ package-version-ids: ${{ inputs.pr_number }}
+
+ - uses: actions/delete-package-versions@v5
+ if: ${{ github.event_name == 'pull_request' }}
+ with:
+ package-name: 'tad'
+ package-type: 'container'
+ package-version-ids: PR-${{ github.event.number }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale-pr-schedule.yml
similarity index 97%
rename from .github/workflows/stale.yml
rename to .github/workflows/stale-pr-schedule.yml
index 35b37843..a1c2395f 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale-pr-schedule.yml
@@ -1,4 +1,4 @@
-name: "Close stale"
+name: stale-shedule
on:
schedule:
- cron: "0 4 * * *"
From 4a43a2379c294ecc092f5c06ce420970de52f01f Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Wed, 8 May 2024 15:54:28 +0000
Subject: [PATCH 25/55] Rename ci to test
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 7b72eca4..eeb585e3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Transparency of Algorithmic Decision making (TAD)
-
+
)
[](https://sonarcloud.io/summary/new_code?id=ai-validation-team_tad)
From 3d94c672e31eda0dcdce986e121dd4755eadd19d Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:23:49 +0000
Subject: [PATCH 26/55] Rename middleware
---
tad/middleware/{routelogging.py => route_logging.py} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename tad/middleware/{routelogging.py => route_logging.py} (100%)
diff --git a/tad/middleware/routelogging.py b/tad/middleware/route_logging.py
similarity index 100%
rename from tad/middleware/routelogging.py
rename to tad/middleware/route_logging.py
From 451f4e5eeec7f995fd0250ed2c22875b5d428f0b Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:25:06 +0000
Subject: [PATCH 27/55] Add exception handler file
---
tad/core/exception_handlers.py | 18 +++++++++++
tad/main.py | 58 +++++++++++++++++++---------------
2 files changed, 50 insertions(+), 26 deletions(-)
create mode 100644 tad/core/exception_handlers.py
diff --git a/tad/core/exception_handlers.py b/tad/core/exception_handlers.py
new file mode 100644
index 00000000..7bdb6d39
--- /dev/null
+++ b/tad/core/exception_handlers.py
@@ -0,0 +1,18 @@
+from fastapi import Request, status
+from fastapi.exceptions import RequestValidationError
+from fastapi.responses import HTMLResponse
+from starlette.exceptions import HTTPException as StarletteHTTPException
+
+
+async def http_exception_handler(request: Request, exc: StarletteHTTPException):
+ return HTMLResponse(
+ status_code=exc.status_code,
+ content=f"{exc.status_code}
{exc.detail}
",
+ )
+
+
+async def validation_exception_handler(_request: Request, _exc: RequestValidationError):
+ return HTMLResponse(
+ status_code=status.HTTP_400_BAD_REQUEST,
+ content="{status.HTTP_400_BAD_REQUEST}
Invalid Request
",
+ )
diff --git a/tad/main.py b/tad/main.py
index e280f290..ea21ff00 100644
--- a/tad/main.py
+++ b/tad/main.py
@@ -2,60 +2,66 @@
from contextlib import asynccontextmanager
from fastapi import FastAPI, Request
+from fastapi.exceptions import RequestValidationError
from fastapi.responses import HTMLResponse
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
from starlette.exceptions import HTTPException as StarletteHTTPException
-from starlette.middleware.cors import CORSMiddleware
+from tad.api.main import api_router
from tad.core.config import settings
-from tad.core.logger import set_default_logging_setup
-from tad.middleware.routelogging import RequestLoggingMiddleware
-from tad.utils.mask import DataMasker
+from tad.core.exception_handlers import (
+ http_exception_handler as tad_http_exception_handler,
+)
+from tad.core.exception_handlers import (
+ validation_exception_handler as tad_validation_exception_handler,
+)
+from tad.core.log import configure_logging
+from tad.middleware.route_logging import RequestLoggingMiddleware
+from tad.utils.mask import Mask
+
+configure_logging(settings.LOGGING_LEVEL, settings.LOGGING_CONFIG)
-set_default_logging_setup()
logger = logging.getLogger(__name__)
-data_masker = DataMasker()
+mask = Mask(mask_keywords=["database_uri"])
+# todo(berry): move lifespan to own file
@asynccontextmanager
async def lifespan(app: FastAPI):
logger.info(f"Starting {settings.PROJECT_NAME} version {settings.VERSION}")
- logger.info(f"Settings: {data_masker.mask_data(settings.model_dump())}")
+ logger.info(f"Settings: {mask.secrets(settings.model_dump())}")
# todo(berry): setup database connection
yield
logger.info(f"Stopping application {settings.PROJECT_NAME} version {settings.VERSION}")
logging.shutdown()
+templates = Jinja2Templates(directory="templates")
+
app = FastAPI(
lifespan=lifespan,
title=settings.PROJECT_NAME,
summary=settings.PROJECT_DESCRIPTION,
version=settings.VERSION,
- docs_url="/docs",
- redoc_url=None,
+ openapi_url=None,
default_response_class=HTMLResponse,
+ redirect_slashes=False,
)
+app.add_middleware(RequestLoggingMiddleware)
+
+app.mount("/static", StaticFiles(directory=settings.STATIC_DIR), name="static")
+
@app.exception_handler(StarletteHTTPException)
-async def http_exception_handler(request: Request, exc: StarletteHTTPException):
- return HTMLResponse(
- status_code=exc.status_code,
- content=f"{exc.status_code}
{exc.detail}
",
- )
+async def http_exception_handler(request: Request, exc: StarletteHTTPException) -> HTMLResponse:
+ return await tad_http_exception_handler(request, exc)
-app.add_middleware(RequestLoggingMiddleware)
-app.add_middleware(
- CORSMiddleware,
- # todo(berry): what if BACKEND_CORS_ORIGINS is not set?
- allow_origins=[str(origin).strip("/") for origin in settings.BACKEND_CORS_ORIGINS],
- allow_credentials=True,
- allow_methods=["*"],
- allow_headers=["*"],
-)
+@app.exception_handler(RequestValidationError)
+async def validation_exception_handler(request: Request, exc: RequestValidationError) -> HTMLResponse:
+ return await tad_validation_exception_handler(request, exc)
-@app.get("/")
-async def root():
- return HTMLResponse(content="message - Hello World 2 sdfasdfsda")
+app.include_router(api_router)
From 7ee42a9b249728cf26ac4fd1df339f7d22a5e2b5 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:25:37 +0000
Subject: [PATCH 28/55] Move migrations
---
tad/alembic.ini => alembic.ini | 2 +-
tad/{alembic => migrations}/env.py | 3 +--
tad/{alembic => migrations}/script.py.mako | 0
tad/{alembic => migrations}/versions/99fb931b1324_.py | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
rename tad/alembic.ini => alembic.ini (99%)
rename tad/{alembic => migrations}/env.py (99%)
rename tad/{alembic => migrations}/script.py.mako (100%)
rename tad/{alembic => migrations}/versions/99fb931b1324_.py (99%)
diff --git a/tad/alembic.ini b/alembic.ini
similarity index 99%
rename from tad/alembic.ini
rename to alembic.ini
index c77a70cf..5f1146fb 100644
--- a/tad/alembic.ini
+++ b/alembic.ini
@@ -2,7 +2,7 @@
[alembic]
# path to migration scripts
-script_location = alembic
+script_location = tad/migrations
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
# Uncomment the line below if you want the files to be prepended with date and time
diff --git a/tad/alembic/env.py b/tad/migrations/env.py
similarity index 99%
rename from tad/alembic/env.py
rename to tad/migrations/env.py
index 5e3667ff..a5e1c4ad 100644
--- a/tad/alembic/env.py
+++ b/tad/migrations/env.py
@@ -1,9 +1,8 @@
import os
from logging.config import fileConfig
-from sqlalchemy import engine_from_config, pool
-
from alembic import context
+from sqlalchemy import engine_from_config, pool
config = context.config
diff --git a/tad/alembic/script.py.mako b/tad/migrations/script.py.mako
similarity index 100%
rename from tad/alembic/script.py.mako
rename to tad/migrations/script.py.mako
diff --git a/tad/alembic/versions/99fb931b1324_.py b/tad/migrations/versions/99fb931b1324_.py
similarity index 99%
rename from tad/alembic/versions/99fb931b1324_.py
rename to tad/migrations/versions/99fb931b1324_.py
index 16719e38..edd267a8 100644
--- a/tad/alembic/versions/99fb931b1324_.py
+++ b/tad/migrations/versions/99fb931b1324_.py
@@ -9,7 +9,6 @@
from collections.abc import Sequence
import sqlalchemy as sa
-
from alembic import op
# revision identifiers, used by Alembic.
From d0655f6418d6d0526b1d3c015f4f149ce3581fbb Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:26:00 +0000
Subject: [PATCH 29/55] Move dockerfile
---
tad/Dockerfile => Dockerfile | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
rename tad/Dockerfile => Dockerfile (75%)
diff --git a/tad/Dockerfile b/Dockerfile
similarity index 75%
rename from tad/Dockerfile
rename to Dockerfile
index 809ad599..56249b8a 100644
--- a/tad/Dockerfile
+++ b/Dockerfile
@@ -45,17 +45,26 @@ RUN ruff format --check
RUN pyright
FROM development AS test
-RUN coverage run -m pytest ./tests
+RUN coverage run -m pytest
RUN coverage report
FROM project-base AS production
+RUN groupadd tad && \
+ adduser --uid 100 --system --ingroup tad tad
+
+#todo(berry): create log folder so permissions can be set to root:root
+# currenlt problem is that i could not get the logger to accept a path in the filerotate handler
+RUN chown tad:tad /app/
+
USER tad
COPY --chown=root:root --chmod=755 ./tad /app/tad
+COPY --chown=root:root --chmod=755 alembic.ini /app/alembic.ini
+COPY --chown=root:root --chmod=755 .env /app/.env
+COPY --chown=root:root --chmod=755 LICENSE /app/LICENSE
ENV PYTHONPATH=/app/
WORKDIR /app/
-# change this to a usefull command
CMD ["python", "-m", "granian", "--host", "0.0.0.0","--interface","asgi","tad.main:app" ]
From 990e5259df304030cd411d135d6071b50b749fe3 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:26:30 +0000
Subject: [PATCH 30/55] Update sonar-porject and pyproject
---
compose.yml | 2 +-
pyproject.toml | 8 ++++----
sonar-project.properties | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/compose.yml b/compose.yml
index 5b49484d..a194a988 100644
--- a/compose.yml
+++ b/compose.yml
@@ -2,7 +2,7 @@ services:
tad:
build:
context: .
- dockerfile: tad/Dockerfile
+ dockerfile: Dockerfile
image: ghcr.io/minbzk/tad:latest
restart: unless-stopped
depends_on:
diff --git a/pyproject.toml b/pyproject.toml
index 8bd1be0e..d3355483 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ build-backend = "poetry.core.masonry.api"
[tool.ruff]
line-length = 120
target-version = "py311"
-src = ["tad"]
+src = ["tad","tests"]
[tool.ruff.format]
line-ending = "lf"
@@ -65,7 +65,7 @@ fixable = ["ALL"]
task-tags = ["TODO"]
[tool.ruff.lint.per-file-ignores]
-"tad/tests/**.py" = ["S101"]
+"tests/**.py" = ["S101"]
[tool.ruff.lint.mccabe]
max-complexity = 8
@@ -80,7 +80,7 @@ reportUnnecessaryIsInstance = false
[tool.coverage.run]
branch = true
command_line = "-m pytest"
-relative_files = true
+relative_files = true # needed for sonarcloud code coverage
[tool.coverage.report]
fail_under = 95
@@ -92,7 +92,7 @@ title = "tad"
[tool.pytest.ini_options]
testpaths = [
- "tad/tests"
+ "tests"
]
filterwarnings = [
"ignore::UserWarning"
diff --git a/sonar-project.properties b/sonar-project.properties
index d05f6bf2..4be98836 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -16,4 +16,4 @@ sonar.python.version=3.10,3.11,3.12
sonar.python.coverage.reportPaths=coverage.xml
-sonar.coverage.exclusions="tad/alembic/*","tad/tests/*"
+sonar.coverage.exclusions="tad/migration/*","tests/*"
From 41a7956db51e3b6fbc761d0094fa2e3e93b38aaf Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:27:20 +0000
Subject: [PATCH 31/55] Add pythonpath to devcontainer
---
.devcontainer/devcontainer.json | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index da0d1e50..1696c40a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,8 @@
"containerEnv": {
"DEVCONTAINER": "1",
"PYTHONASYNCIODEBUG": "1",
- "POETRY_VIRTUALENVS_CREATE": "false"
+ "POETRY_VIRTUALENVS_CREATE": "false",
+ "PYTHONPATH": "/workspaces/tad/"
},
"remoteUser": "root",
"features": {
@@ -16,7 +17,6 @@
"vscode": {
"extensions": [
"ms-python.python",
- "ms-python.vscode-pylance",
"editorconfig.editorconfig",
"streetsidesoftware.code-spell-checker",
"redhat.vscode-yaml",
@@ -42,7 +42,6 @@
"[python]": {
"editor.defaultFormatter": "charliermarsh.ruff"
},
- "python.languageServer": "Pylance",
"python.analysis.typeCheckingMode": "strict",
"markiscodecoverage.searchCriteria": "coverage.lcov"
}
From 571164fd9b2daae52393e75b709d5a987969e8f6 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:28:10 +0000
Subject: [PATCH 32/55] Add log to file tad.log
---
.gitignore | 3 +++
tad/core/log.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++
tad/core/logger.py | 9 ---------
3 files changed, 51 insertions(+), 9 deletions(-)
create mode 100644 tad/core/log.py
delete mode 100644 tad/core/logger.py
diff --git a/.gitignore b/.gitignore
index d8ab9c17..6f460810 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ __pypackages__/
# macos
.DS_Store
+
+# tad tool
+tad.log*
diff --git a/tad/core/log.py b/tad/core/log.py
new file mode 100644
index 00000000..b0a98a29
--- /dev/null
+++ b/tad/core/log.py
@@ -0,0 +1,48 @@
+import copy
+import logging
+import logging.config
+from typing import Any
+
+from tad.core.types import LoggingLevelType
+
+LOGGING_SIZE = 10 * 1024 * 1024
+LOGGING_BACKUP_COUNT = 5
+
+LOGGING_CONFIG = {
+ "version": 1,
+ "disable_existing_loggers": False,
+ "formatters": {
+ "generic": {
+ "()": "logging.Formatter",
+ "style": "{",
+ "fmt": "{asctime}({levelname},{name}): {message}",
+ "datefmt": "[%Y-%m-%d %H:%M:%S %z]",
+ }
+ },
+ "handlers": {
+ "console": {"formatter": "generic", "class": "logging.StreamHandler", "stream": "ext://sys.stdout"},
+ "file": {
+ "formatter": "generic",
+ "()": "logging.handlers.RotatingFileHandler",
+ "filename": "tad.log",
+ "maxBytes": LOGGING_SIZE,
+ "backupCount": LOGGING_BACKUP_COUNT,
+ },
+ },
+ "loggers": {
+ "tad": {"handlers": ["console", "file"], "level": "DEBUG", "propagate": True},
+ },
+}
+
+
+def configure_logging(level: LoggingLevelType = "INFO", config: dict[str, Any] | None = None) -> None:
+ log_config = copy.deepcopy(LOGGING_CONFIG)
+
+ if config:
+ log_config.update(config)
+
+ logging.config.dictConfig(log_config)
+
+ logger = logging.getLogger("tad")
+
+ logger.setLevel(level)
diff --git a/tad/core/logger.py b/tad/core/logger.py
deleted file mode 100644
index 0efe6f43..00000000
--- a/tad/core/logger.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import logging
-
-from tad.core.config import settings
-
-
-def set_default_logging_setup():
- logging.basicConfig(level=settings.LOGGING_LEVEL, style="{", format="{asctime}({levelname},{name}): {message}")
- # todo(berry): load from logging.config.dictConfig
- # todo(berry): create RotatingFileHandler for logging to append to the default stream handler
From 4edd1496141b1c9af4c6a2fd3fe0d557639f0bec Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:30:53 +0000
Subject: [PATCH 33/55] Move test to root
---
tad/tests/core/test_logger.py | 17 ----
tad/tests/test_variables.py | 0
{tad/tests => tests}/__init__.py | 0
tests/api/routes/test_health.py | 19 +++++
tests/api/routes/test_root.py | 9 ++
{tad/tests => tests}/conftest.py | 5 +-
{tad/tests => tests}/core/test_config.py | 18 ----
tests/core/test_exception_handlers.py | 34 ++++++++
{tad/tests => tests}/core/test_exceptions.py | 0
tests/core/test_log.py | 88 ++++++++++++++++++++
{tad/tests => tests}/test_main.py | 8 --
{tad/tests => tests}/utils/test_mask.py | 20 ++---
12 files changed, 162 insertions(+), 56 deletions(-)
delete mode 100644 tad/tests/core/test_logger.py
delete mode 100644 tad/tests/test_variables.py
rename {tad/tests => tests}/__init__.py (100%)
create mode 100644 tests/api/routes/test_health.py
create mode 100644 tests/api/routes/test_root.py
rename {tad/tests => tests}/conftest.py (73%)
rename {tad/tests => tests}/core/test_config.py (79%)
create mode 100644 tests/core/test_exception_handlers.py
rename {tad/tests => tests}/core/test_exceptions.py (100%)
create mode 100644 tests/core/test_log.py
rename {tad/tests => tests}/test_main.py (57%)
rename {tad/tests => tests}/utils/test_mask.py (64%)
diff --git a/tad/tests/core/test_logger.py b/tad/tests/core/test_logger.py
deleted file mode 100644
index b510ac50..00000000
--- a/tad/tests/core/test_logger.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import logging
-
-import pytest
-from tad.core.logger import set_default_logging_setup
-
-
-def test_set_default_logging_setup(caplog: pytest.LogCaptureFixture):
- set_default_logging_setup()
-
- logger = logging.getLogger("tad.main")
-
- message = "This is a test log message"
- logger.info(message)
- logger.debug(message)
-
- assert len(caplog.records) == 1
- assert caplog.records[0].message == message
diff --git a/tad/tests/test_variables.py b/tad/tests/test_variables.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tad/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from tad/tests/__init__.py
rename to tests/__init__.py
diff --git a/tests/api/routes/test_health.py b/tests/api/routes/test_health.py
new file mode 100644
index 00000000..49edab92
--- /dev/null
+++ b/tests/api/routes/test_health.py
@@ -0,0 +1,19 @@
+from fastapi.testclient import TestClient
+
+
+def test_health_ready(client: TestClient) -> None:
+ response = client.get(
+ "/health/ready",
+ )
+ assert response.status_code == 200
+ assert response.headers["content-type"] == "application/json"
+ assert response.json() == {"status": "ok"}
+
+
+def test_health_live(client: TestClient) -> None:
+ response = client.get(
+ "/health/live",
+ )
+ assert response.status_code == 200
+ assert response.headers["content-type"] == "application/json"
+ assert response.json() == {"status": "ok"}
diff --git a/tests/api/routes/test_root.py b/tests/api/routes/test_root.py
new file mode 100644
index 00000000..80871570
--- /dev/null
+++ b/tests/api/routes/test_root.py
@@ -0,0 +1,9 @@
+from fastapi.testclient import TestClient
+
+
+def test_get_root(client: TestClient) -> None:
+ response = client.get(
+ "/",
+ )
+ assert response.status_code == 200
+ assert response.headers["content-type"] == "text/html; charset=utf-8"
diff --git a/tad/tests/conftest.py b/tests/conftest.py
similarity index 73%
rename from tad/tests/conftest.py
rename to tests/conftest.py
index 8bc5bfe8..ba26bced 100644
--- a/tad/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,7 +3,6 @@
import pytest
from fastapi.testclient import TestClient
-
from tad.main import app
@@ -16,9 +15,9 @@ def client() -> Generator[TestClient, None, None]:
@pytest.fixture(autouse=True)
-def setup_basic_environmental_variables() -> Generator[None, None, None]: # noqa: PT004
+def setup_basic_environmental_variables(monkeypatch: pytest.MonkeyPatch) -> Generator[None, None, None]: # noqa: PT004
original_environ = dict(os.environ)
- os.environ["APP_DATABASE_PASSWORD"] = "changethis" # noqa: S105
+ monkeypatch.setenv("APP_DATABASE_PASSWORD", "changethis")
yield
os.environ.clear()
os.environ.update(original_environ)
diff --git a/tad/tests/core/test_config.py b/tests/core/test_config.py
similarity index 79%
rename from tad/tests/core/test_config.py
rename to tests/core/test_config.py
index d22b3da8..697f9124 100644
--- a/tad/tests/core/test_config.py
+++ b/tests/core/test_config.py
@@ -1,7 +1,6 @@
import os
import pytest
-from pydantic import AnyUrl
from tad.core.config import Settings
from tad.core.exceptions import SettingsError
@@ -12,7 +11,6 @@ def test_default_settings():
assert settings.DOMAIN == "localhost"
assert settings.ENVIRONMENT == "local"
assert settings.server_host == "http://localhost"
- assert [] == settings.BACKEND_CORS_ORIGINS
assert settings.VERSION == "0.1.0"
assert settings.LOGGING_LEVEL == "INFO"
assert settings.PROJECT_NAME == "TAD"
@@ -30,7 +28,6 @@ def test_environment_settings():
os.environ["DOMAIN"] = "google.com"
os.environ["ENVIRONMENT"] = "production"
os.environ["PROJECT_NAME"] = "TAD2"
- os.environ["BACKEND_CORS_ORIGINS"] = "http://google.com,https://google.com"
os.environ["SECRET_KEY"] = "mysecret" # noqa: S105
os.environ["APP_DATABASE_SCHEME"] = "postgresql"
os.environ["APP_DATABASE_USER"] = "tad2"
@@ -42,7 +39,6 @@ def test_environment_settings():
assert settings.DOMAIN == "google.com"
assert settings.ENVIRONMENT == "production"
assert settings.server_host == "https://google.com"
- assert [AnyUrl("http://google.com"), AnyUrl("https://google.com")] == settings.BACKEND_CORS_ORIGINS
assert settings.VERSION == "0.1.0"
assert settings.LOGGING_LEVEL == "INFO"
assert settings.PROJECT_NAME == "TAD2"
@@ -57,20 +53,6 @@ def test_environment_settings():
assert settings.SQLALCHEMY_DATABASE_URI == "postgresql://tad2:mypassword@db:5432/tad2"
-def test_environment_settings_cors_list():
- os.environ["BACKEND_CORS_ORIGINS"] = "[http://google.com,https://google.com]"
-
- settings = Settings(_env_file="nonexisitingfile") # type: ignore
-
- assert settings.BACKEND_CORS_ORIGINS == "[http://google.com,https://google.com]"
-
-
-def test_environment_settings_cors_error():
- os.environ["BACKEND_CORS_ORIGINS"] = "1234"
- with pytest.raises(ValueError, match="1234"):
- _settings = Settings(_env_file="nonexisitingfile") # type: ignore
-
-
def test_environment_settings_production_sqlite_error():
os.environ["ENVIRONMENT"] = "production"
os.environ["APP_DATABASE_SCHEME"] = "sqlite"
diff --git a/tests/core/test_exception_handlers.py b/tests/core/test_exception_handlers.py
new file mode 100644
index 00000000..91e2d0b2
--- /dev/null
+++ b/tests/core/test_exception_handlers.py
@@ -0,0 +1,34 @@
+import pytest
+from fastapi import status
+from fastapi.exceptions import HTTPException, RequestValidationError
+from fastapi.testclient import TestClient
+from tad.main import app
+
+
+@pytest.fixture()
+def _mock_error_500():
+ """Add route to raise ValueError"""
+
+ @app.get("/raise-http-exception")
+ async def raise_http_error():
+ raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
+
+ @app.get("/raise-request-validation-exception")
+ async def raise_request_error():
+ raise RequestValidationError(errors=None)
+
+
+@pytest.mark.usefixtures("_mock_error_500")
+def test_http_exception_handler(client: TestClient):
+ response = client.get("/raise-http-exception")
+
+ assert response.status_code == status.HTTP_404_NOT_FOUND
+ assert response.headers["content-type"] == "text/html; charset=utf-8"
+
+
+@pytest.mark.usefixtures("_mock_error_500")
+def test_request_validation_exception_handler(client: TestClient):
+ response = client.get("/raise-request-validation-exception")
+
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ assert response.headers["content-type"] == "text/html; charset=utf-8"
diff --git a/tad/tests/core/test_exceptions.py b/tests/core/test_exceptions.py
similarity index 100%
rename from tad/tests/core/test_exceptions.py
rename to tests/core/test_exceptions.py
diff --git a/tests/core/test_log.py b/tests/core/test_log.py
new file mode 100644
index 00000000..9cebc91a
--- /dev/null
+++ b/tests/core/test_log.py
@@ -0,0 +1,88 @@
+import logging
+import os
+
+import pytest
+from tad.core.config import Settings
+from tad.core.log import configure_logging
+
+
+def test_module_logging_setup(caplog: pytest.LogCaptureFixture):
+ configure_logging()
+
+ logger = logging.getLogger("tad")
+
+ message = "This is a test log message"
+ logger.debug(message) # defaults to INFO level so debug is not printed
+ logger.info(message)
+ logger.warning(message)
+ logger.error(message)
+ logger.critical(message)
+
+ assert len(caplog.records) == 4
+ assert caplog.records[0].message == message
+
+
+def test_root_logging_setup(caplog: pytest.LogCaptureFixture):
+ configure_logging()
+
+ logger = logging.getLogger("")
+
+ message = "This is a test log message"
+ logger.debug(message)
+ logger.info(message)
+ logger.warning(message) # defaults to warning
+ logger.error(message)
+ logger.critical(message)
+
+ assert len(caplog.records) == 3
+ assert caplog.records[0].message == message
+
+
+def test_module_main_logging_setup(caplog: pytest.LogCaptureFixture):
+ configure_logging()
+
+ logger = logging.getLogger("tad.main")
+
+ message = "This is a test log message"
+ logger.debug(message)
+ logger.info(message) # should use module logger level
+ logger.warning(message)
+ logger.error(message)
+ logger.critical(message)
+
+ assert len(caplog.records) == 4
+ assert caplog.records[0].message == message
+
+
+def test_module_main_logging_with_custom_logging_setup(caplog: pytest.LogCaptureFixture):
+ configure_logging(level="ERROR")
+
+ logger = logging.getLogger("tad.main")
+
+ message = "This is a test log message"
+ logger.debug(message)
+ logger.info(message)
+ logger.warning(message)
+ logger.error(message)
+ logger.critical(message)
+
+ assert len(caplog.records) == 2
+
+
+def test_enviroment_setup(caplog: pytest.LogCaptureFixture):
+ os.environ["LOGGING_CONFIG"] = '{"formatters": { "generic": { "fmt": "{name}: {message}"}}}'
+
+ settings = Settings() # type: ignore
+
+ configure_logging(config=settings.LOGGING_CONFIG)
+
+ logger = logging.getLogger("tad.main")
+
+ message = "This is a test log message with other formatting"
+ logger.debug(message)
+ logger.info(message)
+ logger.warning(message)
+ logger.error(message)
+ logger.critical(message)
+
+ assert len(caplog.records) == 4
diff --git a/tad/tests/test_main.py b/tests/test_main.py
similarity index 57%
rename from tad/tests/test_main.py
rename to tests/test_main.py
index c084568f..226f9e5f 100644
--- a/tad/tests/test_main.py
+++ b/tests/test_main.py
@@ -1,14 +1,6 @@
from fastapi.testclient import TestClient
-def test_get_root(client: TestClient) -> None:
- response = client.get(
- "/",
- )
- assert response.status_code == 200
- assert response.headers["content-type"] == "text/html; charset=utf-8"
-
-
def test_get_non_exisiting(client: TestClient) -> None:
response = client.get(
"/pathdoesnotexist/",
diff --git a/tad/tests/utils/test_mask.py b/tests/utils/test_mask.py
similarity index 64%
rename from tad/tests/utils/test_mask.py
rename to tests/utils/test_mask.py
index f72c3f22..36258027 100644
--- a/tad/tests/utils/test_mask.py
+++ b/tests/utils/test_mask.py
@@ -1,13 +1,13 @@
-from tad.utils.mask import DataMasker
+from tad.utils.mask import Mask
def test_mask_dict():
# given
data: dict[str | int, str] = {1: "value1", "MY_PASSWORD": "value2", "key3": "value3"}
- data_masker = DataMasker()
+ mask = Mask()
# when
- masked_data = data_masker.mask_data(data)
+ masked_data = mask.secrets(data)
# then
assert masked_data == {1: "value1", "MY_PASSWORD": "***MASKED***", "key3": "value3"}
@@ -16,10 +16,10 @@ def test_mask_dict():
def test_mask_set():
# given
data: set[str | int] = {"value1", "password", "value3", 4}
- data_masker = DataMasker()
+ mask = Mask()
# when
- masked_data = data_masker.mask_data(data)
+ masked_data = mask.secrets(data)
# then
assert masked_data == {"value1", "***MASKED***", "value3", 4}
@@ -28,10 +28,10 @@ def test_mask_set():
def test_mask_list():
# given
data: list[str | int] = [1, "mysecret", "notimportant"]
- data_masker = DataMasker(mask_value="******")
+ mask = Mask(mask_value="******")
# when
- masked_data = data_masker.mask_data(data)
+ masked_data = mask.secrets(data)
# then
assert masked_data == [1, "******", "notimportant"]
@@ -41,11 +41,11 @@ def test_mask_string():
# given
data: str = "my_token"
data_nosecret: str = "my_notimportant"
- data_masker = DataMasker(mask_keywords=["token"])
+ mask = Mask(mask_keywords=["token"])
# when
- masked_data = data_masker.mask_data(data)
- masked_data_nosecret = data_masker.mask_data(data_nosecret)
+ masked_data = mask.secrets(data)
+ masked_data_nosecret = mask.secrets(data_nosecret)
# then
assert masked_data == "***MASKED***"
From 4d97273063c0df27faa2f010b0b23953f7441af2 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:31:09 +0000
Subject: [PATCH 34/55] Start debugger from root
---
.vscode/launch.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.vscode/launch.json b/.vscode/launch.json
index debd23c4..84d3ec13 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,8 +7,8 @@
"request": "launch",
"module": "granian",
"justMyCode": true,
- "args": ["--interface","asgi","main:app", "--reload"],
- "cwd": "${workspaceFolder}/tad/",
+ "args": ["--interface","asgi","tad.main:app", "--reload"],
+ "cwd": "${workspaceFolder}/",
"env": {
"PYTHONPATH": "${workspaceFolder}"
}
From 334069cac2eb974f4118e03b056abedbdb78bf3f Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:31:30 +0000
Subject: [PATCH 35/55] Add routes
---
tad/api/__init__.py | 0
tad/api/main.py | 7 +++++++
tad/api/routes/__init__.py | 0
tad/api/routes/health.py | 15 +++++++++++++++
tad/api/routes/root.py | 9 +++++++++
5 files changed, 31 insertions(+)
create mode 100644 tad/api/__init__.py
create mode 100644 tad/api/main.py
create mode 100644 tad/api/routes/__init__.py
create mode 100644 tad/api/routes/health.py
create mode 100644 tad/api/routes/root.py
diff --git a/tad/api/__init__.py b/tad/api/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tad/api/main.py b/tad/api/main.py
new file mode 100644
index 00000000..6f604c7e
--- /dev/null
+++ b/tad/api/main.py
@@ -0,0 +1,7 @@
+from fastapi import APIRouter
+
+from tad.api.routes import health, root
+
+api_router = APIRouter()
+api_router.include_router(root.router)
+api_router.include_router(health.router, prefix="/health", tags=["health"])
diff --git a/tad/api/routes/__init__.py b/tad/api/routes/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tad/api/routes/health.py b/tad/api/routes/health.py
new file mode 100644
index 00000000..ee471e6b
--- /dev/null
+++ b/tad/api/routes/health.py
@@ -0,0 +1,15 @@
+from fastapi import APIRouter
+from fastapi.responses import JSONResponse
+
+router = APIRouter()
+
+
+@router.get("/live", response_class=JSONResponse)
+async def liveness():
+ return {"status": "ok"}
+
+
+@router.get("/ready", response_class=JSONResponse)
+async def readiness():
+ # todo(berry): Add database connection check
+ return {"status": "ok"}
diff --git a/tad/api/routes/root.py b/tad/api/routes/root.py
new file mode 100644
index 00000000..2aa20e12
--- /dev/null
+++ b/tad/api/routes/root.py
@@ -0,0 +1,9 @@
+from fastapi import APIRouter
+from fastapi.responses import HTMLResponse
+
+router = APIRouter()
+
+
+@router.get("/")
+async def base():
+ return HTMLResponse(content="message - Hello World 2 sdfasdfsda")
From 39d43f713ef1d5ab9be1062abe49a211dcb309b5 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:31:58 +0000
Subject: [PATCH 36/55] Add logging variable to app
---
tad/core/config.py | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/tad/core/config.py b/tad/core/config.py
index 3fe570bc..2ab11f92 100644
--- a/tad/core/config.py
+++ b/tad/core/config.py
@@ -1,10 +1,8 @@
import secrets
import warnings
-from typing import Annotated, Any, Literal, TypeVar
+from typing import Any, TypeVar
from pydantic import (
- AnyUrl,
- BeforeValidator,
computed_field,
model_validator,
)
@@ -12,26 +10,19 @@
from pydantic_settings import BaseSettings, SettingsConfigDict
from tad.core.exceptions import SettingsError
+from tad.core.types import DatabaseSchemaType, EnvironmentType, LoggingLevelType
# Self type is not available in Python 3.10 so create our own with TypeVar
SelfSettings = TypeVar("SelfSettings", bound="Settings")
-def parse_cors(v: Any) -> list[str] | str:
- if isinstance(v, str) and not v.startswith("["):
- return [i.strip() for i in v.split(",")]
- elif isinstance(v, list | str):
- return v
- raise ValueError(v)
-
-
class Settings(BaseSettings):
# todo(berry): investigate yaml, toml or json file support for SettingsConfigDict
model_config = SettingsConfigDict(env_file=".env", env_ignore_empty=True, extra="ignore")
SECRET_KEY: str = secrets.token_urlsafe(32)
DOMAIN: str = "localhost"
- ENVIRONMENT: Literal["local", "staging", "production"] = "local"
+ ENVIRONMENT: EnvironmentType = "local"
@computed_field # type: ignore[misc]
@property
@@ -40,16 +31,18 @@ def server_host(self) -> str:
return f"http://{self.DOMAIN}"
return f"https://{self.DOMAIN}"
- BACKEND_CORS_ORIGINS: Annotated[list[AnyUrl] | str, BeforeValidator(parse_cors)] = []
VERSION: str = "0.1.0"
- LOGGING_LEVEL: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] = "INFO"
+ LOGGING_LEVEL: LoggingLevelType = "INFO"
+ LOGGING_CONFIG: dict[str, Any] | None = None
PROJECT_NAME: str = "TAD"
PROJECT_DESCRIPTION: str = "Transparency of Algorithmic Decision making"
+ STATIC_DIR: str = "tad/static"
+
# todo(berry): create submodel for database settings
- APP_DATABASE_SCHEME: Literal["sqlite", "postgresql", "mysql", "oracle"] = "sqlite"
+ APP_DATABASE_SCHEME: DatabaseSchemaType = "sqlite"
APP_DATABASE_SERVER: str = "db"
APP_DATABASE_PORT: int = 5432
APP_DATABASE_USER: str = "tad"
From f9204fdacb41944acb9cac20fd1a208ead1b3477 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 13:58:19 +0000
Subject: [PATCH 37/55] Make models a folder
---
BUILD.md | 16 ++++++++++++++++
alembic.ini | 8 ++++----
tad/core/types.py | 5 +++++
tad/migrations/env.py | 9 +++++----
... => 17f5b05e9ec3_added_hero_test_table.py} | 19 +++++++++++--------
tad/models/__init__.py | 0
tad/{models.py => models/hero.py} | 0
tad/utils/mask.py | 16 ++++++++--------
8 files changed, 49 insertions(+), 24 deletions(-)
create mode 100644 tad/core/types.py
rename tad/migrations/versions/{99fb931b1324_.py => 17f5b05e9ec3_added_hero_test_table.py} (50%)
create mode 100644 tad/models/__init__.py
rename tad/{models.py => models/hero.py} (100%)
diff --git a/BUILD.md b/BUILD.md
index 0c3fb396..17713073 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -23,6 +23,22 @@ When poetry is done installing all dependencies you can start using the tool.
poetry run python -m uvicorn tad.main:app
```
+## Database
+
+We support most SQL database types. You can use the variable `APP_DATABASE_SCHEME` to change the database. The default scheme is sqlite.
+
+If you change the `models` at tad/models of the application you can generate a new migration file
+```shell
+alembic revision --autogenerate -m "a message"
+```
+
+Please make sure you check the auto generated file in tad/migrations/
+
+to upgrade to the latest version of the database schema use
+```shell
+alembic upgrade head
+```
+
## Building TAD with Containers
Containers allows to package software, make it portable, and isolated. Before you can run a container you first need a container runtime. There are several available, but al lot of users use [docker desktop](https://www.docker.com/products/docker-desktop/).
diff --git a/alembic.ini b/alembic.ini
index 5f1146fb..bfc48614 100644
--- a/alembic.ini
+++ b/alembic.ini
@@ -75,10 +75,10 @@ script_location = tad/migrations
# black.options = -l 79 REVISION_SCRIPT_FILENAME
# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
-# hooks = ruff
-# ruff.type = exec
-# ruff.executable = %(here)s/.venv/bin/ruff
-# ruff.options = --fix REVISION_SCRIPT_FILENAME
+hooks = ruff
+ruff.type = exec
+ruff.executable = ruff
+ruff.options = check --fix REVISION_SCRIPT_FILENAME
# Logging configuration
[loggers]
diff --git a/tad/core/types.py b/tad/core/types.py
new file mode 100644
index 00000000..4848e7f3
--- /dev/null
+++ b/tad/core/types.py
@@ -0,0 +1,5 @@
+from typing import Literal
+
+EnvironmentType = Literal["local", "staging", "production"]
+LoggingLevelType = Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+DatabaseSchemaType = Literal["sqlite", "postgresql", "mysql", "oracle"]
diff --git a/tad/migrations/env.py b/tad/migrations/env.py
index a5e1c4ad..51cd0f77 100644
--- a/tad/migrations/env.py
+++ b/tad/migrations/env.py
@@ -9,17 +9,18 @@
if config.config_file_name is not None:
fileConfig(config.config_file_name)
-from tad.models import SQLModel # noqa
+# todo(berry): automaticly import all models
+from tad.models.hero import Hero # noqa
-target_metadata = SQLModel.metadata
+target_metadata = [Hero.metadata]
def get_url():
scheme = os.getenv("SQLALCHEMY_SCHEME", "sqlite")
if scheme == "sqlite":
- file = os.getenv("SQLITE_FILE", "./database")
- return f"{scheme}://{file}"
+ file = os.getenv("SQLITE_FILE", "/database")
+ return f"{scheme}:///{file}"
user = os.getenv("APP_DATABASE_USER", "postgres")
password = os.getenv("APP_DATABASE_PASSWORD", "")
diff --git a/tad/migrations/versions/99fb931b1324_.py b/tad/migrations/versions/17f5b05e9ec3_added_hero_test_table.py
similarity index 50%
rename from tad/migrations/versions/99fb931b1324_.py
rename to tad/migrations/versions/17f5b05e9ec3_added_hero_test_table.py
index edd267a8..b3f13cba 100644
--- a/tad/migrations/versions/99fb931b1324_.py
+++ b/tad/migrations/versions/17f5b05e9ec3_added_hero_test_table.py
@@ -1,33 +1,36 @@
-"""empty message
+"""Added hero test table
-Revision ID: 99fb931b1324
+Revision ID: 17f5b05e9ec3
Revises:
-Create Date: 2024-05-02 12:04:56.694709
+Create Date: 2024-05-10 13:57:16.989570
"""
from collections.abc import Sequence
import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
from alembic import op
# revision identifiers, used by Alembic.
-revision: str = "99fb931b1324"
+revision: str = "17f5b05e9ec3"
down_revision: str | None = None
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None
def upgrade() -> None:
+ # ### commands auto generated by Alembic - please adjust! ###
op.create_table(
"hero",
sa.Column("id", sa.Integer(), nullable=False),
- sa.Column("name", sa.String(), nullable=False),
- sa.Column("secret_name", sa.String(), nullable=False),
- sa.Column("age", sa.Integer(), nullable=True),
+ sa.Column("name", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
sa.PrimaryKeyConstraint("id"),
)
+ # ### end Alembic commands ###
def downgrade() -> None:
- pass
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_table("hero")
+ # ### end Alembic commands ###
diff --git a/tad/models/__init__.py b/tad/models/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tad/models.py b/tad/models/hero.py
similarity index 100%
rename from tad/models.py
rename to tad/models/hero.py
diff --git a/tad/utils/mask.py b/tad/utils/mask.py
index f4613e27..73fc6c8b 100644
--- a/tad/utils/mask.py
+++ b/tad/utils/mask.py
@@ -1,21 +1,21 @@
from typing import Any
-class DataMasker:
+class Mask:
def __init__(self, mask_value: str = "***MASKED***", mask_keywords: list[str] | None = None):
if mask_keywords is None:
mask_keywords = []
self.mask_value = mask_value
# default keywords to mask
- self.keywords: list[str] = ["password", "secret", "database_uri"]
+ self.keywords: list[str] = ["password", "secret"]
self.keywords.extend(mask_keywords or [])
- def mask_data( # noqa: C901
+ def secrets( # noqa: C901ß
self, data: str | list[Any] | dict[Any, Any] | set[Any]
) -> str | list[Any] | dict[Any, Any] | set[Any]:
if isinstance(data, dict):
- masked_dict: dict[str | int, str | int] = {}
+ masked_dict: dict[Any, Any] = {}
for key, value in data.items():
if isinstance(key, str):
for keyword in self.keywords:
@@ -29,8 +29,8 @@ def mask_data( # noqa: C901
return masked_dict
elif isinstance(data, list):
- masked_list: list[str | int] = []
- item: str | int
+ masked_list: list[Any] = []
+ item: Any
for item in data:
if isinstance(item, str):
for keyword in self.keywords:
@@ -44,9 +44,9 @@ def mask_data( # noqa: C901
return masked_list
elif isinstance(data, set):
- masked_set: set[str | int] = set()
+ masked_set: set[Any] = set()
- item: str | int
+ item: Any
for item in data:
if isinstance(item, str):
for keyword in self.keywords:
From 6f8addf91ea4615f34f259a07410081006c8c5d3 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 14:01:01 +0000
Subject: [PATCH 38/55] Add ruff formatter to alembic
---
alembic.ini | 6 +++++-
..._test_table.py => a1d47bd833f8_added_hero_test_table.py} | 6 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
rename tad/migrations/versions/{17f5b05e9ec3_added_hero_test_table.py => a1d47bd833f8_added_hero_test_table.py} (89%)
diff --git a/alembic.ini b/alembic.ini
index bfc48614..2e8e170c 100644
--- a/alembic.ini
+++ b/alembic.ini
@@ -75,11 +75,15 @@ script_location = tad/migrations
# black.options = -l 79 REVISION_SCRIPT_FILENAME
# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
-hooks = ruff
+hooks = ruff, ruff_format
ruff.type = exec
ruff.executable = ruff
ruff.options = check --fix REVISION_SCRIPT_FILENAME
+ruff_format.type = exec
+ruff_format.executable = ruff
+ruff_format.options = format REVISION_SCRIPT_FILENAME
+
# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic
diff --git a/tad/migrations/versions/17f5b05e9ec3_added_hero_test_table.py b/tad/migrations/versions/a1d47bd833f8_added_hero_test_table.py
similarity index 89%
rename from tad/migrations/versions/17f5b05e9ec3_added_hero_test_table.py
rename to tad/migrations/versions/a1d47bd833f8_added_hero_test_table.py
index b3f13cba..d945dc80 100644
--- a/tad/migrations/versions/17f5b05e9ec3_added_hero_test_table.py
+++ b/tad/migrations/versions/a1d47bd833f8_added_hero_test_table.py
@@ -1,8 +1,8 @@
"""Added hero test table
-Revision ID: 17f5b05e9ec3
+Revision ID: a1d47bd833f8
Revises:
-Create Date: 2024-05-10 13:57:16.989570
+Create Date: 2024-05-10 14:00:32.948932
"""
@@ -13,7 +13,7 @@
from alembic import op
# revision identifiers, used by Alembic.
-revision: str = "17f5b05e9ec3"
+revision: str = "a1d47bd833f8"
down_revision: str | None = None
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None
From 4e5e061481acd49045d873b9e81b8cc2376be810 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Fri, 10 May 2024 14:02:50 +0000
Subject: [PATCH 39/55] Add __init__
---
tad/middleware/__init__.py | 0
tad/utils/__init__.py | 0
tests/api/__init__.py | 0
tests/api/routes/__init__.py | 0
tests/core/__init__.py | 0
tests/utils/__init__.py | 0
6 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 tad/middleware/__init__.py
create mode 100644 tad/utils/__init__.py
create mode 100644 tests/api/__init__.py
create mode 100644 tests/api/routes/__init__.py
create mode 100644 tests/core/__init__.py
create mode 100644 tests/utils/__init__.py
diff --git a/tad/middleware/__init__.py b/tad/middleware/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tad/utils/__init__.py b/tad/utils/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/api/__init__.py b/tests/api/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/api/routes/__init__.py b/tests/api/routes/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/core/__init__.py b/tests/core/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py
new file mode 100644
index 00000000..e69de29b
From f8d13fe6ed61b54f14fc61ac79d388fe75a1a6e4 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Mon, 13 May 2024 13:04:26 +0000
Subject: [PATCH 40/55] Added a test .env file
---
.env.test | 24 ++++++++++++++++++++++++
.vscode/extensions.json | 3 ++-
.vscode/launch.json | 3 ++-
3 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 .env.test
diff --git a/.env.test b/.env.test
new file mode 100644
index 00000000..4b36cdf8
--- /dev/null
+++ b/.env.test
@@ -0,0 +1,24 @@
+# Domain
+DOMAIN=localhost
+
+# Environment: local, staging, production
+ENVIRONMENT=local
+PROJECT_NAME="TAD"
+
+# TAD backend
+BACKEND_CORS_ORIGINS="http://localhost,https://localhost,http://127.0.0.1,https://127.0.0.1"
+SECRET_KEY=changethis
+APP_DATABASE_SCHEME="sqlite"
+APP_DATABASE_USER=tad
+APP_DATABASE_DB=tad
+APP_DATABASE_PASSWORD=changethis
+
+# Postgres database
+POSTGRES_SERVER=db
+POSTGRES_PORT=5432
+POSTGRES_DB=postgres
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=changethis
+
+# Database viewer
+PGADMIN_DEFAULT_PASSWORD=changethis
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 15f9cc4d..16c15f27 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -8,6 +8,7 @@
"charliermarsh.ruff",
"github.vscode-github-actions",
"mhutchie.git-graph",
- "markis.code-coverage"
+ "markis.code-coverage",
+ "qwtel.sqlite-viewer"
]
}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 84d3ec13..c12e03b6 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,7 +11,8 @@
"cwd": "${workspaceFolder}/",
"env": {
"PYTHONPATH": "${workspaceFolder}"
- }
+ },
+ "envFile": "${workspaceFolder}/.env.test"
},
{
"name": "Project: tests",
From 0dd830c3e139966c0ddc0895301f68350a1ce0e3 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Mon, 13 May 2024 13:05:09 +0000
Subject: [PATCH 41/55] Make models dynamicly imported for alembic
---
tad/migrations/env.py | 13 ++++++-------
...hero_test_table.py => 006c480a1920_a_message.py} | 8 ++++----
2 files changed, 10 insertions(+), 11 deletions(-)
rename tad/migrations/versions/{a1d47bd833f8_added_hero_test_table.py => 006c480a1920_a_message.py} (86%)
diff --git a/tad/migrations/env.py b/tad/migrations/env.py
index 51cd0f77..d5bc0598 100644
--- a/tad/migrations/env.py
+++ b/tad/migrations/env.py
@@ -3,26 +3,25 @@
from alembic import context
from sqlalchemy import engine_from_config, pool
+from sqlmodel import SQLModel
+from tad.models import * # noqa
config = context.config
if config.config_file_name is not None:
fileConfig(config.config_file_name)
-# todo(berry): automaticly import all models
-from tad.models.hero import Hero # noqa
-
-target_metadata = [Hero.metadata]
+target_metadata = SQLModel.metadata
def get_url():
- scheme = os.getenv("SQLALCHEMY_SCHEME", "sqlite")
+ scheme = os.getenv("APP_DATABASE_SCHEME", "sqlite")
if scheme == "sqlite":
- file = os.getenv("SQLITE_FILE", "/database")
+ file = os.getenv("APP_DATABASE__FILE", "/database")
return f"{scheme}:///{file}"
- user = os.getenv("APP_DATABASE_USER", "postgres")
+ user = os.getenv("APP_DATABASE_USER", "tad")
password = os.getenv("APP_DATABASE_PASSWORD", "")
server = os.getenv("APP_DATABASE_SERVER", "db")
port = os.getenv("APP_DATABASE_PORT", "5432")
diff --git a/tad/migrations/versions/a1d47bd833f8_added_hero_test_table.py b/tad/migrations/versions/006c480a1920_a_message.py
similarity index 86%
rename from tad/migrations/versions/a1d47bd833f8_added_hero_test_table.py
rename to tad/migrations/versions/006c480a1920_a_message.py
index d945dc80..fa83e759 100644
--- a/tad/migrations/versions/a1d47bd833f8_added_hero_test_table.py
+++ b/tad/migrations/versions/006c480a1920_a_message.py
@@ -1,8 +1,8 @@
-"""Added hero test table
+"""a message
-Revision ID: a1d47bd833f8
+Revision ID: 006c480a1920
Revises:
-Create Date: 2024-05-10 14:00:32.948932
+Create Date: 2024-05-13 12:36:32.647256
"""
@@ -13,7 +13,7 @@
from alembic import op
# revision identifiers, used by Alembic.
-revision: str = "a1d47bd833f8"
+revision: str = "006c480a1920"
down_revision: str | None = None
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None
From 9f1b180c40b08b5a4ce3024932161ae4917d4e93 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Mon, 13 May 2024 13:05:30 +0000
Subject: [PATCH 42/55] Add SQLite plugin for vscode
---
.devcontainer/devcontainer.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1696c40a..27bc2fe2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -23,7 +23,8 @@
"charliermarsh.ruff",
"github.vscode-github-actions",
"mhutchie.git-graph",
- "markis.code-coverage"
+ "markis.code-coverage",
+ "qwtel.sqlite-viewer"
],
"settings": {
"editor.formatOnPaste": false,
From 90fbd94f565e05aa7c5ecf7b85f265d9a4153b63 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Mon, 13 May 2024 13:07:16 +0000
Subject: [PATCH 43/55] Monkeypatch env in tests
---
.gitignore | 1 +
compose.yml | 8 +-
poetry.lock | 224 +++++++++++---------------
pyproject.toml | 10 +-
tad/core/config.py | 40 +++--
tad/core/db.py | 9 +-
tad/main.py | 2 +
tad/models/__init__.py | 3 +
tests/conftest.py | 27 ++--
tests/core/test_config.py | 44 +++--
tests/core/test_db.py | 15 ++
tests/core/test_exception_handlers.py | 16 +-
12 files changed, 201 insertions(+), 198 deletions(-)
create mode 100644 tests/core/test_db.py
diff --git a/.gitignore b/.gitignore
index 6f460810..a0cbd221 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ __pypackages__/
# tad tool
tad.log*
+database.sqlite3
diff --git a/compose.yml b/compose.yml
index a194a988..324d3887 100644
--- a/compose.yml
+++ b/compose.yml
@@ -9,7 +9,8 @@ services:
db:
condition: service_healthy
env_file:
- - .env
+ - path: .env
+ required: true
environment:
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?Variable not set}
ports:
@@ -22,7 +23,8 @@ services:
- app-db-data:/var/lib/postgresql/data/pgdata
- ./database/:/docker-entrypoint-initdb.d/:cached
env_file:
- - .env
+ - path: .env
+ required: true
environment:
- PGDATA=/var/lib/postgresql/data/pgdata
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?Variable not set}
@@ -38,7 +40,7 @@ services:
ports:
- 8080:8080
environment:
- - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:-berry.hartog@minbzk.nl}
+ - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:-tad@minbzk.nl}
- PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD:?Variable not set}
- PGADMIN_LISTEN_PORT=${PGADMIN_LISTEN_PORT:-8080}
depends_on:
diff --git a/poetry.lock b/poetry.lock
index 6b6eb6e3..f35389eb 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
[[package]]
name = "alembic"
@@ -1096,101 +1096,84 @@ wcwidth = "*"
tests = ["pytest", "pytest-cov", "pytest-lazy-fixtures"]
[[package]]
-name = "psycopg"
-version = "3.1.18"
-description = "PostgreSQL database adapter for Python"
+name = "psycopg2-binary"
+version = "2.9.9"
+description = "psycopg2 - Python-PostgreSQL Database Adapter"
optional = false
python-versions = ">=3.7"
files = [
- {file = "psycopg-3.1.18-py3-none-any.whl", hash = "sha256:4d5a0a5a8590906daa58ebd5f3cfc34091377354a1acced269dd10faf55da60e"},
- {file = "psycopg-3.1.18.tar.gz", hash = "sha256:31144d3fb4c17d78094d9e579826f047d4af1da6a10427d91dfcfb6ecdf6f12b"},
-]
-
-[package.dependencies]
-psycopg-binary = {version = "3.1.18", optional = true, markers = "implementation_name != \"pypy\" and extra == \"binary\""}
-typing-extensions = ">=4.1"
-tzdata = {version = "*", markers = "sys_platform == \"win32\""}
-
-[package.extras]
-binary = ["psycopg-binary (==3.1.18)"]
-c = ["psycopg-c (==3.1.18)"]
-dev = ["black (>=24.1.0)", "codespell (>=2.2)", "dnspython (>=2.1)", "flake8 (>=4.0)", "mypy (>=1.4.1)", "types-setuptools (>=57.4)", "wheel (>=0.37)"]
-docs = ["Sphinx (>=5.0)", "furo (==2022.6.21)", "sphinx-autobuild (>=2021.3.14)", "sphinx-autodoc-typehints (>=1.12)"]
-pool = ["psycopg-pool"]
-test = ["anyio (>=3.6.2,<4.0)", "mypy (>=1.4.1)", "pproxy (>=2.7)", "pytest (>=6.2.5)", "pytest-cov (>=3.0)", "pytest-randomly (>=3.5)"]
-
-[[package]]
-name = "psycopg-binary"
-version = "3.1.18"
-description = "PostgreSQL database adapter for Python -- C optimisation distribution"
-optional = false
-python-versions = ">=3.7"
-files = [
- {file = "psycopg_binary-3.1.18-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5c323103dfa663b88204cf5f028e83c77d7a715f9b6f51d2bbc8184b99ddd90a"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:887f8d856c91510148be942c7acd702ccf761a05f59f8abc123c22ab77b5a16c"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d322ba72cde4ca2eefc2196dad9ad7e52451acd2f04e3688d590290625d0c970"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:489aa4fe5a0b653b68341e9e44af247dedbbc655326854aa34c163ef1bcb3143"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:55ff0948457bfa8c0d35c46e3a75193906d1c275538877ba65907fd67aa059ad"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b15e3653c82384b043d820fc637199b5c6a36b37fa4a4943e0652785bb2bad5d"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f8ff3bc08b43f36fdc24fedb86d42749298a458c4724fb588c4d76823ac39f54"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:1729d0e3dfe2546d823841eb7a3d003144189d6f5e138ee63e5227f8b75276a5"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:13bcd3742112446037d15e360b27a03af4b5afcf767f5ee374ef8f5dd7571b31"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:320047e3d3554b857e16c2b6b615a85e0db6a02426f4d203a4594a2f125dfe57"},
- {file = "psycopg_binary-3.1.18-cp310-cp310-win_amd64.whl", hash = "sha256:888a72c2aca4316ca6d4a619291b805677bae99bba2f6e31a3c18424a48c7e4d"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4e4de16a637ec190cbee82e0c2dc4860fed17a23a35f7a1e6dc479a5c6876722"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6432047b8b24ef97e3fbee1d1593a0faaa9544c7a41a2c67d1f10e7621374c83"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9d684227ef8212e27da5f2aff9d4d303cc30b27ac1702d4f6881935549486dd5"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67284e2e450dc7a9e4d76e78c0bd357dc946334a3d410defaeb2635607f632cd"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1c9b6bd7fb5c6638cb32469674707649b526acfe786ba6d5a78ca4293d87bae4"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7121acc783c4e86d2d320a7fb803460fab158a7f0a04c5e8c5d49065118c1e73"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e28ff8f3de7b56588c2a398dc135fd9f157d12c612bd3daa7e6ba9872337f6f5"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c84a0174109f329eeda169004c7b7ca2e884a6305acab4a39600be67f915ed38"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:531381f6647fc267383dca88dbe8a70d0feff433a8e3d0c4939201fea7ae1b82"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:b293e01057e63c3ac0002aa132a1071ce0fdb13b9ee2b6b45d3abdb3525c597d"},
- {file = "psycopg_binary-3.1.18-cp311-cp311-win_amd64.whl", hash = "sha256:780a90bcb69bf27a8b08bc35b958e974cb6ea7a04cdec69e737f66378a344d68"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:87dd9154b757a5fbf6d590f6f6ea75f4ad7b764a813ae04b1d91a70713f414a1"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f876ebbf92db70125f6375f91ab4bc6b27648aa68f90d661b1fc5affb4c9731c"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:258d2f0cb45e4574f8b2fe7c6d0a0e2eb58903a4fd1fbaf60954fba82d595ab7"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bd27f713f2e5ef3fd6796e66c1a5203a27a30ecb847be27a78e1df8a9a5ae68c"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c38a4796abf7380f83b1653c2711cb2449dd0b2e5aca1caa75447d6fa5179c69"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2f7f95746efd1be2dc240248cc157f4315db3fd09fef2adfcc2a76e24aa5741"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4085f56a8d4fc8b455e8f44380705c7795be5317419aa5f8214f315e4205d804"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:2e2484ae835dedc80cdc7f1b1a939377dc967fed862262cfd097aa9f50cade46"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:3c2b039ae0c45eee4cd85300ef802c0f97d0afc78350946a5d0ec77dd2d7e834"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f54978c4b646dec77fefd8485fa82ec1a87807f334004372af1aaa6de9539a5"},
- {file = "psycopg_binary-3.1.18-cp312-cp312-win_amd64.whl", hash = "sha256:9ffcbbd389e486d3fd83d30107bbf8b27845a295051ccabde240f235d04ed921"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c76659ae29a84f2c14f56aad305dd00eb685bd88f8c0a3281a9a4bc6bd7d2aa7"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c7afcd6f1d55992f26d9ff7b0bd4ee6b475eb43aa3f054d67d32e09f18b0065"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:639dd78ac09b144b0119076783cb64e1128cc8612243e9701d1503c816750b2e"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e1cf59e0bb12e031a48bb628aae32df3d0c98fd6c759cb89f464b1047f0ca9c8"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e262398e5d51563093edf30612cd1e20fedd932ad0994697d7781ca4880cdc3d"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:59701118c7d8842e451f1e562d08e8708b3f5d14974eefbce9374badd723c4ae"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:dea4a59da7850192fdead9da888e6b96166e90608cf39e17b503f45826b16f84"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:4575da95fc441244a0e2ebaf33a2b2f74164603341d2046b5cde0a9aa86aa7e2"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:812726266ab96de681f2c7dbd6b734d327f493a78357fcc16b2ac86ff4f4e080"},
- {file = "psycopg_binary-3.1.18-cp37-cp37m-win_amd64.whl", hash = "sha256:3e7ce4d988112ca6c75765c7f24c83bdc476a6a5ce00878df6c140ca32c3e16d"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:02bd4da45d5ee9941432e2e9bf36fa71a3ac21c6536fe7366d1bd3dd70d6b1e7"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:39242546383f6b97032de7af30edb483d237a0616f6050512eee7b218a2aa8ee"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d46ae44d66bf6058a812467f6ae84e4e157dee281bfb1cfaeca07dee07452e85"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ad35ac7fd989184bf4d38a87decfb5a262b419e8ba8dcaeec97848817412c64a"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:247474af262bdd5559ee6e669926c4f23e9cf53dae2d34c4d991723c72196404"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ebecbf2406cd6875bdd2453e31067d1bd8efe96705a9489ef37e93b50dc6f09"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:1859aeb2133f5ecdd9cbcee155f5e38699afc06a365f903b1512c765fd8d457e"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:da917f6df8c6b2002043193cb0d74cc173b3af7eb5800ad69c4e1fbac2a71c30"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:9e24e7b6a68a51cc3b162d0339ae4e1263b253e887987d5c759652f5692b5efe"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e252d66276c992319ed6cd69a3ffa17538943954075051e992143ccbf6dc3d3e"},
- {file = "psycopg_binary-3.1.18-cp38-cp38-win_amd64.whl", hash = "sha256:5d6e860edf877d4413e4a807e837d55e3a7c7df701e9d6943c06e460fa6c058f"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:eea5f14933177ffe5c40b200f04f814258cc14b14a71024ad109f308e8bad414"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:824a1bfd0db96cc6bef2d1e52d9e0963f5bf653dd5bc3ab519a38f5e6f21c299"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a87e9eeb80ce8ec8c2783f29bce9a50bbcd2e2342a340f159c3326bf4697afa1"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:91074f78a9f890af5f2c786691575b6b93a4967ad6b8c5a90101f7b8c1a91d9c"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e05f6825f8db4428782135e6986fec79b139210398f3710ed4aa6ef41473c008"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f68ac2364a50d4cf9bb803b4341e83678668f1881a253e1224574921c69868c"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7ac1785d67241d5074f8086705fa68e046becea27964267ab3abd392481d7773"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:cd2a9f7f0d4dacc5b9ce7f0e767ae6cc64153264151f50698898c42cabffec0c"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:3e4b0bb91da6f2238dbd4fbb4afc40dfb4f045bb611b92fce4d381b26413c686"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:74e498586b72fb819ca8ea82107747d0cb6e00ae685ea6d1ab3f929318a8ce2d"},
- {file = "psycopg_binary-3.1.18-cp39-cp39-win_amd64.whl", hash = "sha256:d4422af5232699f14b7266a754da49dc9bcd45eba244cf3812307934cd5d6679"},
+ {file = "psycopg2-binary-2.9.9.tar.gz", hash = "sha256:7f01846810177d829c7692f1f5ada8096762d9172af1b1a28d4ab5b77c923c1c"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c2470da5418b76232f02a2fcd2229537bb2d5a7096674ce61859c3229f2eb202"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c6af2a6d4b7ee9615cbb162b0738f6e1fd1f5c3eda7e5da17861eacf4c717ea7"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:75723c3c0fbbf34350b46a3199eb50638ab22a0228f93fb472ef4d9becc2382b"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83791a65b51ad6ee6cf0845634859d69a038ea9b03d7b26e703f94c7e93dbcf9"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0ef4854e82c09e84cc63084a9e4ccd6d9b154f1dbdd283efb92ecd0b5e2b8c84"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed1184ab8f113e8d660ce49a56390ca181f2981066acc27cf637d5c1e10ce46e"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d2997c458c690ec2bc6b0b7ecbafd02b029b7b4283078d3b32a852a7ce3ddd98"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:b58b4710c7f4161b5e9dcbe73bb7c62d65670a87df7bcce9e1faaad43e715245"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:0c009475ee389757e6e34611d75f6e4f05f0cf5ebb76c6037508318e1a1e0d7e"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8dbf6d1bc73f1d04ec1734bae3b4fb0ee3cb2a493d35ede9badbeb901fb40f6f"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-win32.whl", hash = "sha256:3f78fd71c4f43a13d342be74ebbc0666fe1f555b8837eb113cb7416856c79682"},
+ {file = "psycopg2_binary-2.9.9-cp310-cp310-win_amd64.whl", hash = "sha256:876801744b0dee379e4e3c38b76fc89f88834bb15bf92ee07d94acd06ec890a0"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ee825e70b1a209475622f7f7b776785bd68f34af6e7a46e2e42f27b659b5bc26"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1ea665f8ce695bcc37a90ee52de7a7980be5161375d42a0b6c6abedbf0d81f0f"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:143072318f793f53819048fdfe30c321890af0c3ec7cb1dfc9cc87aa88241de2"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c332c8d69fb64979ebf76613c66b985414927a40f8defa16cf1bc028b7b0a7b0"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f7fc5a5acafb7d6ccca13bfa8c90f8c51f13d8fb87d95656d3950f0158d3ce53"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:977646e05232579d2e7b9c59e21dbe5261f403a88417f6a6512e70d3f8a046be"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:b6356793b84728d9d50ead16ab43c187673831e9d4019013f1402c41b1db9b27"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:bc7bb56d04601d443f24094e9e31ae6deec9ccb23581f75343feebaf30423359"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:77853062a2c45be16fd6b8d6de2a99278ee1d985a7bd8b103e97e41c034006d2"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:78151aa3ec21dccd5cdef6c74c3e73386dcdfaf19bced944169697d7ac7482fc"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-win32.whl", hash = "sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d"},
+ {file = "psycopg2_binary-2.9.9-cp311-cp311-win_amd64.whl", hash = "sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6e6f98446430fdf41bd36d4faa6cb409f5140c1c2cf58ce0bbdaf16af7d3f119"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c77e3d1862452565875eb31bdb45ac62502feabbd53429fdc39a1cc341d681ba"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-win32.whl", hash = "sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93"},
+ {file = "psycopg2_binary-2.9.9-cp312-cp312-win_amd64.whl", hash = "sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8359bf4791968c5a78c56103702000105501adb557f3cf772b2c207284273984"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:275ff571376626195ab95a746e6a04c7df8ea34638b99fc11160de91f2fef503"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:f9b5571d33660d5009a8b3c25dc1db560206e2d2f89d3df1cb32d72c0d117d52"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:420f9bbf47a02616e8554e825208cb947969451978dceb77f95ad09c37791dae"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:4154ad09dac630a0f13f37b583eae260c6aa885d67dfbccb5b02c33f31a6d420"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a148c5d507bb9b4f2030a2025c545fccb0e1ef317393eaba42e7eabd28eb6041"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-win32.whl", hash = "sha256:68fc1f1ba168724771e38bee37d940d2865cb0f562380a1fb1ffb428b75cb692"},
+ {file = "psycopg2_binary-2.9.9-cp37-cp37m-win_amd64.whl", hash = "sha256:281309265596e388ef483250db3640e5f414168c5a67e9c665cafce9492eda2f"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:60989127da422b74a04345096c10d416c2b41bd7bf2a380eb541059e4e999980"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:246b123cc54bb5361588acc54218c8c9fb73068bf227a4a531d8ed56fa3ca7d6"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34eccd14566f8fe14b2b95bb13b11572f7c7d5c36da61caf414d23b91fcc5d94"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:18d0ef97766055fec15b5de2c06dd8e7654705ce3e5e5eed3b6651a1d2a9a152"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d3f82c171b4ccd83bbaf35aa05e44e690113bd4f3b7b6cc54d2219b132f3ae55"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ead20f7913a9c1e894aebe47cccf9dc834e1618b7aa96155d2091a626e59c972"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ca49a8119c6cbd77375ae303b0cfd8c11f011abbbd64601167ecca18a87e7cdd"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:323ba25b92454adb36fa425dc5cf6f8f19f78948cbad2e7bc6cdf7b0d7982e59"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:1236ed0952fbd919c100bc839eaa4a39ebc397ed1c08a97fc45fee2a595aa1b3"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:729177eaf0aefca0994ce4cffe96ad3c75e377c7b6f4efa59ebf003b6d398716"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-win32.whl", hash = "sha256:804d99b24ad523a1fe18cc707bf741670332f7c7412e9d49cb5eab67e886b9b5"},
+ {file = "psycopg2_binary-2.9.9-cp38-cp38-win_amd64.whl", hash = "sha256:a6cdcc3ede532f4a4b96000b6362099591ab4a3e913d70bcbac2b56c872446f7"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:72dffbd8b4194858d0941062a9766f8297e8868e1dd07a7b36212aaa90f49472"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:30dcc86377618a4c8f3b72418df92e77be4254d8f89f14b8e8f57d6d43603c0f"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:31a34c508c003a4347d389a9e6fcc2307cc2150eb516462a7a17512130de109e"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:15208be1c50b99203fe88d15695f22a5bed95ab3f84354c494bcb1d08557df67"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1873aade94b74715be2246321c8650cabf5a0d098a95bab81145ffffa4c13876"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a58c98a7e9c021f357348867f537017057c2ed7f77337fd914d0bedb35dace7"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4686818798f9194d03c9129a4d9a702d9e113a89cb03bffe08c6cf799e053291"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ebdc36bea43063116f0486869652cb2ed7032dbc59fbcb4445c4862b5c1ecf7f"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:ca08decd2697fdea0aea364b370b1249d47336aec935f87b8bbfd7da5b2ee9c1"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ac05fb791acf5e1a3e39402641827780fe44d27e72567a000412c648a85ba860"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-win32.whl", hash = "sha256:9dba73be7305b399924709b91682299794887cbbd88e38226ed9f6712eabee90"},
+ {file = "psycopg2_binary-2.9.9-cp39-cp39-win_amd64.whl", hash = "sha256:f7ae5d65ccfbebdfa761585228eb4d0df3a8b15cfb53bd953e713e09fbb12957"},
]
[[package]]
@@ -1352,13 +1335,13 @@ diagrams = ["jinja2", "railroad-diagrams"]
[[package]]
name = "pyright"
-version = "1.1.361"
+version = "1.1.362"
description = "Command line wrapper for pyright"
optional = false
python-versions = ">=3.7"
files = [
- {file = "pyright-1.1.361-py3-none-any.whl", hash = "sha256:c50fc94ce92b5c958cfccbbe34142e7411d474da43d6c14a958667e35b9df7ea"},
- {file = "pyright-1.1.361.tar.gz", hash = "sha256:1d67933315666b05d230c85ea8fb97aaa2056e4092a13df87b7765bb9e8f1a8d"},
+ {file = "pyright-1.1.362-py3-none-any.whl", hash = "sha256:969957cff45154d8a45a4ab1dae5bdc8223d8bd3c64654fa608ab3194dfff319"},
+ {file = "pyright-1.1.362.tar.gz", hash = "sha256:6a477e448d4a07a6a0eab58b2a15a1bbed031eb3169fa809edee79cca168d83a"},
]
[package.dependencies]
@@ -1628,28 +1611,28 @@ files = [
[[package]]
name = "ruff"
-version = "0.4.3"
+version = "0.4.4"
description = "An extremely fast Python linter and code formatter, written in Rust."
optional = false
python-versions = ">=3.7"
files = [
- {file = "ruff-0.4.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b70800c290f14ae6fcbb41bbe201cf62dfca024d124a1f373e76371a007454ce"},
- {file = "ruff-0.4.3-py3-none-macosx_11_0_arm64.whl", hash = "sha256:08a0d6a22918ab2552ace96adeaca308833873a4d7d1d587bb1d37bae8728eb3"},
- {file = "ruff-0.4.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eba1f14df3c758dd7de5b55fbae7e1c8af238597961e5fb628f3de446c3c40c5"},
- {file = "ruff-0.4.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:819fb06d535cc76dfddbfe8d3068ff602ddeb40e3eacbc90e0d1272bb8d97113"},
- {file = "ruff-0.4.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0bfc9e955e6dc6359eb6f82ea150c4f4e82b660e5b58d9a20a0e42ec3bb6342b"},
- {file = "ruff-0.4.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:510a67d232d2ebe983fddea324dbf9d69b71c4d2dfeb8a862f4a127536dd4cfb"},
- {file = "ruff-0.4.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dc9ff11cd9a092ee7680a56d21f302bdda14327772cd870d806610a3503d001f"},
- {file = "ruff-0.4.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:29efff25bf9ee685c2c8390563a5b5c006a3fee5230d28ea39f4f75f9d0b6f2f"},
- {file = "ruff-0.4.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:18b00e0bcccf0fc8d7186ed21e311dffd19761cb632241a6e4fe4477cc80ef6e"},
- {file = "ruff-0.4.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:262f5635e2c74d80b7507fbc2fac28fe0d4fef26373bbc62039526f7722bca1b"},
- {file = "ruff-0.4.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:7363691198719c26459e08cc17c6a3dac6f592e9ea3d2fa772f4e561b5fe82a3"},
- {file = "ruff-0.4.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:eeb039f8428fcb6725bb63cbae92ad67b0559e68b5d80f840f11914afd8ddf7f"},
- {file = "ruff-0.4.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:927b11c1e4d0727ce1a729eace61cee88a334623ec424c0b1c8fe3e5f9d3c865"},
- {file = "ruff-0.4.3-py3-none-win32.whl", hash = "sha256:25cacda2155778beb0d064e0ec5a3944dcca9c12715f7c4634fd9d93ac33fd30"},
- {file = "ruff-0.4.3-py3-none-win_amd64.whl", hash = "sha256:7a1c3a450bc6539ef00da6c819fb1b76b6b065dec585f91456e7c0d6a0bbc725"},
- {file = "ruff-0.4.3-py3-none-win_arm64.whl", hash = "sha256:71ca5f8ccf1121b95a59649482470c5601c60a416bf189d553955b0338e34614"},
- {file = "ruff-0.4.3.tar.gz", hash = "sha256:ff0a3ef2e3c4b6d133fbedcf9586abfbe38d076041f2dc18ffb2c7e0485d5a07"},
+ {file = "ruff-0.4.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:29d44ef5bb6a08e235c8249294fa8d431adc1426bfda99ed493119e6f9ea1bf6"},
+ {file = "ruff-0.4.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:c4efe62b5bbb24178c950732ddd40712b878a9b96b1d02b0ff0b08a090cbd891"},
+ {file = "ruff-0.4.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c8e2f1e8fc12d07ab521a9005d68a969e167b589cbcaee354cb61e9d9de9c15"},
+ {file = "ruff-0.4.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:60ed88b636a463214905c002fa3eaab19795679ed55529f91e488db3fe8976ab"},
+ {file = "ruff-0.4.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b90fc5e170fc71c712cc4d9ab0e24ea505c6a9e4ebf346787a67e691dfb72e85"},
+ {file = "ruff-0.4.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:8e7e6ebc10ef16dcdc77fd5557ee60647512b400e4a60bdc4849468f076f6eef"},
+ {file = "ruff-0.4.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b9ddb2c494fb79fc208cd15ffe08f32b7682519e067413dbaf5f4b01a6087bcd"},
+ {file = "ruff-0.4.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c51c928a14f9f0a871082603e25a1588059b7e08a920f2f9fa7157b5bf08cfe9"},
+ {file = "ruff-0.4.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5eb0a4bfd6400b7d07c09a7725e1a98c3b838be557fee229ac0f84d9aa49c36"},
+ {file = "ruff-0.4.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:b1867ee9bf3acc21778dcb293db504692eda5f7a11a6e6cc40890182a9f9e595"},
+ {file = "ruff-0.4.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:1aecced1269481ef2894cc495647392a34b0bf3e28ff53ed95a385b13aa45768"},
+ {file = "ruff-0.4.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:9da73eb616b3241a307b837f32756dc20a0b07e2bcb694fec73699c93d04a69e"},
+ {file = "ruff-0.4.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:958b4ea5589706a81065e2a776237de2ecc3e763342e5cc8e02a4a4d8a5e6f95"},
+ {file = "ruff-0.4.4-py3-none-win32.whl", hash = "sha256:cb53473849f011bca6e754f2cdf47cafc9c4f4ff4570003a0dad0b9b6890e876"},
+ {file = "ruff-0.4.4-py3-none-win_amd64.whl", hash = "sha256:424e5b72597482543b684c11def82669cc6b395aa8cc69acc1858b5ef3e5daae"},
+ {file = "ruff-0.4.4-py3-none-win_arm64.whl", hash = "sha256:39df0537b47d3b597293edbb95baf54ff5b49589eb7ff41926d8243caa995ea6"},
+ {file = "ruff-0.4.4.tar.gz", hash = "sha256:f87ea42d5cdebdc6a69761a9d0bc83ae9b3b30d0ad78952005ba6568d6c022af"},
]
[[package]]
@@ -1853,17 +1836,6 @@ files = [
{file = "typing_extensions-4.11.0.tar.gz", hash = "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0"},
]
-[[package]]
-name = "tzdata"
-version = "2024.1"
-description = "Provider of IANA time zone data"
-optional = false
-python-versions = ">=2"
-files = [
- {file = "tzdata-2024.1-py2.py3-none-any.whl", hash = "sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252"},
- {file = "tzdata-2024.1.tar.gz", hash = "sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd"},
-]
-
[[package]]
name = "uri-template"
version = "1.3.0"
@@ -2063,4 +2035,4 @@ tests = ["pytest", "pytest-cov"]
[metadata]
lock-version = "2.0"
python-versions = "^3.10"
-content-hash = "f1885d3734003c3ef4591b35fcd92c5b8738f3531a37562591705ae92e16df59"
+content-hash = "32e9283427a9fc742dcaeff76059d3535e8071666612263c92a05a3bdb355b1b"
diff --git a/pyproject.toml b/pyproject.toml
index d3355483..1a8fc052 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,12 +24,12 @@ packages = [
python = "^3.10"
fastapi = "^0.110.3"
sqlmodel = "^0.0.18"
-psycopg = {extras = ["binary"], version = "^3.1.18"}
alembic = "^1.13.1"
pydantic = "^2.7.1"
jinja2 = "^3.1.4"
pydantic-settings = "^2.2.1"
granian = {extras = ["reload"], version = "^1.3.1"}
+psycopg2-binary = "^2.9.9"
[tool.poetry.group.test.dependencies]
pytest = "^8.1.1"
@@ -76,11 +76,18 @@ typeCheckingMode = "strict"
reportMissingImports = true
reportMissingTypeStubs = true
reportUnnecessaryIsInstance = false
+exclude = [
+ "tad/migrations"
+]
[tool.coverage.run]
branch = true
command_line = "-m pytest"
relative_files = true # needed for sonarcloud code coverage
+omit = [
+ "tests/*"
+]
+
[tool.coverage.report]
fail_under = 95
@@ -94,6 +101,7 @@ title = "tad"
testpaths = [
"tests"
]
+addopts = "--strict-markers"
filterwarnings = [
"ignore::UserWarning"
]
diff --git a/tad/core/config.py b/tad/core/config.py
index 2ab11f92..8ead4a88 100644
--- a/tad/core/config.py
+++ b/tad/core/config.py
@@ -1,5 +1,5 @@
+import logging
import secrets
-import warnings
from typing import Any, TypeVar
from pydantic import (
@@ -18,7 +18,10 @@
class Settings(BaseSettings):
# todo(berry): investigate yaml, toml or json file support for SettingsConfigDict
- model_config = SettingsConfigDict(env_file=".env", env_ignore_empty=True, extra="ignore")
+ # todo(berry): investigate multiple .env files support for SettingsConfigDict
+ model_config = SettingsConfigDict(
+ env_file=(".env", ".env.test", ".env.prod"), env_ignore_empty=True, extra="ignore"
+ )
SECRET_KEY: str = secrets.token_urlsafe(32)
DOMAIN: str = "localhost"
@@ -43,23 +46,33 @@ def server_host(self) -> str:
# todo(berry): create submodel for database settings
APP_DATABASE_SCHEME: DatabaseSchemaType = "sqlite"
+ APP_DATABASE_DRIVER: str | None = None
+
APP_DATABASE_SERVER: str = "db"
APP_DATABASE_PORT: int = 5432
APP_DATABASE_USER: str = "tad"
- APP_DATABASE_PASSWORD: str
+ APP_DATABASE_PASSWORD: str | None = None
APP_DATABASE_DB: str = "tad"
- SQLITE_FILE: str = "//./database"
+ APP_DATABASE_FILE: str = "database.sqlite3"
@computed_field # type: ignore[misc]
@property
def SQLALCHEMY_DATABASE_URI(self) -> str:
+ logging.info(f"test: {self.APP_DATABASE_SCHEME}")
+
if self.APP_DATABASE_SCHEME == "sqlite":
- return str(MultiHostUrl.build(scheme=self.APP_DATABASE_SCHEME, host="", path=self.SQLITE_FILE))
+ return str(MultiHostUrl.build(scheme=self.APP_DATABASE_SCHEME, host="", path=self.APP_DATABASE_FILE))
+
+ scheme: str = (
+ f"{self.APP_DATABASE_SCHEME}+{self.APP_DATABASE_DRIVER}"
+ if isinstance(self.APP_DATABASE_DRIVER, str)
+ else self.APP_DATABASE_SCHEME
+ )
return str(
MultiHostUrl.build(
- scheme=self.APP_DATABASE_SCHEME,
+ scheme=scheme,
username=self.APP_DATABASE_USER,
password=self.APP_DATABASE_PASSWORD,
host=self.APP_DATABASE_SERVER,
@@ -68,21 +81,6 @@ def SQLALCHEMY_DATABASE_URI(self) -> str:
)
)
- def _check_default_secret(self, var_name: str, value: str | None) -> None:
- if value == "changethis":
- message = f'The value of {var_name} is "changethis", ' "for security, please change it"
- if self.ENVIRONMENT == "local":
- warnings.warn(message, stacklevel=1)
- else:
- raise SettingsError(message)
-
- @model_validator(mode="after")
- def _enforce_non_default_secrets(self: SelfSettings) -> SelfSettings:
- self._check_default_secret("SECRET_KEY", self.SECRET_KEY)
- self._check_default_secret("APP_DATABASE_PASSWORD", self.APP_DATABASE_PASSWORD)
-
- return self
-
@model_validator(mode="after")
def _enforce_database_rules(self: SelfSettings) -> SelfSettings:
if self.ENVIRONMENT != "local" and self.APP_DATABASE_SCHEME == "sqlite":
diff --git a/tad/core/db.py b/tad/core/db.py
index 1b400351..d5317814 100644
--- a/tad/core/db.py
+++ b/tad/core/db.py
@@ -1,5 +1,10 @@
-from sqlmodel import create_engine
+from sqlmodel import Session, create_engine, select
from tad.core.config import settings
-engine = create_engine(settings.SQLALCHEMY_DATABASE_URI, echo=True)
+engine = create_engine(settings.SQLALCHEMY_DATABASE_URI)
+
+
+async def check_db():
+ with Session(engine) as session:
+ session.exec(select(1))
diff --git a/tad/main.py b/tad/main.py
index ea21ff00..7a2390d2 100644
--- a/tad/main.py
+++ b/tad/main.py
@@ -10,6 +10,7 @@
from tad.api.main import api_router
from tad.core.config import settings
+from tad.core.db import check_db
from tad.core.exception_handlers import (
http_exception_handler as tad_http_exception_handler,
)
@@ -32,6 +33,7 @@ async def lifespan(app: FastAPI):
logger.info(f"Starting {settings.PROJECT_NAME} version {settings.VERSION}")
logger.info(f"Settings: {mask.secrets(settings.model_dump())}")
# todo(berry): setup database connection
+ await check_db()
yield
logger.info(f"Stopping application {settings.PROJECT_NAME} version {settings.VERSION}")
logging.shutdown()
diff --git a/tad/models/__init__.py b/tad/models/__init__.py
index e69de29b..e8084bec 100644
--- a/tad/models/__init__.py
+++ b/tad/models/__init__.py
@@ -0,0 +1,3 @@
+from .hero import Hero
+
+__all__ = ["Hero"]
diff --git a/tests/conftest.py b/tests/conftest.py
index ba26bced..77538545 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,23 +1,28 @@
-import os
from collections.abc import Generator
import pytest
from fastapi.testclient import TestClient
+from sqlmodel import Session, SQLModel, create_engine
+from sqlmodel.pool import StaticPool
from tad.main import app
+# needed to make sure create_all knows about the models
+from tad.models import * # noqa: F403
+
-# todo(berry): add database fixtures
@pytest.fixture(scope="module")
-def client() -> Generator[TestClient, None, None]:
+def client(db: Session) -> Generator[TestClient, None, None]:
with TestClient(app, raise_server_exceptions=True) as c:
- c.timeout = 3
+ c.timeout = 5
yield c
-@pytest.fixture(autouse=True)
-def setup_basic_environmental_variables(monkeypatch: pytest.MonkeyPatch) -> Generator[None, None, None]: # noqa: PT004
- original_environ = dict(os.environ)
- monkeypatch.setenv("APP_DATABASE_PASSWORD", "changethis")
- yield
- os.environ.clear()
- os.environ.update(original_environ)
+@pytest.fixture(scope="module")
+def db() -> Generator[Session, None, None]:
+ engine = create_engine("sqlite://", poolclass=StaticPool)
+ SQLModel.metadata.create_all(engine)
+
+ with Session(engine) as session:
+ yield session
+
+ SQLModel.metadata.drop_all(engine)
diff --git a/tests/core/test_config.py b/tests/core/test_config.py
index 697f9124..f7c8bbc3 100644
--- a/tests/core/test_config.py
+++ b/tests/core/test_config.py
@@ -1,5 +1,3 @@
-import os
-
import pytest
from tad.core.config import Settings
from tad.core.exceptions import SettingsError
@@ -16,23 +14,18 @@ def test_default_settings():
assert settings.PROJECT_NAME == "TAD"
assert settings.PROJECT_DESCRIPTION == "Transparency of Algorithmic Decision making"
assert settings.APP_DATABASE_SCHEME == "sqlite"
- assert settings.APP_DATABASE_SERVER == "db"
- assert settings.APP_DATABASE_PORT == 5432
- assert settings.APP_DATABASE_USER == "tad"
- assert settings.APP_DATABASE_DB == "tad"
- assert settings.SQLITE_FILE == "//./database"
- assert settings.SQLALCHEMY_DATABASE_URI == "sqlite://///database"
-
-
-def test_environment_settings():
- os.environ["DOMAIN"] = "google.com"
- os.environ["ENVIRONMENT"] = "production"
- os.environ["PROJECT_NAME"] = "TAD2"
- os.environ["SECRET_KEY"] = "mysecret" # noqa: S105
- os.environ["APP_DATABASE_SCHEME"] = "postgresql"
- os.environ["APP_DATABASE_USER"] = "tad2"
- os.environ["APP_DATABASE_DB"] = "tad2"
- os.environ["APP_DATABASE_PASSWORD"] = "mypassword" # noqa: S105
+ assert settings.SQLALCHEMY_DATABASE_URI == "sqlite:///database.sqlite3"
+
+
+def test_environment_settings(monkeypatch: pytest.MonkeyPatch):
+ monkeypatch.setenv("DOMAIN", "google.com")
+ monkeypatch.setenv("ENVIRONMENT", "production")
+ monkeypatch.setenv("PROJECT_NAME", "TAD2")
+ monkeypatch.setenv("SECRET_KEY", "mysecret")
+ monkeypatch.setenv("APP_DATABASE_SCHEME", "postgresql")
+ monkeypatch.setenv("APP_DATABASE_USER", "tad2")
+ monkeypatch.setenv("APP_DATABASE_DB", "tad2")
+ monkeypatch.setenv("APP_DATABASE_PASSWORD", "mypassword")
settings = Settings(_env_file="nonexisitingfile") # type: ignore
assert settings.SECRET_KEY == "mysecret" # noqa: S105
@@ -49,22 +42,21 @@ def test_environment_settings():
assert settings.APP_DATABASE_USER == "tad2"
assert settings.APP_DATABASE_PASSWORD == "mypassword" # noqa: S105
assert settings.APP_DATABASE_DB == "tad2"
- assert settings.SQLITE_FILE == "//./database"
assert settings.SQLALCHEMY_DATABASE_URI == "postgresql://tad2:mypassword@db:5432/tad2"
-def test_environment_settings_production_sqlite_error():
- os.environ["ENVIRONMENT"] = "production"
- os.environ["APP_DATABASE_SCHEME"] = "sqlite"
- os.environ["APP_DATABASE_PASSWORD"] = "32452345432" # noqa: S105
+def test_environment_settings_production_sqlite_error(monkeypatch: pytest.MonkeyPatch):
+ monkeypatch.setenv("ENVIRONMENT", "production")
+ monkeypatch.setenv("APP_DATABASE_SCHEME", "sqlite")
+ monkeypatch.setenv("APP_DATABASE_PASSWORD", "32452345432")
with pytest.raises(SettingsError) as e:
_settings = Settings(_env_file="nonexisitingfile") # type: ignore
assert e.value.message == "SQLite is not supported in production"
-def test_environment_settings_production_nopassword_error():
- os.environ["ENVIRONMENT"] = "production"
+def test_environment_settings_production_nopassword_error(monkeypatch: pytest.MonkeyPatch):
+ monkeypatch.setenv("ENVIRONMENT", "production")
with pytest.raises(SettingsError):
_settings = Settings(_env_file="nonexisitingfile") # type: ignore
diff --git a/tests/core/test_db.py b/tests/core/test_db.py
new file mode 100644
index 00000000..5c8aab81
--- /dev/null
+++ b/tests/core/test_db.py
@@ -0,0 +1,15 @@
+from unittest.mock import Mock, patch
+
+import pytest
+from sqlmodel import Session, select
+from tad.core.db import check_db
+
+
+@pytest.mark.skip(reason="not working yet")
+async def test_check_dabase():
+ mock_session = Mock(spec=Session)
+
+ with patch("sqlmodel.Session", return_value=mock_session):
+ await check_db()
+
+ assert mock_session.exec.assert_called_once_with(select(1))
diff --git a/tests/core/test_exception_handlers.py b/tests/core/test_exception_handlers.py
index 91e2d0b2..2c3c41e4 100644
--- a/tests/core/test_exception_handlers.py
+++ b/tests/core/test_exception_handlers.py
@@ -1,3 +1,5 @@
+from typing import Any
+
import pytest
from fastapi import status
from fastapi.exceptions import HTTPException, RequestValidationError
@@ -6,28 +8,26 @@
@pytest.fixture()
-def _mock_error_500():
+def mock_error_500() -> Any: # noqa: PT004
"""Add route to raise ValueError"""
@app.get("/raise-http-exception")
- async def raise_http_error():
+ async def _raise_http_error(): # type: ignore
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
@app.get("/raise-request-validation-exception")
- async def raise_request_error():
- raise RequestValidationError(errors=None)
+ async def _raise_request_error(): # type: ignore
+ raise RequestValidationError(errors="None")
-@pytest.mark.usefixtures("_mock_error_500")
-def test_http_exception_handler(client: TestClient):
+def test_http_exception_handler(client: TestClient, mock_error_500: Any):
response = client.get("/raise-http-exception")
assert response.status_code == status.HTTP_404_NOT_FOUND
assert response.headers["content-type"] == "text/html; charset=utf-8"
-@pytest.mark.usefixtures("_mock_error_500")
-def test_request_validation_exception_handler(client: TestClient):
+def test_request_validation_exception_handler(client: TestClient, mock_error_500: Any):
response = client.get("/raise-request-validation-exception")
assert response.status_code == status.HTTP_400_BAD_REQUEST
From c570ef20f6a8e8ea19b5628defe49e4dfacc2b01 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Mon, 13 May 2024 14:47:24 +0000
Subject: [PATCH 44/55] Add basic template setup
---
tad/api/deps.py | 19 +++++++++++++++++++
tad/api/routes/root.py | 8 +++++---
tad/core/config.py | 1 +
tad/static/css/styles.css | 0
tad/static/js/main.js | 0
tad/templates/layout.html | 21 +++++++++++++++++++++
tad/templates/root/index.html | 8 ++++++++
tests/api/routes/test_root.py | 2 ++
tests/api/routes/test_static.py | 14 ++++++++++++++
9 files changed, 70 insertions(+), 3 deletions(-)
create mode 100644 tad/api/deps.py
create mode 100644 tad/static/css/styles.css
create mode 100644 tad/static/js/main.js
create mode 100644 tad/templates/layout.html
create mode 100644 tad/templates/root/index.html
create mode 100644 tests/api/routes/test_static.py
diff --git a/tad/api/deps.py b/tad/api/deps.py
new file mode 100644
index 00000000..1a7c8622
--- /dev/null
+++ b/tad/api/deps.py
@@ -0,0 +1,19 @@
+from collections.abc import Generator
+from typing import Annotated
+
+from fastapi import Depends
+from fastapi.templating import Jinja2Templates
+from sqlmodel import Session
+
+from tad.core.config import settings
+from tad.core.db import engine
+
+templates = Jinja2Templates(directory=settings.TEMPLATE_DIR)
+
+
+def get_db() -> Generator[Session, None, None]:
+ with Session(engine) as session:
+ yield session
+
+
+SessionDep = Annotated[Session, Depends(get_db)]
diff --git a/tad/api/routes/root.py b/tad/api/routes/root.py
index 2aa20e12..a33a202e 100644
--- a/tad/api/routes/root.py
+++ b/tad/api/routes/root.py
@@ -1,9 +1,11 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
from fastapi.responses import HTMLResponse
+from tad.api.deps import templates
+
router = APIRouter()
@router.get("/")
-async def base():
- return HTMLResponse(content="message - Hello World 2 sdfasdfsda")
+async def base(request: Request) -> HTMLResponse:
+ return templates.TemplateResponse(request=request, name="root/index.html")
diff --git a/tad/core/config.py b/tad/core/config.py
index 8ead4a88..0023c856 100644
--- a/tad/core/config.py
+++ b/tad/core/config.py
@@ -43,6 +43,7 @@ def server_host(self) -> str:
PROJECT_DESCRIPTION: str = "Transparency of Algorithmic Decision making"
STATIC_DIR: str = "tad/static"
+ TEMPLATE_DIR: str = "tad/templates"
# todo(berry): create submodel for database settings
APP_DATABASE_SCHEME: DatabaseSchemaType = "sqlite"
diff --git a/tad/static/css/styles.css b/tad/static/css/styles.css
new file mode 100644
index 00000000..e69de29b
diff --git a/tad/static/js/main.js b/tad/static/js/main.js
new file mode 100644
index 00000000..e69de29b
diff --git a/tad/templates/layout.html b/tad/templates/layout.html
new file mode 100644
index 00000000..1f613521
--- /dev/null
+++ b/tad/templates/layout.html
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ {% block title %}{% endblock %}
+
+
+
+
+
+ {% block head %}{% endblock %}
+
+
+
+
+ {% block content %}{% endblock %}
+
+
+
diff --git a/tad/templates/root/index.html b/tad/templates/root/index.html
new file mode 100644
index 00000000..ce9e75d6
--- /dev/null
+++ b/tad/templates/root/index.html
@@ -0,0 +1,8 @@
+{% extends "layout.html" %}
+
+{% block title %}Home Page{% endblock %}
+
+{% block content %}
+Welcome to the Home Page
+This is a simple Jinja template example.
+{% endblock %}
diff --git a/tests/api/routes/test_root.py b/tests/api/routes/test_root.py
index 80871570..d0930ab1 100644
--- a/tests/api/routes/test_root.py
+++ b/tests/api/routes/test_root.py
@@ -7,3 +7,5 @@ def test_get_root(client: TestClient) -> None:
)
assert response.status_code == 200
assert response.headers["content-type"] == "text/html; charset=utf-8"
+
+ assert b"Welcome to the Home Page
" in response.content
diff --git a/tests/api/routes/test_static.py b/tests/api/routes/test_static.py
new file mode 100644
index 00000000..b2d1a367
--- /dev/null
+++ b/tests/api/routes/test_static.py
@@ -0,0 +1,14 @@
+import pytest
+from fastapi.testclient import TestClient
+
+
+@pytest.mark.skip(reason="Not working yet")
+def test_static_css(client: TestClient) -> None:
+ response = client.get("/static/styles.css")
+ assert response.status_code == 200
+
+
+@pytest.mark.skip(reason="Not working yet")
+def test_static_js(client: TestClient) -> None:
+ response = client.get("/static/main.js")
+ assert response.status_code == 200
From 11c523bb41f7b54b75f6a89f0f62a790e01bfba1 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Mon, 13 May 2024 15:15:00 +0000
Subject: [PATCH 45/55] Add htmx
---
.pre-commit-config.yaml | 1 +
tad/static/vendor/htmx/1.9.12.min.js | 1 +
tad/templates/layout.html | 2 ++
3 files changed, 4 insertions(+)
create mode 100644 tad/static/vendor/htmx/1.9.12.min.js
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index af8a30ea..4290a1e6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,6 +5,7 @@ repos:
rev: v4.6.0
hooks:
- id: end-of-file-fixer
+ exclude: ^tad/static/vendor/*
- id: trailing-whitespace
- id: check-yaml
- id: check-json
diff --git a/tad/static/vendor/htmx/1.9.12.min.js b/tad/static/vendor/htmx/1.9.12.min.js
new file mode 100644
index 00000000..52866033
--- /dev/null
+++ b/tad/static/vendor/htmx/1.9.12.min.js
@@ -0,0 +1 @@
+(function (e, t) { if (typeof define === "function" && define.amd) { define([], t) } else if (typeof module === "object" && module.exports) { module.exports = t() } else { e.htmx = e.htmx || t() } })(typeof self !== "undefined" ? self : this, function () { return function () { "use strict"; var Q = { onLoad: F, process: zt, on: de, off: ge, trigger: ce, ajax: Nr, find: C, findAll: f, closest: v, values: function (e, t) { var r = dr(e, t || "post"); return r.values }, remove: _, addClass: z, removeClass: n, toggleClass: $, takeClass: W, defineExtension: Ur, removeExtension: Br, logAll: V, logNone: j, logger: null, config: { historyEnabled: true, historyCacheSize: 10, refreshOnHistoryMiss: false, defaultSwapStyle: "innerHTML", defaultSwapDelay: 0, defaultSettleDelay: 20, includeIndicatorStyles: true, indicatorClass: "htmx-indicator", requestClass: "htmx-request", addedClass: "htmx-added", settlingClass: "htmx-settling", swappingClass: "htmx-swapping", allowEval: true, allowScriptTags: true, inlineScriptNonce: "", attributesToSettle: ["class", "style", "width", "height"], withCredentials: false, timeout: 0, wsReconnectDelay: "full-jitter", wsBinaryType: "blob", disableSelector: "[hx-disable], [data-hx-disable]", useTemplateFragments: false, scrollBehavior: "smooth", defaultFocusScroll: false, getCacheBusterParam: false, globalViewTransitions: false, methodsThatUseUrlParams: ["get"], selfRequestsOnly: false, ignoreTitle: false, scrollIntoViewOnBoost: true, triggerSpecsCache: null }, parseInterval: d, _: t, createEventSource: function (e) { return new EventSource(e, { withCredentials: true }) }, createWebSocket: function (e) { var t = new WebSocket(e, []); t.binaryType = Q.config.wsBinaryType; return t }, version: "1.9.12" }; var r = { addTriggerHandler: Lt, bodyContains: se, canAccessLocalStorage: U, findThisElement: xe, filterValues: yr, hasAttribute: o, getAttributeValue: te, getClosestAttributeValue: ne, getClosestMatch: c, getExpressionVars: Hr, getHeaders: xr, getInputValues: dr, getInternalData: ae, getSwapSpecification: wr, getTriggerSpecs: it, getTarget: ye, makeFragment: l, mergeObjects: le, makeSettleInfo: T, oobSwap: Ee, querySelectorExt: ue, selectAndSwap: je, settleImmediately: nr, shouldCancel: ut, triggerEvent: ce, triggerErrorEvent: fe, withExtensions: R }; var w = ["get", "post", "put", "delete", "patch"]; var i = w.map(function (e) { return "[hx-" + e + "], [data-hx-" + e + "]" }).join(", "); var S = e("head"), q = e("title"), H = e("svg", true); function e(e, t) { return new RegExp("<" + e + "(\\s[^>]*>|>)([\\s\\S]*?)<\\/" + e + ">", !!t ? "gim" : "im") } function d(e) { if (e == undefined) { return undefined } let t = NaN; if (e.slice(-2) == "ms") { t = parseFloat(e.slice(0, -2)) } else if (e.slice(-1) == "s") { t = parseFloat(e.slice(0, -1)) * 1e3 } else if (e.slice(-1) == "m") { t = parseFloat(e.slice(0, -1)) * 1e3 * 60 } else { t = parseFloat(e) } return isNaN(t) ? undefined : t } function ee(e, t) { return e.getAttribute && e.getAttribute(t) } function o(e, t) { return e.hasAttribute && (e.hasAttribute(t) || e.hasAttribute("data-" + t)) } function te(e, t) { return ee(e, t) || ee(e, "data-" + t) } function u(e) { return e.parentElement } function re() { return document } function c(e, t) { while (e && !t(e)) { e = u(e) } return e ? e : null } function L(e, t, r) { var n = te(t, r); var i = te(t, "hx-disinherit"); if (e !== t && i && (i === "*" || i.split(" ").indexOf(r) >= 0)) { return "unset" } else { return n } } function ne(t, r) { var n = null; c(t, function (e) { return n = L(t, e, r) }); if (n !== "unset") { return n } } function h(e, t) { var r = e.matches || e.matchesSelector || e.msMatchesSelector || e.mozMatchesSelector || e.webkitMatchesSelector || e.oMatchesSelector; return r && r.call(e, t) } function A(e) { var t = /<([a-z][^\/\0>\x20\t\r\n\f]*)/i; var r = t.exec(e); if (r) { return r[1].toLowerCase() } else { return "" } } function s(e, t) { var r = new DOMParser; var n = r.parseFromString(e, "text/html"); var i = n.body; while (t > 0) { t--; i = i.firstChild } if (i == null) { i = re().createDocumentFragment() } return i } function N(e) { return /" + n + "", 0); var a = i.querySelector("template").content; if (Q.config.allowScriptTags) { oe(a.querySelectorAll("script"), function (e) { if (Q.config.inlineScriptNonce) { e.nonce = Q.config.inlineScriptNonce } e.htmxExecuted = navigator.userAgent.indexOf("Firefox") === -1 }) } else { oe(a.querySelectorAll("script"), function (e) { _(e) }) } return a } switch (r) { case "thead": case "tbody": case "tfoot": case "colgroup": case "caption": return s("", 1); case "col": return s("", 2); case "tr": return s("", 2); case "td": case "th": return s("", 3); case "script": case "style": return s("" + n + "
", 1); default: return s(n, 0) } } function ie(e) { if (e) { e() } } function I(e, t) { return Object.prototype.toString.call(e) === "[object " + t + "]" } function k(e) { return I(e, "Function") } function P(e) { return I(e, "Object") } function ae(e) { var t = "htmx-internal-data"; var r = e[t]; if (!r) { r = e[t] = {} } return r } function M(e) { var t = []; if (e) { for (var r = 0; r < e.length; r++) { t.push(e[r]) } } return t } function oe(e, t) { if (e) { for (var r = 0; r < e.length; r++) { t(e[r]) } } } function X(e) { var t = e.getBoundingClientRect(); var r = t.top; var n = t.bottom; return r < window.innerHeight && n >= 0 } function se(e) { if (e.getRootNode && e.getRootNode() instanceof window.ShadowRoot) { return re().body.contains(e.getRootNode().host) } else { return re().body.contains(e) } } function D(e) { return e.trim().split(/\s+/) } function le(e, t) { for (var r in t) { if (t.hasOwnProperty(r)) { e[r] = t[r] } } return e } function E(e) { try { return JSON.parse(e) } catch (e) { b(e); return null } } function U() { var e = "htmx:localStorageTest"; try { localStorage.setItem(e, e); localStorage.removeItem(e); return true } catch (e) { return false } } function B(t) { try { var e = new URL(t); if (e) { t = e.pathname + e.search } if (!/^\/$/.test(t)) { t = t.replace(/\/+$/, "") } return t } catch (e) { return t } } function t(e) { return Tr(re().body, function () { return eval(e) }) } function F(t) { var e = Q.on("htmx:load", function (e) { t(e.detail.elt) }); return e } function V() { Q.logger = function (e, t, r) { if (console) { console.log(t, e, r) } } } function j() { Q.logger = null } function C(e, t) { if (t) { return e.querySelector(t) } else { return C(re(), e) } } function f(e, t) { if (t) { return e.querySelectorAll(t) } else { return f(re(), e) } } function _(e, t) { e = p(e); if (t) { setTimeout(function () { _(e); e = null }, t) } else { e.parentElement.removeChild(e) } } function z(e, t, r) { e = p(e); if (r) { setTimeout(function () { z(e, t); e = null }, r) } else { e.classList && e.classList.add(t) } } function n(e, t, r) { e = p(e); if (r) { setTimeout(function () { n(e, t); e = null }, r) } else { if (e.classList) { e.classList.remove(t); if (e.classList.length === 0) { e.removeAttribute("class") } } } } function $(e, t) { e = p(e); e.classList.toggle(t) } function W(e, t) { e = p(e); oe(e.parentElement.children, function (e) { n(e, t) }); z(e, t) } function v(e, t) { e = p(e); if (e.closest) { return e.closest(t) } else { do { if (e == null || h(e, t)) { return e } } while (e = e && u(e)); return null } } function g(e, t) { return e.substring(0, t.length) === t } function G(e, t) { return e.substring(e.length - t.length) === t } function J(e) { var t = e.trim(); if (g(t, "<") && G(t, "/>")) { return t.substring(1, t.length - 2) } else { return t } } function Z(e, t) { if (t.indexOf("closest ") === 0) { return [v(e, J(t.substr(8)))] } else if (t.indexOf("find ") === 0) { return [C(e, J(t.substr(5)))] } else if (t === "next") { return [e.nextElementSibling] } else if (t.indexOf("next ") === 0) { return [K(e, J(t.substr(5)))] } else if (t === "previous") { return [e.previousElementSibling] } else if (t.indexOf("previous ") === 0) { return [Y(e, J(t.substr(9)))] } else if (t === "document") { return [document] } else if (t === "window") { return [window] } else if (t === "body") { return [document.body] } else { return re().querySelectorAll(J(t)) } } var K = function (e, t) { var r = re().querySelectorAll(t); for (var n = 0; n < r.length; n++) { var i = r[n]; if (i.compareDocumentPosition(e) === Node.DOCUMENT_POSITION_PRECEDING) { return i } } }; var Y = function (e, t) { var r = re().querySelectorAll(t); for (var n = r.length - 1; n >= 0; n--) { var i = r[n]; if (i.compareDocumentPosition(e) === Node.DOCUMENT_POSITION_FOLLOWING) { return i } } }; function ue(e, t) { if (t) { return Z(e, t)[0] } else { return Z(re().body, e)[0] } } function p(e) { if (I(e, "String")) { return C(e) } else { return e } } function ve(e, t, r) { if (k(t)) { return { target: re().body, event: e, listener: t } } else { return { target: p(e), event: t, listener: r } } } function de(t, r, n) { jr(function () { var e = ve(t, r, n); e.target.addEventListener(e.event, e.listener) }); var e = k(r); return e ? r : n } function ge(t, r, n) { jr(function () { var e = ve(t, r, n); e.target.removeEventListener(e.event, e.listener) }); return k(r) ? r : n } var pe = re().createElement("output"); function me(e, t) { var r = ne(e, t); if (r) { if (r === "this") { return [xe(e, t)] } else { var n = Z(e, r); if (n.length === 0) { b('The selector "' + r + '" on ' + t + " returned no matches!"); return [pe] } else { return n } } } } function xe(e, t) { return c(e, function (e) { return te(e, t) != null }) } function ye(e) { var t = ne(e, "hx-target"); if (t) { if (t === "this") { return xe(e, "hx-target") } else { return ue(e, t) } } else { var r = ae(e); if (r.boosted) { return re().body } else { return e } } } function be(e) { var t = Q.config.attributesToSettle; for (var r = 0; r < t.length; r++) { if (e === t[r]) { return true } } return false } function we(t, r) { oe(t.attributes, function (e) { if (!r.hasAttribute(e.name) && be(e.name)) { t.removeAttribute(e.name) } }); oe(r.attributes, function (e) { if (be(e.name)) { t.setAttribute(e.name, e.value) } }) } function Se(e, t) { var r = Fr(t); for (var n = 0; n < r.length; n++) { var i = r[n]; try { if (i.isInlineSwap(e)) { return true } } catch (e) { b(e) } } return e === "outerHTML" } function Ee(e, i, a) { var t = "#" + ee(i, "id"); var o = "outerHTML"; if (e === "true") { } else if (e.indexOf(":") > 0) { o = e.substr(0, e.indexOf(":")); t = e.substr(e.indexOf(":") + 1, e.length) } else { o = e } var r = re().querySelectorAll(t); if (r) { oe(r, function (e) { var t; var r = i.cloneNode(true); t = re().createDocumentFragment(); t.appendChild(r); if (!Se(o, e)) { t = r } var n = { shouldSwap: true, target: e, fragment: t }; if (!ce(e, "htmx:oobBeforeSwap", n)) return; e = n.target; if (n["shouldSwap"]) { Fe(o, e, e, t, a) } oe(a.elts, function (e) { ce(e, "htmx:oobAfterSwap", n) }) }); i.parentNode.removeChild(i) } else { i.parentNode.removeChild(i); fe(re().body, "htmx:oobErrorNoTarget", { content: i }) } return e } function Ce(e, t, r) { var n = ne(e, "hx-select-oob"); if (n) { var i = n.split(","); for (var a = 0; a < i.length; a++) { var o = i[a].split(":", 2); var s = o[0].trim(); if (s.indexOf("#") === 0) { s = s.substring(1) } var l = o[1] || "true"; var u = t.querySelector("#" + s); if (u) { Ee(l, u, r) } } } oe(f(t, "[hx-swap-oob], [data-hx-swap-oob]"), function (e) { var t = te(e, "hx-swap-oob"); if (t != null) { Ee(t, e, r) } }) } function Re(e) { oe(f(e, "[hx-preserve], [data-hx-preserve]"), function (e) { var t = te(e, "id"); var r = re().getElementById(t); if (r != null) { e.parentNode.replaceChild(r, e) } }) } function Te(o, e, s) { oe(e.querySelectorAll("[id]"), function (e) { var t = ee(e, "id"); if (t && t.length > 0) { var r = t.replace("'", "\\'"); var n = e.tagName.replace(":", "\\:"); var i = o.querySelector(n + "[id='" + r + "']"); if (i && i !== o) { var a = e.cloneNode(); we(e, i); s.tasks.push(function () { we(e, a) }) } } }) } function Oe(e) { return function () { n(e, Q.config.addedClass); zt(e); Nt(e); qe(e); ce(e, "htmx:load") } } function qe(e) { var t = "[autofocus]"; var r = h(e, t) ? e : e.querySelector(t); if (r != null) { r.focus() } } function a(e, t, r, n) { Te(e, r, n); while (r.childNodes.length > 0) { var i = r.firstChild; z(i, Q.config.addedClass); e.insertBefore(i, t); if (i.nodeType !== Node.TEXT_NODE && i.nodeType !== Node.COMMENT_NODE) { n.tasks.push(Oe(i)) } } } function He(e, t) { var r = 0; while (r < e.length) { t = (t << 5) - t + e.charCodeAt(r++) | 0 } return t } function Le(e) { var t = 0; if (e.attributes) { for (var r = 0; r < e.attributes.length; r++) { var n = e.attributes[r]; if (n.value) { t = He(n.name, t); t = He(n.value, t) } } } return t } function Ae(e) { var t = ae(e); if (t.onHandlers) { for (var r = 0; r < t.onHandlers.length; r++) { const n = t.onHandlers[r]; e.removeEventListener(n.event, n.listener) } delete t.onHandlers } } function Ne(e) { var t = ae(e); if (t.timeout) { clearTimeout(t.timeout) } if (t.webSocket) { t.webSocket.close() } if (t.sseEventSource) { t.sseEventSource.close() } if (t.listenerInfos) { oe(t.listenerInfos, function (e) { if (e.on) { e.on.removeEventListener(e.trigger, e.listener) } }) } Ae(e); oe(Object.keys(t), function (e) { delete t[e] }) } function m(e) { ce(e, "htmx:beforeCleanupElement"); Ne(e); if (e.children) { oe(e.children, function (e) { m(e) }) } } function Ie(t, e, r) { if (t.tagName === "BODY") { return Ue(t, e, r) } else { var n; var i = t.previousSibling; a(u(t), t, e, r); if (i == null) { n = u(t).firstChild } else { n = i.nextSibling } r.elts = r.elts.filter(function (e) { return e != t }); while (n && n !== t) { if (n.nodeType === Node.ELEMENT_NODE) { r.elts.push(n) } n = n.nextElementSibling } m(t); u(t).removeChild(t) } } function ke(e, t, r) { return a(e, e.firstChild, t, r) } function Pe(e, t, r) { return a(u(e), e, t, r) } function Me(e, t, r) { return a(e, null, t, r) } function Xe(e, t, r) { return a(u(e), e.nextSibling, t, r) } function De(e, t, r) { m(e); return u(e).removeChild(e) } function Ue(e, t, r) { var n = e.firstChild; a(e, n, t, r); if (n) { while (n.nextSibling) { m(n.nextSibling); e.removeChild(n.nextSibling) } m(n); e.removeChild(n) } } function Be(e, t, r) { var n = r || ne(e, "hx-select"); if (n) { var i = re().createDocumentFragment(); oe(t.querySelectorAll(n), function (e) { i.appendChild(e) }); t = i } return t } function Fe(e, t, r, n, i) { switch (e) { case "none": return; case "outerHTML": Ie(r, n, i); return; case "afterbegin": ke(r, n, i); return; case "beforebegin": Pe(r, n, i); return; case "beforeend": Me(r, n, i); return; case "afterend": Xe(r, n, i); return; case "delete": De(r, n, i); return; default: var a = Fr(t); for (var o = 0; o < a.length; o++) { var s = a[o]; try { var l = s.handleSwap(e, r, n, i); if (l) { if (typeof l.length !== "undefined") { for (var u = 0; u < l.length; u++) { var f = l[u]; if (f.nodeType !== Node.TEXT_NODE && f.nodeType !== Node.COMMENT_NODE) { i.tasks.push(Oe(f)) } } } return } } catch (e) { b(e) } } if (e === "innerHTML") { Ue(r, n, i) } else { Fe(Q.config.defaultSwapStyle, t, r, n, i) } } } function Ve(e) { if (e.indexOf(" -1) { var t = e.replace(H, ""); var r = t.match(q); if (r) { return r[2] } } } function je(e, t, r, n, i, a) { i.title = Ve(n); var o = l(n); if (o) { Ce(r, o, i); o = Be(r, o, a); Re(o); return Fe(e, r, t, o, i) } } function _e(e, t, r) { var n = e.getResponseHeader(t); if (n.indexOf("{") === 0) { var i = E(n); for (var a in i) { if (i.hasOwnProperty(a)) { var o = i[a]; if (!P(o)) { o = { value: o } } ce(r, a, o) } } } else { var s = n.split(","); for (var l = 0; l < s.length; l++) { ce(r, s[l].trim(), []) } } } var ze = /\s/; var x = /[\s,]/; var $e = /[_$a-zA-Z]/; var We = /[_$a-zA-Z0-9]/; var Ge = ['"', "'", "/"]; var Je = /[^\s]/; var Ze = /[{(]/; var Ke = /[})]/; function Ye(e) { var t = []; var r = 0; while (r < e.length) { if ($e.exec(e.charAt(r))) { var n = r; while (We.exec(e.charAt(r + 1))) { r++ } t.push(e.substr(n, r - n + 1)) } else if (Ge.indexOf(e.charAt(r)) !== -1) { var i = e.charAt(r); var n = r; r++; while (r < e.length && e.charAt(r) !== i) { if (e.charAt(r) === "\\") { r++ } r++ } t.push(e.substr(n, r - n + 1)) } else { var a = e.charAt(r); t.push(a) } r++ } return t } function Qe(e, t, r) { return $e.exec(e.charAt(0)) && e !== "true" && e !== "false" && e !== "this" && e !== r && t !== "." } function et(e, t, r) { if (t[0] === "[") { t.shift(); var n = 1; var i = " return (function(" + r + "){ return ("; var a = null; while (t.length > 0) { var o = t[0]; if (o === "]") { n--; if (n === 0) { if (a === null) { i = i + "true" } t.shift(); i += ")})"; try { var s = Tr(e, function () { return Function(i)() }, function () { return true }); s.source = i; return s } catch (e) { fe(re().body, "htmx:syntax:error", { error: e, source: i }); return null } } } else if (o === "[") { n++ } if (Qe(o, a, r)) { i += "((" + r + "." + o + ") ? (" + r + "." + o + ") : (window." + o + "))" } else { i = i + o } a = t.shift() } } } function y(e, t) { var r = ""; while (e.length > 0 && !t.test(e[0])) { r += e.shift() } return r } function tt(e) { var t; if (e.length > 0 && Ze.test(e[0])) { e.shift(); t = y(e, Ke).trim(); e.shift() } else { t = y(e, x) } return t } var rt = "input, textarea, select"; function nt(e, t, r) { var n = []; var i = Ye(t); do { y(i, Je); var a = i.length; var o = y(i, /[,\[\s]/); if (o !== "") { if (o === "every") { var s = { trigger: "every" }; y(i, Je); s.pollInterval = d(y(i, /[,\[\s]/)); y(i, Je); var l = et(e, i, "event"); if (l) { s.eventFilter = l } n.push(s) } else if (o.indexOf("sse:") === 0) { n.push({ trigger: "sse", sseEvent: o.substr(4) }) } else { var u = { trigger: o }; var l = et(e, i, "event"); if (l) { u.eventFilter = l } while (i.length > 0 && i[0] !== ",") { y(i, Je); var f = i.shift(); if (f === "changed") { u.changed = true } else if (f === "once") { u.once = true } else if (f === "consume") { u.consume = true } else if (f === "delay" && i[0] === ":") { i.shift(); u.delay = d(y(i, x)) } else if (f === "from" && i[0] === ":") { i.shift(); if (Ze.test(i[0])) { var c = tt(i) } else { var c = y(i, x); if (c === "closest" || c === "find" || c === "next" || c === "previous") { i.shift(); var h = tt(i); if (h.length > 0) { c += " " + h } } } u.from = c } else if (f === "target" && i[0] === ":") { i.shift(); u.target = tt(i) } else if (f === "throttle" && i[0] === ":") { i.shift(); u.throttle = d(y(i, x)) } else if (f === "queue" && i[0] === ":") { i.shift(); u.queue = y(i, x) } else if (f === "root" && i[0] === ":") { i.shift(); u[f] = tt(i) } else if (f === "threshold" && i[0] === ":") { i.shift(); u[f] = y(i, x) } else { fe(e, "htmx:syntax:error", { token: i.shift() }) } } n.push(u) } } if (i.length === a) { fe(e, "htmx:syntax:error", { token: i.shift() }) } y(i, Je) } while (i[0] === "," && i.shift()); if (r) { r[t] = n } return n } function it(e) { var t = te(e, "hx-trigger"); var r = []; if (t) { var n = Q.config.triggerSpecsCache; r = n && n[t] || nt(e, t, n) } if (r.length > 0) { return r } else if (h(e, "form")) { return [{ trigger: "submit" }] } else if (h(e, 'input[type="button"], input[type="submit"]')) { return [{ trigger: "click" }] } else if (h(e, rt)) { return [{ trigger: "change" }] } else { return [{ trigger: "click" }] } } function at(e) { ae(e).cancelled = true } function ot(e, t, r) { var n = ae(e); n.timeout = setTimeout(function () { if (se(e) && n.cancelled !== true) { if (!ct(r, e, Wt("hx:poll:trigger", { triggerSpec: r, target: e }))) { t(e) } ot(e, t, r) } }, r.pollInterval) } function st(e) { return location.hostname === e.hostname && ee(e, "href") && ee(e, "href").indexOf("#") !== 0 } function lt(t, r, e) { if (t.tagName === "A" && st(t) && (t.target === "" || t.target === "_self") || t.tagName === "FORM") { r.boosted = true; var n, i; if (t.tagName === "A") { n = "get"; i = ee(t, "href") } else { var a = ee(t, "method"); n = a ? a.toLowerCase() : "get"; if (n === "get") { } i = ee(t, "action") } e.forEach(function (e) { ht(t, function (e, t) { if (v(e, Q.config.disableSelector)) { m(e); return } he(n, i, e, t) }, r, e, true) }) } } function ut(e, t) { if (e.type === "submit" || e.type === "click") { if (t.tagName === "FORM") { return true } if (h(t, 'input[type="submit"], button') && v(t, "form") !== null) { return true } if (t.tagName === "A" && t.href && (t.getAttribute("href") === "#" || t.getAttribute("href").indexOf("#") !== 0)) { return true } } return false } function ft(e, t) { return ae(e).boosted && e.tagName === "A" && t.type === "click" && (t.ctrlKey || t.metaKey) } function ct(e, t, r) { var n = e.eventFilter; if (n) { try { return n.call(t, r) !== true } catch (e) { fe(re().body, "htmx:eventFilter:error", { error: e, source: n.source }); return true } } return false } function ht(a, o, e, s, l) { var u = ae(a); var t; if (s.from) { t = Z(a, s.from) } else { t = [a] } if (s.changed) { t.forEach(function (e) { var t = ae(e); t.lastValue = e.value }) } oe(t, function (n) { var i = function (e) { if (!se(a)) { n.removeEventListener(s.trigger, i); return } if (ft(a, e)) { return } if (l || ut(e, a)) { e.preventDefault() } if (ct(s, a, e)) { return } var t = ae(e); t.triggerSpec = s; if (t.handledFor == null) { t.handledFor = [] } if (t.handledFor.indexOf(a) < 0) { t.handledFor.push(a); if (s.consume) { e.stopPropagation() } if (s.target && e.target) { if (!h(e.target, s.target)) { return } } if (s.once) { if (u.triggeredOnce) { return } else { u.triggeredOnce = true } } if (s.changed) { var r = ae(n); if (r.lastValue === n.value) { return } r.lastValue = n.value } if (u.delayed) { clearTimeout(u.delayed) } if (u.throttle) { return } if (s.throttle > 0) { if (!u.throttle) { o(a, e); u.throttle = setTimeout(function () { u.throttle = null }, s.throttle) } } else if (s.delay > 0) { u.delayed = setTimeout(function () { o(a, e) }, s.delay) } else { ce(a, "htmx:trigger"); o(a, e) } } }; if (e.listenerInfos == null) { e.listenerInfos = [] } e.listenerInfos.push({ trigger: s.trigger, listener: i, on: n }); n.addEventListener(s.trigger, i) }) } var vt = false; var dt = null; function gt() { if (!dt) { dt = function () { vt = true }; window.addEventListener("scroll", dt); setInterval(function () { if (vt) { vt = false; oe(re().querySelectorAll("[hx-trigger='revealed'],[data-hx-trigger='revealed']"), function (e) { pt(e) }) } }, 200) } } function pt(t) { if (!o(t, "data-hx-revealed") && X(t)) { t.setAttribute("data-hx-revealed", "true"); var e = ae(t); if (e.initHash) { ce(t, "revealed") } else { t.addEventListener("htmx:afterProcessNode", function (e) { ce(t, "revealed") }, { once: true }) } } } function mt(e, t, r) { var n = D(r); for (var i = 0; i < n.length; i++) { var a = n[i].split(/:(.+)/); if (a[0] === "connect") { xt(e, a[1], 0) } if (a[0] === "send") { bt(e) } } } function xt(s, r, n) { if (!se(s)) { return } if (r.indexOf("/") == 0) { var e = location.hostname + (location.port ? ":" + location.port : ""); if (location.protocol == "https:") { r = "wss://" + e + r } else if (location.protocol == "http:") { r = "ws://" + e + r } } var t = Q.createWebSocket(r); t.onerror = function (e) { fe(s, "htmx:wsError", { error: e, socket: t }); yt(s) }; t.onclose = function (e) { if ([1006, 1012, 1013].indexOf(e.code) >= 0) { var t = wt(n); setTimeout(function () { xt(s, r, n + 1) }, t) } }; t.onopen = function (e) { n = 0 }; ae(s).webSocket = t; t.addEventListener("message", function (e) { if (yt(s)) { return } var t = e.data; R(s, function (e) { t = e.transformResponse(t, null, s) }); var r = T(s); var n = l(t); var i = M(n.children); for (var a = 0; a < i.length; a++) { var o = i[a]; Ee(te(o, "hx-swap-oob") || "true", o, r) } nr(r.tasks) }) } function yt(e) { if (!se(e)) { ae(e).webSocket.close(); return true } } function bt(u) { var f = c(u, function (e) { return ae(e).webSocket != null }); if (f) { u.addEventListener(it(u)[0].trigger, function (e) { var t = ae(f).webSocket; var r = xr(u, f); var n = dr(u, "post"); var i = n.errors; var a = n.values; var o = Hr(u); var s = le(a, o); var l = yr(s, u); l["HEADERS"] = r; if (i && i.length > 0) { ce(u, "htmx:validation:halted", i); return } t.send(JSON.stringify(l)); if (ut(e, u)) { e.preventDefault() } }) } else { fe(u, "htmx:noWebSocketSourceError") } } function wt(e) { var t = Q.config.wsReconnectDelay; if (typeof t === "function") { return t(e) } if (t === "full-jitter") { var r = Math.min(e, 6); var n = 1e3 * Math.pow(2, r); return n * Math.random() } b('htmx.config.wsReconnectDelay must either be a function or the string "full-jitter"') } function St(e, t, r) { var n = D(r); for (var i = 0; i < n.length; i++) { var a = n[i].split(/:(.+)/); if (a[0] === "connect") { Et(e, a[1]) } if (a[0] === "swap") { Ct(e, a[1]) } } } function Et(t, e) { var r = Q.createEventSource(e); r.onerror = function (e) { fe(t, "htmx:sseError", { error: e, source: r }); Tt(t) }; ae(t).sseEventSource = r } function Ct(a, o) { var s = c(a, Ot); if (s) { var l = ae(s).sseEventSource; var u = function (e) { if (Tt(s)) { return } if (!se(a)) { l.removeEventListener(o, u); return } var t = e.data; R(a, function (e) { t = e.transformResponse(t, null, a) }); var r = wr(a); var n = ye(a); var i = T(a); je(r.swapStyle, n, a, t, i); nr(i.tasks); ce(a, "htmx:sseMessage", e) }; ae(a).sseListener = u; l.addEventListener(o, u) } else { fe(a, "htmx:noSSESourceError") } } function Rt(e, t, r) { var n = c(e, Ot); if (n) { var i = ae(n).sseEventSource; var a = function () { if (!Tt(n)) { if (se(e)) { t(e) } else { i.removeEventListener(r, a) } } }; ae(e).sseListener = a; i.addEventListener(r, a) } else { fe(e, "htmx:noSSESourceError") } } function Tt(e) { if (!se(e)) { ae(e).sseEventSource.close(); return true } } function Ot(e) { return ae(e).sseEventSource != null } function qt(e, t, r, n) { var i = function () { if (!r.loaded) { r.loaded = true; t(e) } }; if (n > 0) { setTimeout(i, n) } else { i() } } function Ht(t, i, e) { var a = false; oe(w, function (r) { if (o(t, "hx-" + r)) { var n = te(t, "hx-" + r); a = true; i.path = n; i.verb = r; e.forEach(function (e) { Lt(t, e, i, function (e, t) { if (v(e, Q.config.disableSelector)) { m(e); return } he(r, n, e, t) }) }) } }); return a } function Lt(n, e, t, r) { if (e.sseEvent) { Rt(n, r, e.sseEvent) } else if (e.trigger === "revealed") { gt(); ht(n, r, t, e); pt(n) } else if (e.trigger === "intersect") { var i = {}; if (e.root) { i.root = ue(n, e.root) } if (e.threshold) { i.threshold = parseFloat(e.threshold) } var a = new IntersectionObserver(function (e) { for (var t = 0; t < e.length; t++) { var r = e[t]; if (r.isIntersecting) { ce(n, "intersect"); break } } }, i); a.observe(n); ht(n, r, t, e) } else if (e.trigger === "load") { if (!ct(e, n, Wt("load", { elt: n }))) { qt(n, r, t, e.delay) } } else if (e.pollInterval > 0) { t.polling = true; ot(n, r, e) } else { ht(n, r, t, e) } } function At(e) { if (!e.htmxExecuted && Q.config.allowScriptTags && (e.type === "text/javascript" || e.type === "module" || e.type === "")) { var t = re().createElement("script"); oe(e.attributes, function (e) { t.setAttribute(e.name, e.value) }); t.textContent = e.textContent; t.async = false; if (Q.config.inlineScriptNonce) { t.nonce = Q.config.inlineScriptNonce } var r = e.parentElement; try { r.insertBefore(t, e) } catch (e) { b(e) } finally { if (e.parentElement) { e.parentElement.removeChild(e) } } } } function Nt(e) { if (h(e, "script")) { At(e) } oe(f(e, "script"), function (e) { At(e) }) } function It(e) { var t = e.attributes; if (!t) { return false } for (var r = 0; r < t.length; r++) { var n = t[r].name; if (g(n, "hx-on:") || g(n, "data-hx-on:") || g(n, "hx-on-") || g(n, "data-hx-on-")) { return true } } return false } function kt(e) { var t = null; var r = []; if (It(e)) { r.push(e) } if (document.evaluate) { var n = document.evaluate('.//*[@*[ starts-with(name(), "hx-on:") or starts-with(name(), "data-hx-on:") or' + ' starts-with(name(), "hx-on-") or starts-with(name(), "data-hx-on-") ]]', e); while (t = n.iterateNext()) r.push(t) } else if (typeof e.getElementsByTagName === "function") { var i = e.getElementsByTagName("*"); for (var a = 0; a < i.length; a++) { if (It(i[a])) { r.push(i[a]) } } } return r } function Pt(e) { if (e.querySelectorAll) { var t = ", [hx-boost] a, [data-hx-boost] a, a[hx-boost], a[data-hx-boost]"; var r = e.querySelectorAll(i + t + ", form, [type='submit'], [hx-sse], [data-hx-sse], [hx-ws]," + " [data-hx-ws], [hx-ext], [data-hx-ext], [hx-trigger], [data-hx-trigger], [hx-on], [data-hx-on]"); return r } else { return [] } } function Mt(e) { var t = v(e.target, "button, input[type='submit']"); var r = Dt(e); if (r) { r.lastButtonClicked = t } } function Xt(e) { var t = Dt(e); if (t) { t.lastButtonClicked = null } } function Dt(e) { var t = v(e.target, "button, input[type='submit']"); if (!t) { return } var r = p("#" + ee(t, "form")) || v(t, "form"); if (!r) { return } return ae(r) } function Ut(e) { e.addEventListener("click", Mt); e.addEventListener("focusin", Mt); e.addEventListener("focusout", Xt) } function Bt(e) { var t = Ye(e); var r = 0; for (var n = 0; n < t.length; n++) { const i = t[n]; if (i === "{") { r++ } else if (i === "}") { r-- } } return r } function Ft(t, e, r) { var n = ae(t); if (!Array.isArray(n.onHandlers)) { n.onHandlers = [] } var i; var a = function (e) { return Tr(t, function () { if (!i) { i = new Function("event", r) } i.call(t, e) }) }; t.addEventListener(e, a); n.onHandlers.push({ event: e, listener: a }) } function Vt(e) { var t = te(e, "hx-on"); if (t) { var r = {}; var n = t.split("\n"); var i = null; var a = 0; while (n.length > 0) { var o = n.shift(); var s = o.match(/^\s*([a-zA-Z:\-\.]+:)(.*)/); if (a === 0 && s) { o.split(":"); i = s[1].slice(0, -1); r[i] = s[2] } else { r[i] += o } a += Bt(o) } for (var l in r) { Ft(e, l, r[l]) } } } function jt(e) { Ae(e); for (var t = 0; t < e.attributes.length; t++) { var r = e.attributes[t].name; var n = e.attributes[t].value; if (g(r, "hx-on") || g(r, "data-hx-on")) { var i = r.indexOf("-on") + 3; var a = r.slice(i, i + 1); if (a === "-" || a === ":") { var o = r.slice(i + 1); if (g(o, ":")) { o = "htmx" + o } else if (g(o, "-")) { o = "htmx:" + o.slice(1) } else if (g(o, "htmx-")) { o = "htmx:" + o.slice(5) } Ft(e, o, n) } } } } function _t(t) { if (v(t, Q.config.disableSelector)) { m(t); return } var r = ae(t); if (r.initHash !== Le(t)) { Ne(t); r.initHash = Le(t); Vt(t); ce(t, "htmx:beforeProcessNode"); if (t.value) { r.lastValue = t.value } var e = it(t); var n = Ht(t, r, e); if (!n) { if (ne(t, "hx-boost") === "true") { lt(t, r, e) } else if (o(t, "hx-trigger")) { e.forEach(function (e) { Lt(t, e, r, function () { }) }) } } if (t.tagName === "FORM" || ee(t, "type") === "submit" && o(t, "form")) { Ut(t) } var i = te(t, "hx-sse"); if (i) { St(t, r, i) } var a = te(t, "hx-ws"); if (a) { mt(t, r, a) } ce(t, "htmx:afterProcessNode") } } function zt(e) { e = p(e); if (v(e, Q.config.disableSelector)) { m(e); return } _t(e); oe(Pt(e), function (e) { _t(e) }); oe(kt(e), jt) } function $t(e) { return e.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase() } function Wt(e, t) { var r; if (window.CustomEvent && typeof window.CustomEvent === "function") { r = new CustomEvent(e, { bubbles: true, cancelable: true, detail: t }) } else { r = re().createEvent("CustomEvent"); r.initCustomEvent(e, true, true, t) } return r } function fe(e, t, r) { ce(e, t, le({ error: t }, r)) } function Gt(e) { return e === "htmx:afterProcessNode" } function R(e, t) { oe(Fr(e), function (e) { try { t(e) } catch (e) { b(e) } }) } function b(e) { if (console.error) { console.error(e) } else if (console.log) { console.log("ERROR: ", e) } } function ce(e, t, r) { e = p(e); if (r == null) { r = {} } r["elt"] = e; var n = Wt(t, r); if (Q.logger && !Gt(t)) { Q.logger(e, t, r) } if (r.error) { b(r.error); ce(e, "htmx:error", { errorInfo: r }) } var i = e.dispatchEvent(n); var a = $t(t); if (i && a !== t) { var o = Wt(a, n.detail); i = i && e.dispatchEvent(o) } R(e, function (e) { i = i && (e.onEvent(t, n) !== false && !n.defaultPrevented) }); return i } var Jt = location.pathname + location.search; function Zt() { var e = re().querySelector("[hx-history-elt],[data-hx-history-elt]"); return e || re().body } function Kt(e, t, r, n) { if (!U()) { return } if (Q.config.historyCacheSize <= 0) { localStorage.removeItem("htmx-history-cache"); return } e = B(e); var i = E(localStorage.getItem("htmx-history-cache")) || []; for (var a = 0; a < i.length; a++) { if (i[a].url === e) { i.splice(a, 1); break } } var o = { url: e, content: t, title: r, scroll: n }; ce(re().body, "htmx:historyItemCreated", { item: o, cache: i }); i.push(o); while (i.length > Q.config.historyCacheSize) { i.shift() } while (i.length > 0) { try { localStorage.setItem("htmx-history-cache", JSON.stringify(i)); break } catch (e) { fe(re().body, "htmx:historyCacheError", { cause: e, cache: i }); i.shift() } } } function Yt(e) { if (!U()) { return null } e = B(e); var t = E(localStorage.getItem("htmx-history-cache")) || []; for (var r = 0; r < t.length; r++) { if (t[r].url === e) { return t[r] } } return null } function Qt(e) { var t = Q.config.requestClass; var r = e.cloneNode(true); oe(f(r, "." + t), function (e) { n(e, t) }); return r.innerHTML } function er() { var e = Zt(); var t = Jt || location.pathname + location.search; var r; try { r = re().querySelector('[hx-history="false" i],[data-hx-history="false" i]') } catch (e) { r = re().querySelector('[hx-history="false"],[data-hx-history="false"]') } if (!r) { ce(re().body, "htmx:beforeHistorySave", { path: t, historyElt: e }); Kt(t, Qt(e), re().title, window.scrollY) } if (Q.config.historyEnabled) history.replaceState({ htmx: true }, re().title, window.location.href) } function tr(e) { if (Q.config.getCacheBusterParam) { e = e.replace(/org\.htmx\.cache-buster=[^&]*&?/, ""); if (G(e, "&") || G(e, "?")) { e = e.slice(0, -1) } } if (Q.config.historyEnabled) { history.pushState({ htmx: true }, "", e) } Jt = e } function rr(e) { if (Q.config.historyEnabled) history.replaceState({ htmx: true }, "", e); Jt = e } function nr(e) { oe(e, function (e) { e.call() }) } function ir(a) { var e = new XMLHttpRequest; var o = { path: a, xhr: e }; ce(re().body, "htmx:historyCacheMiss", o); e.open("GET", a, true); e.setRequestHeader("HX-Request", "true"); e.setRequestHeader("HX-History-Restore-Request", "true"); e.setRequestHeader("HX-Current-URL", re().location.href); e.onload = function () { if (this.status >= 200 && this.status < 400) { ce(re().body, "htmx:historyCacheMissLoad", o); var e = l(this.response); e = e.querySelector("[hx-history-elt],[data-hx-history-elt]") || e; var t = Zt(); var r = T(t); var n = Ve(this.response); if (n) { var i = C("title"); if (i) { i.innerHTML = n } else { window.document.title = n } } Ue(t, e, r); nr(r.tasks); Jt = a; ce(re().body, "htmx:historyRestore", { path: a, cacheMiss: true, serverResponse: this.response }) } else { fe(re().body, "htmx:historyCacheMissLoadError", o) } }; e.send() } function ar(e) { er(); e = e || location.pathname + location.search; var t = Yt(e); if (t) { var r = l(t.content); var n = Zt(); var i = T(n); Ue(n, r, i); nr(i.tasks); document.title = t.title; setTimeout(function () { window.scrollTo(0, t.scroll) }, 0); Jt = e; ce(re().body, "htmx:historyRestore", { path: e, item: t }) } else { if (Q.config.refreshOnHistoryMiss) { window.location.reload(true) } else { ir(e) } } } function or(e) { var t = me(e, "hx-indicator"); if (t == null) { t = [e] } oe(t, function (e) { var t = ae(e); t.requestCount = (t.requestCount || 0) + 1; e.classList["add"].call(e.classList, Q.config.requestClass) }); return t } function sr(e) { var t = me(e, "hx-disabled-elt"); if (t == null) { t = [] } oe(t, function (e) { var t = ae(e); t.requestCount = (t.requestCount || 0) + 1; e.setAttribute("disabled", "") }); return t } function lr(e, t) { oe(e, function (e) { var t = ae(e); t.requestCount = (t.requestCount || 0) - 1; if (t.requestCount === 0) { e.classList["remove"].call(e.classList, Q.config.requestClass) } }); oe(t, function (e) { var t = ae(e); t.requestCount = (t.requestCount || 0) - 1; if (t.requestCount === 0) { e.removeAttribute("disabled") } }) } function ur(e, t) { for (var r = 0; r < e.length; r++) { var n = e[r]; if (n.isSameNode(t)) { return true } } return false } function fr(e) { if (e.name === "" || e.name == null || e.disabled || v(e, "fieldset[disabled]")) { return false } if (e.type === "button" || e.type === "submit" || e.tagName === "image" || e.tagName === "reset" || e.tagName === "file") { return false } if (e.type === "checkbox" || e.type === "radio") { return e.checked } return true } function cr(e, t, r) { if (e != null && t != null) { var n = r[e]; if (n === undefined) { r[e] = t } else if (Array.isArray(n)) { if (Array.isArray(t)) { r[e] = n.concat(t) } else { n.push(t) } } else { if (Array.isArray(t)) { r[e] = [n].concat(t) } else { r[e] = [n, t] } } } } function hr(t, r, n, e, i) { if (e == null || ur(t, e)) { return } else { t.push(e) } if (fr(e)) { var a = ee(e, "name"); var o = e.value; if (e.multiple && e.tagName === "SELECT") { o = M(e.querySelectorAll("option:checked")).map(function (e) { return e.value }) } if (e.files) { o = M(e.files) } cr(a, o, r); if (i) { vr(e, n) } } if (h(e, "form")) { var s = e.elements; oe(s, function (e) { hr(t, r, n, e, i) }) } } function vr(e, t) { if (e.willValidate) { ce(e, "htmx:validation:validate"); if (!e.checkValidity()) { t.push({ elt: e, message: e.validationMessage, validity: e.validity }); ce(e, "htmx:validation:failed", { message: e.validationMessage, validity: e.validity }) } } } function dr(e, t) { var r = []; var n = {}; var i = {}; var a = []; var o = ae(e); if (o.lastButtonClicked && !se(o.lastButtonClicked)) { o.lastButtonClicked = null } var s = h(e, "form") && e.noValidate !== true || te(e, "hx-validate") === "true"; if (o.lastButtonClicked) { s = s && o.lastButtonClicked.formNoValidate !== true } if (t !== "get") { hr(r, i, a, v(e, "form"), s) } hr(r, n, a, e, s); if (o.lastButtonClicked || e.tagName === "BUTTON" || e.tagName === "INPUT" && ee(e, "type") === "submit") { var l = o.lastButtonClicked || e; var u = ee(l, "name"); cr(u, l.value, i) } var f = me(e, "hx-include"); oe(f, function (e) { hr(r, n, a, e, s); if (!h(e, "form")) { oe(e.querySelectorAll(rt), function (e) { hr(r, n, a, e, s) }) } }); n = le(n, i); return { errors: a, values: n } } function gr(e, t, r) { if (e !== "") { e += "&" } if (String(r) === "[object Object]") { r = JSON.stringify(r) } var n = encodeURIComponent(r); e += encodeURIComponent(t) + "=" + n; return e } function pr(e) { var t = ""; for (var r in e) { if (e.hasOwnProperty(r)) { var n = e[r]; if (Array.isArray(n)) { oe(n, function (e) { t = gr(t, r, e) }) } else { t = gr(t, r, n) } } } return t } function mr(e) { var t = new FormData; for (var r in e) { if (e.hasOwnProperty(r)) { var n = e[r]; if (Array.isArray(n)) { oe(n, function (e) { t.append(r, e) }) } else { t.append(r, n) } } } return t } function xr(e, t, r) { var n = { "HX-Request": "true", "HX-Trigger": ee(e, "id"), "HX-Trigger-Name": ee(e, "name"), "HX-Target": te(t, "id"), "HX-Current-URL": re().location.href }; Rr(e, "hx-headers", false, n); if (r !== undefined) { n["HX-Prompt"] = r } if (ae(e).boosted) { n["HX-Boosted"] = "true" } return n } function yr(t, e) { var r = ne(e, "hx-params"); if (r) { if (r === "none") { return {} } else if (r === "*") { return t } else if (r.indexOf("not ") === 0) { oe(r.substr(4).split(","), function (e) { e = e.trim(); delete t[e] }); return t } else { var n = {}; oe(r.split(","), function (e) { e = e.trim(); n[e] = t[e] }); return n } } else { return t } } function br(e) { return ee(e, "href") && ee(e, "href").indexOf("#") >= 0 } function wr(e, t) { var r = t ? t : ne(e, "hx-swap"); var n = { swapStyle: ae(e).boosted ? "innerHTML" : Q.config.defaultSwapStyle, swapDelay: Q.config.defaultSwapDelay, settleDelay: Q.config.defaultSettleDelay }; if (Q.config.scrollIntoViewOnBoost && ae(e).boosted && !br(e)) { n["show"] = "top" } if (r) { var i = D(r); if (i.length > 0) { for (var a = 0; a < i.length; a++) { var o = i[a]; if (o.indexOf("swap:") === 0) { n["swapDelay"] = d(o.substr(5)) } else if (o.indexOf("settle:") === 0) { n["settleDelay"] = d(o.substr(7)) } else if (o.indexOf("transition:") === 0) { n["transition"] = o.substr(11) === "true" } else if (o.indexOf("ignoreTitle:") === 0) { n["ignoreTitle"] = o.substr(12) === "true" } else if (o.indexOf("scroll:") === 0) { var s = o.substr(7); var l = s.split(":"); var u = l.pop(); var f = l.length > 0 ? l.join(":") : null; n["scroll"] = u; n["scrollTarget"] = f } else if (o.indexOf("show:") === 0) { var c = o.substr(5); var l = c.split(":"); var h = l.pop(); var f = l.length > 0 ? l.join(":") : null; n["show"] = h; n["showTarget"] = f } else if (o.indexOf("focus-scroll:") === 0) { var v = o.substr("focus-scroll:".length); n["focusScroll"] = v == "true" } else if (a == 0) { n["swapStyle"] = o } else { b("Unknown modifier in hx-swap: " + o) } } } } return n } function Sr(e) { return ne(e, "hx-encoding") === "multipart/form-data" || h(e, "form") && ee(e, "enctype") === "multipart/form-data" } function Er(t, r, n) { var i = null; R(r, function (e) { if (i == null) { i = e.encodeParameters(t, n, r) } }); if (i != null) { return i } else { if (Sr(r)) { return mr(n) } else { return pr(n) } } } function T(e) { return { tasks: [], elts: [e] } } function Cr(e, t) { var r = e[0]; var n = e[e.length - 1]; if (t.scroll) { var i = null; if (t.scrollTarget) { i = ue(r, t.scrollTarget) } if (t.scroll === "top" && (r || i)) { i = i || r; i.scrollTop = 0 } if (t.scroll === "bottom" && (n || i)) { i = i || n; i.scrollTop = i.scrollHeight } } if (t.show) { var i = null; if (t.showTarget) { var a = t.showTarget; if (t.showTarget === "window") { a = "body" } i = ue(r, a) } if (t.show === "top" && (r || i)) { i = i || r; i.scrollIntoView({ block: "start", behavior: Q.config.scrollBehavior }) } if (t.show === "bottom" && (n || i)) { i = i || n; i.scrollIntoView({ block: "end", behavior: Q.config.scrollBehavior }) } } } function Rr(e, t, r, n) { if (n == null) { n = {} } if (e == null) { return n } var i = te(e, t); if (i) { var a = i.trim(); var o = r; if (a === "unset") { return null } if (a.indexOf("javascript:") === 0) { a = a.substr(11); o = true } else if (a.indexOf("js:") === 0) { a = a.substr(3); o = true } if (a.indexOf("{") !== 0) { a = "{" + a + "}" } var s; if (o) { s = Tr(e, function () { return Function("return (" + a + ")")() }, {}) } else { s = E(a) } for (var l in s) { if (s.hasOwnProperty(l)) { if (n[l] == null) { n[l] = s[l] } } } } return Rr(u(e), t, r, n) } function Tr(e, t, r) { if (Q.config.allowEval) { return t() } else { fe(e, "htmx:evalDisallowedError"); return r } } function Or(e, t) { return Rr(e, "hx-vars", true, t) } function qr(e, t) { return Rr(e, "hx-vals", false, t) } function Hr(e) { return le(Or(e), qr(e)) } function Lr(t, r, n) { if (n !== null) { try { t.setRequestHeader(r, n) } catch (e) { t.setRequestHeader(r, encodeURIComponent(n)); t.setRequestHeader(r + "-URI-AutoEncoded", "true") } } } function Ar(t) { if (t.responseURL && typeof URL !== "undefined") { try { var e = new URL(t.responseURL); return e.pathname + e.search } catch (e) { fe(re().body, "htmx:badResponseUrl", { url: t.responseURL }) } } } function O(e, t) { return t.test(e.getAllResponseHeaders()) } function Nr(e, t, r) { e = e.toLowerCase(); if (r) { if (r instanceof Element || I(r, "String")) { return he(e, t, null, null, { targetOverride: p(r), returnPromise: true }) } else { return he(e, t, p(r.source), r.event, { handler: r.handler, headers: r.headers, values: r.values, targetOverride: p(r.target), swapOverride: r.swap, select: r.select, returnPromise: true }) } } else { return he(e, t, null, null, { returnPromise: true }) } } function Ir(e) { var t = []; while (e) { t.push(e); e = e.parentElement } return t } function kr(e, t, r) { var n; var i; if (typeof URL === "function") { i = new URL(t, document.location.href); var a = document.location.origin; n = a === i.origin } else { i = t; n = g(t, document.location.origin) } if (Q.config.selfRequestsOnly) { if (!n) { return false } } return ce(e, "htmx:validateUrl", le({ url: i, sameHost: n }, r)) } function he(t, r, n, i, a, e) { var o = null; var s = null; a = a != null ? a : {}; if (a.returnPromise && typeof Promise !== "undefined") { var l = new Promise(function (e, t) { o = e; s = t }) } if (n == null) { n = re().body } var M = a.handler || Mr; var X = a.select || null; if (!se(n)) { ie(o); return l } var u = a.targetOverride || ye(n); if (u == null || u == pe) { fe(n, "htmx:targetError", { target: te(n, "hx-target") }); ie(s); return l } var f = ae(n); var c = f.lastButtonClicked; if (c) { var h = ee(c, "formaction"); if (h != null) { r = h } var v = ee(c, "formmethod"); if (v != null) { if (v.toLowerCase() !== "dialog") { t = v } } } var d = ne(n, "hx-confirm"); if (e === undefined) { var D = function (e) { return he(t, r, n, i, a, !!e) }; var U = { target: u, elt: n, path: r, verb: t, triggeringEvent: i, etc: a, issueRequest: D, question: d }; if (ce(n, "htmx:confirm", U) === false) { ie(o); return l } } var g = n; var p = ne(n, "hx-sync"); var m = null; var x = false; if (p) { var B = p.split(":"); var F = B[0].trim(); if (F === "this") { g = xe(n, "hx-sync") } else { g = ue(n, F) } p = (B[1] || "drop").trim(); f = ae(g); if (p === "drop" && f.xhr && f.abortable !== true) { ie(o); return l } else if (p === "abort") { if (f.xhr) { ie(o); return l } else { x = true } } else if (p === "replace") { ce(g, "htmx:abort") } else if (p.indexOf("queue") === 0) { var V = p.split(" "); m = (V[1] || "last").trim() } } if (f.xhr) { if (f.abortable) { ce(g, "htmx:abort") } else { if (m == null) { if (i) { var y = ae(i); if (y && y.triggerSpec && y.triggerSpec.queue) { m = y.triggerSpec.queue } } if (m == null) { m = "last" } } if (f.queuedRequests == null) { f.queuedRequests = [] } if (m === "first" && f.queuedRequests.length === 0) { f.queuedRequests.push(function () { he(t, r, n, i, a) }) } else if (m === "all") { f.queuedRequests.push(function () { he(t, r, n, i, a) }) } else if (m === "last") { f.queuedRequests = []; f.queuedRequests.push(function () { he(t, r, n, i, a) }) } ie(o); return l } } var b = new XMLHttpRequest; f.xhr = b; f.abortable = x; var w = function () { f.xhr = null; f.abortable = false; if (f.queuedRequests != null && f.queuedRequests.length > 0) { var e = f.queuedRequests.shift(); e() } }; var j = ne(n, "hx-prompt"); if (j) { var S = prompt(j); if (S === null || !ce(n, "htmx:prompt", { prompt: S, target: u })) { ie(o); w(); return l } } if (d && !e) { if (!confirm(d)) { ie(o); w(); return l } } var E = xr(n, u, S); if (t !== "get" && !Sr(n)) { E["Content-Type"] = "application/x-www-form-urlencoded" } if (a.headers) { E = le(E, a.headers) } var _ = dr(n, t); var C = _.errors; var R = _.values; if (a.values) { R = le(R, a.values) } var z = Hr(n); var $ = le(R, z); var T = yr($, n); if (Q.config.getCacheBusterParam && t === "get") { T["org.htmx.cache-buster"] = ee(u, "id") || "true" } if (r == null || r === "") { r = re().location.href } var O = Rr(n, "hx-request"); var W = ae(n).boosted; var q = Q.config.methodsThatUseUrlParams.indexOf(t) >= 0; var H = { boosted: W, useUrlParams: q, parameters: T, unfilteredParameters: $, headers: E, target: u, verb: t, errors: C, withCredentials: a.credentials || O.credentials || Q.config.withCredentials, timeout: a.timeout || O.timeout || Q.config.timeout, path: r, triggeringEvent: i }; if (!ce(n, "htmx:configRequest", H)) { ie(o); w(); return l } r = H.path; t = H.verb; E = H.headers; T = H.parameters; C = H.errors; q = H.useUrlParams; if (C && C.length > 0) { ce(n, "htmx:validation:halted", H); ie(o); w(); return l } var G = r.split("#"); var J = G[0]; var L = G[1]; var A = r; if (q) { A = J; var Z = Object.keys(T).length !== 0; if (Z) { if (A.indexOf("?") < 0) { A += "?" } else { A += "&" } A += pr(T); if (L) { A += "#" + L } } } if (!kr(n, A, H)) { fe(n, "htmx:invalidPath", H); ie(s); return l } b.open(t.toUpperCase(), A, true); b.overrideMimeType("text/html"); b.withCredentials = H.withCredentials; b.timeout = H.timeout; if (O.noHeaders) { } else { for (var N in E) { if (E.hasOwnProperty(N)) { var K = E[N]; Lr(b, N, K) } } } var I = { xhr: b, target: u, requestConfig: H, etc: a, boosted: W, select: X, pathInfo: { requestPath: r, finalRequestPath: A, anchor: L } }; b.onload = function () { try { var e = Ir(n); I.pathInfo.responsePath = Ar(b); M(n, I); lr(k, P); ce(n, "htmx:afterRequest", I); ce(n, "htmx:afterOnLoad", I); if (!se(n)) { var t = null; while (e.length > 0 && t == null) { var r = e.shift(); if (se(r)) { t = r } } if (t) { ce(t, "htmx:afterRequest", I); ce(t, "htmx:afterOnLoad", I) } } ie(o); w() } catch (e) { fe(n, "htmx:onLoadError", le({ error: e }, I)); throw e } }; b.onerror = function () { lr(k, P); fe(n, "htmx:afterRequest", I); fe(n, "htmx:sendError", I); ie(s); w() }; b.onabort = function () { lr(k, P); fe(n, "htmx:afterRequest", I); fe(n, "htmx:sendAbort", I); ie(s); w() }; b.ontimeout = function () { lr(k, P); fe(n, "htmx:afterRequest", I); fe(n, "htmx:timeout", I); ie(s); w() }; if (!ce(n, "htmx:beforeRequest", I)) { ie(o); w(); return l } var k = or(n); var P = sr(n); oe(["loadstart", "loadend", "progress", "abort"], function (t) { oe([b, b.upload], function (e) { e.addEventListener(t, function (e) { ce(n, "htmx:xhr:" + t, { lengthComputable: e.lengthComputable, loaded: e.loaded, total: e.total }) }) }) }); ce(n, "htmx:beforeSend", I); var Y = q ? null : Er(b, n, T); b.send(Y); return l } function Pr(e, t) { var r = t.xhr; var n = null; var i = null; if (O(r, /HX-Push:/i)) { n = r.getResponseHeader("HX-Push"); i = "push" } else if (O(r, /HX-Push-Url:/i)) { n = r.getResponseHeader("HX-Push-Url"); i = "push" } else if (O(r, /HX-Replace-Url:/i)) { n = r.getResponseHeader("HX-Replace-Url"); i = "replace" } if (n) { if (n === "false") { return {} } else { return { type: i, path: n } } } var a = t.pathInfo.finalRequestPath; var o = t.pathInfo.responsePath; var s = ne(e, "hx-push-url"); var l = ne(e, "hx-replace-url"); var u = ae(e).boosted; var f = null; var c = null; if (s) { f = "push"; c = s } else if (l) { f = "replace"; c = l } else if (u) { f = "push"; c = o || a } if (c) { if (c === "false") { return {} } if (c === "true") { c = o || a } if (t.pathInfo.anchor && c.indexOf("#") === -1) { c = c + "#" + t.pathInfo.anchor } return { type: f, path: c } } else { return {} } } function Mr(l, u) { var f = u.xhr; var c = u.target; var e = u.etc; var t = u.requestConfig; var h = u.select; if (!ce(l, "htmx:beforeOnLoad", u)) return; if (O(f, /HX-Trigger:/i)) { _e(f, "HX-Trigger", l) } if (O(f, /HX-Location:/i)) { er(); var r = f.getResponseHeader("HX-Location"); var v; if (r.indexOf("{") === 0) { v = E(r); r = v["path"]; delete v["path"] } Nr("GET", r, v).then(function () { tr(r) }); return } var n = O(f, /HX-Refresh:/i) && "true" === f.getResponseHeader("HX-Refresh"); if (O(f, /HX-Redirect:/i)) { location.href = f.getResponseHeader("HX-Redirect"); n && location.reload(); return } if (n) { location.reload(); return } if (O(f, /HX-Retarget:/i)) { if (f.getResponseHeader("HX-Retarget") === "this") { u.target = l } else { u.target = ue(l, f.getResponseHeader("HX-Retarget")) } } var d = Pr(l, u); var i = f.status >= 200 && f.status < 400 && f.status !== 204; var g = f.response; var a = f.status >= 400; var p = Q.config.ignoreTitle; var o = le({ shouldSwap: i, serverResponse: g, isError: a, ignoreTitle: p }, u); if (!ce(c, "htmx:beforeSwap", o)) return; c = o.target; g = o.serverResponse; a = o.isError; p = o.ignoreTitle; u.target = c; u.failed = a; u.successful = !a; if (o.shouldSwap) { if (f.status === 286) { at(l) } R(l, function (e) { g = e.transformResponse(g, f, l) }); if (d.type) { er() } var s = e.swapOverride; if (O(f, /HX-Reswap:/i)) { s = f.getResponseHeader("HX-Reswap") } var v = wr(l, s); if (v.hasOwnProperty("ignoreTitle")) { p = v.ignoreTitle } c.classList.add(Q.config.swappingClass); var m = null; var x = null; var y = function () { try { var e = document.activeElement; var t = {}; try { t = { elt: e, start: e ? e.selectionStart : null, end: e ? e.selectionEnd : null } } catch (e) { } var r; if (h) { r = h } if (O(f, /HX-Reselect:/i)) { r = f.getResponseHeader("HX-Reselect") } if (d.type) { ce(re().body, "htmx:beforeHistoryUpdate", le({ history: d }, u)); if (d.type === "push") { tr(d.path); ce(re().body, "htmx:pushedIntoHistory", { path: d.path }) } else { rr(d.path); ce(re().body, "htmx:replacedInHistory", { path: d.path }) } } var n = T(c); je(v.swapStyle, c, l, g, n, r); if (t.elt && !se(t.elt) && ee(t.elt, "id")) { var i = document.getElementById(ee(t.elt, "id")); var a = { preventScroll: v.focusScroll !== undefined ? !v.focusScroll : !Q.config.defaultFocusScroll }; if (i) { if (t.start && i.setSelectionRange) { try { i.setSelectionRange(t.start, t.end) } catch (e) { } } i.focus(a) } } c.classList.remove(Q.config.swappingClass); oe(n.elts, function (e) { if (e.classList) { e.classList.add(Q.config.settlingClass) } ce(e, "htmx:afterSwap", u) }); if (O(f, /HX-Trigger-After-Swap:/i)) { var o = l; if (!se(l)) { o = re().body } _e(f, "HX-Trigger-After-Swap", o) } var s = function () { oe(n.tasks, function (e) { e.call() }); oe(n.elts, function (e) { if (e.classList) { e.classList.remove(Q.config.settlingClass) } ce(e, "htmx:afterSettle", u) }); if (u.pathInfo.anchor) { var e = re().getElementById(u.pathInfo.anchor); if (e) { e.scrollIntoView({ block: "start", behavior: "auto" }) } } if (n.title && !p) { var t = C("title"); if (t) { t.innerHTML = n.title } else { window.document.title = n.title } } Cr(n.elts, v); if (O(f, /HX-Trigger-After-Settle:/i)) { var r = l; if (!se(l)) { r = re().body } _e(f, "HX-Trigger-After-Settle", r) } ie(m) }; if (v.settleDelay > 0) { setTimeout(s, v.settleDelay) } else { s() } } catch (e) { fe(l, "htmx:swapError", u); ie(x); throw e } }; var b = Q.config.globalViewTransitions; if (v.hasOwnProperty("transition")) { b = v.transition } if (b && ce(l, "htmx:beforeTransition", u) && typeof Promise !== "undefined" && document.startViewTransition) { var w = new Promise(function (e, t) { m = e; x = t }); var S = y; y = function () { document.startViewTransition(function () { S(); return w }) } } if (v.swapDelay > 0) { setTimeout(y, v.swapDelay) } else { y() } } if (a) { fe(l, "htmx:responseError", le({ error: "Response Status Error Code " + f.status + " from " + u.pathInfo.requestPath }, u)) } } var Xr = {}; function Dr() { return { init: function (e) { return null }, onEvent: function (e, t) { return true }, transformResponse: function (e, t, r) { return e }, isInlineSwap: function (e) { return false }, handleSwap: function (e, t, r, n) { return false }, encodeParameters: function (e, t, r) { return null } } } function Ur(e, t) { if (t.init) { t.init(r) } Xr[e] = le(Dr(), t) } function Br(e) { delete Xr[e] } function Fr(e, r, n) { if (e == undefined) { return r } if (r == undefined) { r = [] } if (n == undefined) { n = [] } var t = te(e, "hx-ext"); if (t) { oe(t.split(","), function (e) { e = e.replace(/ /g, ""); if (e.slice(0, 7) == "ignore:") { n.push(e.slice(7)); return } if (n.indexOf(e) < 0) { var t = Xr[e]; if (t && r.indexOf(t) < 0) { r.push(t) } } }) } return Fr(u(e), r, n) } var Vr = false; re().addEventListener("DOMContentLoaded", function () { Vr = true }); function jr(e) { if (Vr || re().readyState === "complete") { e() } else { re().addEventListener("DOMContentLoaded", e) } } function _r() { if (Q.config.includeIndicatorStyles !== false) { re().head.insertAdjacentHTML("beforeend", "") } } function zr() { var e = re().querySelector('meta[name="htmx-config"]'); if (e) { return E(e.content) } else { return null } } function $r() { var e = zr(); if (e) { Q.config = le(Q.config, e) } } jr(function () { $r(); _r(); var e = re().body; zt(e); var t = re().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']"); e.addEventListener("htmx:abort", function (e) { var t = e.target; var r = ae(t); if (r && r.xhr) { r.xhr.abort() } }); const r = window.onpopstate ? window.onpopstate.bind(window) : null; window.onpopstate = function (e) { if (e.state && e.state.htmx) { ar(); oe(t, function (e) { ce(e, "htmx:restored", { document: re(), triggerEvent: ce }) }) } else { if (r) { r(e) } } }; setTimeout(function () { ce(e, "htmx:load", {}); e = null }, 0) }); return Q }() });
diff --git a/tad/templates/layout.html b/tad/templates/layout.html
index 1f613521..20e74108 100644
--- a/tad/templates/layout.html
+++ b/tad/templates/layout.html
@@ -8,6 +8,8 @@
+
+
{% block head %}{% endblock %}
From f2da393fb2cfd5705a8d4e556c673c520909561d Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 11:06:06 +0000
Subject: [PATCH 46/55] Fix typo for migrations in app database filename
---
tad/migrations/env.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tad/migrations/env.py b/tad/migrations/env.py
index d5bc0598..f790750b 100644
--- a/tad/migrations/env.py
+++ b/tad/migrations/env.py
@@ -18,7 +18,7 @@ def get_url():
scheme = os.getenv("APP_DATABASE_SCHEME", "sqlite")
if scheme == "sqlite":
- file = os.getenv("APP_DATABASE__FILE", "/database")
+ file = os.getenv("APP_DATABASE_FILE", "database.sqlite3")
return f"{scheme}:///{file}"
user = os.getenv("APP_DATABASE_USER", "tad")
From b8d5ed42061318c91ff685c2297f842de75eacb4 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 11:06:36 +0000
Subject: [PATCH 47/55] Fix ci workflow for dockerfile location
---
.github/workflows/ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5d8c48d..da01aaa0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -172,7 +172,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
- file: ./tad/Dockerfile
+ file: ./Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
@@ -182,7 +182,7 @@ jobs:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
- image-ref: ${{ steps.meta.outputs.tags }}
+ image-ref: ${{ steps.meta.outputs.tags[0] }}
trivy-config: trivy.yaml
scan-type: image
exit-code: 0
From 6e8983457103d24c4132a9d53fde2bfbf497687c Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 11:07:37 +0000
Subject: [PATCH 48/55] Update dependencies
---
.pre-commit-config.yaml | 2 +-
poetry.lock | 312 +++++++++++++++++++---------------------
2 files changed, 149 insertions(+), 165 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4290a1e6..18f1b71f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
- id: check-toml
- id: detect-private-key
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.4.3
+ rev: v0.4.4
hooks:
- id: ruff
- id: ruff-format
diff --git a/poetry.lock b/poetry.lock
index f35389eb..a45cbbf9 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -695,165 +695,149 @@ testing = ["black", "isort", "pytest (>=6,!=7.0.0)", "pytest-xdist (>=2)", "twin
[[package]]
name = "lxml"
-version = "5.2.1"
+version = "5.2.2"
description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
optional = false
python-versions = ">=3.6"
files = [
- {file = "lxml-5.2.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1f7785f4f789fdb522729ae465adcaa099e2a3441519df750ebdccc481d961a1"},
- {file = "lxml-5.2.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6cc6ee342fb7fa2471bd9b6d6fdfc78925a697bf5c2bcd0a302e98b0d35bfad3"},
- {file = "lxml-5.2.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:794f04eec78f1d0e35d9e0c36cbbb22e42d370dda1609fb03bcd7aeb458c6377"},
- {file = "lxml-5.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c817d420c60a5183953c783b0547d9eb43b7b344a2c46f69513d5952a78cddf3"},
- {file = "lxml-5.2.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2213afee476546a7f37c7a9b4ad4d74b1e112a6fafffc9185d6d21f043128c81"},
- {file = "lxml-5.2.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b070bbe8d3f0f6147689bed981d19bbb33070225373338df755a46893528104a"},
- {file = "lxml-5.2.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e02c5175f63effbd7c5e590399c118d5db6183bbfe8e0d118bdb5c2d1b48d937"},
- {file = "lxml-5.2.1-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:3dc773b2861b37b41a6136e0b72a1a44689a9c4c101e0cddb6b854016acc0aa8"},
- {file = "lxml-5.2.1-cp310-cp310-manylinux_2_28_ppc64le.whl", hash = "sha256:d7520db34088c96cc0e0a3ad51a4fd5b401f279ee112aa2b7f8f976d8582606d"},
- {file = "lxml-5.2.1-cp310-cp310-manylinux_2_28_s390x.whl", hash = "sha256:bcbf4af004f98793a95355980764b3d80d47117678118a44a80b721c9913436a"},
- {file = "lxml-5.2.1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:a2b44bec7adf3e9305ce6cbfa47a4395667e744097faed97abb4728748ba7d47"},
- {file = "lxml-5.2.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:1c5bb205e9212d0ebddf946bc07e73fa245c864a5f90f341d11ce7b0b854475d"},
- {file = "lxml-5.2.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2c9d147f754b1b0e723e6afb7ba1566ecb162fe4ea657f53d2139bbf894d050a"},
- {file = "lxml-5.2.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:3545039fa4779be2df51d6395e91a810f57122290864918b172d5dc7ca5bb433"},
- {file = "lxml-5.2.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a91481dbcddf1736c98a80b122afa0f7296eeb80b72344d7f45dc9f781551f56"},
- {file = "lxml-5.2.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:2ddfe41ddc81f29a4c44c8ce239eda5ade4e7fc305fb7311759dd6229a080052"},
- {file = "lxml-5.2.1-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:a7baf9ffc238e4bf401299f50e971a45bfcc10a785522541a6e3179c83eabf0a"},
- {file = "lxml-5.2.1-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:31e9a882013c2f6bd2f2c974241bf4ba68c85eba943648ce88936d23209a2e01"},
- {file = "lxml-5.2.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:0a15438253b34e6362b2dc41475e7f80de76320f335e70c5528b7148cac253a1"},
- {file = "lxml-5.2.1-cp310-cp310-win32.whl", hash = "sha256:6992030d43b916407c9aa52e9673612ff39a575523c5f4cf72cdef75365709a5"},
- {file = "lxml-5.2.1-cp310-cp310-win_amd64.whl", hash = "sha256:da052e7962ea2d5e5ef5bc0355d55007407087392cf465b7ad84ce5f3e25fe0f"},
- {file = "lxml-5.2.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:70ac664a48aa64e5e635ae5566f5227f2ab7f66a3990d67566d9907edcbbf867"},
- {file = "lxml-5.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1ae67b4e737cddc96c99461d2f75d218bdf7a0c3d3ad5604d1f5e7464a2f9ffe"},
- {file = "lxml-5.2.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f18a5a84e16886898e51ab4b1d43acb3083c39b14c8caeb3589aabff0ee0b270"},
- {file = "lxml-5.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c6f2c8372b98208ce609c9e1d707f6918cc118fea4e2c754c9f0812c04ca116d"},
- {file = "lxml-5.2.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:394ed3924d7a01b5bd9a0d9d946136e1c2f7b3dc337196d99e61740ed4bc6fe1"},
- {file = "lxml-5.2.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d077bc40a1fe984e1a9931e801e42959a1e6598edc8a3223b061d30fbd26bbc"},
- {file = "lxml-5.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:764b521b75701f60683500d8621841bec41a65eb739b8466000c6fdbc256c240"},
- {file = "lxml-5.2.1-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:3a6b45da02336895da82b9d472cd274b22dc27a5cea1d4b793874eead23dd14f"},
- {file = "lxml-5.2.1-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:5ea7b6766ac2dfe4bcac8b8595107665a18ef01f8c8343f00710b85096d1b53a"},
- {file = "lxml-5.2.1-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:e196a4ff48310ba62e53a8e0f97ca2bca83cdd2fe2934d8b5cb0df0a841b193a"},
- {file = "lxml-5.2.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:200e63525948e325d6a13a76ba2911f927ad399ef64f57898cf7c74e69b71095"},
- {file = "lxml-5.2.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:dae0ed02f6b075426accbf6b2863c3d0a7eacc1b41fb40f2251d931e50188dad"},
- {file = "lxml-5.2.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:ab31a88a651039a07a3ae327d68ebdd8bc589b16938c09ef3f32a4b809dc96ef"},
- {file = "lxml-5.2.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:df2e6f546c4df14bc81f9498bbc007fbb87669f1bb707c6138878c46b06f6510"},
- {file = "lxml-5.2.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5dd1537e7cc06efd81371f5d1a992bd5ab156b2b4f88834ca852de4a8ea523fa"},
- {file = "lxml-5.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:9b9ec9c9978b708d488bec36b9e4c94d88fd12ccac3e62134a9d17ddba910ea9"},
- {file = "lxml-5.2.1-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:8e77c69d5892cb5ba71703c4057091e31ccf534bd7f129307a4d084d90d014b8"},
- {file = "lxml-5.2.1-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:a8d5c70e04aac1eda5c829a26d1f75c6e5286c74743133d9f742cda8e53b9c2f"},
- {file = "lxml-5.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c94e75445b00319c1fad60f3c98b09cd63fe1134a8a953dcd48989ef42318534"},
- {file = "lxml-5.2.1-cp311-cp311-win32.whl", hash = "sha256:4951e4f7a5680a2db62f7f4ab2f84617674d36d2d76a729b9a8be4b59b3659be"},
- {file = "lxml-5.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:5c670c0406bdc845b474b680b9a5456c561c65cf366f8db5a60154088c92d102"},
- {file = "lxml-5.2.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:abc25c3cab9ec7fcd299b9bcb3b8d4a1231877e425c650fa1c7576c5107ab851"},
- {file = "lxml-5.2.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:6935bbf153f9a965f1e07c2649c0849d29832487c52bb4a5c5066031d8b44fd5"},
- {file = "lxml-5.2.1-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d793bebb202a6000390a5390078e945bbb49855c29c7e4d56a85901326c3b5d9"},
- {file = "lxml-5.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afd5562927cdef7c4f5550374acbc117fd4ecc05b5007bdfa57cc5355864e0a4"},
- {file = "lxml-5.2.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0e7259016bc4345a31af861fdce942b77c99049d6c2107ca07dc2bba2435c1d9"},
- {file = "lxml-5.2.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:530e7c04f72002d2f334d5257c8a51bf409db0316feee7c87e4385043be136af"},
- {file = "lxml-5.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59689a75ba8d7ffca577aefd017d08d659d86ad4585ccc73e43edbfc7476781a"},
- {file = "lxml-5.2.1-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:f9737bf36262046213a28e789cc82d82c6ef19c85a0cf05e75c670a33342ac2c"},
- {file = "lxml-5.2.1-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:3a74c4f27167cb95c1d4af1c0b59e88b7f3e0182138db2501c353555f7ec57f4"},
- {file = "lxml-5.2.1-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:68a2610dbe138fa8c5826b3f6d98a7cfc29707b850ddcc3e21910a6fe51f6ca0"},
- {file = "lxml-5.2.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:f0a1bc63a465b6d72569a9bba9f2ef0334c4e03958e043da1920299100bc7c08"},
- {file = "lxml-5.2.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c2d35a1d047efd68027817b32ab1586c1169e60ca02c65d428ae815b593e65d4"},
- {file = "lxml-5.2.1-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:79bd05260359170f78b181b59ce871673ed01ba048deef4bf49a36ab3e72e80b"},
- {file = "lxml-5.2.1-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:865bad62df277c04beed9478fe665b9ef63eb28fe026d5dedcb89b537d2e2ea6"},
- {file = "lxml-5.2.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:44f6c7caff88d988db017b9b0e4ab04934f11e3e72d478031efc7edcac6c622f"},
- {file = "lxml-5.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:71e97313406ccf55d32cc98a533ee05c61e15d11b99215b237346171c179c0b0"},
- {file = "lxml-5.2.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:057cdc6b86ab732cf361f8b4d8af87cf195a1f6dc5b0ff3de2dced242c2015e0"},
- {file = "lxml-5.2.1-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:f3bbbc998d42f8e561f347e798b85513ba4da324c2b3f9b7969e9c45b10f6169"},
- {file = "lxml-5.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:491755202eb21a5e350dae00c6d9a17247769c64dcf62d8c788b5c135e179dc4"},
- {file = "lxml-5.2.1-cp312-cp312-win32.whl", hash = "sha256:8de8f9d6caa7f25b204fc861718815d41cbcf27ee8f028c89c882a0cf4ae4134"},
- {file = "lxml-5.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:f2a9efc53d5b714b8df2b4b3e992accf8ce5bbdfe544d74d5c6766c9e1146a3a"},
- {file = "lxml-5.2.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:70a9768e1b9d79edca17890175ba915654ee1725975d69ab64813dd785a2bd5c"},
- {file = "lxml-5.2.1-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c38d7b9a690b090de999835f0443d8aa93ce5f2064035dfc48f27f02b4afc3d0"},
- {file = "lxml-5.2.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5670fb70a828663cc37552a2a85bf2ac38475572b0e9b91283dc09efb52c41d1"},
- {file = "lxml-5.2.1-cp36-cp36m-manylinux_2_28_x86_64.whl", hash = "sha256:958244ad566c3ffc385f47dddde4145088a0ab893504b54b52c041987a8c1863"},
- {file = "lxml-5.2.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b6241d4eee5f89453307c2f2bfa03b50362052ca0af1efecf9fef9a41a22bb4f"},
- {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:2a66bf12fbd4666dd023b6f51223aed3d9f3b40fef06ce404cb75bafd3d89536"},
- {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:9123716666e25b7b71c4e1789ec829ed18663152008b58544d95b008ed9e21e9"},
- {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:0c3f67e2aeda739d1cc0b1102c9a9129f7dc83901226cc24dd72ba275ced4218"},
- {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:5d5792e9b3fb8d16a19f46aa8208987cfeafe082363ee2745ea8b643d9cc5b45"},
- {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_2_aarch64.whl", hash = "sha256:88e22fc0a6684337d25c994381ed8a1580a6f5ebebd5ad41f89f663ff4ec2885"},
- {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_2_ppc64le.whl", hash = "sha256:21c2e6b09565ba5b45ae161b438e033a86ad1736b8c838c766146eff8ceffff9"},
- {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_2_s390x.whl", hash = "sha256:afbbdb120d1e78d2ba8064a68058001b871154cc57787031b645c9142b937a62"},
- {file = "lxml-5.2.1-cp36-cp36m-musllinux_1_2_x86_64.whl", hash = "sha256:627402ad8dea044dde2eccde4370560a2b750ef894c9578e1d4f8ffd54000461"},
- {file = "lxml-5.2.1-cp36-cp36m-win32.whl", hash = "sha256:e89580a581bf478d8dcb97d9cd011d567768e8bc4095f8557b21c4d4c5fea7d0"},
- {file = "lxml-5.2.1-cp36-cp36m-win_amd64.whl", hash = "sha256:59565f10607c244bc4c05c0c5fa0c190c990996e0c719d05deec7030c2aa8289"},
- {file = "lxml-5.2.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:857500f88b17a6479202ff5fe5f580fc3404922cd02ab3716197adf1ef628029"},
- {file = "lxml-5.2.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:56c22432809085b3f3ae04e6e7bdd36883d7258fcd90e53ba7b2e463efc7a6af"},
- {file = "lxml-5.2.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a55ee573116ba208932e2d1a037cc4b10d2c1cb264ced2184d00b18ce585b2c0"},
- {file = "lxml-5.2.1-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:6cf58416653c5901e12624e4013708b6e11142956e7f35e7a83f1ab02f3fe456"},
- {file = "lxml-5.2.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:64c2baa7774bc22dd4474248ba16fe1a7f611c13ac6123408694d4cc93d66dbd"},
- {file = "lxml-5.2.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:74b28c6334cca4dd704e8004cba1955af0b778cf449142e581e404bd211fb619"},
- {file = "lxml-5.2.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:7221d49259aa1e5a8f00d3d28b1e0b76031655ca74bb287123ef56c3db92f213"},
- {file = "lxml-5.2.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:3dbe858ee582cbb2c6294dc85f55b5f19c918c2597855e950f34b660f1a5ede6"},
- {file = "lxml-5.2.1-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:04ab5415bf6c86e0518d57240a96c4d1fcfc3cb370bb2ac2a732b67f579e5a04"},
- {file = "lxml-5.2.1-cp37-cp37m-musllinux_1_2_ppc64le.whl", hash = "sha256:6ab833e4735a7e5533711a6ea2df26459b96f9eec36d23f74cafe03631647c41"},
- {file = "lxml-5.2.1-cp37-cp37m-musllinux_1_2_s390x.whl", hash = "sha256:f443cdef978430887ed55112b491f670bba6462cea7a7742ff8f14b7abb98d75"},
- {file = "lxml-5.2.1-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:9e2addd2d1866fe112bc6f80117bcc6bc25191c5ed1bfbcf9f1386a884252ae8"},
- {file = "lxml-5.2.1-cp37-cp37m-win32.whl", hash = "sha256:f51969bac61441fd31f028d7b3b45962f3ecebf691a510495e5d2cd8c8092dbd"},
- {file = "lxml-5.2.1-cp37-cp37m-win_amd64.whl", hash = "sha256:b0b58fbfa1bf7367dde8a557994e3b1637294be6cf2169810375caf8571a085c"},
- {file = "lxml-5.2.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:804f74efe22b6a227306dd890eecc4f8c59ff25ca35f1f14e7482bbce96ef10b"},
- {file = "lxml-5.2.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:08802f0c56ed150cc6885ae0788a321b73505d2263ee56dad84d200cab11c07a"},
- {file = "lxml-5.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8c09ed18ecb4ebf23e02b8e7a22a05d6411911e6fabef3a36e4f371f4f2585"},
- {file = "lxml-5.2.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e3d30321949861404323c50aebeb1943461a67cd51d4200ab02babc58bd06a86"},
- {file = "lxml-5.2.1-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:b560e3aa4b1d49e0e6c847d72665384db35b2f5d45f8e6a5c0072e0283430533"},
- {file = "lxml-5.2.1-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:058a1308914f20784c9f4674036527e7c04f7be6fb60f5d61353545aa7fcb739"},
- {file = "lxml-5.2.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:adfb84ca6b87e06bc6b146dc7da7623395db1e31621c4785ad0658c5028b37d7"},
- {file = "lxml-5.2.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:417d14450f06d51f363e41cace6488519038f940676ce9664b34ebf5653433a5"},
- {file = "lxml-5.2.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a2dfe7e2473f9b59496247aad6e23b405ddf2e12ef0765677b0081c02d6c2c0b"},
- {file = "lxml-5.2.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bf2e2458345d9bffb0d9ec16557d8858c9c88d2d11fed53998512504cd9df49b"},
- {file = "lxml-5.2.1-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:58278b29cb89f3e43ff3e0c756abbd1518f3ee6adad9e35b51fb101c1c1daaec"},
- {file = "lxml-5.2.1-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:64641a6068a16201366476731301441ce93457eb8452056f570133a6ceb15fca"},
- {file = "lxml-5.2.1-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:78bfa756eab503673991bdcf464917ef7845a964903d3302c5f68417ecdc948c"},
- {file = "lxml-5.2.1-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:11a04306fcba10cd9637e669fd73aa274c1c09ca64af79c041aa820ea992b637"},
- {file = "lxml-5.2.1-cp38-cp38-win32.whl", hash = "sha256:66bc5eb8a323ed9894f8fa0ee6cb3e3fb2403d99aee635078fd19a8bc7a5a5da"},
- {file = "lxml-5.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:9676bfc686fa6a3fa10cd4ae6b76cae8be26eb5ec6811d2a325636c460da1806"},
- {file = "lxml-5.2.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:cf22b41fdae514ee2f1691b6c3cdeae666d8b7fa9434de445f12bbeee0cf48dd"},
- {file = "lxml-5.2.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ec42088248c596dbd61d4ae8a5b004f97a4d91a9fd286f632e42e60b706718d7"},
- {file = "lxml-5.2.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cd53553ddad4a9c2f1f022756ae64abe16da1feb497edf4d9f87f99ec7cf86bd"},
- {file = "lxml-5.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:feaa45c0eae424d3e90d78823f3828e7dc42a42f21ed420db98da2c4ecf0a2cb"},
- {file = "lxml-5.2.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ddc678fb4c7e30cf830a2b5a8d869538bc55b28d6c68544d09c7d0d8f17694dc"},
- {file = "lxml-5.2.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:853e074d4931dbcba7480d4dcab23d5c56bd9607f92825ab80ee2bd916edea53"},
- {file = "lxml-5.2.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc4691d60512798304acb9207987e7b2b7c44627ea88b9d77489bbe3e6cc3bd4"},
- {file = "lxml-5.2.1-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:beb72935a941965c52990f3a32d7f07ce869fe21c6af8b34bf6a277b33a345d3"},
- {file = "lxml-5.2.1-cp39-cp39-manylinux_2_28_ppc64le.whl", hash = "sha256:6588c459c5627fefa30139be4d2e28a2c2a1d0d1c265aad2ba1935a7863a4913"},
- {file = "lxml-5.2.1-cp39-cp39-manylinux_2_28_s390x.whl", hash = "sha256:588008b8497667f1ddca7c99f2f85ce8511f8f7871b4a06ceede68ab62dff64b"},
- {file = "lxml-5.2.1-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:b6787b643356111dfd4032b5bffe26d2f8331556ecb79e15dacb9275da02866e"},
- {file = "lxml-5.2.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7c17b64b0a6ef4e5affae6a3724010a7a66bda48a62cfe0674dabd46642e8b54"},
- {file = "lxml-5.2.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:27aa20d45c2e0b8cd05da6d4759649170e8dfc4f4e5ef33a34d06f2d79075d57"},
- {file = "lxml-5.2.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:d4f2cc7060dc3646632d7f15fe68e2fa98f58e35dd5666cd525f3b35d3fed7f8"},
- {file = "lxml-5.2.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ff46d772d5f6f73564979cd77a4fffe55c916a05f3cb70e7c9c0590059fb29ef"},
- {file = "lxml-5.2.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:96323338e6c14e958d775700ec8a88346014a85e5de73ac7967db0367582049b"},
- {file = "lxml-5.2.1-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:52421b41ac99e9d91934e4d0d0fe7da9f02bfa7536bb4431b4c05c906c8c6919"},
- {file = "lxml-5.2.1-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:7a7efd5b6d3e30d81ec68ab8a88252d7c7c6f13aaa875009fe3097eb4e30b84c"},
- {file = "lxml-5.2.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:0ed777c1e8c99b63037b91f9d73a6aad20fd035d77ac84afcc205225f8f41188"},
- {file = "lxml-5.2.1-cp39-cp39-win32.whl", hash = "sha256:644df54d729ef810dcd0f7732e50e5ad1bd0a135278ed8d6bcb06f33b6b6f708"},
- {file = "lxml-5.2.1-cp39-cp39-win_amd64.whl", hash = "sha256:9ca66b8e90daca431b7ca1408cae085d025326570e57749695d6a01454790e95"},
- {file = "lxml-5.2.1-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:9b0ff53900566bc6325ecde9181d89afadc59c5ffa39bddf084aaedfe3b06a11"},
- {file = "lxml-5.2.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fd6037392f2d57793ab98d9e26798f44b8b4da2f2464388588f48ac52c489ea1"},
- {file = "lxml-5.2.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b9c07e7a45bb64e21df4b6aa623cb8ba214dfb47d2027d90eac197329bb5e94"},
- {file = "lxml-5.2.1-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:3249cc2989d9090eeac5467e50e9ec2d40704fea9ab72f36b034ea34ee65ca98"},
- {file = "lxml-5.2.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f42038016852ae51b4088b2862126535cc4fc85802bfe30dea3500fdfaf1864e"},
- {file = "lxml-5.2.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:533658f8fbf056b70e434dff7e7aa611bcacb33e01f75de7f821810e48d1bb66"},
- {file = "lxml-5.2.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:622020d4521e22fb371e15f580d153134bfb68d6a429d1342a25f051ec72df1c"},
- {file = "lxml-5.2.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:efa7b51824aa0ee957ccd5a741c73e6851de55f40d807f08069eb4c5a26b2baa"},
- {file = "lxml-5.2.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c6ad0fbf105f6bcc9300c00010a2ffa44ea6f555df1a2ad95c88f5656104817"},
- {file = "lxml-5.2.1-pp37-pypy37_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:e233db59c8f76630c512ab4a4daf5a5986da5c3d5b44b8e9fc742f2a24dbd460"},
- {file = "lxml-5.2.1-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6a014510830df1475176466b6087fc0c08b47a36714823e58d8b8d7709132a96"},
- {file = "lxml-5.2.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:d38c8f50ecf57f0463399569aa388b232cf1a2ffb8f0a9a5412d0db57e054860"},
- {file = "lxml-5.2.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5aea8212fb823e006b995c4dda533edcf98a893d941f173f6c9506126188860d"},
- {file = "lxml-5.2.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff097ae562e637409b429a7ac958a20aab237a0378c42dabaa1e3abf2f896e5f"},
- {file = "lxml-5.2.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f5d65c39f16717a47c36c756af0fb36144069c4718824b7533f803ecdf91138"},
- {file = "lxml-5.2.1-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:3d0c3dd24bb4605439bf91068598d00c6370684f8de4a67c2992683f6c309d6b"},
- {file = "lxml-5.2.1-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e32be23d538753a8adb6c85bd539f5fd3b15cb987404327c569dfc5fd8366e85"},
- {file = "lxml-5.2.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:cc518cea79fd1e2f6c90baafa28906d4309d24f3a63e801d855e7424c5b34144"},
- {file = "lxml-5.2.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a0af35bd8ebf84888373630f73f24e86bf016642fb8576fba49d3d6b560b7cbc"},
- {file = "lxml-5.2.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8aca2e3a72f37bfc7b14ba96d4056244001ddcc18382bd0daa087fd2e68a354"},
- {file = "lxml-5.2.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5ca1e8188b26a819387b29c3895c47a5e618708fe6f787f3b1a471de2c4a94d9"},
- {file = "lxml-5.2.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c8ba129e6d3b0136a0f50345b2cb3db53f6bda5dd8c7f5d83fbccba97fb5dcb5"},
- {file = "lxml-5.2.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e998e304036198b4f6914e6a1e2b6f925208a20e2042563d9734881150c6c246"},
- {file = "lxml-5.2.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:d3be9b2076112e51b323bdf6d5a7f8a798de55fb8d95fcb64bd179460cdc0704"},
- {file = "lxml-5.2.1.tar.gz", hash = "sha256:3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306"},
+ {file = "lxml-5.2.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:364d03207f3e603922d0d3932ef363d55bbf48e3647395765f9bfcbdf6d23632"},
+ {file = "lxml-5.2.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50127c186f191b8917ea2fb8b206fbebe87fd414a6084d15568c27d0a21d60db"},
+ {file = "lxml-5.2.2-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:74e4f025ef3db1c6da4460dd27c118d8cd136d0391da4e387a15e48e5c975147"},
+ {file = "lxml-5.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:981a06a3076997adf7c743dcd0d7a0415582661e2517c7d961493572e909aa1d"},
+ {file = "lxml-5.2.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aef5474d913d3b05e613906ba4090433c515e13ea49c837aca18bde190853dff"},
+ {file = "lxml-5.2.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1e275ea572389e41e8b039ac076a46cb87ee6b8542df3fff26f5baab43713bca"},
+ {file = "lxml-5.2.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5b65529bb2f21ac7861a0e94fdbf5dc0daab41497d18223b46ee8515e5ad297"},
+ {file = "lxml-5.2.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:bcc98f911f10278d1daf14b87d65325851a1d29153caaf146877ec37031d5f36"},
+ {file = "lxml-5.2.2-cp310-cp310-manylinux_2_28_ppc64le.whl", hash = "sha256:b47633251727c8fe279f34025844b3b3a3e40cd1b198356d003aa146258d13a2"},
+ {file = "lxml-5.2.2-cp310-cp310-manylinux_2_28_s390x.whl", hash = "sha256:fbc9d316552f9ef7bba39f4edfad4a734d3d6f93341232a9dddadec4f15d425f"},
+ {file = "lxml-5.2.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:13e69be35391ce72712184f69000cda04fc89689429179bc4c0ae5f0b7a8c21b"},
+ {file = "lxml-5.2.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:3b6a30a9ab040b3f545b697cb3adbf3696c05a3a68aad172e3fd7ca73ab3c835"},
+ {file = "lxml-5.2.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:a233bb68625a85126ac9f1fc66d24337d6e8a0f9207b688eec2e7c880f012ec0"},
+ {file = "lxml-5.2.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:dfa7c241073d8f2b8e8dbc7803c434f57dbb83ae2a3d7892dd068d99e96efe2c"},
+ {file = "lxml-5.2.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1a7aca7964ac4bb07680d5c9d63b9d7028cace3e2d43175cb50bba8c5ad33316"},
+ {file = "lxml-5.2.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:ae4073a60ab98529ab8a72ebf429f2a8cc612619a8c04e08bed27450d52103c0"},
+ {file = "lxml-5.2.2-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:ffb2be176fed4457e445fe540617f0252a72a8bc56208fd65a690fdb1f57660b"},
+ {file = "lxml-5.2.2-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:e290d79a4107d7d794634ce3e985b9ae4f920380a813717adf61804904dc4393"},
+ {file = "lxml-5.2.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:96e85aa09274955bb6bd483eaf5b12abadade01010478154b0ec70284c1b1526"},
+ {file = "lxml-5.2.2-cp310-cp310-win32.whl", hash = "sha256:f956196ef61369f1685d14dad80611488d8dc1ef00be57c0c5a03064005b0f30"},
+ {file = "lxml-5.2.2-cp310-cp310-win_amd64.whl", hash = "sha256:875a3f90d7eb5c5d77e529080d95140eacb3c6d13ad5b616ee8095447b1d22e7"},
+ {file = "lxml-5.2.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:45f9494613160d0405682f9eee781c7e6d1bf45f819654eb249f8f46a2c22545"},
+ {file = "lxml-5.2.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b0b3f2df149efb242cee2ffdeb6674b7f30d23c9a7af26595099afaf46ef4e88"},
+ {file = "lxml-5.2.2-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d28cb356f119a437cc58a13f8135ab8a4c8ece18159eb9194b0d269ec4e28083"},
+ {file = "lxml-5.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:657a972f46bbefdbba2d4f14413c0d079f9ae243bd68193cb5061b9732fa54c1"},
+ {file = "lxml-5.2.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b74b9ea10063efb77a965a8d5f4182806fbf59ed068b3c3fd6f30d2ac7bee734"},
+ {file = "lxml-5.2.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:07542787f86112d46d07d4f3c4e7c760282011b354d012dc4141cc12a68cef5f"},
+ {file = "lxml-5.2.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:303f540ad2dddd35b92415b74b900c749ec2010e703ab3bfd6660979d01fd4ed"},
+ {file = "lxml-5.2.2-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:2eb2227ce1ff998faf0cd7fe85bbf086aa41dfc5af3b1d80867ecfe75fb68df3"},
+ {file = "lxml-5.2.2-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:1d8a701774dfc42a2f0b8ccdfe7dbc140500d1049e0632a611985d943fcf12df"},
+ {file = "lxml-5.2.2-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:56793b7a1a091a7c286b5f4aa1fe4ae5d1446fe742d00cdf2ffb1077865db10d"},
+ {file = "lxml-5.2.2-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:eb00b549b13bd6d884c863554566095bf6fa9c3cecb2e7b399c4bc7904cb33b5"},
+ {file = "lxml-5.2.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1a2569a1f15ae6c8c64108a2cd2b4a858fc1e13d25846be0666fc144715e32ab"},
+ {file = "lxml-5.2.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:8cf85a6e40ff1f37fe0f25719aadf443686b1ac7652593dc53c7ef9b8492b115"},
+ {file = "lxml-5.2.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:d237ba6664b8e60fd90b8549a149a74fcc675272e0e95539a00522e4ca688b04"},
+ {file = "lxml-5.2.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0b3f5016e00ae7630a4b83d0868fca1e3d494c78a75b1c7252606a3a1c5fc2ad"},
+ {file = "lxml-5.2.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:23441e2b5339bc54dc949e9e675fa35efe858108404ef9aa92f0456929ef6fe8"},
+ {file = "lxml-5.2.2-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:2fb0ba3e8566548d6c8e7dd82a8229ff47bd8fb8c2da237607ac8e5a1b8312e5"},
+ {file = "lxml-5.2.2-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:79d1fb9252e7e2cfe4de6e9a6610c7cbb99b9708e2c3e29057f487de5a9eaefa"},
+ {file = "lxml-5.2.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6dcc3d17eac1df7859ae01202e9bb11ffa8c98949dcbeb1069c8b9a75917e01b"},
+ {file = "lxml-5.2.2-cp311-cp311-win32.whl", hash = "sha256:4c30a2f83677876465f44c018830f608fa3c6a8a466eb223535035fbc16f3438"},
+ {file = "lxml-5.2.2-cp311-cp311-win_amd64.whl", hash = "sha256:49095a38eb333aaf44c06052fd2ec3b8f23e19747ca7ec6f6c954ffea6dbf7be"},
+ {file = "lxml-5.2.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:7429e7faa1a60cad26ae4227f4dd0459efde239e494c7312624ce228e04f6391"},
+ {file = "lxml-5.2.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:50ccb5d355961c0f12f6cf24b7187dbabd5433f29e15147a67995474f27d1776"},
+ {file = "lxml-5.2.2-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dc911208b18842a3a57266d8e51fc3cfaccee90a5351b92079beed912a7914c2"},
+ {file = "lxml-5.2.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33ce9e786753743159799fdf8e92a5da351158c4bfb6f2db0bf31e7892a1feb5"},
+ {file = "lxml-5.2.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ec87c44f619380878bd49ca109669c9f221d9ae6883a5bcb3616785fa8f94c97"},
+ {file = "lxml-5.2.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:08ea0f606808354eb8f2dfaac095963cb25d9d28e27edcc375d7b30ab01abbf6"},
+ {file = "lxml-5.2.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75a9632f1d4f698b2e6e2e1ada40e71f369b15d69baddb8968dcc8e683839b18"},
+ {file = "lxml-5.2.2-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:74da9f97daec6928567b48c90ea2c82a106b2d500f397eeb8941e47d30b1ca85"},
+ {file = "lxml-5.2.2-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:0969e92af09c5687d769731e3f39ed62427cc72176cebb54b7a9d52cc4fa3b73"},
+ {file = "lxml-5.2.2-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:9164361769b6ca7769079f4d426a41df6164879f7f3568be9086e15baca61466"},
+ {file = "lxml-5.2.2-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:d26a618ae1766279f2660aca0081b2220aca6bd1aa06b2cf73f07383faf48927"},
+ {file = "lxml-5.2.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:ab67ed772c584b7ef2379797bf14b82df9aa5f7438c5b9a09624dd834c1c1aaf"},
+ {file = "lxml-5.2.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:3d1e35572a56941b32c239774d7e9ad724074d37f90c7a7d499ab98761bd80cf"},
+ {file = "lxml-5.2.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:8268cbcd48c5375f46e000adb1390572c98879eb4f77910c6053d25cc3ac2c67"},
+ {file = "lxml-5.2.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e282aedd63c639c07c3857097fc0e236f984ceb4089a8b284da1c526491e3f3d"},
+ {file = "lxml-5.2.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6dfdc2bfe69e9adf0df4915949c22a25b39d175d599bf98e7ddf620a13678585"},
+ {file = "lxml-5.2.2-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4aefd911793b5d2d7a921233a54c90329bf3d4a6817dc465f12ffdfe4fc7b8fe"},
+ {file = "lxml-5.2.2-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:8b8df03a9e995b6211dafa63b32f9d405881518ff1ddd775db4e7b98fb545e1c"},
+ {file = "lxml-5.2.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f11ae142f3a322d44513de1018b50f474f8f736bc3cd91d969f464b5bfef8836"},
+ {file = "lxml-5.2.2-cp312-cp312-win32.whl", hash = "sha256:16a8326e51fcdffc886294c1e70b11ddccec836516a343f9ed0f82aac043c24a"},
+ {file = "lxml-5.2.2-cp312-cp312-win_amd64.whl", hash = "sha256:bbc4b80af581e18568ff07f6395c02114d05f4865c2812a1f02f2eaecf0bfd48"},
+ {file = "lxml-5.2.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e3d9d13603410b72787579769469af730c38f2f25505573a5888a94b62b920f8"},
+ {file = "lxml-5.2.2-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:38b67afb0a06b8575948641c1d6d68e41b83a3abeae2ca9eed2ac59892b36706"},
+ {file = "lxml-5.2.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c689d0d5381f56de7bd6966a4541bff6e08bf8d3871bbd89a0c6ab18aa699573"},
+ {file = "lxml-5.2.2-cp36-cp36m-manylinux_2_28_x86_64.whl", hash = "sha256:cf2a978c795b54c539f47964ec05e35c05bd045db5ca1e8366988c7f2fe6b3ce"},
+ {file = "lxml-5.2.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:739e36ef7412b2bd940f75b278749106e6d025e40027c0b94a17ef7968d55d56"},
+ {file = "lxml-5.2.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:d8bbcd21769594dbba9c37d3c819e2d5847656ca99c747ddb31ac1701d0c0ed9"},
+ {file = "lxml-5.2.2-cp36-cp36m-musllinux_1_2_x86_64.whl", hash = "sha256:2304d3c93f2258ccf2cf7a6ba8c761d76ef84948d87bf9664e14d203da2cd264"},
+ {file = "lxml-5.2.2-cp36-cp36m-win32.whl", hash = "sha256:02437fb7308386867c8b7b0e5bc4cd4b04548b1c5d089ffb8e7b31009b961dc3"},
+ {file = "lxml-5.2.2-cp36-cp36m-win_amd64.whl", hash = "sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196"},
+ {file = "lxml-5.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b"},
+ {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8"},
+ {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716"},
+ {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905"},
+ {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6"},
+ {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61"},
+ {file = "lxml-5.2.2-cp37-cp37m-win32.whl", hash = "sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f"},
+ {file = "lxml-5.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40"},
+ {file = "lxml-5.2.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7ed07b3062b055d7a7f9d6557a251cc655eed0b3152b76de619516621c56f5d3"},
+ {file = "lxml-5.2.2-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f60fdd125d85bf9c279ffb8e94c78c51b3b6a37711464e1f5f31078b45002421"},
+ {file = "lxml-5.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8a7e24cb69ee5f32e003f50e016d5fde438010c1022c96738b04fc2423e61706"},
+ {file = "lxml-5.2.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23cfafd56887eaed93d07bc4547abd5e09d837a002b791e9767765492a75883f"},
+ {file = "lxml-5.2.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:19b4e485cd07b7d83e3fe3b72132e7df70bfac22b14fe4bf7a23822c3a35bff5"},
+ {file = "lxml-5.2.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:7ce7ad8abebe737ad6143d9d3bf94b88b93365ea30a5b81f6877ec9c0dee0a48"},
+ {file = "lxml-5.2.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e49b052b768bb74f58c7dda4e0bdf7b79d43a9204ca584ffe1fb48a6f3c84c66"},
+ {file = "lxml-5.2.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d14a0d029a4e176795cef99c056d58067c06195e0c7e2dbb293bf95c08f772a3"},
+ {file = "lxml-5.2.2-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:be49ad33819d7dcc28a309b86d4ed98e1a65f3075c6acd3cd4fe32103235222b"},
+ {file = "lxml-5.2.2-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:a6d17e0370d2516d5bb9062c7b4cb731cff921fc875644c3d751ad857ba9c5b1"},
+ {file = "lxml-5.2.2-cp38-cp38-win32.whl", hash = "sha256:5b8c041b6265e08eac8a724b74b655404070b636a8dd6d7a13c3adc07882ef30"},
+ {file = "lxml-5.2.2-cp38-cp38-win_amd64.whl", hash = "sha256:f61efaf4bed1cc0860e567d2ecb2363974d414f7f1f124b1df368bbf183453a6"},
+ {file = "lxml-5.2.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:fb91819461b1b56d06fa4bcf86617fac795f6a99d12239fb0c68dbeba41a0a30"},
+ {file = "lxml-5.2.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d4ed0c7cbecde7194cd3228c044e86bf73e30a23505af852857c09c24e77ec5d"},
+ {file = "lxml-5.2.2-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:54401c77a63cc7d6dc4b4e173bb484f28a5607f3df71484709fe037c92d4f0ed"},
+ {file = "lxml-5.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:625e3ef310e7fa3a761d48ca7ea1f9d8718a32b1542e727d584d82f4453d5eeb"},
+ {file = "lxml-5.2.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:519895c99c815a1a24a926d5b60627ce5ea48e9f639a5cd328bda0515ea0f10c"},
+ {file = "lxml-5.2.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c7079d5eb1c1315a858bbf180000757db8ad904a89476653232db835c3114001"},
+ {file = "lxml-5.2.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:343ab62e9ca78094f2306aefed67dcfad61c4683f87eee48ff2fd74902447726"},
+ {file = "lxml-5.2.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:cd9e78285da6c9ba2d5c769628f43ef66d96ac3085e59b10ad4f3707980710d3"},
+ {file = "lxml-5.2.2-cp39-cp39-manylinux_2_28_ppc64le.whl", hash = "sha256:546cf886f6242dff9ec206331209db9c8e1643ae642dea5fdbecae2453cb50fd"},
+ {file = "lxml-5.2.2-cp39-cp39-manylinux_2_28_s390x.whl", hash = "sha256:02f6a8eb6512fdc2fd4ca10a49c341c4e109aa6e9448cc4859af5b949622715a"},
+ {file = "lxml-5.2.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:339ee4a4704bc724757cd5dd9dc8cf4d00980f5d3e6e06d5847c1b594ace68ab"},
+ {file = "lxml-5.2.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0a028b61a2e357ace98b1615fc03f76eb517cc028993964fe08ad514b1e8892d"},
+ {file = "lxml-5.2.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f90e552ecbad426eab352e7b2933091f2be77115bb16f09f78404861c8322981"},
+ {file = "lxml-5.2.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:d83e2d94b69bf31ead2fa45f0acdef0757fa0458a129734f59f67f3d2eb7ef32"},
+ {file = "lxml-5.2.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a02d3c48f9bb1e10c7788d92c0c7db6f2002d024ab6e74d6f45ae33e3d0288a3"},
+ {file = "lxml-5.2.2-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:6d68ce8e7b2075390e8ac1e1d3a99e8b6372c694bbe612632606d1d546794207"},
+ {file = "lxml-5.2.2-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:453d037e09a5176d92ec0fd282e934ed26d806331a8b70ab431a81e2fbabf56d"},
+ {file = "lxml-5.2.2-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:3b019d4ee84b683342af793b56bb35034bd749e4cbdd3d33f7d1107790f8c472"},
+ {file = "lxml-5.2.2-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:cb3942960f0beb9f46e2a71a3aca220d1ca32feb5a398656be934320804c0df9"},
+ {file = "lxml-5.2.2-cp39-cp39-win32.whl", hash = "sha256:ac6540c9fff6e3813d29d0403ee7a81897f1d8ecc09a8ff84d2eea70ede1cdbf"},
+ {file = "lxml-5.2.2-cp39-cp39-win_amd64.whl", hash = "sha256:610b5c77428a50269f38a534057444c249976433f40f53e3b47e68349cca1425"},
+ {file = "lxml-5.2.2-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b537bd04d7ccd7c6350cdaaaad911f6312cbd61e6e6045542f781c7f8b2e99d2"},
+ {file = "lxml-5.2.2-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4820c02195d6dfb7b8508ff276752f6b2ff8b64ae5d13ebe02e7667e035000b9"},
+ {file = "lxml-5.2.2-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2a09f6184f17a80897172863a655467da2b11151ec98ba8d7af89f17bf63dae"},
+ {file = "lxml-5.2.2-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:76acba4c66c47d27c8365e7c10b3d8016a7da83d3191d053a58382311a8bf4e1"},
+ {file = "lxml-5.2.2-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b128092c927eaf485928cec0c28f6b8bead277e28acf56800e972aa2c2abd7a2"},
+ {file = "lxml-5.2.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:ae791f6bd43305aade8c0e22f816b34f3b72b6c820477aab4d18473a37e8090b"},
+ {file = "lxml-5.2.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a2f6a1bc2460e643785a2cde17293bd7a8f990884b822f7bca47bee0a82fc66b"},
+ {file = "lxml-5.2.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e8d351ff44c1638cb6e980623d517abd9f580d2e53bfcd18d8941c052a5a009"},
+ {file = "lxml-5.2.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bec4bd9133420c5c52d562469c754f27c5c9e36ee06abc169612c959bd7dbb07"},
+ {file = "lxml-5.2.2-pp37-pypy37_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:55ce6b6d803890bd3cc89975fca9de1dff39729b43b73cb15ddd933b8bc20484"},
+ {file = "lxml-5.2.2-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:8ab6a358d1286498d80fe67bd3d69fcbc7d1359b45b41e74c4a26964ca99c3f8"},
+ {file = "lxml-5.2.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:06668e39e1f3c065349c51ac27ae430719d7806c026fec462e5693b08b95696b"},
+ {file = "lxml-5.2.2-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:9cd5323344d8ebb9fb5e96da5de5ad4ebab993bbf51674259dbe9d7a18049525"},
+ {file = "lxml-5.2.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:89feb82ca055af0fe797a2323ec9043b26bc371365847dbe83c7fd2e2f181c34"},
+ {file = "lxml-5.2.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e481bba1e11ba585fb06db666bfc23dbe181dbafc7b25776156120bf12e0d5a6"},
+ {file = "lxml-5.2.2-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:9d6c6ea6a11ca0ff9cd0390b885984ed31157c168565702959c25e2191674a14"},
+ {file = "lxml-5.2.2-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:3d98de734abee23e61f6b8c2e08a88453ada7d6486dc7cdc82922a03968928db"},
+ {file = "lxml-5.2.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:69ab77a1373f1e7563e0fb5a29a8440367dec051da6c7405333699d07444f511"},
+ {file = "lxml-5.2.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:34e17913c431f5ae01d8658dbf792fdc457073dcdfbb31dc0cc6ab256e664a8d"},
+ {file = "lxml-5.2.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:05f8757b03208c3f50097761be2dea0aba02e94f0dc7023ed73a7bb14ff11eb0"},
+ {file = "lxml-5.2.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6a520b4f9974b0a0a6ed73c2154de57cdfd0c8800f4f15ab2b73238ffed0b36e"},
+ {file = "lxml-5.2.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5e097646944b66207023bc3c634827de858aebc226d5d4d6d16f0b77566ea182"},
+ {file = "lxml-5.2.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b5e4ef22ff25bfd4ede5f8fb30f7b24446345f3e79d9b7455aef2836437bc38a"},
+ {file = "lxml-5.2.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:ff69a9a0b4b17d78170c73abe2ab12084bdf1691550c5629ad1fe7849433f324"},
+ {file = "lxml-5.2.2.tar.gz", hash = "sha256:bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87"},
]
[package.extras]
@@ -865,13 +849,13 @@ source = ["Cython (>=3.0.10)"]
[[package]]
name = "mako"
-version = "1.3.3"
+version = "1.3.4"
description = "A super-fast templating language that borrows the best ideas from the existing templating languages."
optional = false
python-versions = ">=3.8"
files = [
- {file = "Mako-1.3.3-py3-none-any.whl", hash = "sha256:5324b88089a8978bf76d1629774fcc2f1c07b82acdf00f4c5dd8ceadfffc4b40"},
- {file = "Mako-1.3.3.tar.gz", hash = "sha256:e16c01d9ab9c11f7290eef1cfefc093fb5a45ee4a3da09e2fec2e4d1bae54e73"},
+ {file = "Mako-1.3.4-py3-none-any.whl", hash = "sha256:a080ace85c3ceb6226d85e124608607b9ee072a87ae3ea22561435e8e6738125"},
+ {file = "Mako-1.3.4.tar.gz", hash = "sha256:029a10f5fc497f5be7f7754e4ef5bcf26cb93044798de31fd1303f777f360916"},
]
[package.dependencies]
@@ -1062,13 +1046,13 @@ testing = ["pytest", "pytest-benchmark"]
[[package]]
name = "pre-commit"
-version = "3.7.0"
+version = "3.7.1"
description = "A framework for managing and maintaining multi-language pre-commit hooks."
optional = false
python-versions = ">=3.9"
files = [
- {file = "pre_commit-3.7.0-py2.py3-none-any.whl", hash = "sha256:5eae9e10c2b5ac51577c3452ec0a490455c45a0533f7960f993a0d01e59decab"},
- {file = "pre_commit-3.7.0.tar.gz", hash = "sha256:e209d61b8acdcf742404408531f0c37d49d2c734fd7cff2d6076083d191cb060"},
+ {file = "pre_commit-3.7.1-py2.py3-none-any.whl", hash = "sha256:fae36fd1d7ad7d6a5a1c0b0d5adb2ed1a3bda5a21bf6c3e5372073d7a11cd4c5"},
+ {file = "pre_commit-3.7.1.tar.gz", hash = "sha256:8ca3ad567bc78a4972a3f1a477e94a79d4597e8140a6e0b651c5e33899c3654a"},
]
[package.dependencies]
@@ -1901,13 +1885,13 @@ test = ["Cython (>=0.29.36,<0.30.0)", "aiohttp (==3.9.0b0)", "aiohttp (>=3.8.1)"
[[package]]
name = "virtualenv"
-version = "20.26.1"
+version = "20.26.2"
description = "Virtual Python Environment builder"
optional = false
python-versions = ">=3.7"
files = [
- {file = "virtualenv-20.26.1-py3-none-any.whl", hash = "sha256:7aa9982a728ae5892558bff6a2839c00b9ed145523ece2274fad6f414690ae75"},
- {file = "virtualenv-20.26.1.tar.gz", hash = "sha256:604bfdceaeece392802e6ae48e69cec49168b9c5f4a44e483963f9242eb0e78b"},
+ {file = "virtualenv-20.26.2-py3-none-any.whl", hash = "sha256:a624db5e94f01ad993d476b9ee5346fdf7b9de43ccaee0e0197012dc838a0e9b"},
+ {file = "virtualenv-20.26.2.tar.gz", hash = "sha256:82bf0f4eebbb78d36ddaee0283d43fe5736b53880b8a8cdcd37390a07ac3741c"},
]
[package.dependencies]
From 437368e5c13b73dfe6f891b47fb46b17afbbbcb4 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 11:16:38 +0000
Subject: [PATCH 49/55] Fix trivy image scanning
---
.github/workflows/ci.yml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da01aaa0..b4441d47 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,7 +61,7 @@ jobs:
run: poetry install
- name: Generate SBOM
- run: poetry run cyclonedx-py poetry > sbom.json
+ run: poetry run cyclonedx-py poetry --without test,dev > sbom.json
- name: Generate licenses file
run: |
@@ -168,6 +168,13 @@ jobs:
env:
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
+ - name: print metadata
+ run: |
+ echo "tags: ${{ steps.meta.outputs.tags }}"
+ echo "labels: ${{ steps.meta.outputs.labels }}"
+ echo "annotations: ${{ steps.meta.outputs.annotations }}"
+
+
- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
@@ -182,7 +189,7 @@ jobs:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
- image-ref: ${{ steps.meta.outputs.tags[0] }}
+ image-ref: ${{ steps.meta.outputs.tags }}
trivy-config: trivy.yaml
scan-type: image
exit-code: 0
From 82b2b1458a2545250ba18170c430f5ae492913ee Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 12:45:41 +0000
Subject: [PATCH 50/55] Fix build step in documentation
---
BUILD.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/BUILD.md b/BUILD.md
index 17713073..2dc92883 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -20,7 +20,7 @@ poetry install
When poetry is done installing all dependencies you can start using the tool.
```shell
-poetry run python -m uvicorn tad.main:app
+poetry run python -m granian --interface asgi tad.main:app
```
## Database
From 47efa5e7f7d9dce645fa77b556287524a4f03246 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 12:49:47 +0000
Subject: [PATCH 51/55] Fix typo in state-pr-schedule
---
.github/workflows/stale-pr-schedule.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/stale-pr-schedule.yml b/.github/workflows/stale-pr-schedule.yml
index a1c2395f..a695d5bb 100644
--- a/.github/workflows/stale-pr-schedule.yml
+++ b/.github/workflows/stale-pr-schedule.yml
@@ -1,4 +1,4 @@
-name: stale-shedule
+name: stale-schedule
on:
schedule:
- cron: "0 4 * * *"
From 4d32b551c1d68278a7778c03a1ad86a2ca75bb98 Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 13:07:47 +0000
Subject: [PATCH 52/55] Fix fatal role error in compose postgres setup
---
compose.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compose.yml b/compose.yml
index 324d3887..17029737 100644
--- a/compose.yml
+++ b/compose.yml
@@ -30,8 +30,8 @@ services:
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?Variable not set}
- SECRET_KEY=${SECRET_KEY:?Variable not set}
healthcheck:
- test: ["CMD-SHELL", "pg_isready", "-d", "tad", "-U", "postgres"]
- start_period: 10s
+ test: ["CMD-SHELL", "pg_isready", "-d", "tad"]
+ start_period: 3s
db-admin:
From b14b676d3b2464e952c97c7d54233d7aafb68c2f Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 13:30:58 +0000
Subject: [PATCH 53/55] Add healthchecks
---
compose.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/compose.yml b/compose.yml
index 17029737..7fb6e1fe 100644
--- a/compose.yml
+++ b/compose.yml
@@ -15,6 +15,8 @@ services:
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?Variable not set}
ports:
- 8000:8000
+ healthcheck:
+ test: ["CMD-SHELL", "curl -f http://localhost:8000/health/live || exit 1"]
db:
image: postgres:16
@@ -46,6 +48,8 @@ services:
depends_on:
db:
condition: service_healthy
+ healthcheck:
+ test: ["CMD", "wget", "-O", "-", "http://localhost:8080/misc/ping"]
#TODO(berry): Traefik
From bf943a988360b74bb63d85533c25bf758aa9a82c Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 13:40:59 +0000
Subject: [PATCH 54/55] Fix database healthcheck from cmd-exec to cmd
---
compose.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compose.yml b/compose.yml
index 7fb6e1fe..4622e6fb 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,7 +32,7 @@ services:
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?Variable not set}
- SECRET_KEY=${SECRET_KEY:?Variable not set}
healthcheck:
- test: ["CMD-SHELL", "pg_isready", "-d", "tad"]
+ test: ["CMD", "pg_isready", "-q", "-d", "tad", "-U", "tad"]
start_period: 3s
From ad1e39a8d56e4f861060ce2edf4be7acc8f78dfb Mon Sep 17 00:00:00 2001
From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com>
Date: Tue, 14 May 2024 14:39:45 +0000
Subject: [PATCH 55/55] Remove downloads from readme
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index eeb585e3..21c62a1f 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
)
[](https://sonarcloud.io/summary/new_code?id=ai-validation-team_tad)
-
