polyaxon 2.4.0rc1__py3-none-any.whl → 2.6.0__py3-none-any.whl

polyaxon/_flow/matrix/bayes.py

@@ -5,8 +5,10 @@ from clipped.compact.pydantic import (
     Field,
     PositiveInt,
     StrictInt,
-    root_validator,
-    validator,
+    field_validator,
+    model_validator,
+    validation_after,
+    validation_always,
 )
 from clipped.config.schema import skip_partial
 from clipped.types.ref_or_obj import RefField
@@ -60,19 +62,21 @@ class UtilityFunctionConfig(BaseSchemaModel):  # TODO: Rename to V1UtilityFuncti
     acquisition_function: Optional[AcquisitionFunctions] = Field(
         default=AcquisitionFunctions.UCB, alias="acquisitionFunction"
     )
-    gaussian_process: Optional[GaussianProcessConfig] = Field(alias="gaussianProcess")
-    kappa: Optional[float]
-    eps: Optional[float]
-    num_warmup: Optional[int] = Field(alias="numWarmup")
-    num_iterations: Optional[int] = Field(alias="numIterations")
+    gaussian_process: Optional[GaussianProcessConfig] = Field(
+        alias="gaussianProcess", default=None
+    )
+    kappa: Optional[float] = None
+    eps: Optional[float] = None
+    num_warmup: Optional[int] = Field(alias="numWarmup", default=None)
+    num_iterations: Optional[int] = Field(alias="numIterations", default=None)
 
-    @root_validator
+    @model_validator(**validation_after)
     @skip_partial
     def validate_utility_function(cls, values):
         validate_utility_function(
-            acquisition_function=values.get("acquisition_function"),
-            kappa=values.get("kappa"),
-            eps=values.get("eps"),
+            acquisition_function=cls.get_value_for_key("acquisition_function", values),
+            kappa=cls.get_value_for_key("kappa", values),
+            eps=cls.get_value_for_key("eps", values),
         )
         return values
 
@@ -393,16 +397,18 @@ class V1Bayes(BaseSearchConfig):
     _IDENTIFIER = V1MatrixKind.BAYES
 
     kind: Literal[_IDENTIFIER] = _IDENTIFIER
-    utility_function: Optional[UtilityFunctionConfig] = Field(alias="utilityFunction")
+    utility_function: Optional[UtilityFunctionConfig] = Field(
+        alias="utilityFunction", default=None
+    )
     num_initial_runs: Union[PositiveInt, RefField] = Field(alias="numInitialRuns")
     max_iterations: Union[PositiveInt, RefField] = Field(alias="maxIterations")
     metric: V1OptimizationMetric
     params: Union[Dict[str, V1HpParam], RefField]
-    seed: Optional[Union[StrictInt, RefField]]
-    concurrency: Optional[Union[PositiveInt, RefField]]
-    tuner: Optional[Union[V1Tuner, RefField]]
+    seed: Optional[Union[StrictInt, RefField]] = None
+    concurrency: Optional[Union[PositiveInt, RefField]] = None
+    tuner: Optional[Union[V1Tuner, RefField]] = None
     early_stopping: Optional[Union[List[V1EarlyStopping], RefField]] = Field(
-        alias="earlyStopping"
+        alias="earlyStopping", default=None
     )
 
     def create_iteration(self, iteration: Optional[int] = None) -> int:
@@ -414,7 +420,7 @@ class V1Bayes(BaseSearchConfig):
         """Return a boolean to indicate if we need to reschedule another iteration."""
         return iteration < self.max_iterations
 
-    @validator("params", always=True)
+    @field_validator("params", **validation_always)
     @skip_partial
     def validate_matrix(cls, params):
         return validate_matrix(params)

polyaxon/_flow/matrix/grid_search.py

@@ -1,7 +1,13 @@
 from typing import Dict, List, Optional, Union
 from typing_extensions import Literal
 
-from clipped.compact.pydantic import Field, PositiveInt, validator
+from clipped.compact.pydantic import (
+    Field,
+    PositiveInt,
+    field_validator,
+    validation_always,
+    validation_before,
+)
 from clipped.config.schema import skip_partial
 from clipped.types.ref_or_obj import RefField
 
