Updated pr and added unit tests.

Author: lu-ohai

ads/model/datascience_model_group.py

@@ -21,21 +21,23 @@
         MemberModelEntries,
         ModelGroup,
         ModelGroupDetails,
+        ModelGroupSummary,
         UpdateModelGroupDetails,
     )
-except ModuleNotFoundError:
+except ModuleNotFoundError as err:
     raise ModuleNotFoundError(
         "The oci model group module was not found. Please run `pip install oci` "
         "to install the latest oci sdk."
-    )
+    ) from err
 
 DEFAULT_WAIT_TIME = 1200
 DEFAULT_POLL_INTERVAL = 10
 ALLOWED_CREATE_TYPES = ["CREATE", "CLONE"]
+MODEL_GROUP_KIND = "datascienceModelGroup"
 
 
 class DataScienceModelGroup(Builder):
-    """Represents a Data Science Model.
+    """Represents a Data Science Model Group.
 
     Attributes
     ----------
@@ -198,6 +200,11 @@ def __init__(self, spec=None, **kwargs):
         super().__init__(spec, **kwargs)
         self.dsc_model_group = OCIDataScienceModelGroup()
 
+    @property
+    def kind(self) -> str:
+        """The kind of the model group as showing in a YAML."""
+        return MODEL_GROUP_KIND
+
     @property
     def id(self) -> str:
         """The model group OCID."""
