Merge branch 'main' into feature/custom_chat_template

Author: siddhantm005

ads/aqua/extension/common_handler.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # Copyright (c) 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 json
+import os
 from importlib import metadata
 
 import huggingface_hub
@@ -18,6 +18,10 @@
 )
 from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.extension.errors import Errors
+from ads.common.object_storage_details import ObjectStorageDetails
+from ads.common.utils import read_file
+from ads.config import CONDA_BUCKET_NAME, CONDA_BUCKET_NS
+from ads.opctl.operator.common.utils import default_signer
 
 
 class ADSVersionHandler(AquaAPIhandler):
@@ -28,6 +32,46 @@ def get(self):
         self.finish({"data": metadata.version("oracle_ads")})
 
 
+class AquaVersionHandler(AquaAPIhandler):
+    @handle_exceptions
+    def get(self):
+        """
+        Returns the current and latest deployed version of AQUA
+
+        {
+          "installed": {
+            "aqua": "0.1.3.0",
+            "ads": "2.14.2"
+          },
+          "latest": {
+            "aqua": "0.1.4.0",
+            "ads": "2.14.4"
+          }
+        }
+
+        """
+
+        current_aqua_version_path = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)), "..", "version.json"
+        )
+        current_aqua_version = json.loads(read_file(current_aqua_version_path))
+        current_ads_version = {"ads": metadata.version("oracle_ads")}
+        current_version = {"installed": {**current_aqua_version, **current_ads_version}}
+        try:
+            latest_version_artifact_path = ObjectStorageDetails(
+                CONDA_BUCKET_NAME,
+                CONDA_BUCKET_NS,
+                "service_pack/aqua_latest_version.json",
+            ).path
+            latest_version = json.loads(
+                read_file(latest_version_artifact_path, auth=default_signer())
+            )
+        except Exception:
+            latest_version = {"latest": current_version["installed"]}
+        response = {**current_version, **latest_version}
+        return self.finish(response)
+
+
 class CompatibilityCheckHandler(AquaAPIhandler):
     """The handler to check if the extension is compatible."""
 
@@ -118,4 +162,5 @@ def get(self):
     ("network_status", NetworkStatusHandler),
     ("hf_login", HFLoginHandler),
     ("hf_logged_in", HFUserStatusHandler),
+    ("aqua_version", AquaVersionHandler),
 ]

ads/aqua/modeldeployment/deployment.py

@@ -4,6 +4,7 @@
 
 
 import json
+import re
 import shlex
 import threading
 from datetime import datetime, timedelta
@@ -752,14 +753,16 @@ def _create_deployment(
         ).deploy(wait_for_completion=False)
 
         deployment_id = deployment.id
+
         logger.info(
             f"Aqua model deployment {deployment_id} created for model {aqua_model_id}. Work request Id is {deployment.dsc_model_deployment.workflow_req_id}"
         )
+        status_list = []
 
         progress_thread = threading.Thread(
             target=self.get_deployment_status,
             args=(
-                deployment_id,
+                deployment,
                 deployment.dsc_model_deployment.workflow_req_id,
                 model_type,
                 model_name,
@@ -1265,7 +1268,7 @@ def list_shapes(self, **kwargs) -> List[ComputeShapeSummary]:
 
     def get_deployment_status(
         self,
-        model_deployment_id: str,
+        deployment: ModelDeployment,
         work_request_id: str,
         model_type: str,
         model_name: str,
@@ -1287,37 +1290,60 @@ def get_deployment_status(
         AquaDeployment
             An Aqua deployment instance.
         """
-        ocid = get_ocid_substring(model_deployment_id, key_len=8)
-        telemetry_kwargs = {"ocid": ocid}
-
+        ocid = get_ocid_substring(deployment.id, key_len=8)
         data_science_work_request: DataScienceWorkRequest = DataScienceWorkRequest(
             work_request_id
         )
-
         try:
             data_science_work_request.wait_work_request(
                 progress_bar_description="Creating model deployment",
                 max_wait_time=DEFAULT_WAIT_TIME,
                 poll_interval=DEFAULT_POLL_INTERVAL,
             )
         except Exception:
+            status = ""
+            logs = deployment.show_logs().sort_values(by="time", ascending=False)
+
+            if logs and len(logs) > 0:
+                status = logs.iloc[0]["message"]
+
+            status = re.sub(r"[^a-zA-Z0-9]", " ", status)
+
             if data_science_work_request._error_message:
                 error_str = ""
                 for error in data_science_work_request._error_message:
                     error_str = error_str + " " + error.message
 
-            self.telemetry.record_event(
-                category=f"aqua/{model_type}/deployment/status",
-                action="FAILED",
-                detail=error_str,
-                value=model_name,
-                **telemetry_kwargs,
-            )
+                error_str = re.sub(r"[^a-zA-Z0-9]", " ", error_str)
+                telemetry_kwargs = {
+                    "ocid": ocid,
+                    "model_name": model_name,
+                    "work_request_error": error_str,
+                    "status": status,
+                }
+
+                self.telemetry.record_event(
+                    category=f"aqua/{model_type}/deployment/status",
+                    action="FAILED",
+                    **telemetry_kwargs,
+                )
+            else:
+                telemetry_kwargs = {
+                    "ocid": ocid,
+                    "model_name": model_name,
+                    "status": status,
+                }
+
+                self.telemetry.record_event(
+                    category=f"aqua/{model_type}/deployment/status",
+                    action="FAILED",
+                    **telemetry_kwargs,
+                )
 
         else:
-            self.telemetry.record_event_async(
+            telemetry_kwargs = {"ocid": ocid, "model_name": model_name}
+            self.telemetry.record_event(
                 category=f"aqua/{model_type}/deployment/status",
                 action="SUCCEEDED",
-                value=model_name,
                 **telemetry_kwargs,
             )

ads/aqua/version.json

@@ -0,0 +1,3 @@
+{
+  "aqua": "1.0.7"
+}

ads/common/oci_logging.py

@@ -1,22 +1,21 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
 
 # Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import datetime
 import logging
 import time
-from typing import Dict, Union, List
+from typing import Dict, List, Union
 
+import oci.exceptions
 import oci.logging
 import oci.loggingsearch
-import oci.exceptions
+
 from ads.common.decorator.utils import class_or_instance_method
 from ads.common.oci_mixin import OCIModelMixin, OCIWorkRequestMixin
 from ads.common.oci_resource import OCIResource, ResourceNotFoundError
 
-
 logger = logging.getLogger(__name__)
 
 # Maximum number of log records to be returned by default.
@@ -862,9 +861,7 @@ def tail(
             time_start=time_start,
             log_filter=log_filter,
         )
-        self._print(
-            sorted(tail_logs, key=lambda log: log["time"])
-        )
+        self._print(sorted(tail_logs, key=lambda log: log["time"]))
 
     def head(
         self,