avoid circular imports

Author: VipulMascarenhas

ads/aqua/common/utils.py

@@ -38,14 +38,12 @@
     MODEL_BY_REFERENCE_OSS_PATH_KEY,
     SERVICE_MANAGED_CONTAINER_URI_SCHEME,
     SUPPORTED_FILE_FORMATS,
+    TGI_INFERENCE_RESTRICTED_PARAMS,
     UNKNOWN,
     UNKNOWN_JSON_STR,
+    VLLM_INFERENCE_RESTRICTED_PARAMS,
 )
 from ads.aqua.data import AquaResourceIdentifier
-from ads.aqua.modeldeployment.constants import (
-    TGIInferenceRestrictedParams,
-    VLLMInferenceRestrictedParams,
-)
 from ads.common.auth import default_signer
 from ads.common.decorator.threaded import threaded
 from ads.common.extended_enum import ExtendedEnumMeta
@@ -897,13 +895,13 @@ def get_restricted_params_by_container(container_type_name: str) -> set:
 
     Returns
     -------
-        InferenceContainerParamType value
+        Set of restricted params based on container type
 
     """
     # check substring instead of direct match in case container_type_name changes in the future
     if InferenceContainerType.CONTAINER_TYPE_VLLM in container_type_name.lower():
-        return VLLMInferenceRestrictedParams
+        return VLLM_INFERENCE_RESTRICTED_PARAMS
     elif InferenceContainerType.CONTAINER_TYPE_TGI in container_type_name.lower():
-        return TGIInferenceRestrictedParams
+        return TGI_INFERENCE_RESTRICTED_PARAMS
     else:
         return set()

ads/aqua/constants.py

@@ -1,5 +1,4 @@
 #!/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/
 """This module defines constants used in ads.aqua module."""
@@ -45,19 +44,34 @@
 SUPPORTED_FILE_FORMATS = ["jsonl"]
 MODEL_BY_REFERENCE_OSS_PATH_KEY = "artifact_location"
 
-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",
-)
+CONSOLE_LINK_RESOURCE_TYPE_MAPPING = {
+    "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",
+}
+
+VLLM_INFERENCE_RESTRICTED_PARAMS = {
+    "--tensor-parallel-size",
+    "--port",
+    "--host",
+    "--served-model-name",
+    "--seed",
+}
+TGI_INFERENCE_RESTRICTED_PARAMS = {
+    "--port",
+    "--hostname",
+    "--num-shard",
+    "--sharded",
+    "--trust-remote-code",
+}

ads/aqua/modeldeployment/constants.py

@@ -1,5 +1,4 @@
 #!/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/
 
@@ -9,18 +8,3 @@
 
 This module contains constants used in Aqua Model Deployment.
 """
-
-VLLMInferenceRestrictedParams = {
-    "--tensor-parallel-size",
-    "--port",
-    "--host",
-    "--served-model-name",
-    "--seed",
-}
-TGIInferenceRestrictedParams = {
-    "--port",
-    "--hostname",
-    "--num-shard",
-    "--sharded",
-    "--trust-remote-code",
-}