Adds shapes method to the OciDataScienceModelDeployment

Author: mrDzurb

ads/aqua/common/utils.py

@@ -1229,10 +1229,10 @@ def load_gpu_shapes_index(
     auth: Optional[Dict[str, Any]] = None,
 ) -> GPUShapesIndex:
     """
-    Load the GPU shapes index, preferring the OS bucket copy over the local one.
+    Load the GPU shapes index, merging based on freshness.
 
-    Attempts to read `gpu_shapes_index.json` from OCI Object Storage first;
-    if that succeeds, those entries will override the local defaults.
+    Compares last-modified timestamps of local and remote files,
+    merging the shapes from the fresher file on top of the older one.
 
     Parameters
     ----------
@@ -1253,7 +1253,9 @@ def load_gpu_shapes_index(
     file_name = "gpu_shapes_index.json"
 
     # Try remote load
-    remote_data: Dict[str, Any] = {}
+    local_data, remote_data = {}, {}
+    local_mtime, remote_mtime = None, None
+
     if CONDA_BUCKET_NS:
         try:
             auth = auth or authutil.default_signer()
@@ -1263,8 +1265,24 @@ def load_gpu_shapes_index(
             logger.debug(
                 "Loading GPU shapes index from Object Storage: %s", storage_path
             )
-            with fsspec.open(storage_path, mode="r", **auth) as f:
+
+            fs = fsspec.filesystem("oci", **auth)
+            with fs.open(storage_path, mode="r") as f:
                 remote_data = json.load(f)
+
+            remote_info = fs.info(storage_path)
+            remote_mtime_str = remote_info.get("timeModified", None)
+            if remote_mtime_str:
+                # Convert OCI timestamp (e.g., 'Mon, 04 Aug 2025 06:37:13 GMT') to epoch time
+                remote_mtime = datetime.strptime(
+                    remote_mtime_str, "%a, %d %b %Y %H:%M:%S %Z"
+                ).timestamp()
+
+                logger.debug(
+                    "Remote GPU shapes last-modified time: %s",
+                    datetime.fromtimestamp(remote_mtime).strftime("%Y-%m-%d %H:%M:%S"),
+                )
+
             logger.debug(
                 "Loaded %d shapes from Object Storage",
                 len(remote_data.get("shapes", {})),
@@ -1273,12 +1291,19 @@ def load_gpu_shapes_index(
             logger.debug("Remote load failed (%s); falling back to local", ex)
 
     # Load local copy
-    local_data: Dict[str, Any] = {}
     local_path = os.path.join(os.path.dirname(__file__), "../resources", file_name)
     try:
         logger.debug("Loading GPU shapes index from local file: %s", local_path)
         with open(local_path) as f:
             local_data = json.load(f)
+
+        local_mtime = os.path.getmtime(local_path)
+
+        logger.debug(
+            "Local GPU shapes last-modified time: %s",
+            datetime.fromtimestamp(local_mtime).strftime("%Y-%m-%d %H:%M:%S"),
+        )
+
         logger.debug(
             "Loaded %d shapes from local file", len(local_data.get("shapes", {}))
         )
@@ -1288,7 +1313,24 @@ def load_gpu_shapes_index(
     # Merge: remote shapes override local
     local_shapes = local_data.get("shapes", {})
     remote_shapes = remote_data.get("shapes", {})
-    merged_shapes = {**local_shapes, **remote_shapes}
+    merged_shapes = {}
+
+    if local_mtime and remote_mtime:
+        if remote_mtime >= local_mtime:
+            logger.debug("Remote data is fresher or equal; merging remote over local.")
+            merged_shapes = {**local_shapes, **remote_shapes}
+        else:
+            logger.debug("Local data is fresher; merging local over remote.")
+            merged_shapes = {**remote_shapes, **local_shapes}
+    elif remote_shapes:
+        logger.debug("Only remote shapes available.")
+        merged_shapes = remote_shapes
+    elif local_shapes:
+        logger.debug("Only local shapes available.")
+        merged_shapes = local_shapes
+    else:
+        logger.error("No GPU shapes data found in either source.")
+        merged_shapes = {}
 
     return GPUShapesIndex(shapes=merged_shapes)
 

ads/model/service/oci_datascience_model_deployment.py

@@ -1,23 +1,24 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
 
-# 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/
 
-from functools import wraps
 import logging
-from typing import Callable, List
-from ads.common.oci_datascience import OCIDataScienceMixin
-from ads.common.work_request import DataScienceWorkRequest
-from ads.config import PROJECT_OCID
-from ads.model.deployment.common.utils import OCIClientManager, State
-import oci
+from functools import wraps
+from typing import Callable, List, Optional
 
+import oci
 from oci.data_science.models import (
     CreateModelDeploymentDetails,
+    ModelDeploymentShapeSummary,
     UpdateModelDeploymentDetails,
 )
 
+from ads.common.oci_datascience import OCIDataScienceMixin
+from ads.common.work_request import DataScienceWorkRequest
+from ads.config import COMPARTMENT_OCID, PROJECT_OCID
+from ads.model.deployment.common.utils import OCIClientManager, State
+
 DEFAULT_WAIT_TIME = 1200
 DEFAULT_POLL_INTERVAL = 10
 ALLOWED_STATUS = [
@@ -185,14 +186,13 @@ def activate(
                 self.id,
             )
 
-           
             self.workflow_req_id = response.headers.get("opc-work-request-id", None)
             if wait_for_completion:
                 try:
                     DataScienceWorkRequest(self.workflow_req_id).wait_work_request(
                         progress_bar_description="Activating model deployment",
-                        max_wait_time=max_wait_time, 
-                        poll_interval=poll_interval
+                        max_wait_time=max_wait_time,
+                        poll_interval=poll_interval,
                     )
                 except Exception as e:
                     logger.error(
@@ -239,8 +239,8 @@ def create(
             try:
                 DataScienceWorkRequest(self.workflow_req_id).wait_work_request(
                     progress_bar_description="Creating model deployment",
-                    max_wait_time=max_wait_time, 
-                    poll_interval=poll_interval
+                    max_wait_time=max_wait_time,
+                    poll_interval=poll_interval,
                 )
             except Exception as e:
                 logger.error("Error while trying to create model deployment: " + str(e))
@@ -290,8 +290,8 @@ def deactivate(
                 try:
                     DataScienceWorkRequest(self.workflow_req_id).wait_work_request(
                         progress_bar_description="Deactivating model deployment",
-                        max_wait_time=max_wait_time, 
-                        poll_interval=poll_interval
+                        max_wait_time=max_wait_time,
+                        poll_interval=poll_interval,
                     )
                 except Exception as e:
                     logger.error(
@@ -351,14 +351,14 @@ def delete(
         response = self.client.delete_model_deployment(
             self.id,
         )
-        
+
         self.workflow_req_id = response.headers.get("opc-work-request-id", None)
         if wait_for_completion:
             try:
                 DataScienceWorkRequest(self.workflow_req_id).wait_work_request(
                     progress_bar_description="Deleting model deployment",
-                    max_wait_time=max_wait_time, 
-                    poll_interval=poll_interval
+                    max_wait_time=max_wait_time,
+                    poll_interval=poll_interval,
                 )
             except Exception as e:
                 logger.error("Error while trying to delete model deployment: " + str(e))
@@ -493,3 +493,30 @@ def from_id(cls, model_deployment_id: str) -> "OCIDataScienceModelDeployment":
             An instance of `OCIDataScienceModelDeployment`.
         """
         return super().from_ocid(model_deployment_id)
+
+    @classmethod
+    def shapes(
+        cls,
+        compartment_id: Optional[str] = None,
+        **kwargs,
+    ) -> List[ModelDeploymentShapeSummary]:
+        """
+        Retrieves all available model deployment shapes in the given compartment.
+
+        This method uses OCI's pagination utility to fetch all pages of model
+        deployment shape summaries available in the specified compartment.
+
+        Args:
+            compartment_id (Optional[str]): The OCID of the compartment. If not provided,
+                                            the default COMPARTMENT_ID extracted form env variables is used.
+            **kwargs: Additional keyword arguments to pass to the list_model_deployments call.
+
+        Returns:
+            List[ModelDeploymentShapeSummary]: A list of all model deployment shape summaries.
+        """
+        client = cls().client
+        compartment_id = compartment_id or COMPARTMENT_OCID
+
+        return oci.pagination.list_call_get_all_results(
+            client.list_model_deployment_shapes, compartment_id, **kwargs
+        ).data