Removing oss bucket config

Author: kumar-shivam-ranjan

ads/aqua/__init__.py

@@ -14,7 +14,6 @@
     get_async_httpx_client,
     get_httpx_client,
 )
-from ads.aqua.common.utils import fetch_service_compartment
 from ads.config import OCI_RESOURCE_PRINCIPAL_VERSION
 
 ENV_VAR_LOG_LEVEL = "ADS_AQUA_LOG_LEVEL"
@@ -41,5 +40,5 @@ def set_log_level(log_level: str):
     set_auth("resource_principal")
 
 ODSC_MODEL_COMPARTMENT_OCID = (
-    os.environ.get("ODSC_MODEL_COMPARTMENT_OCID") or fetch_service_compartment()
+    os.environ.get("ODSC_MODEL_COMPARTMENT_OCID") or "ODSC_MODEL_COMPARTMENT_OCID"
 )

ads/aqua/common/utils.py

@@ -49,9 +49,7 @@
 )
 from ads.aqua.constants import (
     AQUA_GA_LIST,
-    COMPARTMENT_MAPPING_KEY,
     CONSOLE_LINK_RESOURCE_TYPE_MAPPING,
-    CONTAINER_INDEX,
     DEPLOYMENT_CONFIG,
     FINE_TUNING_CONFIG,
     HF_LOGIN_DEFAULT_TIMEOUT,
@@ -560,36 +558,6 @@ def _build_job_identifier(
         return AquaResourceIdentifier()
 
 
-def service_config_path():
-    return f"oci://{AQUA_SERVICE_MODELS_BUCKET}@{CONDA_BUCKET_NS}/service_models/config"
-
-
-def fetch_service_compartment() -> Union[str, None]:
-    """
-    Loads the compartment mapping json from service bucket.
-    This json file has a service-model-compartment key which contains a dictionary of namespaces
-    and the compartment OCID of the service models in that namespace.
-    """
-    config_file_name = (
-        f"oci://{AQUA_SERVICE_MODELS_BUCKET}@{CONDA_BUCKET_NS}/service_models/config"
-    )
-
-    try:
-        config = load_config(
-            file_path=config_file_name,
-            config_file_name=CONTAINER_INDEX,
-        )
-    except Exception as e:
-        logger.debug(
-            f"Config file {config_file_name}/{CONTAINER_INDEX} to fetch service compartment OCID "
-            f"could not be found. \n{str(e)}."
-        )
-        return
-    compartment_mapping = config.get(COMPARTMENT_MAPPING_KEY)
-    if compartment_mapping:
-        return compartment_mapping.get(CONDA_BUCKET_NS)
-
-
 def get_max_version(versions):
     """Takes in a list of versions and returns the higher version."""
     if not versions:

ads/aqua/extension/utils.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# 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 re
@@ -14,7 +14,6 @@
 from tornado.web import HTTPError
 
 from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID, logger
-from ads.aqua.common.utils import fetch_service_compartment
 from ads.aqua.constants import (
     AQUA_TROUBLESHOOTING_LINK,
     OCI_OPERATION_FAILURES,
@@ -41,14 +40,14 @@ def ui_compatability_check():
     """This method caches the service compartment OCID details that is set by either the environment variable or if
     fetched from the configuration. The cached result is returned when multiple calls are made in quick succession
     from the UI to avoid multiple config file loads."""
-    return ODSC_MODEL_COMPARTMENT_OCID or fetch_service_compartment()
+    return ODSC_MODEL_COMPARTMENT_OCID
 
 
 def get_default_error_messages(
     service_payload: dict,
     status_code: str,
     default_msg: str = "Unknown HTTP Error.",
-)-> str:
+) -> str:
     """Method that maps the error messages based on the operation performed or the status codes encountered."""
 
     if service_payload and "operation_name" in service_payload:
@@ -66,14 +65,13 @@ def get_documentation_link(key: str) -> str:
     return f"{AQUA_TROUBLESHOOTING_LINK}#{github_header}"
 
 
-def get_troubleshooting_tips(service_payload: dict,
-                             status_code: str) -> str:
+def get_troubleshooting_tips(service_payload: dict, status_code: str) -> str:
     """Maps authorization errors to potential solutions on Troubleshooting Page per Aqua Documentation on oci-data-science-ai-samples"""
 
     tip = f"For general tips on troubleshooting: {AQUA_TROUBLESHOOTING_LINK}"
 
     if status_code in (404, 400):
-        failed_operation = service_payload.get('operation_name')
+        failed_operation = service_payload.get("operation_name")
 
         if failed_operation in OCI_OPERATION_FAILURES:
             link = get_documentation_link(failed_operation)
@@ -118,14 +116,13 @@ def construct_error(status_code: int, **kwargs) -> ReplyDetails:
 
     tips = get_troubleshooting_tips(service_payload, status_code)
 
-
     reply = ReplyDetails(
-        status = status_code,
-        troubleshooting_tips = tips,
-        message = message,
-        service_payload = service_payload,
-        reason = reason,
-        request_id = str(uuid.uuid4()),
+        status=status_code,
+        troubleshooting_tips=tips,
+        message=message,
+        service_payload=service_payload,
+        reason=reason,
+        request_id=str(uuid.uuid4()),
     )
 
     exc_info = kwargs.get("exc_info")

ads/aqua/model/model.py

@@ -933,7 +933,7 @@ def list(
         """
 
         models = []
-        category = kwargs.get("category", USER)
+        category = kwargs.pop("category", USER)
         if compartment_id and category != SERVICE:
             # tracks number of times custom model listing was called
             self.telemetry.record_event_async(
@@ -961,8 +961,9 @@ def list(
 
             models = self.list_resource(
                 self.ds_client.list_models,
-                compartment_id=ODSC_MODEL_COMPARTMENT_OCID,
+                compartment_id=compartment_id or COMPARTMENT_OCID,
                 lifecycle_state=lifecycle_state,
+                category=category,
                 **kwargs,
             )