Skip to content

Commit

Permalink
fix: resolve PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@astsiapanay
astsiapanay committed Feb 18, 2025
1 parent cb759de commit d23fe75
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 23 deletions.
44 changes: 21 additions & 23 deletions server/src/main/java/com/epam/aidial/core/server/service/ApplicationService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.epam.aidial.core.storage.service.ResourceService;
import com.epam.aidial.core.storage.util.EtagHeader;
import com.epam.aidial.core.storage.util.UrlUtil;
import io.vertx.core.Future;
import io.vertx.core.Vertx;
import io.vertx.core.json.JsonObject;
import lombok.Getter;
Expand Down Expand Up @@ -343,12 +344,11 @@ public Application redeployApplication(ProxyContext context, ResourceDescriptor
verifyApplication(resource);
controller.verifyActive();

Application application = prepareApplicationToUndeploy(resource);
Pair<Application, Future<Void>> result = undeployApplicationInternal(resource);

vertx.executeBlocking(() -> terminateApplication(resource, null), false)
.map(ignore -> deployApplication(context, resource))
result.getValue().map(ignore -> deployApplication(context, resource))
.onFailure(error -> log.error("Application redeployment is failed due to the error", error));
return application;
return result.getKey();
}

public Application deployApplication(ProxyContext context, ResourceDescriptor resource) {
Expand Down Expand Up @@ -386,29 +386,13 @@ public Application deployApplication(ProxyContext context, ResourceDescriptor re
}

public Application undeployApplication(ResourceDescriptor resource) {
verifyApplication(resource);
controller.verifyActive();

Application application = prepareApplicationToUndeploy(resource);

vertx.executeBlocking(() -> terminateApplication(resource, null), false);
return application;
return undeployApplicationInternal(resource).getKey();
}

public Application.Logs getApplicationLogs(ResourceDescriptor resource) {
private Pair<Application, Future<Void>> undeployApplicationInternal(ResourceDescriptor resource) {
verifyApplication(resource);
controller.verifyActive();

Application application = getApplication(resource).getValue();

if (application.getFunction() == null || application.getFunction().getStatus() != Application.Function.Status.DEPLOYED) {
throw new HttpException(HttpStatus.CONFLICT, "Application is not started: " + resource.getUrl());
}

return controller.getApplicationLogs(application.getFunction());
}

private Application prepareApplicationToUndeploy(ResourceDescriptor resource) {
MutableObject<Application> result = new MutableObject<>();
resourceService.computeResource(resource, json -> {
Application application = ProxyUtil.convertToObject(json, Application.class);
Expand Down Expand Up @@ -437,7 +421,21 @@ private Application prepareApplicationToUndeploy(ResourceDescriptor resource) {
return ProxyUtil.convertToString(application);
});

return result.getValue();
Future<Void> future = vertx.executeBlocking(() -> terminateApplication(resource, null), false);
return Pair.of(result.getValue(), future);
}

public Application.Logs getApplicationLogs(ResourceDescriptor resource) {
verifyApplication(resource);
controller.verifyActive();

Application application = getApplication(resource).getValue();

if (application.getFunction() == null || application.getFunction().getStatus() != Application.Function.Status.DEPLOYED) {
throw new HttpException(HttpStatus.CONFLICT, "Application is not started: " + resource.getUrl());
}

return controller.getApplicationLogs(application.getFunction());
}

private void prepareApplication(ResourceDescriptor resource, Application application) {
Expand Down
85 changes: 85 additions & 0 deletions server/src/test/java/com/epam/aidial/core/server/ApplicationDeploymentApiTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,91 @@ void testApplicationStopped() {
""");
}

@Test
void testApplicationRestarted() {
testApplicationStarted();

webServer.map(HttpMethod.DELETE, "/v1/image/0123", 200,
"""
event: result
data: {}
""");
webServer.map(HttpMethod.DELETE, "/v1/deployment/0123", 200,
"""
event: result
data: {"deleted":true}
""");

Response response = send(HttpMethod.POST, "/v1/ops/application/redeploy", null, """
{
"url": "applications/3CcedGxCx23EwiVbVmscVktScRyf46KypuBQ65miviST/my-app"
}
""");
verifyJsonNotExact(response, 200, """
{
"name" : "applications/3CcedGxCx23EwiVbVmscVktScRyf46KypuBQ65miviST/my-app",
"display_name" : "My App",
"display_version" : "1.0",
"icon_url" : "http://application1/icon.svg",
"description" : "My App Description",
"reference" : "@ignore",
"forward_auth_token" : false,
"features" : { },
"defaults" : { },
"interceptors" : [ ],
"description_keywords" : [ ],
"max_retry_attempts" : 1,
"function" : {
"id" : "0123",
"runtime": "python3.11",
"author_bucket" : "3CcedGxCx23EwiVbVmscVktScRyf46KypuBQ65miviST",
"source_folder" : "files/3CcedGxCx23EwiVbVmscVktScRyf46KypuBQ65miviST/my-app/",
"target_folder" : "files/2CZ9i2bcBACFts8JbBu3MdcF8sdwTbELGXeFRV6CVDwnPEU8vWC1y8PpXyRChHQvzt/",
"status" : "UNDEPLOYING",
"mapping" : {
"chat_completion" : "/application"
},
"env" : {
"VAR" : "VAL"
}
}
}
""");

response = awaitApplicationStatus("/v1/applications/3CcedGxCx23EwiVbVmscVktScRyf46KypuBQ65miviST/my-app", "DEPLOYED");
verifyJsonNotExact(response, 200, """
{
"name" : "applications/3CcedGxCx23EwiVbVmscVktScRyf46KypuBQ65miviST/my-app",
"endpoint" : "http://localhost:17321/application",
"display_name" : "My App",
"display_version" : "1.0",
"icon_url" : "http://application1/icon.svg",
"description" : "My App Description",
"reference" : "@ignore",
"forward_auth_token" : false,
"features" : { },
"defaults" : { },
"interceptors" : [ ],
"description_keywords" : [ ],
"max_retry_attempts" : 1,
"function" : {
"id" : "0123",
"runtime": "python3.11",
"author_bucket" : "3CcedGxCx23EwiVbVmscVktScRyf46KypuBQ65miviST",
"source_folder" : "files/3CcedGxCx23EwiVbVmscVktScRyf46KypuBQ65miviST/my-app/",
"target_folder" : "files/2CZ9i2bcBACFts8JbBu3MdcF8sdwTbELGXeFRV6CVDwnPEU8vWC1y8PpXyRChHQvzt/",
"status" : "DEPLOYED",
"mapping" : {
"chat_completion" : "/application"
},
"env" : {
"VAR" : "VAL"
}
}
}
""");
}

@Test
void testApplicationFailed() {
testApplicationCreated();
Expand Down

0 comments on commit d23fe75

Please sign in to comment.