hypertune 1.1.0rc45__py3-none-any.whl → 1.2.0__py3-none-any.whl

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/pkg.py

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

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.dist-info → hypertune-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hypertune
-Version: 1.1.0rc45
+Version: 1.2.0
 Summary: A library for performing hyperparameter optimization with Polyaxon.
 Home-page: https://github.com/polyaxon/hypertune
 Author: Polyaxon, Inc.
@@ -34,17 +34,18 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: all
-Requires-Dist: scikit-learn ; extra == 'all'
-Requires-Dist: hyperopt ; extra == 'all'
+Requires-Dist: scikit-learn; extra == "all"
+Requires-Dist: hyperopt; extra == "all"
 Provides-Extra: dev
-Requires-Dist: pandas ; extra == 'dev'
-Requires-Dist: ipython ; extra == 'dev'
-Requires-Dist: numpy ; extra == 'dev'
-Requires-Dist: scipy <1.11 ; extra == 'dev'
-Requires-Dist: scikit-learn <1.3 ; extra == 'dev'
-Requires-Dist: hyperopt <0.2.8 ; extra == 'dev'
+Requires-Dist: pandas; extra == "dev"
+Requires-Dist: ipython; extra == "dev"
+Requires-Dist: numpy; extra == "dev"
+Requires-Dist: scipy; extra == "dev"
+Requires-Dist: scikit-learn<1.6; extra == "dev"
+Requires-Dist: hyperopt<0.2.8; extra == "dev"
+Requires-Dist: setuptools; extra == "dev"
 Provides-Extra: polyaxon
-Requires-Dist: polyaxon ; extra == 'polyaxon'
+Requires-Dist: polyaxon; extra == "polyaxon"
 
 [![License: Apache 2](https://img.shields.io/badge/License-apache2-green.svg)](LICENSE)
 [![hypertune](https://github.com/polyaxon/hypertune/actions/workflows/hypertune.yml/badge.svg)](https://github.com/polyaxon/hypertune/actions/workflows/hypertune.yml)

{hypertune-1.1.0rc45.dist-info → hypertune-1.2.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
 hypertune/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 hypertune/iteration_lineage.py,sha256=z515AFwiJd9w8LjmS_9fZ3Isi3XWB1deNQtr_OssoaE,2886
 hypertune/logger.py,sha256=IHyqYlPIbssr8aCrewsPyxUBpgYPFWqvRithcGd7RDc,56
-hypertune/pkg.py,sha256=ilLZ17hvGb5E5TI2dClhd-K9u9ZwvXW1Ixv8bc1Y78g,245
+hypertune/pkg.py,sha256=BW9xgRq8hp2J6KnWWX9x7wpOQuLBX7nxxpzqSFuGUzg,240
 hypertune/matrix/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 hypertune/matrix/dist.py,sha256=4d0jdcmaMGkTjpZvkRsnsA5PgzvO4g323LZ9mVdiDuA,1442
 hypertune/matrix/hyperopt.py,sha256=d4q50BaHQCU62YnpEKr8-m7NAvMR73aRhB1tDPXHwzo,2175
-hypertune/matrix/utils.py,sha256=KsTuTItUptoQvHlo4UGpXOBpVS2Sb_A_WO6pBy5FJGo,9430
+hypertune/matrix/utils.py,sha256=SQFV3uGr3UGTfHRSKqLjRexsFoNEzTixUeocP3Q8PcM,12335
 hypertune/search_managers/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 hypertune/search_managers/base.py,sha256=IIPiJYBqexlIF9T-2JdPyVzoWSsrN-XDOOHuYltoGfA,539
 hypertune/search_managers/spec.py,sha256=Z0Vq14yaA5MEz1lbaay8QSCIRIjTWnYQjPzaU0KhRfY,725
 hypertune/search_managers/utils.py,sha256=8gLvRNTmFTm6xUDx3HgHv4h4_Dl5ywGHpAffIM6Tm5E,134
 hypertune/search_managers/bayesian_optimization/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-hypertune/search_managers/bayesian_optimization/acquisition_function.py,sha256=Hhxiks3poJ0vK6CQUo1uPYCDoknieVg4l2xcrYButX4,4711
+hypertune/search_managers/bayesian_optimization/acquisition_function.py,sha256=W524peBo9rGvahBhlb4s96isR-Pk0f7Z7K7wX-x2xVo,4706
 hypertune/search_managers/bayesian_optimization/manager.py,sha256=D9onVt4EWkTjNQcVf1yQo1J4sPmLB1sqfQ6-sctpc60,1268
 hypertune/search_managers/bayesian_optimization/optimizer.py,sha256=fNxLnBpSFPVWeGNhDp_OGUwhT6h_VzOV32pY9TeNzJQ,1304
 hypertune/search_managers/bayesian_optimization/space.py,sha256=gNXMHeUeCyaMurkImNuKRb7Lbo2e1ar6LbOxqN0N4o0,5265
@@ -25,8 +25,8 @@ hypertune/search_managers/mapping/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZ
 hypertune/search_managers/mapping/manager.py,sha256=nDeS5PkD2FEX151MUpB2GWelpO_V6Yvh46NZzVVDqC8,632
 hypertune/search_managers/random_search/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 hypertune/search_managers/random_search/manager.py,sha256=NhkRCAtrkVm63YC7TCdzeQJcvK2xRYoMzU1ImZinnJY,1850
-hypertune-1.1.0rc45.dist-info/LICENSE,sha256=86kroZbQUDsmSWOomB7dpceG65UXiVSPob4581tStBc,11349
-hypertune-1.1.0rc45.dist-info/METADATA,sha256=KCjpCi8ZFdLzP0jbS7puluKvOdbdjVO2R73A7sJkfEE,3313
-hypertune-1.1.0rc45.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-hypertune-1.1.0rc45.dist-info/top_level.txt,sha256=96t0aNwmDTWYuj8VXyzogiQ8zBV06FCXZic8xyMTY14,10
-hypertune-1.1.0rc45.dist-info/RECORD,,
+hypertune-1.2.0.dist-info/LICENSE,sha256=86kroZbQUDsmSWOomB7dpceG65UXiVSPob4581tStBc,11349
+hypertune-1.2.0.dist-info/METADATA,sha256=pXf6CMpyB8N5NYbGIxWHdkV-fbiMc1-h4YUjC24vX7Q,3334
+hypertune-1.2.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hypertune-1.2.0.dist-info/top_level.txt,sha256=96t0aNwmDTWYuj8VXyzogiQ8zBV06FCXZic8xyMTY14,10
+hypertune-1.2.0.dist-info/RECORD,,

{hypertune-1.1.0rc45.dist-info → hypertune-1.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any