updated as per comments and added missing api and column

Author: iamishaan

ads/model/datascience_model.py

@@ -333,6 +333,29 @@ def lifecycle_state(self) -> Union[str, None]:
         if self.dsc_model:
             return self.dsc_model.status
         return None
+    
+    @property
+    def lifecycle_details(self) -> str:
+        """
+        Gets the lifecycle_details of this DataScienceModel.
+        Details about the lifecycle state of the model.
+
+        :return: The lifecycle_details of this DataScienceModel.
+        :rtype: str
+        """
+        return self.get_spec(self.CONST_LIFECYCLE_DETAILS)
+
+    @lifecycle_details.setter
+    def lifecycle_details(self, lifecycle_details: str) -> "DataScienceModel":
+        """
+        Sets the lifecycle_details of this DataScienceModel.
+        Details about the lifecycle state of the model.
+
+        :param lifecycle_details: The lifecycle_details of this DataScienceModel.
+        :type: str
+        """
+        return self.set_spec(self.CONST_LIFECYCLE_DETAILS, lifecycle_details)
+
 
     @property
     def kind(self) -> str:
@@ -737,15 +760,13 @@ def with_retention_setting(self, retention_setting: Union[Dict, ModelRetentionSe
             The `DataScienceModel` instance (self) for method chaining.
         """
         if retention_setting and isinstance(retention_setting, dict):
-            try:
-                retention_setting = ModelRetentionSetting.from_dict(retention_setting)
-            except Exception as err:
-                logger.warn(f"Failed to convert retention_setting from dict: {err}")
+            retention_setting = ModelRetentionSetting.from_dict(retention_setting)
 
         return self.set_spec(self.CONST_RETENTION_SETTING, retention_setting)
 
 
 
+
     @property
     def backup_setting(self) -> ModelBackupSetting:
         """
@@ -769,15 +790,13 @@ def with_backup_setting(self, backup_setting: Union[Dict, ModelBackupSetting]) -
         Returns
         -------
         DataScienceModel
-            The `DataScienceModel` instance (self) for method chaining.
+           The `DataScienceModel` instance (self) for method chaining.
         """
         if backup_setting and isinstance(backup_setting, dict):
-            try:
-                backup_setting = ModelBackupSetting.from_dict(backup_setting)
-            except Exception as err:
-                logger.warn(f"Failed to convert backup_setting from dict: {err}")
+            backup_setting = ModelBackupSetting.from_dict(backup_setting)
 
         return self.set_spec(self.CONST_BACKUP_SETTING, backup_setting)
+
 
     @property
     def retention_operation_details(self) -> ModelRetentionOperationDetails:
@@ -788,16 +807,6 @@ def retention_operation_details(self) -> ModelRetentionOperationDetails:
         :rtype: ModelRetentionOperationDetails
         """
         return self.get_spec(self.CONST_RETENTION_OPERATION_DETAILS)
-
-    @retention_operation_details.setter
-    def retention_operation_details(self, retention_operation_details: ModelRetentionOperationDetails) -> "DataScienceModel":
-        """
-        Sets the retention_operation_details of this Model using the spec constant.
-
-        :param retention_operation_details: The retention_operation_details of this Model.
-        :type: ModelRetentionOperationDetails
-        """
-        return self.set_spec(self.CONST_RETENTION_OPERATION_DETAILS, retention_operation_details)
 
     @property
     def backup_operation_details(self) -> "ModelBackupOperationDetails":
@@ -809,16 +818,6 @@ def backup_operation_details(self) -> "ModelBackupOperationDetails":
         """
         return self.get_spec(self.CONST_BACKUP_OPERATION_DETAILS)
 
-    @backup_operation_details.setter
-    def backup_operation_details(self, backup_operation_details: "ModelBackupOperationDetails") -> "DataScienceModel":
-        """
-        Sets the backup_operation_details of this Model using the spec constant.
-
-        :param backup_operation_details: The backup_operation_details of this Model.
-        :type: ModelBackupOperationDetails
-        """
-        return self.set_spec(self.CONST_BACKUP_OPERATION_DETAILS, backup_operation_details)
-
     def create(self, **kwargs) -> "DataScienceModel":
         """Creates datascience model.
 
@@ -1043,6 +1042,45 @@ def _remove_file_description_artifact(self):
         if self.local_copy_dir:
             shutil.rmtree(self.local_copy_dir, ignore_errors=True)
 
+    
+    def restore_model(
+    self,
+    model_id: str,
+    restore_model_for_hours_specified: Optional[int] = None,
+    ):
+        """
+        Restore archived model artifact.
+
+        Parameters
+        ----------
+        model_id : str
+            The `OCID` of the model to be restored.
+            restore_model_for_hours_specified : Optional[int]
+            Duration in hours for which the archived model is available for access.
+
+        Returns
+        -------
+        None
+
+        Raises
+        ------
+        ValueError
+            If the model ID is invalid or if any parameters are incorrect.
+        """
+        # Validate model_id
+        if not model_id or not isinstance(model_id, str):
+            raise ValueError("model_id must be a non-empty string.")
+
+        # Optional: Validate restore_model_for_hours_specified
+        if restore_model_for_hours_specified is not None:
+            if not isinstance(restore_model_for_hours_specified, int) or restore_model_for_hours_specified <= 0:
+                raise ValueError("restore_model_for_hours_specified must be a positive integer.")
+
+        self.dsc_model.restore_archived_model_artifact(
+        model_id=model_id,
+        restore_model_for_hours_specified=restore_model_for_hours_specified)
+
+
     def download_artifact(
         self,
         target_dir: str,
@@ -1298,6 +1336,8 @@ def _init_complex_attributes(self):
         self.with_provenance_metadata(self.provenance_metadata)
         self.with_input_schema(self.input_schema)
         self.with_output_schema(self.output_schema)
+        self.with_backup_setting(self.backup_setting)
+        self.with_retention_setting(self.retention_setting)
 
     def _to_oci_dsc_model(self, **kwargs):
         """Creates an `OCIDataScienceModel` instance from the  `DataScienceModel`.

ads/model/model_metadata.py

@@ -1794,7 +1794,7 @@ def __init__(self, is_backup_enabled: Optional[bool] = None, backup_region: Opti
                  customer_notification_type: Optional[CustomerNotificationType] = None):
         self.is_backup_enabled = is_backup_enabled if is_backup_enabled is not None else False
         self.backup_region = backup_region
-        self.customer_notification_type = customer_notification_type if customer_notification_type is not None else CustomerNotificationType.NONE
+        self.customer_notification_type = customer_notification_type or CustomerNotificationType.NONE
 
     def to_dict(self) -> Dict:
         """Serializes the backup settings into a dictionary."""
@@ -1810,7 +1810,7 @@ def from_dict(cls, data: Dict) -> 'ModelBackupSetting':
         return cls(
             is_backup_enabled=data.get("is_backup_enabled"),
             backup_region=data.get("backup_region"),
-            customer_notification_type=CustomerNotificationType(data.get("customer_notification_type", CustomerNotificationType.NONE.value))
+            customer_notification_type = CustomerNotificationType(data.get("customer_notification_type")) or None
         )
 
     def to_json(self) -> str:
@@ -1838,7 +1838,8 @@ def validate(self) -> bool:
         return True
 
     def __repr__(self):
-        return f"ModelBackupSetting(is_backup_enabled={self.is_backup_enabled}, backup_region={self.backup_region}, customer_notification_type={self.customer_notification_type})"
+        return self.to_yaml()
+
 
 
 class ModelRetentionSetting:
@@ -1865,7 +1866,7 @@ def __init__(self, archive_after_days: Optional[int] = None, delete_after_days:
                  customer_notification_type: Optional[CustomerNotificationType] = None):
         self.archive_after_days = archive_after_days
         self.delete_after_days = delete_after_days
-        self.customer_notification_type = customer_notification_type if customer_notification_type is not None else CustomerNotificationType.NONE
+        self.customer_notification_type = customer_notification_type or CustomerNotificationType.NONE
 
     def to_dict(self) -> Dict:
         """Serializes the retention settings into a dictionary."""
@@ -1881,7 +1882,7 @@ def from_dict(cls, data: Dict) -> 'ModelRetentionSetting':
         return cls(
             archive_after_days=data.get("archive_after_days"),
             delete_after_days=data.get("delete_after_days"),
-            customer_notification_type=CustomerNotificationType(data.get("customer_notification_type", CustomerNotificationType.NONE.value))
+            customer_notification_type = CustomerNotificationType(data.get("customer_notification_type")) or None
         )
 
     def to_json(self) -> str:
@@ -1909,7 +1910,7 @@ def validate(self) -> bool:
         return True
 
     def __repr__(self):
-        return f"ModelRetentionSetting(archive_after_days={self.archive_after_days}, delete_after_days={self.delete_after_days}, customer_notification_type={self.customer_notification_type})"
+        return self.to_yaml()
 
 
 class SettingStatus(str, ExtendedEnumMeta):
@@ -1945,19 +1946,19 @@ def __init__(self,
                  delete_state_details: Optional[str] = None,
                  time_archival_scheduled: Optional[int] = None,
                  time_deletion_scheduled: Optional[int] = None):
-        self.archive_state = archive_state if archive_state is not None else SettingStatus.PENDING
+        self.archive_state = archive_state
         self.archive_state_details = archive_state_details
-        self.delete_state = delete_state if delete_state is not None else SettingStatus.PENDING
+        self.delete_state = delete_state
         self.delete_state_details = delete_state_details
         self.time_archival_scheduled = time_archival_scheduled
         self.time_deletion_scheduled = time_deletion_scheduled
 
     def to_dict(self) -> Dict:
         """Serializes the retention operation details into a dictionary."""
         return {
-            "archive_state": self.archive_state.value,
+            "archive_state": self.archive_state.value or None,
             "archive_state_details": self.archive_state_details,
-            "delete_state": self.delete_state.value,
+            "delete_state": self.delete_state.value or None,
             "delete_state_details": self.delete_state_details,
             "time_archival_scheduled": self.time_archival_scheduled,
             "time_deletion_scheduled": self.time_deletion_scheduled
@@ -1967,9 +1968,9 @@ def to_dict(self) -> Dict:
     def from_dict(cls, data: Dict) -> 'ModelRetentionOperationDetails':
         """Constructs retention operation details from a dictionary."""
         return cls(
-            archive_state=SettingStatus(data.get("archive_state", SettingStatus.PENDING.value)),
+            archive_state = SettingStatus(data.get("archive_state")) or None,
             archive_state_details=data.get("archive_state_details"),
-            delete_state=SettingStatus(data.get("delete_state", SettingStatus.PENDING.value)),
+            delete_state = SettingStatus(data.get("delete_state")) or None,
             delete_state_details=data.get("delete_state_details"),
             time_archival_scheduled=data.get("time_archival_scheduled"),
             time_deletion_scheduled=data.get("time_deletion_scheduled")
@@ -1991,24 +1992,16 @@ def to_yaml(self) -> str:
 
     def validate(self) -> bool:
         """Validates the retention operation details."""
-        if not isinstance(self.archive_state, SettingStatus):
-            return False
-        if not isinstance(self.delete_state, SettingStatus):
-            return False
-        if self.time_archival_scheduled is not None and not isinstance(self.time_archival_scheduled, int):
-            return False
-        if self.time_deletion_scheduled is not None and not isinstance(self.time_deletion_scheduled, int):
-            return False
-        return True
+        return all([
+            self.archive_state is None or isinstance(self.archive_state, SettingStatus),
+            self.delete_state is None or isinstance(self.delete_state, SettingStatus),
+            self.time_archival_scheduled is None or isinstance(self.time_archival_scheduled, int),
+            self.time_deletion_scheduled is None or isinstance(self.time_deletion_scheduled, int),
+        ])
+
 
     def __repr__(self):
-        return (f"ModelRetentionOperationDetails("
-                f"archive_state={self.archive_state}, "
-                f"archive_state_details={self.archive_state_details}, "
-                f"delete_state={self.delete_state}, "
-                f"delete_state_details={self.delete_state_details}, "
-                f"time_archival_scheduled={self.time_archival_scheduled}, "
-                f"time_deletion_scheduled={self.time_deletion_scheduled})")
+        return self.to_yaml()
 
 
 class ModelBackupOperationDetails:
@@ -2032,17 +2025,17 @@ class ModelBackupOperationDetails:
     """
 
     def __init__(self,
-                 backup_state: Optional['SettingStatus'] = None,
+                 backup_state: Optional[SettingStatus] = None,
                  backup_state_details: Optional[str] = None,
                  time_last_backed_up: Optional[int] = None):
-        self.backup_state = backup_state if backup_state is not None else SettingStatus.PENDING
+        self.backup_state = backup_state 
         self.backup_state_details = backup_state_details
         self.time_last_backed_up = time_last_backed_up
 
     def to_dict(self) -> Dict:
         """Serializes the backup operation details into a dictionary."""
         return {
-            "backup_state": self.backup_state.value,
+            "backup_state": self.backup_state.value or None,
             "backup_state_details": self.backup_state_details,
             "time_last_backed_up": self.time_last_backed_up
         }
@@ -2051,7 +2044,7 @@ def to_dict(self) -> Dict:
     def from_dict(cls, data: Dict) -> 'ModelBackupOperationDetails':
         """Constructs backup operation details from a dictionary."""
         return cls(
-            backup_state=SettingStatus(data.get("backup_state", SettingStatus.PENDING.value)),
+            backup_state=SettingStatus(data.get("backup_state")) or None,
             backup_state_details=data.get("backup_state_details"),
             time_last_backed_up=data.get("time_last_backed_up")
         )
@@ -2072,17 +2065,11 @@ def to_yaml(self) -> str:
 
     def validate(self) -> bool:
         """Validates the backup operation details."""
-        if not isinstance(self.backup_state, SettingStatus):
+        if self.backup_state is not None and not isinstance(self.backup_state, SettingStatus):
             return False
         if self.time_last_backed_up is not None and not isinstance(self.time_last_backed_up, int):
             return False
         return True
 
     def __repr__(self):
-        return (f"ModelBackupOperationDetails("
-                f"backup_state={self.backup_state}, "
-                f"backup_state_details={self.backup_state_details}, "
-                f"time_last_backed_up={self.time_last_backed_up})")
-
-
-
+        return self.to_yaml()