v2.13.2

Release v2.13.2 to master

antarest/__init__.py

@@ -7,9 +7,9 @@
 
 # Standard project metadata
 
-__version__ = "2.13.1"
+__version__ = "2.13.2"
 __author__ = "RTE, Antares Web Team"
-__date__ = "2023-04-11"
+__date__ = "2023-04-25"
 # noinspection SpellCheckingInspection
 __credits__ = "(c) Réseau de Transport de l’Électricité (RTE)"
 

antarest/launcher/adapters/slurm_launcher/slurm_launcher.py

@@ -148,7 +148,16 @@ def _retrieve_running_jobs(self) -> None:
 
     def _loop(self) -> None:
         while self.check_state:
-            self._check_studies_state()
+            # noinspection PyBroadException
+            try:
+                self._check_studies_state()
+            except Exception:
+                # To keep the SLURM processing monitoring loop active, exceptions
+                # are caught and a message is simply displayed in the logs.
+                logger.error(
+                    "An uncaught exception occurred in slurm_launcher loop",
+                    exc_info=True,
+                )
             time.sleep(2)
 
     def start(self) -> None:
@@ -406,7 +415,6 @@ def _handle_failure(self, study: StudyDTO) -> None:
                 study.name, JobStatus.FAILED, msg, None
             )
             logger.error(msg, exc_info=e)
-            raise
         else:
             msg = "Simulation failed (even if some output results may be available)"
             self.callbacks.append_after_log(study.name, msg)
@@ -444,7 +452,6 @@ def _handle_success(self, study: StudyDTO) -> None:
                 study.name, JobStatus.FAILED, msg, None
             )
             logger.error(msg, exc_info=e)
-            raise
         else:
             self.callbacks.update_status(
                 study.name, JobStatus.SUCCESS, None, output_id

docs/CHANGELOG.md

@@ -1,6 +1,17 @@
 Antares Web Changelog
 =====================
 
+v2.13.2 (2023-04-25)
+--------------------
+
+### Bug Fixes
+
+*  **api:** fix uncaught exceptions stopping slurm launcher loop (#1477) ([2737914](https://github.com/AntaresSimulatorTeam/AntaREST/commit/27379146cfa12cc90e38f2f0d77009d80f3164db))
+
+### Contributors
+
+<a href="https://github.com/sylvlecl">Sylvain LECLERC</a>
+
 v2.13.1 (2023-04-11)
 --------------------
 

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="AntaREST",
-    version="2.13.1",
+    version="2.13.2",
     description="Antares Server",
     long_description=long_description,
     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.13.1
+sonar.projectVersion=2.13.2
 sonar.coverage.exclusions=antarest/gui.py,antarest/main.py,antarest/singleton_services.py,antarest/worker/archive_worker_service.py,webapp/**/*

tests/worker/test_worker.py

@@ -3,6 +3,7 @@
 from typing import List
 from unittest.mock import MagicMock
 
+import pytest
 from antarest.core.config import Config
 from antarest.core.interfaces.eventbus import Event, EventType, IEventBus
 from antarest.core.model import PermissionInfo, PublicMode
@@ -27,6 +28,7 @@ def execute_task(self, task_info: WorkerTaskCommand) -> TaskResult:
         return TaskResult(success=True, message="")
 
 
+@pytest.mark.skip(reason="disabled because it sometimes crashes randomly")
 def test_simple_task(tmp_path: Path):
     task_queue = "do_stuff"
     event_bus = build_eventbus(MagicMock(), Config(), autostart=True)

webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antares-web",
-  "version": "2.13.1",
+  "version": "2.13.2",
   "private": true,
   "dependencies": {
     "@emotion/react": "11.10.6",