deps bump (#98)

* deps bump
* mypy fixes
* brought back timeout, lowered limits on cpu requests for pods

Author: HardMax71

.github/workflows/sbom-compliance.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Generate SBOM (${{ matrix.component }})
         uses: anchore/sbom-action@v0
@@ -41,22 +41,22 @@ jobs:
           upload-artifact: false
 
       - name: Scan SBOM for Vulnerabilities
-        uses: anchore/scan-action@v6
+        uses: anchore/scan-action@v7
         id: scan
         with:
           sbom: ${{ matrix.component }}-sbom.spdx.json
           fail-build: false # Don't block builds yet, just report
           severity-cutoff: high
 
       - name: Upload SBOM Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.component }}-sbom
           path: ${{ matrix.component }}-sbom.spdx.json
           retention-days: 5
 
       - name: Upload Vulnerability Report
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         if: always()
         with:
           sarif_file: ${{ steps.scan.outputs.sarif }}

.github/workflows/stack-tests.yml

@@ -111,7 +111,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Cache base image
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: base-cache
         with:
           path: /tmp/base-image.tar.zst
@@ -280,7 +280,7 @@ jobs:
         run: npm ci
 
       - name: Cache Playwright browsers
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: playwright-cache
         with:
           path: ~/.cache/ms-playwright

backend/.env.test

@@ -10,7 +10,7 @@ KUBERNETES_CONFIG_PATH=/app/kubeconfig.yaml
 KUBERNETES_CA_CERTIFICATE_PATH=/app/certs/k8s-ca.pem
 K8S_POD_CPU_LIMIT=1000m
 K8S_POD_MEMORY_LIMIT=128Mi
-K8S_POD_CPU_REQUEST=200m
+K8S_POD_CPU_REQUEST=50m
 K8S_POD_MEMORY_REQUEST=128Mi
 K8S_POD_EXECUTION_TIMEOUT=5
 K8S_NAMESPACE=integr8scode

backend/app/db/repositories/admin/admin_events_repository.py

@@ -170,13 +170,13 @@ async def get_event_stats(self, hours: int = 24) -> EventStatistics:
         top_users = [UserEventCount(**doc) for doc in top_users_result if doc["user_id"]]
 
         # Execution duration pipeline
-        exec_time_field = S.field(ExecutionDocument.resource_usage.execution_time_wall_seconds)
+        exec_time_field = S.field(ExecutionDocument.resource_usage.execution_time_wall_seconds)  # type: ignore[union-attr]
         exec_pipeline = (
             Pipeline()
             .match({
                 ExecutionDocument.created_at: {"$gte": start_time},
                 ExecutionDocument.status: "completed",
-                ExecutionDocument.resource_usage.execution_time_wall_seconds: {"$exists": True},
+                ExecutionDocument.resource_usage.execution_time_wall_seconds: {"$exists": True},  # type: ignore[union-attr]
             })
             .group(by=None, query={"avg_duration": S.avg(exec_time_field)})
         )

backend/app/db/repositories/admin/admin_user_repository.py

@@ -2,7 +2,7 @@
 from datetime import datetime, timezone
 
 from beanie.odm.operators.find import BaseFindOperator
