testing in INT

Author: agrimk

ads/aqua/modeldeployment/constants.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/
 
 """
@@ -8,5 +8,6 @@
 
 This module contains constants used in Aqua Model Deployment.
 """
-DEFAULT_WAIT_TIME = 1200
-DEFAULT_POLL_INTERVAL = 10
+
+DEFAULT_WAIT_TIME = 120
+DEFAULT_POLL_INTERVAL = 10

ads/aqua/modeldeployment/deployment.py

@@ -8,9 +8,6 @@
 from typing import Dict, List, Optional, Union
 
 from cachetools import TTLCache, cached
-from ads.aqua.modeldeployment.constants import DEFAULT_POLL_INTERVAL, DEFAULT_WAIT_TIME
-from ads.common.decorator.threaded import threaded
-from ads.common.work_request import DataScienceWorkRequest
 from oci.data_science.models import ModelDeploymentShapeSummary
 from pydantic import ValidationError
 
@@ -49,16 +46,16 @@
     AQUA_MULTI_MODEL_CONFIG,
     MODEL_BY_REFERENCE_OSS_PATH_KEY,
     MODEL_NAME_DELIMITER,
-    UNKNOWN_DICT
+    UNKNOWN_DICT,
 )
-
 from ads.aqua.data import AquaResourceIdentifier
 from ads.aqua.model import AquaModelApp
 from ads.aqua.model.constants import AquaModelMetadataKeys, ModelCustomMetadataFields
 from ads.aqua.model.utils import (
     extract_base_model_from_ft,
     extract_fine_tune_artifacts_path,
 )
+from ads.aqua.modeldeployment.constants import DEFAULT_POLL_INTERVAL, DEFAULT_WAIT_TIME
 from ads.aqua.modeldeployment.entities import (
     AquaDeployment,
     AquaDeploymentConfig,
@@ -69,8 +66,10 @@
     ModelDeploymentConfigSummary,
 )
 from ads.aqua.modeldeployment.utils import MultiModelDeploymentConfigLoader
+from ads.common.decorator.threaded import thread_pool
 from ads.common.object_storage_details import ObjectStorageDetails
 from ads.common.utils import UNKNOWN, get_log_links
+from ads.common.work_request import DataScienceWorkRequest
 from ads.config import (
     AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME,
     AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME,
@@ -85,10 +84,9 @@
     ModelDeploymentInfrastructure,
     ModelDeploymentMode,
 )
-
 from ads.model.model_metadata import ModelCustomMetadataItem
 from ads.telemetry import telemetry
-from ads.common.decorator.threaded import thread_pool
+
 
 class AquaDeploymentApp(AquaApp):
     """Provides a suite of APIs to interact with Aqua model deployments within the Oracle
@@ -795,11 +793,13 @@ def _create_deployment(
         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}"
         )
-        
-        thread_pool.submit( self.get_deployment_status ,
-            deployment_id, 
+
+        thread_pool.submit(
+            self.get_deployment_status,
+            deployment_id,
             deployment.dsc_model_deployment.workflow_req_id,
-            model_type)
+            model_type,
+        )
 
         # we arbitrarily choose last 8 characters of OCID to identify MD in telemetry
         telemetry_kwargs = {"ocid": get_ocid_substring(deployment_id, key_len=8)}
@@ -1324,12 +1324,14 @@ def list_shapes(self, **kwargs) -> List[ComputeShapeSummary]:
             for oci_shape in oci_shapes
         ]
 
-    def get_deployment_status(self,model_deployment_id: str, work_request_id : str, model_type : str) -> None:
+    def get_deployment_status(
+        self, model_deployment_id: str, work_request_id: str, model_type: str
+    ) -> None:
         """Waits for the data science  model deployment to be completed and log its status in telemetry.
 
         Parameters
         ----------
-        
+
         model_deployment_id: str
             The id of the deployed aqua model.
         work_request_id: str
@@ -1342,29 +1344,33 @@ def get_deployment_status(self,model_deployment_id: str, work_request_id : str,
         AquaDeployment
             An Aqua deployment instance.
         """
-        telemetry_kwargs = {"ocid": get_ocid_substring(model_deployment_id, key_len=8)}
+        ocid = get_ocid_substring(model_deployment_id, key_len=8)
+        telemetry_kwargs = {"ocid": ocid}
+
+        data_science_work_request: DataScienceWorkRequest = DataScienceWorkRequest(
+            work_request_id
+        )
 
-        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
+                max_wait_time=DEFAULT_WAIT_TIME,
+                poll_interval=DEFAULT_POLL_INTERVAL,
             )
         except Exception as e:
-            logger.error(
-                "Error while trying to create model deployment: " + str(e)
-            )
+            logger.error("Error while trying to create model deployment: " + str(e))
+            print("Error while trying to create model deployment: " + str(e))
             self.telemetry.record_event_async(
                 category=f"aqua/{model_type}/deployment/status",
                 action="FAILED",
-                detail=data_science_work_request._error_message
-                **telemetry_kwargs
+                detail=data_science_work_request._error_message,
+                value=ocid,
+                **telemetry_kwargs,
             )
-        else :
+        else:
             self.telemetry.record_event_async(
-                    category=f"aqua/{model_type}/deployment/status",
-                    action="SUCCEEDED",
-                    **telemetry_kwargs
-                )
+                category=f"aqua/{model_type}/deployment/status",
+                action="SUCCEEDED",
+                value=ocid,
+                **telemetry_kwargs,
+            )

ads/telemetry/client.py

@@ -3,12 +3,11 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 
+import concurrent.futures
 import logging
-import threading
 import traceback
 import urllib.parse
 from typing import Optional
-import concurrent.futures
 
 import oci
 
@@ -20,6 +19,7 @@
 THREAD_POOL_SIZE = 16
 thread_pool = concurrent.futures.ThreadPoolExecutor(max_workers=THREAD_POOL_SIZE)
 
+
 class TelemetryClient(TelemetryBase):
     """Represents a telemetry python client providing functions to record an event.
 
@@ -81,7 +81,8 @@ def record_event(
             # Here `endpoint`` is for debugging purpose
             # For some federated/domain users, the `endpoint` may not be a valid URL
             endpoint = f"{self.service_endpoint}/n/{self.namespace}/b/{self.bucket}/o/telemetry/{category}/{action}"
-            logger.debug(f"Sending telemetry to endpoint: {endpoint}")
+            logger.info(f"Sending telemetry to endpoint: {endpoint}")
+            print(f"Sending telemetry to endpoint: {endpoint}")
 
             self.os_client.base_client.user_agent = self._encode_user_agent(**kwargs)
             try:
@@ -104,7 +105,7 @@ def record_event(
 
     def record_event_async(
         self, category: str = None, action: str = None, detail: str = None, **kwargs
-    )-> None:
+    ) -> None:
         """Send a head request to generate an event record.
 
         Parameters
@@ -119,4 +120,4 @@ def record_event_async(
         Thread
             A started thread to send a head request to generate an event record.
         """
-        thread_pool.submit(self.record_event, category, action, detail, **kwargs)
+        thread_pool.submit(self.record_event, category, action, detail, **kwargs)