Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/api/version_endpoints_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,10 @@ func (c *EndpointsController) DeleteEndpoint(r *http.Request, vars map[string]st
return BadRequest(fmt.Sprintf("Version Endpoints %s is still serving traffic. Please route the traffic to another model version first", rawEndpointID))
}

if endpoint.IsPending() {
return BadRequest(fmt.Sprintf("Version Endpoint %s is still pending and cannot be undeployed", rawEndpointID))
}

_, err = c.EndpointsService.UndeployEndpoint(ctx, env, model, version, endpoint)
if err != nil {
return InternalServerError(fmt.Sprintf("Unable to undeploy version endpoint %s: %v", rawEndpointID, err))
Expand Down
122 changes: 122 additions & 0 deletions api/api/version_endpoints_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6628,6 +6628,128 @@ func TestDeleteEndpoint(t *testing.T) {
data: Error{Message: fmt.Sprintf("Version Endpoints %s is still serving traffic. Please route the traffic to another model version first", uuid)},
},
},
{
desc: "Should return 400 if endpoint is currently pending",
vars: map[string]string{
"model_id": "1",
"version_id": "1",
"endpoint_id": uuid.String(),
},
modelService: func() *mocks.ModelsService {
svc := &mocks.ModelsService{}
svc.On("FindByID", context.Background(), models.ID(1)).Return(&models.Model{
ID: models.ID(1),
Name: "model-1",
ProjectID: models.ID(1),
Project: mlp.Project{},
ExperimentID: 1,
Type: "pyfunc",
MlflowURL: "",
Endpoints: nil,
}, nil)
return svc
},
versionService: func() *mocks.VersionsService {
svc := &mocks.VersionsService{}
svc.On("FindByID", context.Background(), models.ID(1), models.ID(1), mock.Anything).Return(&models.Version{
ID: models.ID(1),
ModelID: models.ID(1),
Model: &models.Model{
ID: models.ID(1),
Name: "model-1",
ProjectID: models.ID(1),
Project: mlp.Project{},
ExperimentID: 1,
Type: "pyfunc",
MlflowURL: "",
Endpoints: nil,
},
}, nil)
return svc
},
envService: func() *mocks.EnvironmentService {
svc := &mocks.EnvironmentService{}
svc.On("GetEnvironment", "dev").Return(&models.Environment{
ID: models.ID(1),
Name: "dev",
Cluster: "dev",
IsDefault: &trueBoolean,
Region: "id",
GcpProject: "dev-proj",
MaxCPU: "1",
MaxMemory: "1Gi",
}, nil)
return svc
},
endpointService: func() *mocks.EndpointsService {
svc := &mocks.EndpointsService{}
svc.On("FindByID", context.Background(), uuid).Return(&models.VersionEndpoint{
ID: uuid,
VersionID: models.ID(1),
VersionModelID: models.ID(1),
Status: models.EndpointPending,
ServiceName: "sample",
InferenceServiceName: "sample",
Namespace: "sample",
URL: "http://endpoint.svc",
MonitoringURL: "http://monitoring.com",
Environment: &models.Environment{
ID: models.ID(1),
Name: "dev",
Cluster: "dev",
IsDefault: &trueBoolean,
Region: "id",
GcpProject: "dev-proj",
MaxCPU: "1",
MaxMemory: "1Gi",
}, EnvironmentName: "dev",
Message: "",
ResourceRequest: nil,
EnvVars: models.EnvVars([]models.EnvVar{
{
Name: "WORKER",
Value: "1",
},
}),
}, nil)
svc.On("UndeployEndpoint", context.Background(), mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&models.VersionEndpoint{
ID: uuid,
VersionID: models.ID(1),
VersionModelID: models.ID(1),
Status: models.EndpointTerminated,
URL: "http://endpoint.svc",
ServiceName: "sample",
InferenceServiceName: "sample",
Namespace: "sample",
MonitoringURL: "http://monitoring.com",
Environment: &models.Environment{
ID: models.ID(1),
Name: "dev",
Cluster: "dev",
IsDefault: &trueBoolean,
Region: "id",
GcpProject: "dev-proj",
MaxCPU: "1",
MaxMemory: "1Gi",
},
EnvironmentName: "dev",
Message: "",
ResourceRequest: nil,
EnvVars: models.EnvVars([]models.EnvVar{
{
Name: "WORKER",
Value: "1",
},
}),
CreatedUpdated: models.CreatedUpdated{},
}, nil)
return svc
},
expected: &Response{
code: http.StatusBadRequest,
data: Error{Message: fmt.Sprintf("Version Endpoint %s is still pending and cannot be undeployed", uuid)},
},
},
{
desc: "Should return 500 if failed undeploy endpoint",
vars: map[string]string{
Expand Down
4 changes: 4 additions & 0 deletions api/models/version_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ func (ve *VersionEndpoint) IsServing() bool {
return ve.Status == EndpointServing
}

func (ve *VersionEndpoint) IsPending() bool {
return ve.Status == EndpointPending
}

func (ve *VersionEndpoint) IsModelMonitoringEnabled() bool {
if ve.ModelObservability == nil {
return ve.EnableModelObservability
Expand Down
Loading