@@ -196,19 +202,22 @@ class V1GridSearch(BaseSearchConfig):
 
     kind: Literal[_IDENTIFIER] = _IDENTIFIER
     params: Union[Dict[str, V1HpParam], RefField]
-    num_runs: Optional[Union[PositiveInt, RefField]] = Field(alias="numRuns")
-    concurrency: Optional[Union[PositiveInt, RefField]]
+    num_runs: Optional[Union[PositiveInt, RefField]] = Field(
+        alias="numRuns", default=None
+    )
+    concurrency: Optional[Union[PositiveInt, RefField]] = None
     early_stopping: Optional[Union[List[V1EarlyStopping], RefField]] = Field(
-        alias="earlyStopping"
+        alias="earlyStopping", default=None
     )
 
-    @validator("num_runs", "concurrency", pre=True)
+    @field_validator("num_runs", "concurrency", **validation_before)
     def check_values(cls, v, field):
+        key = cls.get_field_name(field)
         if v and v < 1:
-            raise ValueError(f"{field} must be greater than 1, received `{v}` instead.")
+            raise ValueError(f"{key} must be greater than 1, received `{v}` instead.")
         return v
 
-    @validator("params", always=True)
+    @field_validator("params", **validation_always)
     @skip_partial
     def validate_matrix(cls, params):
         return validate_matrix(params)

polyaxon/_flow/matrix/hyperband.py

@@ -313,17 +313,17 @@ class V1Hyperband(BaseSearchConfig):
     _IDENTIFIER = V1MatrixKind.HYPERBAND
 
     kind: Literal[_IDENTIFIER] = _IDENTIFIER
-    params: Optional[Union[Dict[str, V1HpParam], RefField]]
-    max_iterations: Optional[PositiveInt] = Field(alias="maxIterations")
-    eta: Optional[Union[NonNegativeFloat, RefField]]
-    resource: Optional[V1OptimizationResource]
-    metric: Optional[V1OptimizationMetric]
-    resume: Optional[BoolOrRef]
-    seed: Optional[IntOrRef]
-    concurrency: Optional[Union[PositiveInt, RefField]]
-    tuner: Optional[V1Tuner]
+    params: Optional[Union[Dict[str, V1HpParam], RefField]] = None
+    max_iterations: Optional[PositiveInt] = Field(alias="maxIterations", default=None)
+    eta: Optional[Union[NonNegativeFloat, RefField]] = None
+    resource: Optional[V1OptimizationResource] = None
+    metric: Optional[V1OptimizationMetric] = None
+    resume: Optional[BoolOrRef] = None
+    seed: Optional[IntOrRef] = None
+    concurrency: Optional[Union[PositiveInt, RefField]] = None
+    tuner: Optional[V1Tuner] = None
     early_stopping: Optional[Union[List[V1EarlyStopping], RefField]] = Field(
-        alias="earlyStopping"
+        alias="earlyStopping", default=None
     )
 
     _s_max: Optional[int] = PrivateAttr()

polyaxon/_flow/matrix/hyperopt.py

@@ -1,7 +1,12 @@
 from typing import Dict, List, Optional, Union
 from typing_extensions import Literal
 
-from clipped.compact.pydantic import Field, PositiveInt, validator
+from clipped.compact.pydantic import (
+    Field,
+    PositiveInt,
+    field_validator,
+    validation_before,
+)
 from clipped.types.ref_or_obj import IntOrRef, RefField
 from clipped.utils.enums import PEnum
 
@@ -212,19 +217,19 @@ class V1Hyperopt(BaseSearchConfig):
     _IDENTIFIER = V1MatrixKind.HYPEROPT
 
     kind: Literal[_IDENTIFIER] = _IDENTIFIER
-    max_iterations: Optional[IntOrRef] = Field(alias="maxIterations")
+    max_iterations: Optional[IntOrRef] = Field(alias="maxIterations", default=None)
     metric: V1OptimizationMetric
-    algorithm: Optional[V1HyperoptAlgorithms]
+    algorithm: Optional[V1HyperoptAlgorithms] = None
     params: Union[Dict[str, V1HpParam], RefField]