@@ -503,6 +510,7 @@ def create(
         return self._update_from_oci_model(response)
 
     def _build_model_group_details(self) -> dict:
+        """Builds model group details dict for creating or updating oci model group."""
         model_group_details = HomogeneousModelGroupDetails(
             custom_metadata_list=[
                 CustomMetadata(
@@ -537,8 +545,21 @@ def _build_model_group_details(self) -> dict:
         return build_model_group_details
 
     def _update_from_oci_model(
-        self, oci_model_group_instance: ModelGroup
+        self, oci_model_group_instance: Union[ModelGroup, ModelGroupSummary]
     ) -> "DataScienceModelGroup":
+        """Updates self spec from oci model group instance.
+
+        Parameters
+        ----------
+        oci_model_group_instance: Union[ModelGroup, ModelGroupSummary]
+            The oci model group instance, could be an instance of oci.data_science.models.ModelGroup
+            or oci.data_science.models.ModelGroupSummary.
+
+        Returns
+        -------
+        DataScienceModelGroup
+           The instance of DataScienceModelGroup.
+        """
         self.dsc_model_group = oci_model_group_instance
         for key, value in self.attribute_map.items():
             if hasattr(oci_model_group_instance, value):
@@ -560,23 +581,27 @@ def _update_from_oci_model(
             )
         self.set_spec(self.CONST_CUSTOM_METADATA_LIST, model_custom_metadata)
 
-        member_model_entries: MemberModelEntries = (
-            oci_model_group_instance.member_model_entries
-        )
-        member_model_details: List[MemberModelDetails] = (
-            member_model_entries.member_model_details
-        )
+        # only updates member_models when oci_model_group_instance is an instance of
+        # oci.data_science.models.ModelGroup as oci.data_science.models.ModelGroupSummary
+        # doesn't have member_model_entries property.
+        if isinstance(oci_model_group_instance, ModelGroup):
+            member_model_entries: MemberModelEntries = (
+                oci_model_group_instance.member_model_entries
+            )
+            member_model_details: List[MemberModelDetails] = (
+                member_model_entries.member_model_details
+            )
 
-        self.set_spec(
-            self.CONST_MEMBER_MODELS,
-            [
-                {
-                    "inference_key": member_model_detail.inference_key,
-                    "model_id": member_model_detail.model_id,
-                }
-                for member_model_detail in member_model_details
-            ],
-        )
+            self.set_spec(
+                self.CONST_MEMBER_MODELS,
+                [
+                    {
+                        "inference_key": member_model_detail.inference_key,
+                        "model_id": member_model_detail.model_id,
+                    }
+                    for member_model_detail in member_model_details
+                ],
+            )
 
         return self
 
@@ -729,18 +754,18 @@ def sync(self) -> "DataScienceModelGroup":
     @classmethod
     def list(
         cls,
+        status: str = None,
         compartment_id: str = None,
-        project_id: str = None,
         **kwargs,
     ) -> List["DataScienceModelGroup"]:
         """Lists datascience model groups in a given compartment.
 
         Parameters
         ----------
+        status: (str, optional). Defaults to `None`.
+                        The status of model group. Allowed values: `ACTIVE`, `CREATING`, `DELETED`, `DELETING`, `FAILED` and `INACTIVE`.
         compartment_id: (str, optional). Defaults to `None`.
             The compartment OCID.
-        project_id: (str, optional). Defaults to `None`.
-            The project OCID.
         kwargs
             Additional keyword arguments for filtering model groups.
 
@@ -750,9 +775,11 @@ def list(
             The list of the datascience model groups.
         """
         return [
-            cls()._update_from_oci_model(model_group)
-            for model_group in OCIDataScienceModelGroup.list_resource(
-                compartment_id, project_id=project_id, **kwargs
+            cls()._update_from_oci_model(model_group_summary)
+            for model_group_summary in OCIDataScienceModelGroup.list(
+                status=status,
+                compartment_id=compartment_id,
+                **kwargs,
             )
         ]
 

ads/model/service/oci_datascience_model_group.py

@@ -11,13 +11,15 @@
 
 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
 
 try:
     from oci.data_science.models import CreateModelGroupDetails, UpdateModelGroupDetails
-except:
-    raise
+except ModuleNotFoundError as err:
+    raise ModuleNotFoundError(
+        "The oci model group module was not found. Please run `pip install oci` "
+        "to install the latest oci sdk."
+    ) from err
 
 logger = logging.getLogger(__name__)
 
@@ -116,8 +118,8 @@ class OCIDataScienceModelGroup(
         Deletes datascience model group.
     update(self, ...) -> "OCIDataScienceModelGroup":
         Updates datascience model group.
-    list(self, ...) -> list[oci.data_science.models.ModelGroup]:
-        List oci.data_science.models.ModelGroup instances within given compartment and project.
+    list(self, ...) -> list[oci.data_science.models.ModelGroupSummary]:
+        List oci.data_science.models.ModelGroupSummary instances within given compartment.
     from_id(cls, model_group: str) -> "OCIDataScienceModelGroup":
         Gets model group by OCID.
 
@@ -396,8 +398,8 @@ def update(
         """
         if wait_for_completion:
             wait_for_states = [
-                oci.data_science.models.WorkRequest.STATUS_SUCCEEDED,
-                oci.data_science.models.WorkRequest.STATUS_FAILED,
+                self.LIFECYCLE_STATE_ACTIVE,
+                self.LIFECYCLE_STATE_FAILED,
             ]
         else:
             wait_for_states = []
@@ -423,7 +425,6 @@ def list(
         cls,
         status: str = None,
         compartment_id: str = None,
-        project_id: str = None,
         **kwargs,
     ) -> list:
         """Lists the model group associated with current compartment id and status
@@ -438,16 +439,13 @@ def list(
             Defaults to the compartment set in the environment variable "NB_SESSION_COMPARTMENT_OCID".
             If "NB_SESSION_COMPARTMENT_OCID" is not set, the root compartment ID will be used.
             An ValueError will be raised if root compartment ID cannot be determined.
-        project_id : str
-            Target project to list model groups from.
-            Defaults to the project id in the environment variable "PROJECT_OCID".
         kwargs :
             The values are passed to oci.data_science.DataScienceClient.list_model_groups.
 
         Returns
         -------
         list
-            A list of oci.data_science.models.ModelGroup objects.
+            A list of oci.data_science.models.ModelGroupSummary objects.
 
         Raises
         ------
@@ -461,10 +459,6 @@ def list(
                 "Unable to determine compartment ID from environment. Specify `compartment_id`."
             )
 
-        project_id = project_id or PROJECT_OCID
-        if project_id:
-            kwargs["project_id"] = project_id
-
         if status is not None:
             if status not in ALLOWED_STATUS:
                 raise ValueError(