lets pray 🙏

Author: MarcusDragsten

.github/workflows/tests.yaml

@@ -21,7 +21,7 @@ jobs:
         id: setup-python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.14"
 
       - name: Install pre-commit
         run: pip install pre-commit

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
     rev: v4.4.0
     hooks:
       - id: check-ast
-        language_version: python3.10
+        language_version: python3.14
       - id: check-merge-conflict
       - id: check-case-conflict
       - id: check-json
@@ -35,7 +35,7 @@ repos:
     rev: 23.7.0
     hooks:
       - id: black
-        language_version: python3.10
+        language_version: python3.14
         args: [--target-version, py310]
         files: ^src/.*\.py$
         exclude: ^src/dmss_api/

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim as base
+FROM python:3.14-slim AS base
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONPATH=/code/src
 WORKDIR /code
@@ -14,7 +14,7 @@ RUN pip install --upgrade pip && \
 
 COPY pyproject.toml poetry.lock ./
 
-FROM base as development
+FROM base AS development
 RUN poetry install
 WORKDIR /code/src
 COPY src /code/src/
@@ -23,7 +23,7 @@ COPY .flake8 .bandit ./
 RUN chown -R 1000:1000 /code/app/
 USER 0
 
-FROM base as prod
+FROM base AS prod
 RUN poetry install --without dev
 WORKDIR /code/src
 COPY src /code/src/

poetry.lock

@@ -10,28 +10,28 @@ requires-poetry = ">=2.0"
 package-mode = false
 
 [tool.poetry.dependencies]
-python = "^3.10.4"
-redis = "^5.0.5"
-APScheduler = "^3.10.4"
+python = "^3.14"
+redis = "^7.2.1"
+APScheduler = "^3.11.2"
 docker = "^7.1.0"
-fastapi = "0.92.0"  # Migrate to pydantic V2 before upgrading
-uvicorn = "^0.30.1"
+fastapi = "^0.135.1"
+uvicorn = "^0.41.0"
 azure-mgmt-containerinstance = "^10.1.0"
-azure-mgmt-resource = "^23.1.1"
-azure-identity = "^1.16.1"
+azure-mgmt-resource = "^25.0.0"
+azure-identity = "^1.25.2"
 dm-cli = "^1.7.1"
-azure-monitor-opentelemetry = "^1.2.0"
-opentelemetry-instrumentation-fastapi = "^0.43b0"
+azure-monitor-opentelemetry = "^1.8.6"
+opentelemetry-instrumentation-fastapi = "0.60b0"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.2.1"
-pre-commit = "^3.3.3"
-flake8 = "^5.0.4"
-bandit = "^1.7.4"
-black = "^22.6.0"
-types-redis = "^4.3.21"
-httpx = "^0.23.3"
-icecream = "^2.1.3"
+pytest = "^9.0.2"
+pre-commit = "^4.5.1"
+flake8 = "^7.3.0"
+bandit = "^1.9.4"
+black = "^26.1.0"
+types-redis = "^4.6.0.20241004"
+httpx = "^0.28.1"
+icecream = "^2.1.10"
 
 [tool.isort]
 profile = "black"
@@ -50,7 +50,7 @@ all=true
 
 [tool.black]
 line-length = 119
-target-version = ['py10']
+target-version = ['py314']
 exclude = '''
 /(
     \.eggs

pyproject.toml

@@ -1,4 +1,4 @@
-from pydantic.main import BaseModel
+from pydantic import BaseModel
 
 from services.job_handler_interface import JobStatus
 

src/domain_classes/progress.py

@@ -35,7 +35,7 @@ def start(job_dmss_id: str):
 
     The PROTOCOL is optional, and the default is dmss.
     """
-    return start_job_use_case(job_dmss_id=job_dmss_id).dict()
+    return start_job_use_case(job_dmss_id=job_dmss_id).model_dump()
 
 
 @router.get("/{job_uid}", operation_id="job_status", response_model=StatusJobResponse)
@@ -45,7 +45,7 @@ def status(job_uid: UUID):
 
     - **job_uid**: the job API's internal uid for the job.
     """
-    return status_job_use_case(job_id=job_uid).dict()
+    return status_job_use_case(job_id=job_uid).model_dump()
 
 
 @router.delete("/{job_uid}", operation_id="remove_job", response_model=DeleteJobResponse)
@@ -56,7 +56,7 @@ def remove(job_uid: UUID):
 
     - **job_uid**: the job API's internal uid for the job.
     """
-    return delete_job_use_case(job_id=job_uid).dict()
+    return delete_job_use_case(job_id=job_uid).model_dump()
 
 
 @router.get("/{job_uid}/result", operation_id="job_result", response_model=GetJobResultResponse)
@@ -66,7 +66,7 @@ def result(job_uid: UUID):
 
     - **job_uid**: the job API's internal uid for the job.
     """
-    return get_job_result_use_case(job_uid=job_uid).dict()
+    return get_job_result_use_case(job_uid=job_uid).model_dump()
 
 
 @router.put("/{job_uid}", operation_id="update_job_progress", response_model=UpdateJobProgressResponse)
@@ -77,4 +77,6 @@ def progress(job_uid: UUID, overwrite_log: bool, job_progress: Progress):
     - **job_uid**: the job API's internal uid for the job.
     - **progress**: progress object with percentage and logs
     """
-    return update_job_progress_use_case(job_uid=job_uid, overwrite_log=overwrite_log, progress=job_progress).dict()
+    return update_job_progress_use_case(
+        job_uid=job_uid, overwrite_log=overwrite_log, progress=job_progress
+    ).model_dump()

src/features/jobs/jobs.py

@@ -1,6 +1,6 @@
 from uuid import UUID
 
-from pydantic.main import BaseModel
+from pydantic import BaseModel
 
 from services.job_handler_interface import JobStatus
 from services.job_service import remove_job

src/features/jobs/use_cases/delete_job.py

@@ -1,4 +1,4 @@
-from pydantic.main import BaseModel
+from pydantic import BaseModel
 
 from services.job_handler_interface import JobStatus
 from services.job_service import register_job

src/features/jobs/use_cases/start_job.py

@@ -1,19 +1,18 @@
 from uuid import UUID
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 from services.job_handler_interface import JobStatus
 from services.job_service import status_job
 
 
 class StatusJobResponse(BaseModel):
+    model_config = ConfigDict(use_enum_values=True)
+
     status: JobStatus
     log: list[str] | None
     percentage: float | None
 
-    class Config:
-        use_enum_values = True
-
 
 def status_job_use_case(job_id: UUID) -> StatusJobResponse:
     status, log, percentage = status_job(job_id)