Merge pull request #40 from DataKitchen/release/2.12.4

Release/2.12.4

Author: datakitchen-devops

.github/actions/publish_charts/action.yaml

@@ -17,7 +17,7 @@ runs:
       uses: azure/setup-helm@v4.2.0
 
     - name: Run chart-releaser
-      uses: helm/chart-releaser-action@v1.6.0
+      uses: helm/chart-releaser-action@v1.7.0
       with:
         charts_dir: deploy/charts
         skip_existing: 'true'

common/api/base_view.py

@@ -86,7 +86,7 @@ def request_body(self) -> dict[str, Any]:
                 request_body = json.loads(request.data)
             except json.JSONDecodeError as je:
                 raise BadRequest("The request does not contain a valid JSON body") from je
-        return request_body
+        return request_body  # type: ignore[no-any-return]
 
     def parse_body(self, *, schema: Schema) -> Any:
         """Parse the response body using the given schema."""

common/api/flask_ext/authentication/jwt_plugin.py

@@ -6,6 +6,7 @@
 
 from flask import current_app, g, request
 from jwt import decode, encode
+from jwt.types import Options
 from peewee import DoesNotExist
 from werkzeug.exceptions import Unauthorized
 
@@ -33,7 +34,7 @@ class JWTAuth(BaseAuthPlugin):
     header_name = "Authorization"
     header_prefix = "Bearer"
 
-    default_jwt_options: dict[str, object] = {"verify_signature": True, "verify_aud": False, "verify_exp": False}
+    default_jwt_options: Options = {"verify_signature": True, "verify_aud": False, "verify_exp": False}
     """Default options for decoding JWT values."""
 
     default_jwt_expiration: timedelta = NotImplemented

deploy/charts/observability-app/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: dataops-observability-app
 type: application
 appVersion: "2"
-version: "3.0.1"
+version: "3.0.2"
 
 description: DataOps Observability
 home: https://datakitchen.io

deploy/charts/observability-app/values.yaml

@@ -10,7 +10,7 @@ observability:
   cors_domains: "localhost:*"
   services_secrets_name: external-service-keys
   keys_secrets_name: internal-keys
-  pythonpath: /dk/lib/python3.12/site-packages
+  pythonpath: /dk/lib/python3.13/site-packages
   image:
     repository: docker.io/datakitchen
     tag: "v2"

deploy/docker/observability-be.dockerfile

@@ -1,6 +1,6 @@
 # DEV NOTE:  YOU MUST RUN `docker build` FROM THE TOP-LEVEL OF `observability-be` AND POINT TO THIS FILE.
 ARG BASE_IMAGE_URL
-FROM ${BASE_IMAGE_URL}python:3.12.11-alpine3.22 AS build-image
+FROM ${BASE_IMAGE_URL}python:3.13-alpine3.23 AS build-image
 LABEL maintainer="DataKitchen"
 
 RUN apk update && apk upgrade && apk add --no-cache \
@@ -10,7 +10,7 @@ RUN apk update && apk upgrade && apk add --no-cache \
     make \
     cmake \
     musl-dev \
-    librdkafka-dev=2.10.0-r0
+    librdkafka-dev=2.12.1-r0
 
 COPY pyproject.toml /tmp/dk/
 #           -O: Strips asserts from the code which removes some unnecessary codepaths resulting in a small
@@ -21,7 +21,7 @@ RUN python3 -O -m pip install /tmp/dk --prefix=/dk
 
 # Copy and build the actual application
 COPY . /tmp/dk/
-ENV PYTHONPATH=/dk/lib/python3.12/site-packages
+ENV PYTHONPATH=/dk/lib/python3.13/site-packages
 #    --no-deps: The previous pip layer will have already installed the dependencies. This
 #               will disable doing a second dependency resolution check.
 #           -O: Strips asserts from the code which removes some unnecessary codepaths resulting in a small
