feat: Custom applications for DIAL

config/src/main/java/com/epam/aidial/core/config/Config.java

@@ -3,9 +3,8 @@
 import com.epam.aidial.core.config.databind.JsonArrayToSchemaMapDeserializer;
 import com.epam.aidial.core.config.databind.MapToJsonArraySerializer;
 import com.epam.aidial.core.config.validation.ConformToMetaSchema;
-import com.epam.aidial.core.config.validation.CustomApplicationsConformToSchemas;
+import com.epam.aidial.core.config.validation.CustomApplicationsConformToTypeSchemas;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
@@ -18,7 +17,7 @@
 
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
-@CustomApplicationsConformToSchemas(message = "All custom schema-rich applications should conform to their schemas")
+@CustomApplicationsConformToTypeSchemas(message = "All custom schema-rich applications should conform to their schemas")
 public class Config {
     public static final String ASSISTANT = "assistant";
 

config/src/main/java/com/epam/aidial/core/config/validation/CustomApplicationsConformToSchemas.java → config/src/main/java/com/epam/aidial/core/config/validation/CustomApplicationsConformToTypeSchemas.java

@@ -11,11 +11,11 @@
 import static java.lang.annotation.ElementType.TYPE;
 
 @Documented
-@Constraint(validatedBy = { CustomApplicationsConformToSchemasValidator.class})
+@Constraint(validatedBy = { CustomApplicationsConformToTypeSchemasValidator.class})
 @Target({ TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @ReportAsSingleViolation
-public @interface CustomApplicationsConformToSchemas {
+public @interface CustomApplicationsConformToTypeSchemas {
     String message() default "Custom applications should comply with their schemas";
     Class<?>[] groups() default {};
     Class<? extends jakarta.validation.Payload>[] payload() default {};

config/src/main/java/com/epam/aidial/core/config/validation/CustomApplicationsConformToSchemasValidator.java → config/src/main/java/com/epam/aidial/core/config/validation/CustomApplicationsConformToTypeSchemasValidator.java

@@ -21,7 +21,7 @@
 import static com.epam.aidial.core.metaschemas.MetaSchemaHolder.getMetaschemaBuilder;
 
 @Slf4j
-public class CustomApplicationsConformToSchemasValidator implements ConstraintValidator<CustomApplicationsConformToSchemas, Config> {
+public class CustomApplicationsConformToTypeSchemasValidator implements ConstraintValidator<CustomApplicationsConformToTypeSchemas, Config> {
 
 
     private static final JsonMetaSchema DIAL_META_SCHEMA = getMetaschemaBuilder()

server/src/main/java/com/epam/aidial/core/server/controller/ApplicationController.java

@@ -12,8 +12,8 @@
 import com.epam.aidial.core.server.service.ApplicationService;
 import com.epam.aidial.core.server.service.PermissionDeniedException;
 import com.epam.aidial.core.server.service.ResourceNotFoundException;
+import com.epam.aidial.core.server.util.ApplicationTypeSchemaUtils;
 import com.epam.aidial.core.server.util.BucketBuilder;
-import com.epam.aidial.core.server.util.CustomApplicationUtils;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import com.epam.aidial.core.server.util.ResourceDescriptorFactory;
 import com.epam.aidial.core.storage.http.HttpException;
@@ -66,7 +66,7 @@ public Future<?> getApplications() {
             List<Application> list = new ArrayList<>();
             for (Application application : config.getApplications().values()) {
                 if (application.hasAccess(context.getUserRoles())) {
-                    application = CustomApplicationUtils.filterCustomClientProperties(config, application);
+                    application = ApplicationTypeSchemaUtils.filterCustomClientProperties(config, application);
                     list.add(application);
                 }
             }

server/src/main/java/com/epam/aidial/core/server/controller/AppSchemaController.java → server/src/main/java/com/epam/aidial/core/server/controller/ApplicationTypeSchemaController.java

@@ -20,19 +20,19 @@
 import java.util.Map;
 
 @Slf4j
-public class AppSchemaController {
+public class ApplicationTypeSchemaController {
 
     private static final String FAILED_READ_SCHEMA_MESSAGE = "Failed to read schema from resources";
     private static final String ID_FIELD = "$id";
     private static final String ID_PARAM = "id";
-    private static final String EDITOR_URL_FIELD = "dial:custom-application-type-editor-url";
-    private static final String DISPLAY_NAME_FIELD = "dial:custom-application-type-display-name";
-    private static final String COMPLETION_ENDPOINT_FIELD = "dial:custom-application-type-completion-endpoint";
+    private static final String EDITOR_URL_FIELD = "dial:applicationTypeEditorUrl";
+    private static final String DISPLAY_NAME_FIELD = "dial:applicationTypeDisplayName";
+    private static final String COMPLETION_ENDPOINT_FIELD = "dial:applicationTypeCompletionEndpoint";
 
     private final ProxyContext context;
     private final Vertx vertx;
 
-    public AppSchemaController(ProxyContext context) {
+    public ApplicationTypeSchemaController(ProxyContext context) {
         this.context = context;
         this.vertx = context.getProxy().getVertx();
     }

server/src/main/java/com/epam/aidial/core/server/controller/ControllerSelector.java

@@ -74,7 +74,7 @@ public class ControllerSelector {
 
     private static final Pattern USER_INFO = Pattern.compile("^/v1/user/info$");
 
-    private static final Pattern APP_SCHEMAS = Pattern.compile("^/v1/application_type_schemas(/schemas|/schema|/meta_schema)?$");
+    private static final Pattern APP_SCHEMAS = Pattern.compile("^/v1/application_type_schemas(/schemas|/schema|/meta_schema)?");
 
     static {
         // GET routes
@@ -173,7 +173,7 @@ public class ControllerSelector {
         });
         get(USER_INFO, (proxy, context, pathMatcher) -> new UserInfoController(context));
         get(APP_SCHEMAS, (proxy, context, pathMatcher) -> {
-            AppSchemaController controller = new AppSchemaController(context);
+            ApplicationTypeSchemaController controller = new ApplicationTypeSchemaController(context);
             String operation = pathMatcher.group(1);
             return switch (operation) {
                 case "/schemas" -> controller::handleListSchemas;

server/src/main/java/com/epam/aidial/core/server/controller/DeploymentController.java

@@ -14,7 +14,7 @@
 import com.epam.aidial.core.server.data.ResourceTypes;
 import com.epam.aidial.core.server.service.PermissionDeniedException;
 import com.epam.aidial.core.server.service.ResourceNotFoundException;
-import com.epam.aidial.core.server.util.CustomApplicationUtils;
+import com.epam.aidial.core.server.util.ApplicationTypeSchemaUtils;
 import com.epam.aidial.core.server.util.ResourceDescriptorFactory;
 import com.epam.aidial.core.storage.http.HttpStatus;
 import com.epam.aidial.core.storage.resource.ResourceDescriptor;
@@ -81,10 +81,10 @@ public static Future<Deployment> selectDeployment(ProxyContext context, String i
                             }
                             Application modifiedApp = application;
                             if (filterCustomProperties) {
-                                modifiedApp = CustomApplicationUtils.filterCustomClientProperties(context.getConfig(), application);
+                                modifiedApp = ApplicationTypeSchemaUtils.filterCustomClientProperties(context.getConfig(), application);
                             }
                             if (modifyEndpoint) {
-                                modifiedApp = CustomApplicationUtils.modifyEndpointForCustomApplication(context.getConfig(), modifiedApp);
+                                modifiedApp = ApplicationTypeSchemaUtils.modifyEndpointForCustomApplication(context.getConfig(), modifiedApp);
                             }
                             return modifiedApp;
                         });
@@ -120,10 +120,10 @@ public static Future<Deployment> selectDeployment(ProxyContext context, String i
 
             if (app.getCustomAppSchemaId() != null) {
                 if (filterCustomProperties) {
-                    app = CustomApplicationUtils.filterCustomClientPropertiesWhenNoWriteAccess(context, resource, app);
+                    app = ApplicationTypeSchemaUtils.filterCustomClientPropertiesWhenNoWriteAccess(context, resource, app);
                 }
                 if (modifyEndpoint) {
-                    app = CustomApplicationUtils.modifyEndpointForCustomApplication(context.getConfig(), app);
+                    app = ApplicationTypeSchemaUtils.modifyEndpointForCustomApplication(context.getConfig(), app);
                 }
             }
 

server/src/main/java/com/epam/aidial/core/server/controller/ResourceController.java

@@ -14,10 +14,11 @@
 import com.epam.aidial.core.server.service.PermissionDeniedException;
 import com.epam.aidial.core.server.service.ResourceNotFoundException;
 import com.epam.aidial.core.server.service.ShareService;
-import com.epam.aidial.core.server.util.CustomApplicationUtils;
+import com.epam.aidial.core.server.util.ApplicationTypeSchemaProcessingException;
+import com.epam.aidial.core.server.util.ApplicationTypeSchemaUtils;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import com.epam.aidial.core.server.util.ResourceDescriptorFactory;
-import com.epam.aidial.core.server.validation.CustomAppValidationException;
+import com.epam.aidial.core.server.validation.ApplicationTypeSchemaValidationException;
 import com.epam.aidial.core.storage.data.MetadataBase;
 import com.epam.aidial.core.storage.data.ResourceItemMetadata;
 import com.epam.aidial.core.storage.http.HttpException;
@@ -177,15 +178,17 @@ private Future<Pair<ResourceItemMetadata, String>> getResourceData(ResourceDescr
     private void validateCustomApplication(Application application) {
         try {
             Config config = context.getConfig();
-            List<ResourceDescriptor> files = CustomApplicationUtils.getFiles(config, application, encryptionService,
+            List<ResourceDescriptor> files = ApplicationTypeSchemaUtils.getFiles(config, application, encryptionService,
                     resourceService);
             files.stream().filter(resource -> !(accessService.hasReadAccess(resource, context)))
                     .findAny().ifPresent(file -> {
                         throw new HttpException(BAD_REQUEST, "No read access to file: " + file.getUrl());
                     });
         } catch (ValidationException | IllegalArgumentException e) {
             throw new HttpException(BAD_REQUEST, "Custom application validation failed", e);
-        } catch (CustomAppValidationException e) {
+        } catch (ApplicationTypeSchemaValidationException e) {
+            throw new HttpException(BAD_REQUEST, "Custom application processing exception", e);
+        } catch (ApplicationTypeSchemaProcessingException e) {
             throw new HttpException(INTERNAL_SERVER_ERROR, "Custom application validation failed", e);
         }
     }

server/src/main/java/com/epam/aidial/core/server/function/enhancement/AppendCustomApplicationPropertiesFn.java

@@ -5,7 +5,7 @@
 import com.epam.aidial.core.server.Proxy;
 import com.epam.aidial.core.server.ProxyContext;
 import com.epam.aidial.core.server.function.BaseRequestFunction;
-import com.epam.aidial.core.server.util.CustomApplicationUtils;
+import com.epam.aidial.core.server.util.ApplicationTypeSchemaUtils;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
@@ -25,7 +25,7 @@ public Boolean apply(ObjectNode tree) {
             return false;
         }
         boolean appended = false;
-        Map<String, Object> props = CustomApplicationUtils.getCustomServerProperties(context.getConfig(), application);
+        Map<String, Object> props = ApplicationTypeSchemaUtils.getCustomServerProperties(context.getConfig(), application);
         ObjectNode customAppPropertiesNode = ProxyUtil.MAPPER.createObjectNode();
         for (Map.Entry<String, Object> entry : props.entrySet()) {
             customAppPropertiesNode.putPOJO(entry.getKey(), entry.getValue());

server/src/main/java/com/epam/aidial/core/server/service/ApplicationService.java

@@ -9,8 +9,8 @@
 import com.epam.aidial.core.server.data.SharedResourcesResponse;
 import com.epam.aidial.core.server.security.AccessService;
 import com.epam.aidial.core.server.security.EncryptionService;
+import com.epam.aidial.core.server.util.ApplicationTypeSchemaUtils;
 import com.epam.aidial.core.server.util.BucketBuilder;
-import com.epam.aidial.core.server.util.CustomApplicationUtils;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import com.epam.aidial.core.server.util.ResourceDescriptorFactory;
 import com.epam.aidial.core.storage.blobstore.BlobStorageUtil;
@@ -134,7 +134,7 @@ public List<Application> getSharedApplications(ProxyContext context) {
 
             if (meta instanceof ResourceItemMetadata) {
                 Application application = getApplication(resource).getValue();
-                application = CustomApplicationUtils.filterCustomClientPropertiesWhenNoWriteAccess(context, resource, application);
+                application = ApplicationTypeSchemaUtils.filterCustomClientPropertiesWhenNoWriteAccess(context, resource, application);
                 list.add(application);
             } else {
                 list.addAll(getApplications(resource, context));
@@ -200,7 +200,7 @@ public List<Application> getApplications(ResourceDescriptor resource,
                     try {
                         ResourceDescriptor item = ResourceDescriptorFactory.fromAnyUrl(meta.getUrl(), encryptionService);
                         Application application = getApplication(item).getValue();
-                        application = CustomApplicationUtils.filterCustomClientPropertiesWhenNoWriteAccess(ctx, item, application);
+                        application = ApplicationTypeSchemaUtils.filterCustomClientPropertiesWhenNoWriteAccess(ctx, item, application);
                         applications.add(application);
                     } catch (ResourceNotFoundException ignore) {
                         // deleted while fetching

server/src/main/java/com/epam/aidial/core/server/service/PublicationService.java

@@ -12,8 +12,8 @@
 import com.epam.aidial.core.server.data.Rule;
 import com.epam.aidial.core.server.security.AccessService;
 import com.epam.aidial.core.server.security.EncryptionService;
+import com.epam.aidial.core.server.util.ApplicationTypeSchemaUtils;
 import com.epam.aidial.core.server.util.BucketBuilder;
-import com.epam.aidial.core.server.util.CustomApplicationUtils;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import com.epam.aidial.core.server.util.ResourceDescriptorFactory;
 import com.epam.aidial.core.storage.data.MetadataBase;
@@ -41,7 +41,7 @@
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 
-import static com.epam.aidial.core.server.util.CustomApplicationUtils.replaceCustomAppFiles;
+import static com.epam.aidial.core.server.util.ApplicationTypeSchemaUtils.replaceCustomAppFiles;
 
 @RequiredArgsConstructor
 public class PublicationService {
@@ -405,7 +405,7 @@ private void addCustomApplicationRelatedFiles(ProxyContext context, Publication
                         return Stream.empty();
                     }
                     Publication.ResourceAction action = resource.getAction();
-                    return CustomApplicationUtils.getFiles(context.getConfig(), application, encryption, resourceService)
+                    return ApplicationTypeSchemaUtils.getFiles(context.getConfig(), application, encryption, resourceService)
                             .stream()
                             .filter(sourceDescriptor -> !existingUrls.contains(sourceDescriptor.getUrl())
                                     && !sourceDescriptor.isPublic())

server/src/main/java/com/epam/aidial/core/server/service/ShareService.java

@@ -15,7 +15,7 @@
 import com.epam.aidial.core.server.data.SharedResources;
 import com.epam.aidial.core.server.data.SharedResourcesResponse;
 import com.epam.aidial.core.server.security.EncryptionService;
-import com.epam.aidial.core.server.util.CustomApplicationUtils;
+import com.epam.aidial.core.server.util.ApplicationTypeSchemaUtils;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import com.epam.aidial.core.server.util.ResourceDescriptorFactory;
 import com.epam.aidial.core.storage.data.MetadataBase;
@@ -121,7 +121,7 @@ private void addCustomApplicationRelatedFiles(ShareResourcesRequest request) {
             ResourceDescriptor resource = getResourceFromLink(sharedResource.url());
             if (resource.getType() == ResourceTypes.APPLICATION) {
                 Application application = applicationService.getApplication(resource).getValue();
-                List<ResourceDescriptor> files = CustomApplicationUtils.getFiles(config, application, encryptionService, resourceService);
+                List<ResourceDescriptor> files = ApplicationTypeSchemaUtils.getFiles(config, application, encryptionService, resourceService);
                 for (ResourceDescriptor file : files) {
                     if (!filesFromRequest.contains(file.getUrl())) {
                         newSharedResources.add(new SharedResource(file.getUrl(), sharedResource.permissions()));

server/src/main/java/com/epam/aidial/core/server/util/ApplicationTypeSchemaProcessingException.java

@@ -0,0 +1,11 @@
+package com.epam.aidial.core.server.util;
+
+public class ApplicationTypeSchemaProcessingException extends RuntimeException {
+    public ApplicationTypeSchemaProcessingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ApplicationTypeSchemaProcessingException(String message) {
+        super(message);
+    }
+}