physioblocks 1.1.0__tar.gz → 1.1.1__tar.gz

{physioblocks-1.1.0 → physioblocks-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: physioblocks
-Version: 1.1.0
+Version: 1.1.1
 Dynamic: Author
 Dynamic: Author-email
 Dynamic: License
@@ -31,6 +31,7 @@ Requires-Dist: pandas
 Requires-Dist: plotly
 Requires-Dist: pyarrow
 Requires-Dist: regex
+Requires-Dist: rich
 Requires-Dist: scipy
 Provides-Extra: doc
 Requires-Dist: sphinx; extra == 'doc'

{physioblocks-1.1.0 → physioblocks-1.1.1}/physioblocks/__init__.py

@@ -26,7 +26,7 @@
 
 """Physioblocks package definition"""
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 __copyright__ = "INRIA"
 __license__ = "LGPL-3.0-only"
 __authors__ = [

{physioblocks-1.1.0 → physioblocks-1.1.1}/physioblocks/launcher/__main__.py

@@ -37,6 +37,7 @@ from pathlib import Path
 from typing import Any
 
 import pandas as pd
+from rich.logging import RichHandler
 
 import physioblocks.utils.exceptions_utils as exception_utils
 from physioblocks.configuration import Configuration, load, unwrap_aliases
@@ -64,8 +65,9 @@ from physioblocks.simulation import AbstractSimulation, SimulationError
 .. note:: When deleting a serie from the launcher folder, or a specific simulation from
   a serie, the launchers logs are updated the next time any simulation is launched.
 """
+FILE_LOG_FORMATTER = logging.Formatter(logging.BASIC_FORMAT)
+RICH_LOG_FORMATTER = logging.Formatter("%(message)s", "[%X]")
 
-SIMULATION_LOG_FORMATER = logging.Formatter(logging.BASIC_FORMAT)
 _root_logger = logging.getLogger()
 _root_logger.setLevel(logging.DEBUG)
 
@@ -90,8 +92,10 @@ def run_simulation(config: Configuration) -> pd.DataFrame:
     return pd.DataFrame(results)
 
 
-def add_log_handler(handler: logging.Handler, level: str | int) -> None:
-    handler.setFormatter(SIMULATION_LOG_FORMATER)
+def add_log_handler(
+    handler: logging.Handler, level: str | int, formatter: logging.Formatter
+) -> None:
+    handler.setFormatter(formatter)
     handler.setLevel(level)
     _root_logger.addHandler(handler)
 
@@ -132,7 +136,7 @@ def main(
     # configure the simulation log file (always in DEBUG)
     log_file_path = sim_folder / str.join(".", [sim_info.reference, "log"])
     file_handler = logging.FileHandler(log_file_path)
-    add_log_handler(file_handler, logging.DEBUG)
+    add_log_handler(file_handler, logging.DEBUG, FILE_LOG_FORMATTER)
 
     # log the current simulation infos
     _root_logger.info(str(sim_info))
@@ -260,8 +264,8 @@ if __name__ == "__main__":
 
     # setup logger when verbose
     if args.verbose is True:
-        stdout_handler = logging.StreamHandler(sys.stdout)
-        add_log_handler(stdout_handler, args.log_level)
+        # stdout_handler = logging.StreamHandler(sys.stdout)
+        add_log_handler(RichHandler(), args.log_level, RICH_LOG_FORMATTER)
 
     # create paths from arguments
     root_folder_path = Path(args.launcher_directory).absolute()

{physioblocks-1.1.0 → physioblocks-1.1.1}/physioblocks/simulation/runtime.py

@@ -37,6 +37,7 @@ from typing import Any, TypeAlias
 
 import numpy as np
 from numpy.typing import NDArray
+from rich.progress import Progress
 
 from physioblocks.computing.assembling import EqSystem
 from physioblocks.computing.models import ModelComponent
@@ -359,77 +360,82 @@ class ForwardSimulation(AbstractSimulation):
         """
         # initialize the simulation and save the initial results
         results = self._initialize()
-
-        try:
-            while self.time_manager.ended is False:
-                next_step = self.time_manager.time.new
-
-                self._update_time()
-
-                while (
-                    np.abs(next_step - self.time_manager.time.current)
-                    > self.time_manager.min_step
-                ):
-                    self.state.reset_state_vector()
-
-                    sol = self.solver.solve(self.state, self.eq_system)
-
-                    if sol.converged is False:
-                        inter_time = 0.5 * self.time_manager.current_step_size
-                        if inter_time < self.time_manager.min_step:
-                            raise ConvergenceError(
-                                str.format(
-                                    "The solver did not converge at {0}s for minimal"
-                                    "time step {1}",
-                                    self.time_manager.time.current,
-                                    self.time_manager.min_step,
+        progress_step_update = (
+            100.0 * self.time_manager.step_size / self.time_manager.duration
+        )
+        with Progress() as progress:
+            try:
+                sim_task = progress.add_task("Simulation in progress...")
+                while self.time_manager.ended is False:
+                    next_step = self.time_manager.time.new
+
+                    self._update_time()
+
+                    while (
+                        np.abs(next_step - self.time_manager.time.current)
+                        > self.time_manager.min_step
+                    ):
+                        self.state.reset_state_vector()
+
+                        sol = self.solver.solve(self.state, self.eq_system)
+
+                        if sol.converged is False:
+                            inter_time = 0.5 * self.time_manager.current_step_size
+                            if inter_time < self.time_manager.min_step:
+                                raise ConvergenceError(
+                                    str.format(
+                                        "The solver did not converge at {0}s for "
+                                        "minimal time step {1}",
+                                        self.time_manager.time.current,
+                                        self.time_manager.min_step,
+                                    )
                                 )
-                            )
 
-                        self.time_manager.current_step_size = inter_time
-                        self.time_manager.time.update(
-                            self.time_manager.time.current
-                            + self.time_manager.current_step_size
-                        )
-                    else:
-                        self.state.set_state_vector(sol.x)
-
-                        self.time_manager.update_time()
-                        if (
-                            np.abs(next_step - self.time_manager.time.current)
-                            >= self.time_manager.min_step
-                        ):
-                            self.time_manager.current_step_size = (
-                                next_step - self.time_manager.time.current
-                            )
-                            self.time_manager.time.update(next_step)
-                        else:
-                            self.time_manager.time.initialize(next_step)
-                            self.time_manager.current_step_size = (
-                                self.time_manager.step_size
-                            )
+                            self.time_manager.current_step_size = inter_time
                             self.time_manager.time.update(
                                 self.time_manager.time.current
                                 + self.time_manager.current_step_size
                             )
+                        else:
+                            self.state.set_state_vector(sol.x)
+
+                            self.time_manager.update_time()
+                            if (
+                                np.abs(next_step - self.time_manager.time.current)
+                                >= self.time_manager.min_step
+                            ):
+                                self.time_manager.current_step_size = (
+                                    next_step - self.time_manager.time.current
+                                )
+                                self.time_manager.time.update(next_step)
+                            else:
+                                progress.update(sim_task, advance=progress_step_update)
+                                self.time_manager.time.initialize(next_step)
+                                self.time_manager.current_step_size = (
+                                    self.time_manager.step_size
+                                )
+                                self.time_manager.time.update(
+                                    self.time_manager.time.current
+                                    + self.time_manager.current_step_size
+                                )
 
-                self.state.set_state_vector(sol.x)
-                results.append(self._get_current_result())
-        except Exception as exception:
-            log_exception(
-                _logger,
-                type(exception),
-                exception,
-                exception.__traceback__,
-                logging.DEBUG,
-            )
-            raise SimulationError(
-                str.format(
-                    "An error caused the simulation to stop prematurely",
-                    intermediate_results=results,
-                ),
-                results,
-            ) from exception
+                    self.state.set_state_vector(sol.x)
+                    results.append(self._get_current_result())
+            except Exception as exception:
+                log_exception(
+                    _logger,
+                    type(exception),
+                    exception,
+                    exception.__traceback__,
+                    logging.DEBUG,
+                )
+                raise SimulationError(
+                    str.format(
+                        "An error caused the simulation to stop prematurely",
+                        intermediate_results=results,
+                    ),
+                    results,
+                ) from exception
 
         self._finalize()
         return results

{physioblocks-1.1.0 → physioblocks-1.1.1}/pyproject.toml

@@ -10,7 +10,8 @@ dependencies = [
     "pandas",
     "plotly",
     "pyarrow",
-    "regex"
+    "regex",
+    "rich"
 ]
 description = "Physioblocks allows the simulation of dynamical models of physiological systems"
 keywords = [