Merge branch 'main' into pre-commit-ci-update-config

Author: janosg

.pre-commit-config.yaml

@@ -137,7 +137,7 @@ repos:
       - id: mypy
         files: src|tests
         additional_dependencies:
-          - numpy
+          - numpy >= 2
           - packaging
           - pandas-stubs
           - sqlalchemy-stubs

.tools/envs/testenv-linux.yml

@@ -18,7 +18,7 @@ dependencies:
   - joblib  # run, tests
   - numpy >= 2  # run, tests
   - pandas  # run, tests
-  - plotly  # run, tests
+  - plotly<6.0.0  # run, tests
   - pybaum>=0.1.2  # run, tests
   - scipy>=1.2.1  # run, tests
   - sqlalchemy  # run, tests

.tools/envs/testenv-numpy.yml

@@ -16,7 +16,7 @@ dependencies:
   - statsmodels  # dev, tests
   - cloudpickle  # run, tests
   - joblib  # run, tests
-  - plotly  # run, tests
+  - plotly<6.0.0  # run, tests
   - pybaum>=0.1.2  # run, tests
   - scipy>=1.2.1  # run, tests
   - sqlalchemy  # run, tests

.tools/envs/testenv-others.yml

@@ -16,7 +16,7 @@ dependencies:
   - joblib  # run, tests
   - numpy >= 2  # run, tests
   - pandas  # run, tests
-  - plotly  # run, tests
+  - plotly<6.0.0  # run, tests
   - pybaum>=0.1.2  # run, tests
   - scipy>=1.2.1  # run, tests
   - sqlalchemy  # run, tests

.tools/envs/testenv-pandas.yml

@@ -16,7 +16,7 @@ dependencies:
   - statsmodels  # dev, tests
   - cloudpickle  # run, tests
   - joblib  # run, tests
-  - plotly  # run, tests
+  - plotly<6.0.0  # run, tests
   - pybaum>=0.1.2  # run, tests
   - scipy>=1.2.1  # run, tests
   - sqlalchemy  # run, tests

environment.yml

@@ -20,7 +20,7 @@ dependencies:
   - joblib  # run, tests
   - numpy >= 2  # run, tests
   - pandas  # run, tests
-  - plotly  # run, tests
+  - plotly<6.0.0  # run, tests
   - pybaum>=0.1.2  # run, tests
   - scipy>=1.2.1  # run, tests
   - sqlalchemy  # run, tests

pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "joblib",
     "numpy",
     "pandas",
-    "plotly",
+    "plotly<6.0.0",
     "pybaum>=0.1.2",
     "scipy>=1.2.1",
     "sqlalchemy>=1.3",

src/optimagic/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from optimagic import constraints, mark, utilities
+from optimagic import constraints, mark, timing, utilities
 from optimagic.algorithms import algos
 from optimagic.benchmarking.benchmark_reports import (
     convergence_report,
@@ -102,4 +102,5 @@
     "History",
     "__version__",
     "algos",
+    "timing",
 ]

src/optimagic/benchmarking/run_benchmark.py

@@ -209,7 +209,7 @@ def _process_one_result(optimize_result, problem):
             criterion_history = history.fun
         criterion_history = np.clip(criterion_history, _solution_crit, np.inf)
         batches_history = history.batches
-        time_history = history.time
+        time_history = history.start_time
 
     return {
         "params_history": params_history_flat,

src/optimagic/optimization/convergence_report.py

@@ -1,16 +1,14 @@
 import numpy as np
+from numpy.typing import NDArray
 
-from optimagic.optimization.history_tools import get_history_arrays
+from optimagic.optimization.history import History
 
 
-def get_convergence_report(history, direction):
-    history_arrs = get_history_arrays(
-        history=history,
-        direction=direction,
-    )
+def get_convergence_report(history: History) -> dict[str, dict[str, float]] | None:
+    is_accepted = history.is_accepted
 
-    critvals = history_arrs.fun[history_arrs.is_accepted]
-    params = history_arrs.params[history_arrs.is_accepted]
+    critvals = np.array(history.fun, dtype=np.float64)[is_accepted]
+    params = np.array(history.flat_params, dtype=np.float64)[is_accepted]
 
     if len(critvals) < 2:
         out = None
@@ -35,7 +33,7 @@ def get_convergence_report(history, direction):
     return out
 
 
-def _get_max_f_changes(critvals):
+def _get_max_f_changes(critvals: NDArray[np.float64]) -> tuple[float, float]:
     best_val = critvals[-1]
     worst_val = critvals[0]
 
@@ -47,7 +45,7 @@ def _get_max_f_changes(critvals):
     return max_change_rel, max_change_abs
 
 
-def _get_max_x_changes(params):
+def _get_max_x_changes(params: NDArray[np.float64]) -> tuple[float, float]:
     best_x = params[-1]
     diffs = params - best_x
     denom = np.clip(np.abs(best_x), 0.1, np.inf)