bayesian-optimization 3.2.0__tar.gz → 3.2.2__tar.gz

{bayesian_optimization-3.2.0 → bayesian_optimization-3.2.2}/PKG-INFO

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

{bayesian_optimization-3.2.0 → bayesian_optimization-3.2.2}/bayes_opt/acquisition.py

@@ -99,13 +99,13 @@ class AcquisitionFunction(abc.ABC):
         )
         raise NotImplementedError(error_msg)
 
-    def set_acquisition_params(self, **params) -> None:
+    def set_acquisition_params(self, params: dict[str, Any]) -> None:
         """
         Set the parameters of the acquisition function.
 
         Parameters
         ----------
-        **params : dict
+        params : dict
             The parameters of the acquisition function.
         """
         error_msg = (
@@ -553,7 +553,7 @@ class UpperConfidenceBound(AcquisitionFunction):
         ):
             self.kappa = self.kappa * self.exploration_decay
 
-    def get_acquisition_params(self) -> dict:
+    def get_acquisition_params(self) -> dict[str, Any]:
         """Get the current acquisition function parameters.
 
         Returns
@@ -567,7 +567,7 @@ class UpperConfidenceBound(AcquisitionFunction):
             "exploration_decay_delay": self.exploration_decay_delay,
         }
 
-    def set_acquisition_params(self, params: dict) -> None:
+    def set_acquisition_params(self, params: dict[str, Any]) -> None:
         """Set the acquisition function parameters.
 
         Parameters
@@ -733,7 +733,7 @@ class ProbabilityOfImprovement(AcquisitionFunction):
         ):
             self.xi = self.xi * self.exploration_decay
 
-    def get_acquisition_params(self) -> dict:
+    def get_acquisition_params(self) -> dict[str, Any]:
         """Get the current acquisition function parameters.
 
         Returns
@@ -747,7 +747,7 @@ class ProbabilityOfImprovement(AcquisitionFunction):
             "exploration_decay_delay": self.exploration_decay_delay,
         }
 
-    def set_acquisition_params(self, params: dict) -> None:
+    def set_acquisition_params(self, params: dict[str, Any]) -> None:
         """Set the acquisition function parameters.
 
         Parameters
@@ -922,7 +922,7 @@ class ExpectedImprovement(AcquisitionFunction):
         ):
             self.xi = self.xi * self.exploration_decay
 
-    def get_acquisition_params(self) -> dict:
+    def get_acquisition_params(self) -> dict[str, Any]:
         """Get the current acquisition function parameters.
 
         Returns
@@ -936,7 +936,7 @@ class ExpectedImprovement(AcquisitionFunction):
             "exploration_decay_delay": self.exploration_decay_delay,
         }
 
-    def set_acquisition_params(self, params: dict) -> None:
+    def set_acquisition_params(self, params: dict[str, Any]) -> None:
         """Set the acquisition function parameters.
 
         Parameters
@@ -1147,7 +1147,7 @@ class ConstantLiar(AcquisitionFunction):
 
         return x_max
 
-    def get_acquisition_params(self) -> dict:
+    def get_acquisition_params(self) -> dict[str, Any]:
         """Get the current acquisition function parameters.
 
         Returns
@@ -1163,7 +1163,7 @@ class ConstantLiar(AcquisitionFunction):
             "rtol": self.rtol,
         }
 
-    def set_acquisition_params(self, params: dict) -> None:
+    def set_acquisition_params(self, params: dict[str, Any]) -> None:
         """Set the acquisition function parameters.
 
         Parameters
@@ -1318,7 +1318,7 @@ class GPHedge(AcquisitionFunction):
         idx = self._sample_idx_from_softmax_gains(random_state=random_state)
         return x_max[idx]
 
-    def get_acquisition_params(self) -> dict:
+    def get_acquisition_params(self) -> dict[str, Any]:
         """Get the current acquisition function parameters.
 
         Returns
@@ -1334,7 +1334,7 @@ class GPHedge(AcquisitionFunction):
             else None,
         }
 
-    def set_acquisition_params(self, params: dict) -> None:
+    def set_acquisition_params(self, params: dict[str, Any]) -> None:
         """Set the acquisition function parameters.
 
         Parameters

{bayesian_optimization-3.2.0 → bayesian_optimization-3.2.2}/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
@@ -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:
@@ -328,7 +302,7 @@ class BayesianOptimization:
                 self._space.keys, self._space.res()[-1], self._space.params_config, self.max
             )
 
-    def random_sample(self, n: int = 1) -> dict[str, float | NDArray[Float]]:
+    def random_sample(self, n: int = 1) -> list[dict[str, float | NDArray[Float]]]:
         """Generate a random sample of parameters from the target space.
 
         Parameters
@@ -442,13 +416,13 @@ class BayesianOptimization:
         """
         random_state = None
         if self._random_state is not None:
-            state_tuple = self._random_state.get_state()
+            state_dict = self._random_state.get_state(legacy=False)
             random_state = {
-                "bit_generator": state_tuple[0],
-                "state": state_tuple[1].tolist(),
-                "pos": state_tuple[2],
-                "has_gauss": state_tuple[3],
-                "cached_gaussian": state_tuple[4],
+                "bit_generator": state_dict["bit_generator"],
+                "state": state_dict["state"]["key"].tolist(),
+                "pos": state_dict["state"]["pos"],
+                "has_gauss": state_dict["has_gauss"],
+                "cached_gaussian": state_dict["gauss"],
             }
 
         # Get constraint values if they exist

{bayesian_optimization-3.2.0 → bayesian_optimization-3.2.2}/bayes_opt/target_space.py

@@ -643,7 +643,7 @@ class TargetSpace:
         params = self.params[self.mask]
         target_max_idx = np.argmax(target)
 
-        res = {"target": target_max, "params": dict(zip(self.keys, params[target_max_idx]))}
+        res = {"target": target_max, "params": self.array_to_params(params[target_max_idx])}
 
         if self._constraint is not None:
             constraint_values = self.constraint_values[self.mask]
@@ -672,7 +672,7 @@ class TargetSpace:
 
             return [{"target": target, "params": param} for target, param in zip(self.target, params)]
 
-        params = [dict(zip(self.keys, p)) for p in self.params]
+        params = [self.array_to_params(p) for p in self.params]
 
         return [
             {"target": target, "constraint": constraint_value, "params": param, "allowed": allowed}

{bayesian_optimization-3.2.0 → bayesian_optimization-3.2.2}/pyproject.toml

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