update create API validation

Author: VipulMascarenhas

ads/aqua/common/utils.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2024 Oracle and/or its affiliates.
+# Copyright (c) 2024, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 """AQUA utils and constants."""
 
@@ -30,6 +30,7 @@
 )
 from oci.data_science.models import JobRun, Model
 from oci.object_storage.models import ObjectSummary
+from pydantic import ValidationError
 
 from ads.aqua.common.enums import (
     InferenceContainerParamType,
@@ -788,7 +789,9 @@ def get_ocid_substring(ocid: str, key_len: int) -> str:
     return ocid[-key_len:] if ocid and len(ocid) > key_len else ""
 
 
-def upload_folder(os_path: str, local_dir: str, model_name: str, exclude_pattern: str = None) -> str:
+def upload_folder(
+    os_path: str, local_dir: str, model_name: str, exclude_pattern: str = None
+) -> str:
     """Upload the local folder to the object storage
 
     Args:
@@ -1159,3 +1162,15 @@ def validate_cmd_var(cmd_var: List[str], overrides: List[str]) -> List[str]:
 
     combined_cmd_var = cmd_var + overrides
     return combined_cmd_var
+
+
+def build_pydantic_error_message(ex: ValidationError):
+    """Added to handle error messages from pydantic model validator.
+    Combine both loc and msg for errors where loc (field) is present in error details, else only build error
+    message using msg field."""
+
+    return {
+        ".".join(map(str, e["loc"])): e["msg"]
+        for e in ex.errors()
+        if "loc" in e and e["loc"]
+    } or "; ".join(e["msg"] for e in ex.errors())

ads/aqua/extension/finetune_handler.py

@@ -11,7 +11,6 @@
 from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.extension.errors import Errors
 from ads.aqua.finetuning import AquaFineTuningApp
-from ads.aqua.finetuning.entities import CreateFineTuningDetails
 
 
 class AquaFineTuneHandler(AquaAPIhandler):
@@ -48,7 +47,7 @@ def post(self, *args, **kwargs):  # noqa: ARG002
         if not input_data:
             raise HTTPError(400, Errors.NO_INPUT_DATA)
 
-        self.finish(AquaFineTuningApp().create(CreateFineTuningDetails(**input_data)))
+        self.finish(AquaFineTuningApp().create(**input_data))
 
     def get_finetuning_config(self, model_id):
         """Gets the finetuning config for Aqua model."""

ads/aqua/finetuning/finetuning.py

@@ -18,6 +18,7 @@
 from ads.aqua.common.enums import Resource, Tags
 from ads.aqua.common.errors import AquaFileExistsError, AquaValueError
 from ads.aqua.common.utils import (
+    build_pydantic_error_message,
     get_container_image,
     upload_local_to_os,
 )
@@ -105,15 +106,11 @@ def create(
             try:
                 create_fine_tuning_details = CreateFineTuningDetails(**kwargs)
             except ValidationError as ex:
-                custom_errors = {
-                    ".".join(map(str, e["loc"])): e["msg"] for e in ex.errors()
-                }
+                custom_errors = build_pydantic_error_message(ex)
                 raise AquaValueError(
                     f"Invalid parameters for creating a fine-tuned model. Error details: {custom_errors}."
                 ) from ex
 
-        source = self.get_source(create_fine_tuning_details.ft_source_id)
-
         target_compartment = (
             create_fine_tuning_details.compartment_id or COMPARTMENT_OCID
         )
@@ -211,6 +208,8 @@ def create(
             defined_tags=create_fine_tuning_details.defined_tags,
         )
 
+        source = self.get_source(create_fine_tuning_details.ft_source_id)
+
         ft_model_custom_metadata = ModelCustomMetadata()
         ft_model_custom_metadata.add(
             key=FineTuneCustomMetadata.FINE_TUNE_SOURCE,
@@ -615,13 +614,7 @@ def _get_finetuning_params(
                 **{**params, **{"_validate": validate}}
             )
         except ValidationError as ex:
-            # combine both loc and msg for errors where loc (field) is present in error details, else only build error
-            # message using msg field. Added to handle error messages from pydantic model validator handler.
-            custom_errors = {
-                ".".join(map(str, e["loc"])): e["msg"]
-                for e in ex.errors()
-                if "loc" in e and e["loc"]
-            } or "; ".join(e["msg"] for e in ex.errors())
+            custom_errors = build_pydantic_error_message(ex)
             raise AquaValueError(
                 f"Invalid finetuning parameters. Error details: {custom_errors}."
             ) from ex

tests/unitary/with_extras/aqua/test_finetuning_handler.py

@@ -1,21 +1,20 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*--
 
-# Copyright (c) 2024 Oracle and/or its affiliates.
+# Copyright (c) 2024, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 from unittest import TestCase
 from unittest.mock import MagicMock
 
 from mock import patch
-from notebook.base.handlers import APIHandler, IPythonHandler
+from notebook.base.handlers import IPythonHandler
 
 from ads.aqua.extension.finetune_handler import (
     AquaFineTuneHandler,
     AquaFineTuneParamsHandler,
 )
 from ads.aqua.finetuning import AquaFineTuningApp
-from ads.aqua.finetuning.entities import CreateFineTuningDetails
 
 
 class TestDataset:
@@ -68,9 +67,7 @@ def test_post(self, mock_create):
         self.test_instance.post()
 
         self.test_instance.finish.assert_called_with(mock_create.return_value)
-        mock_create.assert_called_with(
-            CreateFineTuningDetails(**TestDataset.mock_valid_input)
-        )
+        mock_create.assert_called_with(**TestDataset.mock_valid_input)
 
     @patch.object(AquaFineTuningApp, "get_finetuning_config")
     def test_get_finetuning_config(self, mock_get_finetuning_config):