v2.15.1

antarest/__init__.py

@@ -7,9 +7,9 @@
 
 # Standard project metadata
 
-__version__ = "2.15.0"
+__version__ = "2.15.1"
 __author__ = "RTE, Antares Web Team"
-__date__ = "2023-09-30"
+__date__ = "2023-10-05"
 # noinspection SpellCheckingInspection
 __credits__ = "(c) Réseau de Transport de l’Électricité (RTE)"
 

antarest/study/web/raw_studies_blueprint.py

@@ -136,7 +136,18 @@ def get_study(
                 # because it's better to avoid raising an exception.
                 return Response(content=output, media_type="application/octet-stream")
 
-        return JSONResponse(content=output)
+        # We want to allow `NaN`, `+Infinity`, and `-Infinity` values in the JSON response
+        # even though they are not standard JSON values because they are supported in JavaScript.
+        # Additionally, we cannot use `orjson` because, despite its superior performance, it converts
+        # `NaN` and other values to `null`, even when using a custom encoder.
+        json_response = json.dumps(
+            output,
+            ensure_ascii=False,
+            allow_nan=True,
+            indent=None,
+            separators=(",", ":"),
+        ).encode("utf-8")
+        return Response(content=json_response, media_type="application/json")
 
     @bp.post(
         "/studies/{uuid}/raw",

docs/CHANGELOG.md

@@ -1,6 +1,29 @@
 Antares Web Changelog
 =====================
 
+v2.15.1 (2023-10-05)
+--------------------
+
+### Features
+
+* **ui-results:** move filters on top of matrices [`#1751`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/1751)
+* **ui-outputs:** add outputs synthesis view [`#1737`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/1737)
+
+
+### Bug Fixes
+
+* **api:** allow `NaN`, `+Infinity`, and `-Infinity` values in JSON response [`7394248`](https://github.com/AntaresSimulatorTeam/AntaREST/commit/7394248821ad5e2e8e5b51d389896c745740225d)
+* **ui-xpansion:** display issue in form [`#1754`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/1754)
+* **raw:** impossible to see matrix containing NaN values [`#1714`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/1714)
+* **raw:** allow NaN in matrices [`0cad1a9`](https://github.com/AntaresSimulatorTeam/AntaREST/commit/0cad1a969fd14e81cf502aecb821df4b2d7abcb6)
+
+
+### Tests
+
+* **tests:** add a test to ensure GET `/raw` endpoint reads NaN values [`29b1f71`](https://github.com/AntaresSimulatorTeam/AntaREST/commit/29b1f71856463542dcc0170fe97bc6832ec4a72a)
+
+
+
 v2.15.0 (2023-09-30)
 --------------------
 

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="AntaREST",
-    version="2.15.0",
+    version="2.15.1",
     description="Antares Server",
     long_description=Path("README.md").read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",

sonar-project.properties

@@ -6,5 +6,5 @@ sonar.exclusions=antarest/gui.py,antarest/main.py
 sonar.python.coverage.reportPaths=coverage.xml
 sonar.python.version=3.8
 sonar.javascript.lcov.reportPaths=webapp/coverage/lcov.info
-sonar.projectVersion=2.15.0
+sonar.projectVersion=2.15.1
 sonar.coverage.exclusions=antarest/gui.py,antarest/main.py,antarest/singleton_services.py,antarest/worker/archive_worker_service.py,webapp/**/*

tests/integration/raw_studies_blueprint/test_fetch_raw_data.py

@@ -4,6 +4,7 @@
 import shutil
 from urllib.parse import urlencode
 
+import numpy as np
 import pytest
 from starlette.testclient import TestClient
 
@@ -41,6 +42,7 @@ def test_get_study(
         with db():
             study: RawStudy = db.session.get(Study, study_id)
             study_dir = pathlib.Path(study.path)
+        headers = {"Authorization": f"Bearer {user_access_token}"}
 
         shutil.copytree(
             ASSETS_DIR.joinpath("user"),
@@ -55,7 +57,7 @@ def test_get_study(
             query_string = urlencode({"path": f"/{rel_path}", "depth": 1})
             res = client.get(
                 f"/v1/studies/{study_id}/raw?{query_string}",
-                headers={"Authorization": f"Bearer {user_access_token}"},
+                headers=headers,
             )
             res.raise_for_status()
             if file_path.suffix == ".json":
@@ -81,7 +83,7 @@ def test_get_study(
             query_string = urlencode({"path": f"/{rel_path.as_posix()}", "depth": 1})
             res = client.get(
                 f"/v1/studies/{study_id}/raw?{query_string}",
-                headers={"Authorization": f"Bearer {user_access_token}"},
+                headers=headers,
             )
             res.raise_for_status()
             actual = res.content
@@ -95,7 +97,7 @@ def test_get_study(
             query_string = urlencode({"path": f"/{rel_path.as_posix()}", "depth": 1})
             res = client.get(
                 f"/v1/studies/{study_id}/raw?{query_string}",
-                headers={"Authorization": f"Bearer {user_access_token}"},
+                headers=headers,
             )
             assert res.status_code == http.HTTPStatus.UNPROCESSABLE_ENTITY
 
@@ -104,7 +106,15 @@ def test_get_study(
         query_string = urlencode({"path": "/input/areas/list", "depth": 1})
         res = client.get(
             f"/v1/studies/{study_id}/raw?{query_string}",
-            headers={"Authorization": f"Bearer {user_access_token}"},
+            headers=headers,
         )
         res.raise_for_status()
         assert res.json() == ["DE", "ES", "FR", "IT"]
+
+        # asserts that the GET /raw endpoint is able to read matrix containing NaN values
+        res = client.get(
+            f"/v1/studies/{study_id}/raw?path=output/20201014-1427eco/economy/mc-all/areas/de/id-monthly",
+            headers=headers,
+        )
+        assert res.status_code == 200
+        assert np.isnan(res.json()["data"][0]).any()

tests/integration/test_integration_xpansion.py

@@ -1,18 +1,14 @@
 import io
 from pathlib import Path
 
-from fastapi import FastAPI
 from starlette.testclient import TestClient
 
 from antarest.study.business.area_management import AreaType
 from antarest.study.business.xpansion_management import XpansionCandidateDTO
 
 
-def test_integration_xpansion(app: FastAPI, tmp_path: Path):
-    client = TestClient(app, raise_server_exceptions=False)
-    res = client.post("/v1/login", json={"username": "admin", "password": "admin"})
-    admin_credentials = res.json()
-    headers = {"Authorization": f'Bearer {admin_credentials["access_token"]}'}
+def test_integration_xpansion(client: TestClient, tmp_path: Path, admin_access_token: str):
+    headers = {"Authorization": f"Bearer {admin_access_token}"}
 
     created = client.post(
         "/v1/studies?name=foo",

webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antares-web",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "private": true,
   "engines": {
     "node": "18.16.1"

webapp/public/locales/en/main.json

@@ -479,7 +479,6 @@
   "study.modelization.bindingConst.question.deleteConstraintTerm": "Are you sure you want to delete this constraint term?",
   "study.modelization.bindingConst.question.deleteBindingConstraint": "Are you sure you want to delete this binding constraint?",
   "study.results.mc": "Monte-Carlo",
-  "study.results.mc.year": "Year",
   "study.results.display": "Display",
   "study.results.temporality": "Temporality",
   "study.results.noData": "No data available",

webapp/public/locales/fr/main.json

@@ -110,7 +110,7 @@
   "form.submit.inProgress": "Le formulaire est en cours de soumission. Etes-vous sûr de vouloir quitter la page ?",
   "form.asyncDefaultValues.error": "Impossible d'obtenir les valeurs",
   "form.field.required": "Champ requis",
-  "form.field.duplicate": "Cette valeur existe déjà: {{0}}", 
+  "form.field.duplicate": "Cette valeur existe déjà: {{0}}",
   "form.field.minLength": "{{0}} caractère(s) minimum",
   "form.field.minValue": "La valeur minimum est {{0}}",
   "form.field.maxValue": "La valeur maximum est {{0}}",
@@ -198,7 +198,7 @@
   "study.timeLimitHelper": "Limite de temps en heures (max: {{max}}h)",
   "study.nbCpu": "Nombre de coeurs",
   "study.clusterLoad": "Charge du cluster",
-  "study.synthesis": "Synthesis",
+  "study.synthesis": "Synthèse",
   "study.level": "Niveau",
   "study.years": "Années",
   "study.type": "Type",
@@ -479,7 +479,6 @@
   "study.modelization.bindingConst.question.deleteConstraintTerm": "Êtes-vous sûr de vouloir supprimer ce terme ?",
   "study.modelization.bindingConst.question.deleteBindingConstraint": "Êtes-vous sûr de vouloir supprimer cette contrainte couplante ?",
   "study.results.mc": "Monte-Carlo",
-  "study.results.mc.year": "année",
   "study.results.display": "Affichage",
   "study.results.temporality": "Temporalité",
   "study.results.noData": "Aucune donnée disponible",