Skip to content

Commit 3a27682

Browse files
refactor base handler
1 parent 6bb395a commit 3a27682

File tree

10 files changed

+22
-19
lines changed

10 files changed

+22
-19
lines changed

ads/aqua/common/enums.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ class Resource(str, metaclass=ExtendedEnumMeta):
2424
MODEL_VERSION_SET = "model-version-sets"
2525

2626

27-
class DataScienceResource(str, metaclass=ExtendedEnumMeta):
28-
MODEL_DEPLOYMENT = "datasciencemodeldeployment"
29-
MODEL = "datasciencemodel"
30-
31-
3227
class Tags(str, metaclass=ExtendedEnumMeta):
3328
TASK = "task"
3429
LICENSE = "license"

ads/aqua/extension/base_handler.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,3 @@ def get_default_error_messages(
137137
return messages[status_code]
138138
else:
139139
return default_msg
140-
141-
142-
# todo: remove after error handler is implemented
143-
class Errors(str):
144-
INVALID_INPUT_DATA_FORMAT = "Invalid format of input data."
145-
NO_INPUT_DATA = "No input data provided."
146-
MISSING_REQUIRED_PARAMETER = "Missing required parameter: '{}'"

ads/aqua/extension/deployment_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
from tornado.web import HTTPError
99

1010
from ads.aqua.common.decorator import handle_exceptions
11-
from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
11+
from ads.aqua.extension.errors import Errors
12+
from ads.aqua.extension.base_handler import AquaAPIhandler
1213
from ads.aqua.modeldeployment import AquaDeploymentApp, MDInferenceResponse
1314
from ads.aqua.modeldeployment.entities import ModelParams
1415
from ads.config import COMPARTMENT_OCID, PROJECT_OCID

ads/aqua/extension/errors.py

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

ads/aqua/extension/evaluation_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
from ads.aqua.common.decorator import handle_exceptions
1111
from ads.aqua.evaluation import AquaEvaluationApp
1212
from ads.aqua.evaluation.entities import CreateAquaEvaluationDetails
13-
from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
13+
from ads.aqua.extension.errors import Errors
14+
from ads.aqua.extension.base_handler import AquaAPIhandler
1415
from ads.aqua.extension.utils import validate_function_parameters
1516
from ads.config import COMPARTMENT_OCID
1617

ads/aqua/extension/finetune_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
from tornado.web import HTTPError
1010

1111
from ads.aqua.common.decorator import handle_exceptions
12-
from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
12+
from ads.aqua.extension.errors import Errors
13+
from ads.aqua.extension.base_handler import AquaAPIhandler
1314
from ads.aqua.extension.utils import validate_function_parameters
1415
from ads.aqua.finetuning import AquaFineTuningApp
1516
from ads.aqua.finetuning.entities import CreateFineTuningDetails

ads/aqua/extension/model_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
from ads.aqua.common.decorator import handle_exceptions
2020
from ads.aqua.common.errors import AquaRuntimeError
21-
from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
21+
from ads.aqua.extension.errors import Errors
22+
from ads.aqua.extension.base_handler import AquaAPIhandler
2223
from ads.aqua.model import AquaModelApp
2324
from ads.aqua.model.constants import ModelTask
2425
from ads.aqua.model.entities import AquaModelSummary, HFModelSummary

ads/aqua/extension/ui_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
from ads.aqua.common.decorator import handle_exceptions
1212
from ads.aqua.common.enums import Tags
13-
from ads.aqua.extension.base_handler import AquaAPIhandler, Errors
13+
from ads.aqua.extension.errors import Errors
14+
from ads.aqua.extension.base_handler import AquaAPIhandler
1415
from ads.aqua.extension.utils import validate_function_parameters
1516
from ads.aqua.model.entities import ImportModelDetails
1617
from ads.aqua.ui import AquaUIApp

ads/aqua/extension/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from tornado.web import HTTPError
99

10-
from ads.aqua.extension.base_handler import Errors
10+
from ads.aqua.extension.errors import Errors
1111

1212

1313
def validate_function_parameters(data_class, input_data: Dict):

tests/unitary/with_extras/aqua/test_evaluation_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from ads.aqua.evaluation import AquaEvaluationApp
1313
from ads.aqua.evaluation.entities import CreateAquaEvaluationDetails
14-
from ads.aqua.extension.base_handler import Errors
14+
from ads.aqua.extension.errors import Errors
1515
from ads.aqua.extension.evaluation_handler import AquaEvaluationHandler
1616
from tests.unitary.with_extras.aqua.utils import HandlerTestDataset as TestDataset
1717

0 commit comments

Comments
 (0)