Merge branch 'main' into fix-logs-api

caraml-dev · Oct 23, 2023 · 8c733c7 · 8c733c7
2 parents e737ada + 288ceb7
commit 8c733c7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/api/queue/work/model_service_deployment.go b/api/queue/work/model_service_deployment.go
@@ -107,11 +107,9 @@ func (depl *ModelServiceDeployment) Deploy(job *queue.Job) error {
 	}
 
 	defer func() {
-		deploymentCounter.WithLabelValues(model.Project.Name, model.Name, fmt.Sprint(endpoint.Status), fmt.Sprint(isRedeployment)).Inc()
+		deploymentCounter.WithLabelValues(model.Project.Name, model.Name, fmt.Sprint(deployment.Status), fmt.Sprint(isRedeployment)).Inc()
 
 		// record the deployment result
-		deployment.Status = endpoint.Status
-		deployment.Error = endpoint.Message
 		deployment.UpdatedAt = time.Now()
 		if _, err := depl.DeploymentStorage.Save(deployment); err != nil {
 			log.Warnf("unable to update deployment history", err)
@@ -125,19 +123,26 @@ func (depl *ModelServiceDeployment) Deploy(job *queue.Job) error {
 
 	modelOpt, err := depl.generateModelOptions(ctx, model, version)
 	if err != nil {
+		deployment.Status = models.EndpointFailed
+		deployment.Error = err.Error()
 		endpoint.Message = err.Error()
 		return err
 	}
 
 	modelService := models.NewService(model, version, modelOpt, endpoint)
 	ctl, ok := depl.ClusterControllers[endpoint.EnvironmentName]
 	if !ok {
+		deployment.Status = models.EndpointFailed
+		deployment.Error = err.Error()
+		endpoint.Message = err.Error()
 		return fmt.Errorf("unable to find cluster controller for environment %s", endpoint.EnvironmentName)
 	}
 
 	svc, err := ctl.Deploy(ctx, modelService)
 	if err != nil {
 		log.Errorf("unable to deploy version endpoint for model: %s, version: %s, reason: %v", model.Name, version.ID, err)
+		deployment.Status = models.EndpointFailed
+		deployment.Error = err.Error()
 		endpoint.Message = err.Error()
 		return err
 	}
@@ -154,6 +159,8 @@ func (depl *ModelServiceDeployment) Deploy(job *queue.Job) error {
 	endpoint.InferenceServiceName = svc.CurrentIsvcName
 	endpoint.Message = "" // reset message
 
+	deployment.Status = endpoint.Status
+
 	return nil
 }
 

diff --git a/python/pyfunc-server/requirements.txt b/python/pyfunc-server/requirements.txt
@@ -2,7 +2,8 @@ argparse>=1.4.0
 numpy >= 1.8.2
 cloudpickle==2.0.0
 prometheus_client==0.14.1
-uvloop>=0.15.2
+#TODO: Remove uvloop pinning once we drop Python 3.7 support
+uvloop>=0.15.2,<0.18.0
 orjson>=2.6.8
 tornado
 caraml-upi-protos

diff --git a/ui/src/pages/version/HistoryDetails.js b/ui/src/pages/version/HistoryDetails.js
@@ -29,7 +29,9 @@ const DeploymentStatus = ({
   if (status === "running" || status === "serving") {
     if (
       deployment.id === deployedRevision.id &&
-      (endpointStatus === "running" || endpointStatus === "serving")
+      (endpointStatus === "pending" ||
+        endpointStatus === "running" ||
+        endpointStatus === "serving")
     ) {
       return <EuiHealth color="success">Deployed</EuiHealth>;
     }
@@ -44,7 +46,8 @@ const RevisionPanel = ({ deployments, deploymentsLoaded, endpoint }) => {
 
   const deployedRevision = orderedDeployments.find(
     (deployment) =>
-      deployment.status === "running" || deployment.status === "serving"
+      (deployment.status === "running" || deployment.status === "serving") &&
+      deployment.error === ""
   ) || { id: null };
 
   const canBeExpanded = (deployment) => {
@@ -92,7 +95,6 @@ const RevisionPanel = ({ deployments, deploymentsLoaded, endpoint }) => {
           {deployment.id === deployedRevision.id && (
             <EuiBadge color="default">Current</EuiBadge>
           )}
-          {/* {JSON.stringify(deployment.id)} */}
         </>
       ),
     },