-from beanie.operators import Or, RegEx
+from beanie.operators import Eq, Or, RegEx
 
 from app.core.security import SecurityService
 from app.db.docs import (
@@ -50,7 +50,7 @@ async def list_users(
             )
 
         if role:
-            conditions.append(UserDocument.role == role)
+            conditions.append(Eq(UserDocument.role, role))
 
         query = UserDocument.find(*conditions)
         total = await query.count()

backend/app/db/repositories/event_repository.py

@@ -3,7 +3,8 @@
 from typing import Any, Mapping
 
 from beanie.odm.enums import SortDirection
-from beanie.operators import GTE, LT, LTE, In, Not, Or, RegEx
+from beanie.odm.operators.find import BaseFindOperator
+from beanie.operators import GTE, LT, LTE, Eq, In, Not, Or, RegEx
 from monggregate import Pipeline, S
 
 from app.core.tracing import EventAttributes
@@ -96,11 +97,9 @@ async def get_events_by_type(
     async def get_events_by_aggregate(
             self, aggregate_id: str, event_types: list[EventType] | None = None, limit: int = 100
     ) -> list[DomainEvent]:
-        conditions = [
-            EventDocument.aggregate_id == aggregate_id,
-            In(EventDocument.event_type, list(event_types)) if event_types else None,
-        ]
-        conditions = [c for c in conditions if c is not None]
+        conditions: list[BaseFindOperator] = [Eq(EventDocument.aggregate_id, aggregate_id)]
+        if event_types:
+            conditions.append(In(EventDocument.event_type, list(event_types)))
         docs = (
             await EventDocument.find(*conditions).sort([("timestamp", SortDirection.ASCENDING)]).limit(limit).to_list()
         )

backend/app/db/repositories/saga_repository.py

@@ -3,7 +3,7 @@
 
 from beanie.odm.enums import SortDirection
 from beanie.odm.operators.find import BaseFindOperator
-from beanie.operators import GT, LT, In
+from beanie.operators import GT, LT, NE, Eq, In
 from monggregate import Pipeline, S
 
 from app.db.docs import ExecutionDocument, SagaDocument
@@ -14,19 +14,24 @@
 class SagaRepository:
     def _filter_conditions(self, saga_filter: SagaFilter) -> list[BaseFindOperator]:
         """Build Beanie query conditions from SagaFilter."""
-        conditions = [
-            SagaDocument.state == saga_filter.state if saga_filter.state else None,
-            In(SagaDocument.execution_id, saga_filter.execution_ids) if saga_filter.execution_ids else None,
-            SagaDocument.context_data["user_id"] == saga_filter.user_id if saga_filter.user_id else None,
-            SagaDocument.saga_name == saga_filter.saga_name if saga_filter.saga_name else None,
-            GT(SagaDocument.created_at, saga_filter.created_after) if saga_filter.created_after else None,
-            LT(SagaDocument.created_at, saga_filter.created_before) if saga_filter.created_before else None,
-        ]
+        conditions: list[BaseFindOperator] = []
+        if saga_filter.state:
+            conditions.append(Eq(SagaDocument.state, saga_filter.state))
+        if saga_filter.execution_ids:
+            conditions.append(In(SagaDocument.execution_id, saga_filter.execution_ids))
+        if saga_filter.user_id:
+            conditions.append(Eq(SagaDocument.context_data["user_id"], saga_filter.user_id))
+        if saga_filter.saga_name:
+            conditions.append(Eq(SagaDocument.saga_name, saga_filter.saga_name))
+        if saga_filter.created_after:
+            conditions.append(GT(SagaDocument.created_at, saga_filter.created_after))
+        if saga_filter.created_before:
+            conditions.append(LT(SagaDocument.created_at, saga_filter.created_before))
         if saga_filter.error_status is True:
-            conditions.append(SagaDocument.error_message != None)  # noqa: E711
+            conditions.append(NE(SagaDocument.error_message, None))
         elif saga_filter.error_status is False:
-            conditions.append(SagaDocument.error_message == None)  # noqa: E711
-        return [c for c in conditions if c is not None]
+            conditions.append(Eq(SagaDocument.error_message, None))
+        return conditions
 
     async def upsert_saga(self, saga: Saga) -> bool:
         existing = await SagaDocument.find_one(SagaDocument.saga_id == saga.saga_id)
@@ -55,11 +60,9 @@ async def get_saga(self, saga_id: str) -> Saga | None:
     async def get_sagas_by_execution(
             self, execution_id: str, state: SagaState | None = None, limit: int = 100, skip: int = 0
     ) -> SagaListResult:
-        conditions = [
-            SagaDocument.execution_id == execution_id,
-            SagaDocument.state == state if state else None,
-        ]
-        conditions = [c for c in conditions if c is not None]
+        conditions: list[BaseFindOperator] = [Eq(SagaDocument.execution_id, execution_id)]
+        if state:
+            conditions.append(Eq(SagaDocument.state, state))
 
         query = SagaDocument.find(*conditions)
         total = await query.count()
@@ -135,10 +138,10 @@ async def get_saga_statistics(self, saga_filter: SagaFilter | None = None) -> di
             states[doc["_id"]] = doc["count"]
 
         # Average duration for completed sagas
-        completed_conditions = [
+        completed_conditions: list[BaseFindOperator] = [
             *conditions,
-            SagaDocument.state == SagaState.COMPLETED,
-            SagaDocument.completed_at != None,  # noqa: E711
+            Eq(SagaDocument.state, SagaState.COMPLETED),
+            NE(SagaDocument.completed_at, None),
         ]
         duration_pipeline = (
             Pipeline()

backend/app/db/repositories/user_repository.py

@@ -2,7 +2,7 @@
 from datetime import datetime, timezone
 
 from beanie.odm.operators.find import BaseFindOperator
-from beanie.operators import Or, RegEx
+from beanie.operators import Eq, Or, RegEx
 
 from app.db.docs import UserDocument
 from app.domain.enums.user import UserRole
@@ -38,7 +38,7 @@ async def list_users(
             )
 
         if role:
-            conditions.append(UserDocument.role == role)
+            conditions.append(Eq(UserDocument.role, role))
 
         query = UserDocument.find(*conditions)
         total = await query.count()

backend/app/db/repositories/user_settings_repository.py

@@ -2,7 +2,8 @@
 from datetime import datetime
 
 from beanie.odm.enums import SortDirection
-from beanie.operators import GT, LTE, In
+from beanie.odm.operators.find import BaseFindOperator
+from beanie.operators import GT, LTE, Eq, In
 
 from app.db.docs import EventDocument, UserSettingsDocument, UserSettingsSnapshotDocument
 from app.domain.enums.events import EventType
@@ -37,13 +38,14 @@ async def get_settings_events(
         sort_order: SortDirection = SortDirection.ASCENDING,
     ) -> list[DomainUserSettingsChangedEvent]:
         aggregate_id = f"user_settings_{user_id}"
-        conditions = [
-            EventDocument.aggregate_id == aggregate_id,
+        conditions: list[BaseFindOperator] = [
+            Eq(EventDocument.aggregate_id, aggregate_id),
             In(EventDocument.event_type, [str(et) for et in event_types]),
-            GT(EventDocument.timestamp, since) if since else None,
-            LTE(EventDocument.timestamp, until) if until else None,
         ]
-        conditions = [c for c in conditions if c is not None]
+        if since:
+            conditions.append(GT(EventDocument.timestamp, since))
+        if until:
+            conditions.append(LTE(EventDocument.timestamp, until))
 
         find_query = EventDocument.find(*conditions).sort([("timestamp", sort_order)])
         if limit:

backend/pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
     "backoff==2.2.1",
     "blinker==1.9.0",
     "Brotli==1.2.0",
-    "cachetools==6.2.0",
+    "cachetools==6.2.4",
     "certifi==2024.8.30",
     "charset-normalizer==3.4.0",
     "click==8.1.7",
@@ -37,7 +37,7 @@ dependencies = [
     "fastavro==1.12.1",
     "fonttools==4.61.1",
     "frozenlist==1.7.0",
-    "google-auth==2.45.0",
+    "google-auth==2.47.0",
     "googleapis-common-protos==1.70.0",
     "greenlet==3.3.0",
     "grpcio==1.76.0",
@@ -52,13 +52,13 @@ dependencies = [
     "Jinja2==3.1.6",
     "kiwisolver==1.4.9",
     "kubernetes==31.0.0",
-    "limits==3.13.0",
+    "limits==5.6.0",
     "markdown-it-py==4.0.0",
     "MarkupSafe==3.0.2",
     "mdurl==0.1.2",
     "msgpack==1.1.0",
     "multidict==6.7.0",
-    "oauthlib==3.2.2",
+    "oauthlib==3.3.1",
     "opentelemetry-api==1.22.0",
     "opentelemetry-exporter-otlp==1.22.0",
     "opentelemetry-exporter-otlp-proto-common==1.22.0",
@@ -140,7 +140,7 @@ dev = [
     "hypothesis==6.103.4",
     "iniconfig==2.0.0",
     "matplotlib==3.10.8",
-    "mypy==1.17.1",
+    "mypy==1.19.1",
     "mypy_extensions==1.1.0",
     "pipdeptree==2.23.4",
     "pluggy==1.5.0",