update hello reload pr

Author: VipulMascarenhas

ads/aqua/__init__.py

@@ -18,19 +18,12 @@
 if OCI_RESOURCE_PRINCIPAL_VERSION:
     set_auth("resource_principal")
 
-ODSC_MODEL_COMPARTMENT_OCID = os.environ.get("ODSC_MODEL_COMPARTMENT_OCID")
+ODSC_MODEL_COMPARTMENT_OCID = (
+    os.environ.get("ODSC_MODEL_COMPARTMENT_OCID") or fetch_service_compartment()
+)
 if not ODSC_MODEL_COMPARTMENT_OCID:
-    try:
-        ODSC_MODEL_COMPARTMENT_OCID = fetch_service_compartment()
-    except:
-        pass
-
-if not ODSC_MODEL_COMPARTMENT_OCID:
-    logger.error(
-        f"ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua."
-    )
     if NB_SESSION_OCID:
         logger.error(
-            f"Aqua is not available for this notebook session {NB_SESSION_OCID}."
+            f"Aqua is not available for the notebook session {NB_SESSION_OCID}."
         )
     exit()

ads/aqua/extension/common_handler.py

@@ -39,9 +39,7 @@ def get(self):
             AquaResourceAccessError: raised when aqua is not accessible in the given session/region.
 
         """
-        if (
-            ODSC_MODEL_COMPARTMENT_OCID or fetch_service_compartment()
-        ):  # TODO replace this with method that does not raise exception
+        if ODSC_MODEL_COMPARTMENT_OCID or fetch_service_compartment():
             return self.finish(dict(status="ok"))
         elif known_realm():
             return self.finish(dict(status="compatible"))

ads/aqua/utils.py

@@ -584,14 +584,19 @@ def fetch_service_compartment():
         f"oci://{AQUA_SERVICE_MODELS_BUCKET}@{CONDA_BUCKET_NS}/service_models/config"
     )
 
-    config = load_config(
-        file_path=config_file_name,
-        config_file_name=CONTAINER_INDEX,
-    )
+    try:
+        config = load_config(
+            file_path=config_file_name,
+            config_file_name=CONTAINER_INDEX,
+        )
+    except AquaFileNotFoundError:
+        logger.error(
+            f"ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua."
+        )
+        return
     compartment_mapping = config.get(COMPARTMENT_MAPPING_KEY)
     if compartment_mapping:
         return compartment_mapping.get(CONDA_BUCKET_NS)
-    return None
 
 
 def get_max_version(versions):