Fixes unt tests

Author: mrDzurb

ads/aqua/app.py

@@ -353,7 +353,7 @@ def get_config(
                 f"Check if the custom metadata has the artifact path set."
             )
 
-        return ModelConfigResult(config=config or {}, model_details=oci_model)
+        return ModelConfigResult(config=config, model_details=oci_model)
 
     @property
     def telemetry(self):

ads/aqua/common/entities.py

@@ -2,7 +2,7 @@
 # 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 typing import Any, Dict
+from typing import Any, Dict, Optional
 
 from oci.data_science.models import Model
 from pydantic import BaseModel, Field
@@ -31,8 +31,12 @@ class ModelConfigResult(BaseModel):
         config (Dict[str, Any]): A dictionary of the loaded configuration.
     """
 
-    config: Dict[str, Any] = Field(..., description="Loaded configuration dictionary.")
-    model_details: Model = Field(..., description="Details of the model from OCI.")
+    config: Optional[Dict[str, Any]] = Field(
+        None, description="Loaded configuration dictionary."
+    )
+    model_details: Optional[Model] = Field(
+        None, description="Details of the model from OCI."
+    )
 
     class Config:
         extra = "ignore"

tests/unitary/with_extras/aqua/test_deployment.py

@@ -1,7 +1,7 @@
 #!/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/
 
 import copy
@@ -16,6 +16,7 @@
 import pytest
 from parameterized import parameterized
 
+from ads.aqua.common.entities import ModelConfigResult
 import ads.aqua.modeldeployment.deployment
 import ads.config
 from ads.aqua.modeldeployment import AquaDeploymentApp, MDInferenceResponse
@@ -438,11 +439,11 @@ def test_get_deployment_config(self):
         with open(config_json, "r") as _file:
             config = json.load(_file)
 
-        self.app.get_config = MagicMock(return_value=config)
+        self.app.get_config = MagicMock(return_value=ModelConfigResult(config=config))
         result = self.app.get_deployment_config(TestDataset.MODEL_ID)
         assert result == config
 
-        self.app.get_config = MagicMock(return_value=None)
+        self.app.get_config = MagicMock(return_value=ModelConfigResult(config=None))
         result = self.app.get_deployment_config(TestDataset.MODEL_ID)
         assert result == None
 

tests/unitary/with_extras/aqua/test_finetuning.py

@@ -17,6 +17,7 @@
 import ads.aqua.finetuning.finetuning
 import ads.config
 from ads.aqua.app import AquaApp
+from ads.aqua.common.entities import ModelConfigResult
 from ads.aqua.common.errors import AquaValueError
 from ads.aqua.finetuning import AquaFineTuningApp
 from ads.aqua.finetuning.constants import FineTuneCustomMetadata
@@ -279,7 +280,7 @@ def test_get_finetuning_config(self):
         with open(config_json, "r") as _file:
             config = json.load(_file)
 
-        self.app.get_config = MagicMock(return_value=config)
+        self.app.get_config = MagicMock(return_value=ModelConfigResult(config=config))
         result = self.app.get_finetuning_config(model_id="test-model-id")
         assert result == config