build(python): bump python version to use v3.11 (#2164)

.github/workflows/deploy.yml

@@ -42,7 +42,7 @@ jobs:
       - name: 🐍 Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       - name: 🐍 Install development dependencies
         run: |

.github/workflows/license_header.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -46,7 +46,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

.github/workflows/worker.yml

@@ -18,7 +18,7 @@ jobs:
       - name: 🐍 Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       - name: 🐍 Install dependencies
         run: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8-slim-bullseye
+FROM python:3.11-slim-bullseye
 
 # RUN apt update && apt install -y procps gdb
 
@@ -16,10 +16,6 @@ COPY ./scripts /scripts
 COPY ./alembic /alembic
 COPY ./alembic.ini /alembic.ini
 
-RUN ./scripts/install-debug.sh
-
-RUN pip3 install --no-cache-dir --upgrade pip \
-    && pip3 install --no-cache-dir -r /conf/requirements.txt
-
+RUN pip3 install --no-cache-dir --upgrade pip && pip3 install --no-cache-dir -r /conf/requirements.txt
 
 ENTRYPOINT ["./scripts/start.sh"]

antarest/core/config.py

@@ -13,7 +13,7 @@
 import multiprocessing
 import tempfile
 from dataclasses import asdict, dataclass, field
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 from typing import Dict, List, Optional
 
@@ -25,7 +25,7 @@
 DEFAULT_WORKSPACE_NAME = "default"
 
 
-class Launcher(str, Enum):
+class Launcher(StrEnum):
     SLURM = "slurm"
     LOCAL = "local"
     DEFAULT = "default"

antarest/core/configdata/model.py

@@ -10,7 +10,7 @@
 #
 # This file is part of the Antares project.
 
-from enum import Enum
+from enum import StrEnum
 from typing import Any, Optional
 
 from sqlalchemy import Column, Integer, String  # type: ignore
@@ -43,6 +43,6 @@ def to_dto(self) -> ConfigDataDTO:
 
 
 # APP MAIN CONFIG KEYS
-class ConfigDataAppKeys(str, Enum):
+class ConfigDataAppKeys(StrEnum):
     MAINTENANCE_MODE = "MAINTENANCE_MODE"
     MESSAGE_INFO = "MESSAGE_INFO"

antarest/core/interfaces/eventbus.py

@@ -11,14 +11,14 @@
 # This file is part of the Antares project.
 
 from abc import ABC, abstractmethod
-from enum import Enum
+from enum import StrEnum
 from typing import Any, Awaitable, Callable, List, Optional
 
 from antarest.core.model import PermissionInfo
 from antarest.core.serialization import AntaresBaseModel
 
 
-class EventType(str, Enum):
+class EventType(StrEnum):
     ANY = "_ANY"
     STUDY_CREATED = "STUDY_CREATED"
     STUDY_DELETED = "STUDY_DELETED"

antarest/core/maintenance/model.py

@@ -10,10 +10,10 @@
 #
 # This file is part of the Antares project.
 
-from enum import Enum
+from enum import StrEnum
 
 
-class MaintenanceMode(str, Enum):
+class MaintenanceMode(StrEnum):
     NORMAL_MODE = "NORMAL"
     MAINTENANCE_MODE = "MAINTENANCE"
 

antarest/core/model.py

@@ -24,15 +24,15 @@
 SUB_JSON = Union[ELEMENT, JSON, List[Any], None]
 
 
-class PublicMode(str, enum.Enum):
+class PublicMode(enum.StrEnum):
     NONE = "NONE"
     READ = "READ"
     EXECUTE = "EXECUTE"
     EDIT = "EDIT"
     FULL = "FULL"
 
 
-class StudyPermissionType(str, enum.Enum):
+class StudyPermissionType(enum.StrEnum):
     """
     User permission belongs to Study
     """

antarest/core/tasks/model.py

@@ -13,7 +13,7 @@
 import typing as t
 import uuid
 from datetime import datetime
-from enum import Enum
+from enum import Enum, StrEnum
 
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, Sequence, String  # type: ignore
 from sqlalchemy.engine.base import Engine  # type: ignore
@@ -28,7 +28,7 @@
     from antarest.study.model import Study
 
 
-class TaskType(str, Enum):
+class TaskType(StrEnum):
     EXPORT = "EXPORT"
     VARIANT_GENERATION = "VARIANT_GENERATION"
     COPY = "COPY"

antarest/core/utils/archives.py

@@ -15,7 +15,7 @@
 import tempfile
 import typing as t
 import zipfile
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 
 import py7zr
@@ -25,7 +25,7 @@
 logger = logging.getLogger(__name__)
 
 
-class ArchiveFormat(str, Enum):
+class ArchiveFormat(StrEnum):
     ZIP = ".zip"
     SEVEN_ZIP = ".7z"
 

antarest/eventbus/web.py

@@ -12,7 +12,7 @@
 
 import dataclasses
 import logging
-from enum import Enum
+from enum import StrEnum
 from http import HTTPStatus
 from typing import List, Optional
 
@@ -32,7 +32,7 @@
 logger = logging.getLogger(__name__)
 
 
-class WebsocketMessageAction(str, Enum):
+class WebsocketMessageAction(StrEnum):
     SUBSCRIBE = "SUBSCRIBE"
     UNSUBSCRIBE = "UNSUBSCRIBE"
 

antarest/gui.py

@@ -9,6 +9,18 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+
+import os
+import sys
+
+# The Pyinstaller version we use has a known issue on windows and to fix it we need to implement this workaround.
+# See issue description and workaround on pyinstaller website:
+# https://pyinstaller.org/en/stable/common-issues-and-pitfalls.html#sys-stdin-sys-stdout-and-sys-stderr-in-noconsole-windowed-applications-windows-only
+if sys.stdout is None:
+    sys.stdout = open(os.devnull, "w")
+if sys.stderr is None:
+    sys.stderr = open(os.devnull, "w")
+
 import argparse
 import multiprocessing
 

antarest/launcher/adapters/abstractlauncher.py

@@ -116,6 +116,6 @@ def update_log(log_line: str) -> None:
                         channel=EventChannelDirectory.JOB_STATUS + job_id,
                     )
                 )
