revert to previous validation

Author: VipulMascarenhas

ads/aqua/common/utils.py

@@ -12,12 +12,11 @@
 import re
 import shlex
 import subprocess
-from dataclasses import fields
 from datetime import datetime, timedelta
 from functools import wraps
 from pathlib import Path
 from string import Template
-from typing import Any, List, Optional, Type, TypeVar, Union
+from typing import List, Union
 
 import fsspec
 import oci
@@ -31,7 +30,6 @@
 )
 from oci.data_science.models import JobRun, Model
 from oci.object_storage.models import ObjectSummary
-from pydantic import BaseModel, ValidationError
 
 from ads.aqua.common.enums import (
     InferenceContainerParamType,
@@ -76,7 +74,6 @@
 from ads.model import DataScienceModel, ModelVersionSet
 
 logger = logging.getLogger("ads.aqua")
-T = TypeVar("T", bound=Union[BaseModel, Any])
 
 
 class LifecycleStatus(str, metaclass=ExtendedEnumMeta):
@@ -1164,49 +1161,3 @@ def validate_cmd_var(cmd_var: List[str], overrides: List[str]) -> List[str]:
 
     combined_cmd_var = cmd_var + overrides
     return combined_cmd_var
-
-
-def validate_dataclass_params(dataclass_type: Type[T], **kwargs: Any) -> Optional[T]:
-    """This method tries to initialize a dataclass with the provided keyword arguments. It handles
-    errors related to missing, unexpected or invalid arguments.
-
-    Parameters
-    ----------
-    dataclass_type (Type[T]):
-        the dataclass type to instantiate.
-    kwargs (Any):
-        the keyword arguments to initialize the dataclass
-    Returns
-    -------
-    Optional[T]
-        instance of dataclass if successfully initialized
-    """
-
-    try:
-        return dataclass_type(**kwargs)
-    except TypeError as ex:
-        error_message = str(ex)
-        allowed_params = ", ".join(
-            field.name for field in fields(dataclass_type)
-        ).rstrip()
-        if "__init__() missing" in error_message:
-            missing_params = error_message.split("missing ")[1]
-            raise AquaValueError(
-                "Error: Missing required parameters: "
-                f"{missing_params}. Allowable parameters are: {allowed_params}."
-            ) from ex
-        elif "__init__() got an unexpected keyword argument" in error_message:
-            unexpected_param = error_message.split("argument '")[1].rstrip("'")
-            raise AquaValueError(
-                "Error: Unexpected parameter: "
-                f"{unexpected_param}. Allowable parameters are: {allowed_params}."
-            ) from ex
-        else:
-            raise AquaValueError(
-                "Invalid parameters. Allowable parameters are: " f"{allowed_params}."
-            ) from ex
-    except ValidationError as ex:
-        custom_errors = {".".join(map(str, e["loc"])): e["msg"] for e in ex.errors()}
-        raise AquaValueError(
-            f"Invalid parameters. Error details: {custom_errors}."
-        ) from ex

ads/aqua/evaluation/evaluation.py

@@ -43,7 +43,6 @@
     get_container_image,
     is_valid_ocid,
     upload_local_to_os,
-    validate_dataclass_params,
 )
 from ads.aqua.config.config import get_evaluation_service_config
 from ads.aqua.constants import (
@@ -156,9 +155,16 @@ def create(
             The instance of AquaEvaluationSummary.
         """
         if not create_aqua_evaluation_details:
-            create_aqua_evaluation_details = validate_dataclass_params(
-                CreateAquaEvaluationDetails, **kwargs
-            )
+            try:
+                create_aqua_evaluation_details = CreateAquaEvaluationDetails(**kwargs)
+            except Exception as ex:
+                custom_errors = {
+                    ".".join(map(str, e["loc"])): e["msg"]
+                    for e in json.loads(ex.json())
+                }
+                raise AquaValueError(
+                    f"Invalid create evaluation parameters. Error details: {custom_errors}."
+                ) from ex
 
         if not is_valid_ocid(create_aqua_evaluation_details.evaluation_source_id):
             raise AquaValueError(

ads/aqua/extension/finetune_handler.py

@@ -89,7 +89,7 @@ def post(self, *args, **kwargs):  # noqa: ARG002
 
         params = input_data.get("params", None)
         return self.finish(
-            AquaFineTuningApp.validate_finetuning_params(
+            AquaFineTuningApp().validate_finetuning_params(
                 params=params,
             )
         )

ads/aqua/finetuning/finetuning.py

@@ -4,7 +4,7 @@
 
 import json
 import os
-from dataclasses import asdict, fields
+from dataclasses import MISSING, asdict, fields
 from typing import Dict
 
 from oci.data_science.models import (
@@ -20,7 +20,6 @@
 from ads.aqua.common.utils import (
     get_container_image,
     upload_local_to_os,
-    validate_dataclass_params,
 )
 from ads.aqua.constants import (
     DEFAULT_FT_BATCH_SIZE,
@@ -103,9 +102,16 @@ def create(
             The instance of AquaFineTuningSummary.
         """
         if not create_fine_tuning_details:
-            create_fine_tuning_details = validate_dataclass_params(
-                CreateFineTuningDetails, **kwargs
-            )
+            try:
+                create_fine_tuning_details = CreateFineTuningDetails(**kwargs)
+            except Exception as ex:
+                allowed_create_fine_tuning_details = ", ".join(
+                    field.name for field in fields(CreateFineTuningDetails)
+                ).rstrip()
+                raise AquaValueError(
+                    "Invalid create fine tuning parameters. Allowable parameters are: "
+                    f"{allowed_create_fine_tuning_details}."
+                ) from ex
 
         source = self.get_source(create_fine_tuning_details.ft_source_id)
 
@@ -615,8 +621,7 @@ def get_finetuning_default_params(self, model_id: str) -> Dict:
 
         return default_params
 
-    @staticmethod
-    def validate_finetuning_params(params: Dict = None) -> Dict:
+    def validate_finetuning_params(self, params: Dict = None) -> Dict:
         """Validate if the fine-tuning parameters passed by the user can be overridden. Parameter values are not
         validated, only param keys are validated.
 
@@ -627,7 +632,21 @@ def validate_finetuning_params(params: Dict = None) -> Dict:
 
         Returns
         -------
-            Return a dict with value true if valid, else raises AquaValueError.
+            Return a list of restricted params.
         """
-        validate_dataclass_params(AquaFineTuningParams, **(params or {}))
+        try:
+            AquaFineTuningParams(
+                **params,
+            )
+        except Exception as e:
+            logger.debug(str(e))
+            allowed_fine_tuning_parameters = ", ".join(
+                f"{field.name} (required)" if field.default is MISSING else field.name
+                for field in fields(AquaFineTuningParams)
+            ).rstrip()
+            raise AquaValueError(
+                f"Invalid fine tuning parameters. Allowable parameters are: "
+                f"{allowed_fine_tuning_parameters}."
+            ) from e
+
         return {"valid": True}