Merge pull request #27 from DataKitchen/release/2.5.0

Release/2.5.0

Author: datakitchen-devops

README.md

@@ -9,7 +9,7 @@
 
 ## Developer Setup
 
-**This repository requires `Python 3.10` at minimum -- prefer the latest `3.10.X`.**
+**This repository requires `Python 3.12` at minimum -- prefer the latest `3.12.X`.**
 
 A local Kubernetes cluster requires
 
@@ -28,7 +28,7 @@ it for you.
 
 Example install
 ```bash
-python -m virtualenv -p /usr/bin/python3.10 venv
+python3.12 -m venv venv
 source venv/bin/activate
 # Install platform and developer extra packages
 pip install --editable '.[dev]'

common/api/flask_ext/authentication/jwt_plugin.py

@@ -44,7 +44,7 @@ class JWTAuth(BaseAuthPlugin):
     logout_callbacks: dict[str, Callable] = {}
     """Callback functions to be called when the user logs out."""
 
-    secret_key: str = NotImplemented
+    secret_key: bytes | str = NotImplemented
     """
     Secret key utilized to encode/decode the JTW tokens.
     It is automatically set after flask's namesake setting upon initialization.

common/tests/integration/entity_services/test_event_service.py

@@ -2,6 +2,7 @@
 from unittest.mock import patch
 
 import pytest
+from werkzeug.datastructures import MultiDict
 
 from common.entities import DB
 from common.entity_services import EventService
@@ -22,14 +23,14 @@ def test_get_events_with_rules_filters(
 ):
     filter_cases = (
         ({}, (event_entity, event_entity_2)),
-        ({"component_id": [str(pipeline.id)]}, (event_entity,)),
-        ({"instance_id": [str(instance_instance_set.instance_id)]}, (event_entity,)),
-        ({"journey_id": [str(instance_instance_set.instance.journey_id)]}, (event_entity,)),
-        ({"event_type": ["BATCH_PIPELINE_STATUS"]}, (event_entity,)),
-        ({"event_type": ["DATASET_OPERATION"]}, (event_entity_2,)),
-        ({"event_id": [str(event_entity_2.id)]}, (event_entity_2,)),
-        ({"run_id": [str(run.id)]}, (event_entity,)),
-        ({"task_id": [str(task.id)]}, (event_entity,)),
+        ({"component_id": str(pipeline.id)}, (event_entity,)),
+        ({"instance_id": str(instance_instance_set.instance_id)}, (event_entity,)),
+        ({"journey_id": str(instance_instance_set.instance.journey_id)}, (event_entity,)),
+        ({"event_type": "BATCH_PIPELINE_STATUS"}, (event_entity,)),
+        ({"event_type": "DATASET_OPERATION"}, (event_entity_2,)),
+        ({"event_id": str(event_entity_2.id)}, (event_entity_2,)),
+        ({"run_id": str(run.id)}, (event_entity,)),
+        ({"task_id": str(task.id)}, (event_entity,)),
         ({"date_range_start": "2024-01-20T09:56:00"}, (event_entity,)),
         ({"date_range_end": "2024-01-20T09:59:10"}, (event_entity, event_entity_2)),
         (
@@ -42,7 +43,7 @@ def test_get_events_with_rules_filters(
 
     rules = ListRules()
     for filter_params, expected_result in filter_cases:
-        filters = ProjectEventFilters.from_params(params=filter_params, project_ids=[project.id])
+        filters = ProjectEventFilters.from_params(params=MultiDict(filter_params.items()), project_ids=[project.id])
         page = EventService.get_events_with_rules(rules=rules, filters=filters)
         assert set(page.results) == set(expected_result), filter_params
 
@@ -51,7 +52,7 @@ def test_get_events_with_rules_filters(
 @pytest.mark.parametrize("sort_order,reverse", ((SortOrder.ASC, False), (SortOrder.DESC, True)))
 def test_get_events_with_rules_sort(sort_order, reverse, event_entity, event_entity_2, project):
     rules = ListRules(sort=sort_order)
-    filters = ProjectEventFilters.from_params(params={}, project_ids=[project.id])
+    filters = ProjectEventFilters.from_params(params=MultiDict({}), project_ids=[project.id])
 
     page = EventService.get_events_with_rules(rules=rules, filters=filters)
 
@@ -62,7 +63,7 @@ def test_get_events_with_rules_sort(sort_order, reverse, event_entity, event_ent
 @pytest.mark.integration
 def test_get_events_with_rules_prefetch(event_entity, project, instance):
     rules = ListRules()
-    filters = ProjectEventFilters.from_params(params={}, project_ids=[project.id])
+    filters = ProjectEventFilters.from_params(params=MultiDict({}), project_ids=[project.id])
 
     with assert_num_queries(3):
         (result_event,) = EventService.get_events_with_rules(rules=rules, filters=filters)

common/tests/unit/test_decorators.py

@@ -136,11 +136,11 @@ def test_class_mangled_auto_name():
 @pytest.mark.unit
 def test_no_duplicate_names():
     """The same decorator function cannot be applied to two names on the same class."""
-    with pytest.raises(RuntimeError):
+    with pytest.raises(TypeError):
 
         class DuplicateCheck:
             @cached_property
-            def x() -> int:
+            def x(self) -> int:
                 return 3
 
             y = x

deploy/charts/observability-app/values.yaml

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

deploy/docker/observability-be.dockerfile

@@ -1,8 +1,17 @@
 # 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.10-slim-bullseye AS build-image
+FROM ${BASE_IMAGE_URL}python:3.12.7-alpine3.20 AS build-image
 LABEL maintainer="DataKitchen"
 
+RUN apk update && apk upgrade && apk add --no-cache \
+    # Tools needed for building the python wheels
+    gcc \
+    g++ \
+    make \
+    cmake \
+    musl-dev \
+    librdkafka-dev=2.4.0-r0
+
 COPY pyproject.toml /tmp/dk/
 #           -O: Strips asserts from the code which removes some unnecessary codepaths resulting in a small
 #               performance improvement
@@ -12,7 +21,7 @@ RUN python3 -O -m pip install /tmp/dk --prefix=/dk
 
 # Copy and build the actual application
 COPY . /tmp/dk/
-ENV PYTHONPATH ${PYTHONPATH}:/dk/lib/python3.10/site-packages
+ENV PYTHONPATH ${PYTHONPATH}:/dk/lib/python3.12/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
@@ -21,7 +30,9 @@ ENV PYTHONPATH ${PYTHONPATH}:/dk/lib/python3.10/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.10-slim-bullseye AS runtime-image
+FROM ${BASE_IMAGE_URL}python:3.12.7-alpine3.20 AS runtime-image
+
+RUN apk update && apk upgrade && apk add --no-cache librdkafka=2.4.0-r0
 
 # Grab the pre-built app from the build-image. This way we don't have
 # excess laying around in the final image.
@@ -30,5 +41,5 @@ COPY --from=build-image /dk /dk
 COPY --from=build-image /tmp/dk/deploy/conf/gunicorn.conf.py /tmp/dk/deploy/conf/yoyo.ini /dk/
 COPY --from=build-image /tmp/dk/deploy/migrations/ /dk/lib/migrations/
 
-ENV PYTHONPATH ${PYTHONPATH}:/dk/lib/python3.10/site-packages
+ENV PYTHONPATH ${PYTHONPATH}:/dk/lib/python3.12/site-packages
 ENV PATH ${PATH}:/dk/bin

deploy/docker/observability-ui.dockerfile

@@ -1,24 +1,14 @@
 ARG BASE_IMAGE_URL
 
-FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE_URL}debian:bookworm-slim AS build-image
+FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE_URL}node:23.10-alpine3.21 AS build-image
 
 WORKDIR /observability_ui
 COPY observability_ui/ /observability_ui
 
-SHELL ["/bin/bash", "--login", "-c"]
-
-RUN apt-get update -y && \
-  apt-get upgrade -y && \
-  apt-get install curl -y && \
-  apt-get install jq -y
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
-RUN nvm install $(jq -r .engines.node package.json)
-RUN npm install --global yarn
 RUN yarn
 RUN yarn build:ci
 
-
-FROM ${BASE_IMAGE_URL}nginxinc/nginx-unprivileged:1.25
+FROM ${BASE_IMAGE_URL}nginxinc/nginx-unprivileged:alpine3.21
 
 WORKDIR /observability_ui
 

observability_ui/apps/shell/src/app/projects/events/event-list/event-list.component.ts

@@ -83,7 +83,7 @@ export class EventListComponent extends CoreComponent implements OnInit, HasSear
       const filters: EventSearchFields = {
         event_type: event_type?.split(',').filter(e => e) ?? [] as any,
         component_id: component_id?.split(',').filter(e => e) ?? [] as any,
-      }
+      };
 
       if (date_range_start) {
         const startDate = beginningOfDay(new Date(date_range_start));

observability_ui/apps/shell/src/app/projects/instances/alerts-dialog/alerts-dialog.component.scss

@@ -2,7 +2,7 @@
 @use '@observability/ui/styles/mixins' as mixins;
 
 .table-wrapper-container {
-  height: 400px;
+  height: 500px;
   display: flex;
 
   table-wrapper {

observability_ui/apps/shell/src/app/projects/instances/alerts-dialog/alerts-dialog.component.ts

@@ -79,7 +79,7 @@ export class AlertsDialogComponent {
     instance: Instance
   }, private store: InstancesStore, private router: Router) {
     let urlTree = this.router.parseUrl(this.router.url);
-    urlTree.queryParams['_pageSize'] = '5';
+    urlTree.queryParams['_pageSize'] = '25';
     urlTree.queryParams['_pageIndex'] = 0;
 
     void this.router.navigateByUrl(urlTree);