Refactor base handler (#859)

Author: VipulMascarenhas

ads/aqua/common/enums.py

@@ -24,11 +24,6 @@ class Resource(str, metaclass=ExtendedEnumMeta):
     MODEL_VERSION_SET = "model-version-sets"
 
 
-class DataScienceResource(str, metaclass=ExtendedEnumMeta):
-    MODEL_DEPLOYMENT = "datasciencemodeldeployment"
-    MODEL = "datasciencemodel"
-
-
 class Tags(str, metaclass=ExtendedEnumMeta):
     TASK = "task"
     LICENSE = "license"

ads/aqua/extension/base_handler.py

@@ -137,10 +137,3 @@ def get_default_error_messages(
             return messages[status_code]
         else:
             return default_msg
-
-
-# todo: remove after error handler is implemented
-class Errors(str):
-    INVALID_INPUT_DATA_FORMAT = "Invalid format of input data."
-    NO_INPUT_DATA = "No input data provided."
-    MISSING_REQUIRED_PARAMETER = "Missing required parameter: '{}'"

ads/aqua/extension/deployment_handler.py

@@ -8,7 +8,8 @@
 from tornado.web import HTTPError
 
 from ads.aqua.common.decorator import handle_exceptions
-from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
+from ads.aqua.extension.errors import Errors
+from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.modeldeployment import AquaDeploymentApp, MDInferenceResponse
 from ads.aqua.modeldeployment.entities import ModelParams
 from ads.config import COMPARTMENT_OCID, PROJECT_OCID

ads/aqua/extension/errors.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+
+class Errors(str):
+    INVALID_INPUT_DATA_FORMAT = "Invalid format of input data."
+    NO_INPUT_DATA = "No input data provided."
+    MISSING_REQUIRED_PARAMETER = "Missing required parameter: '{}'"

ads/aqua/extension/evaluation_handler.py

@@ -10,7 +10,8 @@
 from ads.aqua.common.decorator import handle_exceptions
 from ads.aqua.evaluation import AquaEvaluationApp
 from ads.aqua.evaluation.entities import CreateAquaEvaluationDetails
-from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
+from ads.aqua.extension.errors import Errors
+from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.extension.utils import validate_function_parameters
 from ads.config import COMPARTMENT_OCID
 

ads/aqua/extension/finetune_handler.py

@@ -9,7 +9,8 @@
 from tornado.web import HTTPError
 
 from ads.aqua.common.decorator import handle_exceptions
-from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
+from ads.aqua.extension.errors import Errors
+from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.extension.utils import validate_function_parameters
 from ads.aqua.finetuning import AquaFineTuningApp
 from ads.aqua.finetuning.entities import CreateFineTuningDetails

ads/aqua/extension/model_handler.py

@@ -18,7 +18,8 @@
 
 from ads.aqua.common.decorator import handle_exceptions
 from ads.aqua.common.errors import AquaRuntimeError
-from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
+from ads.aqua.extension.errors import Errors
+from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.model import AquaModelApp
 from ads.aqua.model.constants import ModelTask
 from ads.aqua.model.entities import AquaModelSummary, HFModelSummary

ads/aqua/extension/ui_handler.py

@@ -10,7 +10,8 @@
 
 from ads.aqua.common.decorator import handle_exceptions
 from ads.aqua.common.enums import Tags
-from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
+from ads.aqua.extension.errors import Errors
+from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.extension.utils import validate_function_parameters
 from ads.aqua.model.entities import ImportModelDetails
 from ads.aqua.ui import AquaUIApp

ads/aqua/extension/utils.py

@@ -7,7 +7,7 @@
 
 from tornado.web import HTTPError
 
-from ads.aqua.extension.base_handler import Errors
+from ads.aqua.extension.errors import Errors
 
 
 def validate_function_parameters(data_class, input_data: Dict):

tests/unitary/with_extras/aqua/test_deployment_handler.py

@@ -136,9 +136,7 @@ def setUp(self, ipython_init_mock) -> None:
         self.test_instance = AquaDeploymentParamsHandler(MagicMock(), MagicMock())
 
     @patch("notebook.base.handlers.APIHandler.finish")
-    @patch(
-        "ads.aqua.modeldeployment.deployment.AquaDeploymentApp.get_deployment_default_params"
-    )
+    @patch("ads.aqua.modeldeployment.AquaDeploymentApp.get_deployment_default_params")
     def test_get_deployment_default_params(
         self, mock_get_deployment_default_params, mock_finish
     ):
@@ -159,9 +157,7 @@ def test_get_deployment_default_params(
         )
 
     @patch("notebook.base.handlers.APIHandler.finish")
-    @patch(
-        "ads.aqua.modeldeployment.deployment.AquaDeploymentApp.validate_deployment_params"
-    )
+    @patch("ads.aqua.modeldeployment.AquaDeploymentApp.validate_deployment_params")
     def test_validate_deployment_params(
         self, mock_validate_deployment_params, mock_finish
     ):