hypertune 1.1.0rc45__tar.gz → 1.2.0rc0__tar.gz

{hypertune-1.1.0rc45 → hypertune-1.2.0rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hypertune
-Version: 1.1.0rc45
+Version: 1.2.0rc0
 Summary: A library for performing hyperparameter optimization with Polyaxon.
 Home-page: https://github.com/polyaxon/hypertune
 Author: Polyaxon, Inc.

{hypertune-1.1.0rc45 → hypertune-1.2.0rc0}/hypertune/matrix/utils.py

@@ -2,7 +2,7 @@ import numpy as np
 
 from datetime import date, datetime
 
-from clipped.compact.pydantic import ValidationError
+from clipped.compact.pydantic import PYDANTIC_VERSION, ValidationError
 
 from hypertune.matrix import dist
 from polyaxon.schemas import (
@@ -97,9 +97,25 @@ def get_length(matrix):
         V1HpLogNormal._IDENTIFIER,
         V1HpQLogNormal._IDENTIFIER,
     }:
-        raise ValidationError(
-            ["Distribution should not call `length`"], matrix.__class__
-        )
+        error_msg = "Distribution should not call `length`"
+        if PYDANTIC_VERSION.startswith("2."):
+            raise ValidationError.from_exception_data(
+                title="Value Error",
+                line_errors=[
+                    {
+                        "type": "value_error",
+                        "loc": ("get_length",),
+                        # Location tuple indicating where the error occurred
+                        "msg": error_msg,
+                        "input": matrix.__class__,  # The invalid input that caused the error
+                        "ctx": {"error": error_msg},
+                    }
+                ],
+            )
+        else:
+            raise ValidationError(
+                ["Distribution should not call `length`"], matrix.__class__
+            )
 
 
 def get_min(matrix):
@@ -175,13 +191,31 @@ def to_numpy(matrix):
         return matrix.value
 
     if matrix._IDENTIFIER == V1HpPChoice._IDENTIFIER:
-        raise ValidationError(  # TODO: Fix error message
-            [
-                "Distribution should not call `to_numpy`, "
-                "instead it should call `sample`."
-            ],
-            matrix.__class__,
+        error_msg = (
+            "Distribution should not call `to_numpy`, instead it should call `sample`."
         )
+        if PYDANTIC_VERSION.startswith("2."):
+            raise ValidationError.from_exception_data(
+                title="Value Error",
+                line_errors=[
+                    {
+                        "type": "value_error",
+                        "loc": ("get_length",),
+                        # Location tuple indicating where the error occurred
+                        "msg": error_msg,
+                        "input": matrix.__class__,  # The invalid input that caused the error
+                        "ctx": {"error": error_msg},
+                    }
+                ],
+            )
+        else:
+            raise ValidationError(  # TODO: Fix error message
+                [
+                    "Distribution should not call `to_numpy`, "
+                    "instead it should call `sample`."
+                ],
+                matrix.__class__,
+            )
 
     if matrix._IDENTIFIER == V1HpDateRange._IDENTIFIER:
         return np.arange(**matrix.value.to_dict()).astype(date)
@@ -211,13 +245,31 @@ def to_numpy(matrix):
         V1HpLogNormal._IDENTIFIER,
         V1HpQLogNormal._IDENTIFIER,
     }:
-        raise ValidationError(
-            [
-                "Distribution should not call `to_numpy`, "
-                "instead it should call `sample`."
-            ],
-            matrix.__class__,
+        error_msg = (
+            "Distribution should not call `to_numpy`, instead it should call `sample`."
         )
+        if PYDANTIC_VERSION.startswith("2."):
+            raise ValidationError.from_exception_data(
+                title="Value Error",
+                line_errors=[
+                    {
+                        "type": "value_error",
+                        "loc": ("get_length",),
+                        # Location tuple indicating where the error occurred
+                        "msg": error_msg,
+                        "input": matrix.__class__,  # The invalid input that caused the error
+                        "ctx": {"error": error_msg},
+                    }
+                ],
+            )
+        else:
+            raise ValidationError(
+                [
+                    "Distribution should not call `to_numpy`, "
+                    "instead it should call `sample`."
+                ],
+                matrix.__class__,
+            )
 
 
 def _sample(matrix, size=None, rand_generator=None):
@@ -295,11 +347,27 @@ def sample(matrix, size=None, rand_generator=None):
     try:
         return _sample(matrix, size=size, rand_generator=rand_generator)
     except Exception as e:
-        raise ValidationError(
-            [
-                "Could not sample from matrix value: {} for kind: {} with size: {}".format(
-                    matrix.value, matrix._IDENTIFIER, size
-                )
-            ],
-            matrix.__class__,
-        ) from e
+        error_msg = (
+            "Could not sample from matrix value: {} for kind: {} with size: {}".format(
+                matrix.value, matrix._IDENTIFIER, size
+            )
+        )
+        if PYDANTIC_VERSION.startswith("2."):
+            raise ValidationError.from_exception_data(
+                title="Value Error",
+                line_errors=[
+                    {
+                        "type": "value_error",
+                        "loc": ("get_length",),
+                        # Location tuple indicating where the error occurred
+                        "msg": error_msg,
+                        "input": matrix.__class__,  # The invalid input that caused the error
+                        "ctx": {"error": error_msg},
+                    }
+                ],
+            ) from e
+        else:
+            raise ValidationError(
+                [error_msg],
+                matrix.__class__,
+            ) from e

{hypertune-1.1.0rc45 → hypertune-1.2.0rc0}/hypertune/pkg.py

@@ -1,5 +1,5 @@
 NAME = "hypertune"
-VERSION = "1.1.0-rc45"
+VERSION = "1.2.0-rc0"
 DESC = "A library for performing hyperparameter optimization with Polyaxon."
 URL = "https://github.com/polyaxon/hypertune"
 AUTHOR = "Polyaxon, Inc."

{hypertune-1.1.0rc45 → hypertune-1.2.0rc0}/hypertune/search_managers/bayesian_optimization/acquisition_function.py

@@ -99,7 +99,7 @@ class UtilityFunction:
             # Find the minimum of minus the acquisition function
             res = minimize(
                 lambda x: -self.compute(x.reshape(1, -1), y_max=y_max),
-                x_try.reshape(1, -1),
+                x_try.flatten(),
                 bounds=bounds,
                 method="L-BFGS-B",
             )

{hypertune-1.1.0rc45 → hypertune-1.2.0rc0}/hypertune.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hypertune
-Version: 1.1.0rc45
+Version: 1.2.0rc0
 Summary: A library for performing hyperparameter optimization with Polyaxon.
 Home-page: https://github.com/polyaxon/hypertune
 Author: Polyaxon, Inc.

{hypertune-1.1.0rc45 → hypertune-1.2.0rc0}/hypertune.egg-info/requires.txt

@@ -7,9 +7,10 @@ hyperopt
 pandas
 ipython
 numpy
-scipy<1.11
-scikit-learn<1.3
+scipy
+scikit-learn<1.6
 hyperopt<0.2.8
+setuptools
 
 [polyaxon]
 polyaxon

{hypertune-1.1.0rc45 → hypertune-1.2.0rc0}/setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-description-file = README.md
+description = file: README.md
 
 [isort]
 honor_noqa = True