Skip to content

chore: refactor execute query in Appsmith AI Plugin #38013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nsarupr merged 4 commits into from
Dec 9, 2024
Merged

chore: refactor execute query in Appsmith AI Plugin #38013

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89eadb2
refactor executeQuery
nsarupr Dec 6, 2024
e15a0df
spotless lint
nsarupr Dec 6, 2024
30cafd8
Merge branch 'release' into chore/appsmith-ai-refactor
nsarupr Dec 6, 2024
9e684a1
Merge branch 'release' into chore/appsmith-ai-refactor
nsarupr Dec 9, 2024
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
51 changes: 34 additions & 17 deletions ...ppsmith-plugins/appsmithAiPlugin/src/main/java/com/external/plugins/AppsmithAiPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,41 +166,58 @@ public Mono<ActionExecutionResult> executeCommon(
ExecuteActionDTO executeActionDTO) {

log.debug(Thread.currentThread().getName() + ": executeCommon() called for AppsmithAI plugin.");
// Initializing object for error condition
ActionExecutionResult errorResult = new ActionExecutionResult();
initUtils.initializeResponseWithError(errorResult);
Feature feature =
Feature.valueOf(RequestUtils.extractDataFromFormData(actionConfiguration.getFormData(), USECASE));
AiFeatureService aiFeatureService = AiFeatureServiceFactory.getAiFeatureService(feature);
Query query = aiFeatureService.createQuery(actionConfiguration, datasourceConfiguration, executeActionDTO);
AiServerRequestDTO aiServerRequestDTO = new AiServerRequestDTO(feature, query);

ActionExecutionResult actionExecutionResult = new ActionExecutionResult();
ActionExecutionRequest actionExecutionRequest = RequestCaptureFilter.populateRequestFields(
actionConfiguration, RequestUtils.getQueryUri(), insertedParams, objectMapper);

SourceDetails sourceDetails = SourceDetails.createSourceDetails(executeActionDTO);

return handleExecution(aiFeatureService, aiServerRequestDTO, sourceDetails, actionExecutionRequest);
}

private Mono<ActionExecutionResult> handleExecution(
AiFeatureService aiFeatureService,
AiServerRequestDTO aiServerRequestDTO,
SourceDetails sourceDetails,
ActionExecutionRequest actionExecutionRequest) {
Mono<ActionExecutionResult> actionExecutionResultMono;
actionExecutionResultMono =
handleExecuteForAiServerService(aiServerRequestDTO, sourceDetails, actionExecutionRequest);
return actionExecutionResultMono.onErrorResume(this::handleError);
}

private Mono<ActionExecutionResult> handleExecuteForAiServerService(
AiServerRequestDTO aiServerRequestDTO,
SourceDetails sourceDetails,
ActionExecutionRequest actionExecutionRequest) {
return aiServerService
.executeQuery(aiServerRequestDTO, SourceDetails.createSourceDetails(executeActionDTO))
.executeQuery(aiServerRequestDTO, sourceDetails)
.map(response -> {
ActionExecutionResult actionExecutionResult = new ActionExecutionResult();
actionExecutionResult.setIsExecutionSuccess(true);
actionExecutionResult.setBody(response);
actionExecutionResult.setRequest(actionExecutionRequest);
return actionExecutionResult;
})
.onErrorResume(error -> {
errorResult.setIsExecutionSuccess(false);
log.error(
"An error has occurred while trying to run the AI server API query. Error: {}",
error.getMessage());
if (!(error instanceof AppsmithPluginException)) {
error = new AppsmithPluginException(
AppsmithPluginError.PLUGIN_ERROR, error.getMessage(), error);
}
errorResult.setErrorInfo(error);
return Mono.just(errorResult);
});
}

private Mono<ActionExecutionResult> handleError(Throwable error) {
ActionExecutionResult errorResult = new ActionExecutionResult();
initUtils.initializeResponseWithError(errorResult);
log.error(
"An error has occurred while trying to run the AI server API query. Error: {}", error.getMessage());
if (!(error instanceof AppsmithPluginException)) {
error = new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, error.getMessage(), error);
}
errorResult.setErrorInfo(error);
return Mono.just(errorResult);
}

@Override
public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration, boolean isEmbedded) {
log.debug(Thread.currentThread().getName() + ": validateDatasource() called for AppsmithAI plugin.");
Expand Down