-    num_runs: Union[PositiveInt, RefField] = Field(alias="numRuns")
-    seed: Optional[IntOrRef]
-    concurrency: Optional[Union[PositiveInt, RefField]]
-    tuner: Optional[V1Tuner]
+    num_runs: Union[PositiveInt, RefField] = Field(alias="numRuns", default=None)
+    seed: Optional[IntOrRef] = None
+    concurrency: Optional[Union[PositiveInt, RefField]] = None
+    tuner: Optional[V1Tuner] = None
     early_stopping: Optional[Union[List[V1EarlyStopping], RefField]] = Field(
-        alias="earlyStopping"
+        alias="earlyStopping", default=None
     )
 
-    @validator("num_runs", "concurrency", pre=True)
+    @field_validator("num_runs", "concurrency", **validation_before)
     def check_values(cls, v, field):
         if v and v < 1:
             raise ValueError(f"{field} must be greater than 1, received `{v}` instead.")

polyaxon/_flow/matrix/iterative.py

@@ -1,7 +1,12 @@
 from typing import Dict, List, Optional, Union
 from typing_extensions import Literal
 
-from clipped.compact.pydantic import Field, PositiveInt, validator
+from clipped.compact.pydantic import (
+    Field,
+    PositiveInt,
+    field_validator,
+    validation_before,
+)
 from clipped.types.ref_or_obj import IntOrRef, RefField
 
 from polyaxon._flow.early_stopping import V1EarlyStopping
@@ -224,19 +229,20 @@ class V1Iterative(BaseSearchConfig):
     _IDENTIFIER = V1MatrixKind.ITERATIVE
 
     kind: Literal[_IDENTIFIER] = _IDENTIFIER
-    params: Optional[Union[Dict[str, V1HpParam], RefField]]
+    params: Optional[Union[Dict[str, V1HpParam], RefField]] = None
     max_iterations: Union[PositiveInt, RefField] = Field(alias="maxIterations")
-    seed: Optional[IntOrRef]
-    concurrency: Optional[Union[PositiveInt, RefField]]
-    tuner: Optional[V1Tuner]
+    seed: Optional[IntOrRef] = None
+    concurrency: Optional[Union[PositiveInt, RefField]] = None
+    tuner: Optional[V1Tuner] = None
     early_stopping: Optional[Union[List[V1EarlyStopping], RefField]] = Field(
-        alias="earlyStopping"
+        alias="earlyStopping", default=None
     )
 
-    @validator("max_iterations", "concurrency", pre=True)
+    @field_validator("max_iterations", "concurrency", **validation_before)
     def check_values(cls, v, field):
+        key = cls.get_field_name(field)
         if v and v < 1:
-            raise ValueError(f"{field} must be greater than 1, received `{v}` instead.")
+            raise ValueError(f"{key} must be greater than 1, received `{v}` instead.")
         return v
 
     def create_iteration(self, iteration: Optional[int] = None) -> int:

polyaxon/_flow/matrix/mapping.py

@@ -1,7 +1,7 @@
 from typing import Dict, List, Optional, Union
 from typing_extensions import Literal
 
-from clipped.compact.pydantic import Field, PositiveInt, validator
+from clipped.compact.pydantic import Field, PositiveInt, field_validator
 from clipped.types.ref_or_obj import RefField
 
 from polyaxon._contexts.params import is_template_ref
@@ -107,12 +107,12 @@ class V1Mapping(BaseSearchConfig):
 
     kind: Literal[_IDENTIFIER] = _IDENTIFIER
     values: Union[List[Dict], RefField]
-    concurrency: Optional[Union[PositiveInt, RefField]]
+    concurrency: Optional[Union[PositiveInt, RefField]] = None
     early_stopping: Optional[Union[List[V1EarlyStopping], RefField]] = Field(
-        alias="earlyStopping"
+        alias="earlyStopping", default=None
     )
 
-    @validator("concurrency")
+    @field_validator("concurrency")
     def check_concurrency(cls, v):
         if v and v < 1:
             raise ValueError(