Updated pr.

Author: lu-ohai

ads/model/deployment/model_deployment.py

@@ -614,17 +614,14 @@ def deploy(
  else self.properties.build()
  )
 
- try:
- response = self.dsc_model_deployment.create(
- create_model_deployment_details=create_model_deployment_details,
- wait_for_completion=wait_for_completion,
- max_wait_time=max_wait_time,
- poll_interval=poll_interval,
- )
- except Exception as ex:
- raise ex
- finally:
- return self._update_from_oci_model(response)
+ response = self.dsc_model_deployment.create(
+ create_model_deployment_details=create_model_deployment_details,
+ wait_for_completion=wait_for_completion,
+ max_wait_time=max_wait_time,
+ poll_interval=poll_interval,
+ )
+
+ return self._update_from_oci_model(response)
 
  def delete(
  self,
@@ -650,16 +647,13 @@ def delete(
  ModelDeployment
  The instance of ModelDeployment.
  """
- try:
- response = self.dsc_model_deployment.delete(
- wait_for_completion=wait_for_completion,
- max_wait_time=max_wait_time,
- poll_interval=poll_interval,
- )
- except Exception as ex:
- raise ex
- finally:
- return self._update_from_oci_model(response)
+ response = self.dsc_model_deployment.delete(
+ wait_for_completion=wait_for_completion,
+ max_wait_time=max_wait_time,
+ poll_interval=poll_interval,
+ )
+
+ return self._update_from_oci_model(response)
 
  def update(
  self,
@@ -715,17 +709,14 @@ def update(
  else self._update_model_deployment_details(**kwargs)
  )
 
- try:
- response = self.dsc_model_deployment.update(
- update_model_deployment_details=update_model_deployment_details,
- wait_for_completion=wait_for_completion,
- max_wait_time=max_wait_time,
- poll_interval=poll_interval,
- )
- except Exception as ex:
- raise ex
- finally:
- return self._update_from_oci_model(response)
+ response = self.dsc_model_deployment.update(
+ update_model_deployment_details=update_model_deployment_details,
+ wait_for_completion=wait_for_completion,
+ max_wait_time=max_wait_time,
+ poll_interval=poll_interval,
+ )
+
+ return self._update_from_oci_model(response)
 
  def watch(
  self,
@@ -891,10 +882,10 @@ def predict(
 
  """
  current_state = self.sync().lifecycle_state
- if current_state != "ACTIVE":
+ if current_state != State.ACTIVE.name:
  raise ModelDeploymentPredictError(
- f"Predict() can't be called when model deployment is `{current_state}`. "
- "Make sure model deployment is `ACTIVE` before calling predict."
+ "This model deployment is not in active state, you will not be able to use predict end point. "
+ f"Current model deployment state: {current_state} "
  )
  endpoint = f"{self.url}/predict"
  signer = authutil.default_signer()["signer"]
@@ -991,16 +982,13 @@ def activate(
  ModelDeployment
  The instance of ModelDeployment.
  """
- try:
- response = self.dsc_model_deployment.activate(
- wait_for_completion=wait_for_completion,
- max_wait_time=max_wait_time,
- poll_interval=poll_interval,
- )
- except Exception as ex:
- raise ex
- finally:
- return self._update_from_oci_model(response)
+ response = self.dsc_model_deployment.activate(
+ wait_for_completion=wait_for_completion,
+ max_wait_time=max_wait_time,
+ poll_interval=poll_interval,
+ )
+
+ return self._update_from_oci_model(response)
 
  def deactivate(
  self,
@@ -1026,16 +1014,13 @@ def deactivate(
  ModelDeployment
  The instance of ModelDeployment.
  """
- try:
- response = self.dsc_model_deployment.deactivate(
- wait_for_completion=wait_for_completion,
- max_wait_time=max_wait_time,
- poll_interval=poll_interval,
- )
- except Exception as ex:
- raise ex
- finally:
- return self._update_from_oci_model(response)
+ response = self.dsc_model_deployment.deactivate(
+ wait_for_completion=wait_for_completion,
+ max_wait_time=max_wait_time,
+ poll_interval=poll_interval,
+ )
+
+ return self._update_from_oci_model(response)
 
  def _log_details(self, log_type: str = ModelDeploymentLogType.ACCESS):
  """Gets log details for the provided `log_type`.

ads/model/generic_model.py

@@ -1575,7 +1575,7 @@ def from_model_deployment(
  current_state = model_deployment.state.name.upper()
  if current_state != ModelDeploymentState.ACTIVE.name:
  logger.warning(
- "Model deployment should be in `ACTIVE` state while being fetched. "
+ "This model deployment is not in active state, you will not be able to use predict end point. "
  f"Current model deployment state: `{current_state}`"
  )
 
@@ -2318,20 +2318,16 @@ def deploy(
  .with_runtime(runtime)
  )
 
- try:
- self.model_deployment = model_deployment.deploy(
- wait_for_completion=wait_for_completion,
- max_wait_time=max_wait_time,
- poll_interval=poll_interval,
- )
- except Exception as ex:
- raise ex
- finally:
- self._summary_status.update_status(
- detail="Deployed the model",
- status=self.model_deployment.state.name.upper(),
- )
- return self.model_deployment
+ self.model_deployment = model_deployment.deploy(
+ wait_for_completion=wait_for_completion,
+ max_wait_time=max_wait_time,
+ poll_interval=poll_interval,
+ )
+ self._summary_status.update_status(
+ detail="Deployed the model",
+ status=self.model_deployment.state.name.upper(),
+ )
+ return self.model_deployment
 
  def prepare_save_deploy(
  self,
@@ -2799,29 +2795,25 @@ def restart_deployment(
  """
  if not self.model_deployment:
  raise ValueError("Use `deploy()` method to start model deployment.")
- try:
- logger.info(
- f"Deactivating model deployment {self.model_deployment.model_deployment_id}."
- )
- self.model_deployment.deactivate(
- max_wait_time=max_wait_time, poll_interval=poll_interval
- )
- logger.info(
- f"Model deployment {self.model_deployment.model_deployment_id} has successfully been deactivated."
- )
- logger.info(
- f"Activating model deployment {self.model_deployment.model_deployment_id}."
- )
- self.model_deployment.activate(
- max_wait_time=max_wait_time, poll_interval=poll_interval
- )
- logger.info(
- f"Model deployment {self.model_deployment.model_deployment_id} has successfully been activated."
- )
- except Exception as ex:
- raise ex
- finally:
- return self.model_deployment
+ logger.info(
+ f"Deactivating model deployment {self.model_deployment.model_deployment_id}."
+ )
+ self.model_deployment.deactivate(
+ max_wait_time=max_wait_time, poll_interval=poll_interval
+ )
+ logger.info(
+ f"Model deployment {self.model_deployment.model_deployment_id} has successfully been deactivated."
+ )
+ logger.info(
+ f"Activating model deployment {self.model_deployment.model_deployment_id}."
+ )
+ self.model_deployment.activate(
+ max_wait_time=max_wait_time, poll_interval=poll_interval
+ )
+ logger.info(
+ f"Model deployment {self.model_deployment.model_deployment_id} has successfully been activated."
+ )
+ return self.model_deployment
 
  @class_or_instance_method
  def delete(

ads/model/service/oci_datascience_model_deployment.py

@@ -209,11 +209,8 @@ def activate(
  )
  except Exception as e:
  logger.error(
- f"Error while trying to activate model deployment: {self.id}"
+ "Error while trying to activate model deployment: " + str(e)
  )
- raise e
- finally:
- return self.sync()
 
  return self.sync()
  else:
@@ -263,11 +260,8 @@ def create(
  )
  except Exception as e:
  logger.error(
- f"Error while trying to create model deployment: {self.id}"
+ "Error while trying to create model deployment: " + str(e)
  )
- raise e
- finally:
- return self.sync()
 
  return self.sync()
 
@@ -329,11 +323,8 @@ def deactivate(
  )
  except Exception as e:
  logger.error(
- f"Error while trying to deactivate model deployment: {self.id}"
+ "Error while trying to deactivate model deployment: " + str(e)
  )
- raise e
- finally:
- return self.sync()
 
  return self.sync()
  else:
@@ -402,11 +393,8 @@ def delete(
  )
  except Exception as e:
  logger.error(
- f"Error while trying to delete model deployment: {self.id}"
+ "Error while trying to delete model deployment: " + str(e)
  )
- raise e
- finally:
- return self.sync()
 
  return self.sync()
 
@@ -460,10 +448,11 @@ def update(
  )
  self.workflow_req_id = response.headers.get("opc-work-request-id", None)
  except Exception as e:
- logger.error(f"Error while trying to update model deployment: {self.id}")
- raise e
- finally:
- return self.sync()
+ logger.error(
+ "Error while trying to update model deployment: " + str(e)
+ )
+
+ return self.sync()
 
  @classmethod
  def list(