diff --git a/bayes_opt/acquisition.py b/bayes_opt/acquisition.py index 4c8c7191..0b4ba77c 100644 --- a/bayes_opt/acquisition.py +++ b/bayes_opt/acquisition.py @@ -99,13 +99,13 @@ def get_acquisition_params(self) -> dict[str, Any]: ) 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 @@ def decay_exploration(self) -> None: ): 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 @@ def get_acquisition_params(self) -> dict: "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 @@ def decay_exploration(self) -> None: ): 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 @@ def get_acquisition_params(self) -> dict: "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 @@ def decay_exploration(self) -> None: ): 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 @@ def get_acquisition_params(self) -> dict: "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 @@ def suggest( 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 @@ def get_acquisition_params(self) -> dict: "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 @@ def suggest( 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 @@ def get_acquisition_params(self) -> dict: 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 diff --git a/bayes_opt/bayesian_optimization.py b/bayes_opt/bayesian_optimization.py index b454248e..35741693 100644 --- a/bayes_opt/bayesian_optimization.py +++ b/bayes_opt/bayesian_optimization.py @@ -328,7 +328,7 @@ def probe(self, params: ParamsType, lazy: bool = True) -> None: 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 +442,13 @@ def save_state(self, path: str | PathLike[str]) -> None: """ 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