-                self.cache.put(f"Launch_Progress_{job_id}", launch_progress_dto.model_dump())
+                self.cache.put(f"Launch_Progress_{job_id}", launch_progress_dto.model_dump(mode="json"))
 
         return update_log

antarest/launcher/model.py

@@ -57,7 +57,7 @@ def from_launcher_params(cls, params: t.Optional[str]) -> "LauncherParametersDTO
         return cls.model_validate(from_json(params))
 
 
-class LogType(str, enum.Enum):
+class LogType(enum.StrEnum):
     STDOUT = "STDOUT"
     STDERR = "STDERR"
 
@@ -79,14 +79,14 @@ def to_suffix(self) -> str:
             return "out.log"
 
 
-class JobStatus(str, enum.Enum):
+class JobStatus(enum.StrEnum):
     PENDING = "pending"
     FAILED = "failed"
     SUCCESS = "success"
     RUNNING = "running"
 
 
-class JobLogType(str, enum.Enum):
+class JobLogType(enum.StrEnum):
     BEFORE = "BEFORE"
     AFTER = "AFTER"
 
@@ -139,7 +139,7 @@ def json_schema_extra(schema: t.MutableMapping[str, t.Any]) -> None:
                 exit_code=0,
                 solver_stats="time: 1651s, call_count: 1, optimization_issues: []",
                 owner=UserInfo(id=0o007, name="James BOND"),
-            ).model_dump()
+            ).model_dump(mode="json")
 
 
 class JobLog(Base):  # type: ignore

antarest/launcher/service.py

