Merge branch 'dev' into feat/poc-add-dao-layer-v2

.github/workflows/commitlint.yml

@@ -1,12 +1,12 @@
-name: Lint Commit Messages
+name: commitlint
 on: [pull_request]
 
 permissions:
   contents: read
   pull-requests: read
 
 jobs:
-  commitlint:
+  commit-messages-lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/deploy.yml

@@ -27,7 +27,7 @@ jobs:
       - name: 💚 Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18.16.1
+          node-version: 22.13.0
 
       - name: 💚 Install dependencies
         run: npm install

.github/workflows/license_header.yml → .github/workflows/license-header.yml

@@ -1,4 +1,4 @@
-name: check license headers
+name: license-header
 on:
   push:
     branches:

.github/workflows/main.yml

@@ -69,7 +69,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18.16.1
+          node-version: 22.13.0
       - name: Cache node modules
         uses: actions/cache@v4
         with:
@@ -92,7 +92,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18.16.1
+          node-version: 22.13.0
       - name: Restore node modules
         uses: actions/cache@v4
         with:
@@ -112,7 +112,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18.16.1
+          node-version: 22.13.0
       - name: Restore node modules
         uses: actions/cache@v4
         with:
@@ -132,7 +132,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18.16.1
+          node-version: 22.13.0
       - name: Restore node modules
         uses: actions/cache@v4
         with:

.github/workflows/pr-title.yml

@@ -0,0 +1,13 @@
+name: pr-title
+on:
+    pull_request:
+      types: ['opened', 'edited', 'reopened', 'synchronize']
+
+jobs:
+  pr-title-lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: npm install @commitlint/[email protected]
+    - uses: JulienKode/[email protected]

antarest/core/exceptions.py

@@ -545,6 +545,11 @@ def __init__(self, message: str) -> None:
         super().__init__(HTTPStatus.UNPROCESSABLE_ENTITY, message)
 
 
