Aqua refactor: use const in aqua.constants.py (#849)

Author: mingkang111

ads/aqua/app.py

@@ -15,12 +15,12 @@
 from ads.aqua.common.enums import Tags
 from ads.aqua.common.errors import AquaRuntimeError, AquaValueError
 from ads.aqua.common.utils import (
-    UNKNOWN,
     _is_valid_mvs,
     get_artifact_path,
     is_valid_ocid,
     load_config,
 )
+from ads.aqua.constants import UNKNOWN
 from ads.common import oci_client as oc
 from ads.common.auth import default_signer
 from ads.common.utils import extract_region

ads/aqua/common/utils.py

@@ -27,7 +27,7 @@
     AquaRuntimeError,
     AquaValueError,
 )
-from ads.aqua.constants import SERVICE_MANAGED_CONTAINER_URI_SCHEME
+from ads.aqua.constants import *
 from ads.aqua.data import AquaResourceIdentifier
 from ads.common.auth import AuthState, default_signer
 from ads.common.extended_enum import ExtendedEnumMeta
@@ -39,50 +39,6 @@
 
 logger = logging.getLogger("ads.aqua")
 
-UNKNOWN = ""
-UNKNOWN_DICT = {}
-README = "README.md"
-LICENSE_TXT = "config/LICENSE.txt"
-DEPLOYMENT_CONFIG = "deployment_config.json"
-COMPARTMENT_MAPPING_KEY = "service-model-compartment"
-CONTAINER_INDEX = "container_index.json"
-EVALUATION_REPORT_JSON = "report.json"
-EVALUATION_REPORT_MD = "report.md"
-EVALUATION_REPORT = "report.html"
-UNKNOWN_JSON_STR = "{}"
-CONSOLE_LINK_RESOURCE_TYPE_MAPPING = dict(
-    datasciencemodel="models",
-    datasciencemodeldeployment="model-deployments",
-    datasciencemodeldeploymentdev="model-deployments",
-    datasciencemodeldeploymentint="model-deployments",
-    datasciencemodeldeploymentpre="model-deployments",
-    datasciencejob="jobs",
-    datasciencejobrun="job-runs",
-    datasciencejobrundev="job-runs",
-    datasciencejobrunint="job-runs",
-    datasciencejobrunpre="job-runs",
-    datasciencemodelversionset="model-version-sets",
-    datasciencemodelversionsetpre="model-version-sets",
-    datasciencemodelversionsetint="model-version-sets",
-    datasciencemodelversionsetdev="model-version-sets",
-)
-FINE_TUNING_RUNTIME_CONTAINER = "iad.ocir.io/ociodscdev/aqua_ft_cuda121:0.3.17.20"
-DEFAULT_FT_BLOCK_STORAGE_SIZE = 750
-DEFAULT_FT_REPLICA = 1
-DEFAULT_FT_BATCH_SIZE = 1
-DEFAULT_FT_VALIDATION_SET_SIZE = 0.1
-
-HF_MODELS = "/home/datascience/conda/pytorch21_p39_gpu_v1/"
-MAXIMUM_ALLOWED_DATASET_IN_BYTE = 52428800  # 1024 x 1024 x 50 = 50MB
-JOB_INFRASTRUCTURE_TYPE_DEFAULT_NETWORKING = "ME_STANDALONE"
-NB_SESSION_IDENTIFIER = "NB_SESSION_OCID"
-LIFECYCLE_DETAILS_MISSING_JOBRUN = "The asscociated JobRun resource has been deleted."
-READY_TO_DEPLOY_STATUS = "ACTIVE"
-READY_TO_FINE_TUNE_STATUS = "TRUE"
-AQUA_GA_LIST = ["id19sfcrra6z"]
-AQUA_MODEL_TYPE_SERVICE = "service"
-AQUA_MODEL_TYPE_CUSTOM = "custom"
-
 
 class LifecycleStatus(str, metaclass=ExtendedEnumMeta):
     UNKNOWN = ""
@@ -143,8 +99,6 @@ def get_status(evaluation_status: str, job_run_status: str = None):
     JobRun.LIFECYCLE_STATE_FAILED: "The evaluation failed.",
     JobRun.LIFECYCLE_STATE_NEEDS_ATTENTION: "Missing jobrun information.",
 }
-SUPPORTED_FILE_FORMATS = ["jsonl"]
-MODEL_BY_REFERENCE_OSS_PATH_KEY = "artifact_location"
 
 
 def random_color_generator(word: str):

ads/aqua/constants.py

@@ -39,3 +39,5 @@
 VALIDATION_METRICS = "validation_metrics"
 
 SERVICE_MANAGED_CONTAINER_URI_SCHEME = "dsmc://"
+SUPPORTED_FILE_FORMATS = ["jsonl"]
+MODEL_BY_REFERENCE_OSS_PATH_KEY = "artifact_location"

ads/aqua/evaluation/evaluation.py

@@ -40,15 +40,17 @@
     AquaValueError,
 )
 from ads.aqua.common.utils import (
-    JOB_INFRASTRUCTURE_TYPE_DEFAULT_NETWORKING,
-    NB_SESSION_IDENTIFIER,
-    UNKNOWN,
     extract_id_and_name_from_tag,
     fire_and_forget,
     get_container_image,
     is_valid_ocid,
     upload_local_to_os,
 )