@@ -185,7 +185,7 @@ def update(
                 self.event_bus.push(
                     Event(
                         type=EventType.STUDY_JOB_COMPLETED if final_status else EventType.STUDY_JOB_STATUS_UPDATE,
-                        payload=job_result.to_dto().model_dump(),
+                        payload=job_result.to_dto().model_dump(mode="json"),
                         permissions=PermissionInfo(public_mode=PublicMode.READ),
                         channel=EventChannelDirectory.JOB_STATUS + job_result.id,
                     )

antarest/matrixstore/service.py

@@ -101,11 +101,7 @@ def get_matrix_id(self, matrix: t.Union[t.List[t.List[float]], str]) -> str:
         """
         # noinspection SpellCheckingInspection
         if isinstance(matrix, str):
-            # str.removeprefix() is not available in Python 3.8
-            prefix = "matrix://"
-            if matrix.startswith(prefix):
-                return matrix[len(prefix) :]
-            return matrix
+            return matrix.removeprefix("matrix://")
         elif isinstance(matrix, list):
             return self.create(matrix)
         else:

antarest/service_creator.py

@@ -12,7 +12,7 @@
 
 import logging
 import typing as t
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 
 import redis
@@ -65,7 +65,7 @@
 """
 
 
-class Module(str, Enum):
+class Module(StrEnum):
     APP = "app"
     WATCHER = "watcher"
     MATRIX_GC = "matrix_gc"

antarest/study/business/aggregator_management.py

@@ -12,7 +12,7 @@
 
 import logging
 import typing as t
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 
 import numpy as np
@@ -54,31 +54,31 @@
 logger = logging.getLogger(__name__)
 
 
-class MCRoot(str, Enum):
+class MCRoot(StrEnum):
     MC_IND = "mc-ind"
     MC_ALL = "mc-all"
 
 
-class MCIndAreasQueryFile(str, Enum):
+class MCIndAreasQueryFile(StrEnum):
     VALUES = "values"
     DETAILS = "details"
     DETAILS_ST_STORAGE = "details-STstorage"
     DETAILS_RES = "details-res"
 
 
-class MCAllAreasQueryFile(str, Enum):
+class MCAllAreasQueryFile(StrEnum):
     VALUES = "values"
     DETAILS = "details"
     DETAILS_ST_STORAGE = "details-STstorage"
     DETAILS_RES = "details-res"
     ID = "id"
 
 
-class MCIndLinksQueryFile(str, Enum):
+class MCIndLinksQueryFile(StrEnum):
     VALUES = "values"
 
 
-class MCAllLinksQueryFile(str, Enum):
+class MCAllLinksQueryFile(StrEnum):
     VALUES = "values"
     ID = "id"
 
@@ -308,7 +308,7 @@ def _process_df(self, file_path: Path, is_details: bool) -> pd.DataFrame:
             # loop over the cluster id to extract the values of the actual columns
             for cluster_id, dummy_component in cluster_dummy_product_cols:
                 for actual_col in actual_cols:
-                    col_values = un_normalized_df[(cluster_id, actual_col, dummy_component)].tolist()  # type: ignore
+                    col_values = un_normalized_df[(cluster_id, actual_col, dummy_component)].tolist()
                     new_obj[actual_col] += col_values
                 new_obj[CLUSTER_ID_COL] += [cluster_id for _ in range(df_len)]
                 new_obj[TIME_ID_COL] += list(range(1, df_len + 1))

antarest/study/business/area_management.py

@@ -229,11 +229,11 @@ def from_model(
         obj = {
             "average_unsupplied_energy_cost": average_unsupplied_energy_cost,
             "average_spilled_energy_cost": average_spilled_energy_cost,
-            **area_folder.optimization.filtering.model_dump(by_alias=False),
-            **area_folder.optimization.nodal_optimization.model_dump(by_alias=False),
+            **area_folder.optimization.filtering.model_dump(mode="json", by_alias=False),
+            **area_folder.optimization.nodal_optimization.model_dump(mode="json", by_alias=False),
             # adequacy_patch is only available if study version >= 830.
             **(
-                area_folder.adequacy_patch.adequacy_patch.model_dump(by_alias=False)
+                area_folder.adequacy_patch.adequacy_patch.model_dump(mode="json", by_alias=False)
                 if area_folder.adequacy_patch
                 else {}
             ),
@@ -363,7 +363,7 @@ def update_areas_props(
         for area_id, update_area in update_areas_by_ids.items():
             # Update the area properties.
             old_area = old_areas_by_ids[area_id]
-            new_area = old_area.copy(update=update_area.model_dump(by_alias=False, exclude_none=True))
+            new_area = old_area.copy(update=update_area.model_dump(mode="json", by_alias=False, exclude_none=True))
             new_areas_by_ids[area_id] = new_area
 
             # Convert the DTO to a configuration object and update the configuration file.

antarest/study/business/areas/renewable_management.py

@@ -65,7 +65,7 @@ def json_schema_extra(schema: t.MutableMapping[str, t.Any]) -> None:
                 unit_count=100,
                 nominal_capacity=1000.0,
                 ts_interpretation="power-generation",
-            ).model_dump()
+            ).model_dump(mode="json")
 
 
 class RenewableClusterCreation(RenewableClusterInput):