bayesian-optimization 3.2.1__tar.gz → 3.3.0__tar.gz

{bayesian_optimization-3.2.1 → bayesian_optimization-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bayesian-optimization
-Version: 3.2.1
+Version: 3.3.0
 Summary: Bayesian Optimization package
 Author: Fernando Nogueira
 Author-email: Fernando Nogueira <fmfnogueira@gmail.com>

{bayesian_optimization-3.2.1 → bayesian_optimization-3.3.0}/bayes_opt/bayesian_optimization.py

@@ -12,7 +12,6 @@ from collections.abc import Iterable
 from os import PathLike
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
-from warnings import warn
 
 import numpy as np
 from scipy.optimize import NonlinearConstraint
@@ -27,7 +26,7 @@ from bayes_opt.target_space import TargetSpace
 from bayes_opt.util import ensure_rng
 
 if TYPE_CHECKING:
-    from collections.abc import Callable, Mapping
+    from collections.abc import Callable
 
     from numpy.random import RandomState
     from numpy.typing import NDArray
@@ -86,7 +85,7 @@ class BayesianOptimization:
     def __init__(
         self,
         f: Callable[..., float] | None,
-        pbounds: Mapping[str, tuple[float, float]],
+        pbounds: BoundsMapping,
         acquisition_function: AcquisitionFunction | None = None,
         constraint: NonlinearConstraint | None = None,
         random_state: int | RandomState | None = None,
@@ -138,8 +137,6 @@ class BayesianOptimization:
                 raise TypeError(msg)
             self._bounds_transformer.initialize(self._space)
 
-        self._sorting_warning_already_shown = False  # TODO: remove in future version
-
         # Initialize logger
         self.logger = ScreenLogger(verbose=self._verbose, is_constrained=self.is_constrained)
 
@@ -278,17 +275,6 @@ class BayesianOptimization:
         constraint_value: float or None
             Value of the constraint function at the observation, if any.
         """
-        # TODO: remove in future version
-        if isinstance(params, np.ndarray) and not self._sorting_warning_already_shown:
-            msg = (
-                "You're attempting to register an np.ndarray. In previous versions, the optimizer internally"
-                " sorted parameters by key and expected any registered array to respect this order."
-                " In the current and any future version the order as given by the pbounds dictionary will be"
-                " used. If you wish to retain sorted parameters, please manually sort your pbounds"
-                " dictionary before constructing the optimizer."
-            )
-            warn(msg, stacklevel=1)
-            self._sorting_warning_already_shown = True
         self._space.register(params, target, constraint_value)
         self.logger.log_optimization_step(
             self._space.keys, self._space.res()[-1], self._space.params_config, self.max
@@ -308,18 +294,6 @@ class BayesianOptimization:
             If True, the optimizer will evaluate the points when calling
             maximize(). Otherwise it will evaluate it at the moment.
         """
-        # TODO: remove in future version
-        if isinstance(params, np.ndarray) and not self._sorting_warning_already_shown:
-            msg = (
-                "You're attempting to register an np.ndarray. In previous versions, the optimizer internally"
-                " sorted parameters by key and expected any registered array to respect this order."
-                " In the current and any future version the order as given by the pbounds dictionary will be"
-                " used. If you wish to retain sorted parameters, please manually sort your pbounds"
-                " dictionary before constructing the optimizer."
-            )
-            warn(msg, stacklevel=1)
-            self._sorting_warning_already_shown = True
-            params = self._space.array_to_params(params)
         if lazy:
             self._queue.append(params)
         else:
@@ -432,13 +406,13 @@ class BayesianOptimization:
             params["kernel"] = wrap_kernel(kernel=params["kernel"], transform=self._space.kernel_transform)
         self._gp.set_params(**params)
 
-    def save_state(self, path: str | PathLike[str]) -> None:
-        """Save complete state for reconstruction of the optimizer.
+    def _state_to_dict(self) -> dict[str, Any]:
+        """Convert optimizer state to a dictionary.
 
-        Parameters
-        ----------
-        path : str or PathLike
-            Path to save the optimization state
+        Returns
+        -------
+        dict
+            Dictionary containing the complete optimizer state.
         """
         random_state = None
         if self._random_state is not None:
@@ -454,7 +428,7 @@ class BayesianOptimization:
         # Get constraint values if they exist
         constraint_values = self._space._constraint_values.tolist() if self.is_constrained else None
         acquisition_params = self._acquisition_function.get_acquisition_params()
-        state = {
+        return {
             "pbounds": {key: self._space._bounds[i].tolist() for i, key in enumerate(self._space.keys)},
             # Add current transformed bounds if using bounds transformer
             "transformed_bounds": (self._space.bounds.tolist() if self._bounds_transformer else None),
@@ -474,20 +448,14 @@ class BayesianOptimization:
             "acquisition_params": acquisition_params,
         }
 
-        with Path(path).open("w") as f:
-            json.dump(state, f, indent=2)
-
-    def load_state(self, path: str | PathLike[str]) -> None:
-        """Load optimizer state from a JSON file.
+    def _load_state_dict(self, state: dict[str, Any]) -> None:
+        """Load optimizer state from a dictionary.
 
         Parameters
         ----------
-        path : str or PathLike
-            Path to the JSON file containing the optimizer state.
+        state : dict
+            Dictionary containing the optimizer state.
         """
-        with Path(path).open("r") as file:
-            state = json.load(file)
-
         params_array = np.asarray(state["params"], dtype=np.float64)
         target_array = np.asarray(state["target"], dtype=np.float64)
         constraint_array = (
@@ -530,3 +498,27 @@ class BayesianOptimization:
                 state["random_state"]["cached_gaussian"],
             )
             self._random_state.set_state(random_state_tuple)
+
+    def save_state(self, path: str | PathLike[str]) -> None:
+        """Save complete state for reconstruction of the optimizer.
+
+        Parameters
+        ----------
+        path : str or PathLike
+            Path to save the optimization state
+        """
+        state = self._state_to_dict()
+        with Path(path).open("w") as f:
+            json.dump(state, f, indent=2)
+
+    def load_state(self, path: str | PathLike[str]) -> None:
+        """Load optimizer state from a JSON file.
+
+        Parameters
+        ----------
+        path : str or PathLike
+            Path to the JSON file containing the optimizer state.
+        """
+        with Path(path).open("r") as file:
+            state = json.load(file)
+        self._load_state_dict(state)

{bayesian_optimization-3.2.1 → bayesian_optimization-3.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bayesian-optimization"
-version = "3.2.1"
+version = "3.3.0"
 description = "Bayesian Optimization package"
 authors = [{ name = "Fernando Nogueira", email = "fmfnogueira@gmail.com" }]
 license = { file = "LICENSE" }