+from ads.aqua.constants import (
+    JOB_INFRASTRUCTURE_TYPE_DEFAULT_NETWORKING,
+    NB_SESSION_IDENTIFIER,
+    UNKNOWN,
+)
 from ads.aqua.evaluation.constants import *
 from ads.aqua.evaluation.entities import *
 from ads.aqua.evaluation.errors import *

ads/aqua/finetuning/finetuning.py

@@ -18,16 +18,15 @@
 from ads.aqua.app import AquaApp
 from ads.aqua.common.enums import Resource, Tags
 from ads.aqua.common.errors import AquaFileExistsError, AquaValueError
-from ads.aqua.common.utils import (
+from ads.aqua.common.utils import get_container_image, upload_local_to_os
+from ads.aqua.constants import (
     DEFAULT_FT_BATCH_SIZE,
     DEFAULT_FT_BLOCK_STORAGE_SIZE,
     DEFAULT_FT_REPLICA,
     DEFAULT_FT_VALIDATION_SET_SIZE,
     JOB_INFRASTRUCTURE_TYPE_DEFAULT_NETWORKING,
     UNKNOWN,
     UNKNOWN_DICT,
-    get_container_image,
-    upload_local_to_os,
 )
 from ads.aqua.data import AquaResourceIdentifier
 from ads.aqua.finetuning.constants import *

ads/aqua/model/model.py

@@ -18,22 +18,22 @@
 from ads.aqua.common.enums import Tags
 from ads.aqua.common.errors import AquaRuntimeError
 from ads.aqua.common.utils import (
-    LICENSE_TXT,
-    MODEL_BY_REFERENCE_OSS_PATH_KEY,
-    README,
-    READY_TO_DEPLOY_STATUS,
-    READY_TO_FINE_TUNE_STATUS,
-    UNKNOWN,
     create_word_icon,
     get_artifact_path,
     is_service_managed_container,
     read_file,
     upload_folder,
 )
 from ads.aqua.constants import (
+    LICENSE_TXT,
+    MODEL_BY_REFERENCE_OSS_PATH_KEY,
+    README,
+    READY_TO_DEPLOY_STATUS,
+    READY_TO_FINE_TUNE_STATUS,
     READY_TO_IMPORT_STATUS,
     TRAINING_METRICS_FINAL,
     TRINING_METRICS,
+    UNKNOWN,
     VALIDATION_METRICS,
     VALIDATION_METRICS_FINAL,
 )

ads/aqua/modeldeployment/deployment.py

@@ -12,18 +12,20 @@
 from ads.aqua.common.enums import Tags
 from ads.aqua.common.errors import AquaRuntimeError, AquaValueError
 from ads.aqua.common.utils import (
-    AQUA_MODEL_TYPE_CUSTOM,
-    AQUA_MODEL_TYPE_SERVICE,
-    MODEL_BY_REFERENCE_OSS_PATH_KEY,
-    UNKNOWN,
-    UNKNOWN_DICT,
     get_container_config,
     get_container_image,
     get_model_by_reference_paths,
     get_ocid_substring,
     get_resource_name,
     load_config,
 )
+from ads.aqua.constants import (
+    AQUA_MODEL_TYPE_CUSTOM,
+    AQUA_MODEL_TYPE_SERVICE,
+    MODEL_BY_REFERENCE_OSS_PATH_KEY,
+    UNKNOWN,
+    UNKNOWN_DICT,
+)
 from ads.aqua.data import AquaResourceIdentifier
 from ads.aqua.finetuning.finetuning import FineTuneCustomMetadata
 from ads.aqua.model import AquaModelApp

ads/aqua/modeldeployment/entities.py

@@ -9,7 +9,7 @@
 from oci.data_science.models import ModelDeployment, ModelDeploymentSummary
 
 from ads.aqua.common.enums import Tags
-from ads.aqua.common.utils import UNKNOWN, UNKNOWN_DICT
+from ads.aqua.constants import UNKNOWN, UNKNOWN_DICT
 from ads.aqua.data import AquaResourceIdentifier
 from ads.common.serializer import DataClassSerializable
 from ads.common.utils import get_console_link

tests/unitary/with_extras/aqua/test_common_handler.py

@@ -13,7 +13,7 @@
 
 import ads.aqua
 import ads.config
-from ads.aqua.common.utils import AQUA_GA_LIST
+from ads.aqua.constants import AQUA_GA_LIST
 from ads.aqua.extension.common_handler import CompatibilityCheckHandler
 
 

tests/unitary/with_extras/aqua/test_evaluation.py

@@ -22,7 +22,7 @@
     AquaMissingKeyError,
     AquaRuntimeError,
 )
-from ads.aqua.common.utils import EVALUATION_REPORT_JSON, EVALUATION_REPORT_MD, UNKNOWN
+from ads.aqua.constants import EVALUATION_REPORT_JSON, EVALUATION_REPORT_MD, UNKNOWN
 from ads.aqua.evaluation import AquaEvaluationApp
 from ads.aqua.evaluation.entities import (
     AquaEvalMetrics,