@@ -30,9 +30,12 @@ ENV PYTHONPATH=/dk/lib/python3.12/site-packages
 # --prefix=/dk: The destination installation environment folder
 RUN python3 -O -m pip install --no-deps /tmp/dk --prefix=/dk
 
-FROM ${BASE_IMAGE_URL}python:3.12.11-alpine3.22 AS runtime-image
+FROM ${BASE_IMAGE_URL}python:3.13-alpine3.23 AS runtime-image
 
-RUN apk update && apk upgrade && apk add --no-cache librdkafka=2.10.0-r0 \
+RUN apk update && apk upgrade && apk add --no-cache librdkafka=2.12.1-r0 \
+    && apk del curl \
+    && apk upgrade --no-cache libcurl busybox busybox-binsh ssl_client \
+        --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main \
     && pip install --no-cache-dir --upgrade pip
 
 # Grab the pre-built app from the build-image. This way we don't have
@@ -47,7 +50,7 @@ COPY --from=build-image \
 
 COPY --from=build-image /tmp/dk/deploy/migrations/ /dk/lib/migrations/
 
-ENV PYTHONPATH=/dk/lib/python3.12/site-packages
+ENV PYTHONPATH=/dk/lib/python3.13/site-packages
 ENV PATH=${PATH}:/dk/bin
 
 RUN addgroup -S observability && adduser -S observability -G observability

observability_api/endpoints/v1/project_settings.py

@@ -26,7 +26,7 @@ class ProjectAlertsSettings(BaseEntityView):
     _project: Optional[Project]
 
     def get_request_schema(self) -> Schema:
-        return cast(Schema, Schema.from_dict(self.get_fields(), name=f"{self.__class__.__name__}Schema")())
+        return Schema.from_dict(self.get_fields(), name=f"{self.__class__.__name__}Schema")()  # type: ignore[arg-type]
 
     @no_body_allowed
     def get(self, project_id: UUID) -> Response:

pyproject.toml

@@ -14,9 +14,9 @@ classifiers = [
     "Intended Audience :: Developers",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 
 dependencies = [
     "arrow~=1.2.2",
@@ -25,17 +25,17 @@ dependencies = [
     "APScheduler~=3.10.0",
     "blinker~=1.9.0",
     "boltons~=23.0.0",
-    "confluent-kafka==2.4.0",
+    "confluent-kafka~=2.6.0",
     "cryptography~=46.0.5",
     "flask~=3.1.0",
     "gunicorn~=23.0.0",
     "log-color==2.0.0",
     "Marshmallow-Peewee~=3.4.3",
     "marshmallow~=3.26.2",
     "marshmallow-union==0.1.15.post1",
-    "msgpack==1.0.4",
+    "msgpack~=1.1.0",
     "oauthlib~=3.2",
-    "peewee~=3.16.0",
+    "peewee~=3.17.0",
     "PyJWT~=2.4",
     "PyMySQL==1.1.1",
     "pybars3~=0.9.7",
@@ -50,7 +50,7 @@ dependencies = [
 dev = [
     "ruff~=0.7.3",
     "invoke~=2.1.2",
-    "lxml~=4.9.1",
+    "lxml~=5.3.0",
     "mypy~=1.5.0",
     "pre-commit~=2.20.0",
     "pytest-cov~=4.0.0",
@@ -122,7 +122,7 @@ filterwarnings = [
 # for an explanation of their functionality.
 # WARNING: When changing mypy configurations, be sure to test them after removing your .mypy_cache
 [tool.mypy]
-python_version = "3.12"
+python_version = "3.13"
 check_untyped_defs = true
 disallow_untyped_decorators = true
 disallow_untyped_defs = true
@@ -249,7 +249,7 @@ module = "pybars"
 ignore_missing_imports = true
 
 [tool.ruff]
-target-version = "py310"
+target-version = "py313"
 line-length = 120
 
 [tool.ruff.lint]