+class MatrixImportFailed(HTTPException):
+    def __init__(self, message: str) -> None:
+        super().__init__(HTTPStatus.UNPROCESSABLE_ENTITY, message)
+
+
 class ConstraintTermNotFound(HTTPException):
     """
     Exception raised when a constraint term is not found.

antarest/study/service.py

@@ -13,7 +13,6 @@
 import base64
 import collections
 import contextlib
-import csv
 import http
 import io
 import logging
@@ -25,6 +24,7 @@
 from uuid import uuid4
 
 import numpy as np
+import numpy.typing as npt
 import pandas as pd
 from antares.study.version import StudyVersion
 from fastapi import HTTPException, UploadFile
@@ -39,6 +39,7 @@
     CommandApplicationError,
     FolderCreationNotAllowed,
     IncorrectPathError,
+    MatrixImportFailed,
     NotAManagedStudyException,
     OutputAlreadyArchived,
     OutputAlreadyUnarchived,
@@ -198,6 +199,20 @@ def get_disk_usage(path: t.Union[str, Path]) -> int:
     return total_size
 
 
+def _imports_matrix_from_bytes(data: bytes) -> npt.NDArray[np.float64]:
+    """Tries to convert bytes to a numpy array when importing a matrix"""
+    str_data = data.decode("utf-8")
+    if not str_data:
+        return np.zeros(shape=(0, 0))
+    for delimiter in [",", ";", "\t"]:
+        with contextlib.suppress(Exception):
+            df = pd.read_csv(io.BytesIO(data), delimiter=delimiter, header=None).replace(",", ".", regex=True)
+            df = df.dropna(axis=1, how="all")  # We want to remove columns full of NaN at the import
+            matrix = df.to_numpy(dtype=np.float64)
+            return matrix
+    raise MatrixImportFailed("Could not parse the given matrix")
+
+
 def _get_path_inside_user_folder(
     path: str, exception_class: t.Type[t.Union[FolderCreationNotAllowed, ResourceDeletionNotAllowed]]
 ) -> str:
@@ -1593,19 +1608,7 @@ def _create_edit_study_command(
         elif isinstance(tree_node, InputSeriesMatrix):
             if isinstance(data, bytes):
                 # noinspection PyTypeChecker
-                str_data = data.decode("utf-8")
-                if not str_data:
-                    matrix = np.zeros(shape=(0, 0))
-                else:
-                    size_to_check = min(len(str_data), 64)  # sniff a chunk only to speed up the code
-                    try:
-                        delimiter = csv.Sniffer().sniff(str_data[:size_to_check], delimiters=r"[,;\t]").delimiter
-                    except csv.Error:
-                        # Can happen with data with only one column. In this case, we don't care about the delimiter.
-                        delimiter = "\t"
-                    df = pd.read_csv(io.BytesIO(data), delimiter=delimiter, header=None).replace(",", ".", regex=True)
-                    df = df.dropna(axis=1, how="all")  # We want to remove columns full of NaN at the import
-                    matrix = df.to_numpy(dtype=np.float64)
+                matrix = _imports_matrix_from_bytes(data)
                 matrix = matrix.reshape((1, 0)) if matrix.size == 0 else matrix
                 return ReplaceMatrix(
                     target=url, matrix=matrix.tolist(), command_context=context, study_version=study_version

antarest/study/storage/variantstudy/model/command/remove_multiple_binding_constraints.py

@@ -61,8 +61,11 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
             if binding_constraints[key].get("id") in self.ids:
                 deleted_binding_constraints.append(binding_constraints.pop(key))
 
+        # BC dict should start at index 0
+        new_binding_constraints = {str(i): value for i, value in enumerate(binding_constraints.values())}
+
         study_data.tree.save(
-            binding_constraints,
+            new_binding_constraints,
             ["input", "bindingconstraints", "bindingconstraints"],
         )
 

commitlint.config.js

@@ -1,10 +1,21 @@
-import { RuleConfigSeverity } from "@commitlint/types";
+// Config used by 'commitlint' and 'pr-title' GitHub Actions
 
-// Config used by 'commitlint' GitHub action.
-export default {
+const RuleConfigSeverity = {
+  Disabled: 0,
+  Warning: 1,
+  Error: 2,
+};
+
+module.exports = {
   extends: ["@commitlint/config-conventional"],
   // Rules: https://commitlint.js.org/reference/rules.html
   rules: {
-    "header-max-length": [RuleConfigSeverity.Error, "always", 150], 
+    "scope-case": [
+      RuleConfigSeverity.Error,
+      "always",
+      ["lower-case", "kebab-case"],
+    ],
+    "scope-empty": [RuleConfigSeverity.Error, "never"],
+    "header-max-length": [RuleConfigSeverity.Error, "always", 150],
   },
 };

docs/CHANGELOG.md

@@ -1096,7 +1096,7 @@ v2.15.0 (2023-09-30)
 
 ### Chore
 
-* **github-actions:** update Node.js version to 18.16.1 [`b9988f6`](https://github.com/AntaresSimulatorTeam/AntaREST/commit/b9988f6dedc5a653de00bf5becc917487ce589e6)
+* **github-actions:** update Node.js version to 22.13.0 [`b9988f6`](https://github.com/AntaresSimulatorTeam/AntaREST/commit/b9988f6dedc5a653de00bf5becc917487ce589e6)
 * correct handling of base class with no `__annotations__` in `AllOptionalMetaclass` [`d9ed61f`](https://github.com/AntaresSimulatorTeam/AntaREST/commit/d9ed61fdaaa32974431b41e9cce44be09bb92e79)
 * correct indentation [`4af01b4`](https://github.com/AntaresSimulatorTeam/AntaREST/commit/4af01b4023cb828093f8fd9b139f76429806c7b8)
 * increase line length limit to 120 characters for Black and iSort [`586fb43`](https://github.com/AntaresSimulatorTeam/AntaREST/commit/586fb438607824899c66db66f183451fbe4a88e4)

docs/developer-guide/install/0-INSTALL.md

@@ -9,7 +9,7 @@ A local build allows using Antares Web as a desktop application.
 Requirements:
 
 - python : 3.11.x
-- node : 18.16.1
+- node : 22.13.0
 
 Then perform the following steps: