chore: re-factor blob storage

server/src/main/java/com/epam/aidial/core/server/ProxyContext.java

@@ -7,10 +7,10 @@
 import com.epam.aidial.core.server.security.ExtractedClaims;
 import com.epam.aidial.core.server.token.TokenUsage;
 import com.epam.aidial.core.server.upstream.UpstreamRoute;
-import com.epam.aidial.core.server.util.BufferingReadStream;
 import com.epam.aidial.core.server.util.HttpException;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ProxyUtil;
+import com.epam.aidial.core.server.vertx.stream.BufferingReadStream;
 import io.vertx.core.Future;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpClientRequest;

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

@@ -14,7 +14,7 @@
 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.storage.BlobStorageUtil;
+import com.epam.aidial.core.server.util.BucketBuilder;
 import com.epam.aidial.core.server.util.HttpException;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ProxyUtil;
@@ -149,7 +149,7 @@ private void checkAccess(ResourceDescriptor resource) {
         boolean hasAccess = accessService.hasAdminAccess(context);
 
         if (!hasAccess && resource.isPrivate()) {
-            String bucket = BlobStorageUtil.buildInitiatorBucket(context);
+            String bucket = BucketBuilder.buildInitiatorBucket(context);
             hasAccess = resource.getBucketLocation().equals(bucket);
         }
 

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

@@ -5,7 +5,7 @@
 import com.epam.aidial.core.server.data.Bucket;
 import com.epam.aidial.core.server.resource.ResourceDescriptor;
 import com.epam.aidial.core.server.security.EncryptionService;
-import com.epam.aidial.core.server.storage.BlobStorageUtil;
+import com.epam.aidial.core.server.util.BucketBuilder;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.UrlUtil;
 import io.vertx.core.Future;
@@ -19,16 +19,16 @@ public class BucketController {
 
     public Future<?> getBucket() {
         EncryptionService encryptionService = proxy.getEncryptionService();
-        String bucketLocation = BlobStorageUtil.buildUserBucket(context);
+        String bucketLocation = BucketBuilder.buildUserBucket(context);
         String encryptedBucket = encryptionService.encrypt(bucketLocation);
-        String appDataBucket = BlobStorageUtil.buildAppDataBucket(context);
+        String appDataBucket = BucketBuilder.buildAppDataBucket(context);
         String appDataLocation;
         if (appDataBucket == null) {
             appDataLocation = null;
         } else {
             String encryptedAppDataBucket = encryptionService.encrypt(appDataBucket);
             String encodedSourceDeployment = UrlUtil.encodePath(context.getSourceDeployment()); // bucket/my-app
-            appDataLocation = encryptedAppDataBucket + ResourceDescriptor.PATH_SEPARATOR + BlobStorageUtil.APPDATA_PATTERN.formatted(encodedSourceDeployment);
+            appDataLocation = encryptedAppDataBucket + ResourceDescriptor.PATH_SEPARATOR + BucketBuilder.APPDATA_PATTERN.formatted(encodedSourceDeployment);
         }
         return context.respond(HttpStatus.OK, new Bucket(encryptedBucket, appDataLocation));
     }

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

@@ -5,9 +5,9 @@
 import com.epam.aidial.core.server.ProxyContext;
 import com.epam.aidial.core.server.service.PermissionDeniedException;
 import com.epam.aidial.core.server.service.ResourceNotFoundException;
-import com.epam.aidial.core.server.util.BufferingReadStream;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ProxyUtil;
+import com.epam.aidial.core.server.vertx.stream.BufferingReadStream;
 import io.vertx.core.Future;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpClientRequest;

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

@@ -26,11 +26,11 @@
 import com.epam.aidial.core.server.upstream.DeploymentUpstreamProvider;
 import com.epam.aidial.core.server.upstream.UpstreamProvider;
 import com.epam.aidial.core.server.upstream.UpstreamRoute;
-import com.epam.aidial.core.server.util.BufferingReadStream;
 import com.epam.aidial.core.server.util.HttpException;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ModelCostCalculator;
 import com.epam.aidial.core.server.util.ProxyUtil;
+import com.epam.aidial.core.server.vertx.stream.BufferingReadStream;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.annotations.VisibleForTesting;
 import io.netty.buffer.ByteBufInputStream;

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

@@ -3,8 +3,8 @@
 import com.epam.aidial.core.server.Proxy;
 import com.epam.aidial.core.server.ProxyContext;
 import com.epam.aidial.core.server.resource.ResourceDescriptor;
-import com.epam.aidial.core.server.storage.InputStreamReader;
 import com.epam.aidial.core.server.util.HttpStatus;
+import com.epam.aidial.core.server.vertx.stream.InputStreamReader;
 import io.vertx.core.Future;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpServerResponse;

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

@@ -8,9 +8,9 @@
 import com.epam.aidial.core.server.function.CollectRequestAttachmentsFn;
 import com.epam.aidial.core.server.function.CollectRequestDataFn;
 import com.epam.aidial.core.server.function.CollectResponseAttachmentsFn;
-import com.epam.aidial.core.server.util.BufferingReadStream;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ProxyUtil;
+import com.epam.aidial.core.server.vertx.stream.BufferingReadStream;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.netty.buffer.ByteBufInputStream;
 import io.vertx.core.Future;

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

@@ -9,7 +9,7 @@
 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.storage.BlobStorageUtil;
+import com.epam.aidial.core.server.util.BucketBuilder;
 import com.epam.aidial.core.server.util.HttpStatus;
 import io.vertx.core.Future;
 
@@ -34,7 +34,7 @@ public InvitationController(Proxy proxy, ProxyContext context) {
     public Future<?> getInvitations() {
         proxy.getVertx()
                 .executeBlocking(() -> {
-                    String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+                    String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
                     String bucket = encryptionService.encrypt(bucketLocation);
                     return invitationService.getMyInvitations(bucket, bucketLocation);
                 }, false)
@@ -48,7 +48,7 @@ public Future<?> getOrAcceptInvitation(String invitationId) {
         if (accept) {
             proxy.getVertx()
                     .executeBlocking(() -> {
-                        String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+                        String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
                         String bucket = encryptionService.encrypt(bucketLocation);
                         ResourceDescriptor invitationResource = invitationService.getInvitationResource(invitationId);
                         if (invitationResource == null) {
@@ -86,7 +86,7 @@ public Future<?> getOrAcceptInvitation(String invitationId) {
     public Future<?> deleteInvitation(String invitationId) {
         proxy.getVertx()
                 .executeBlocking(() -> {
-                    String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+                    String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
                     String bucket = encryptionService.encrypt(bucketLocation);
                     return lockService.underBucketLock(bucketLocation, () -> {
                         invitationService.deleteInvitation(bucket, invitationId);

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

@@ -19,7 +19,7 @@
 import com.epam.aidial.core.server.service.PublicationService;
 import com.epam.aidial.core.server.service.ResourceNotFoundException;
 import com.epam.aidial.core.server.service.RuleService;
-import com.epam.aidial.core.server.storage.BlobStorageUtil;
+import com.epam.aidial.core.server.util.BucketBuilder;
 import com.epam.aidial.core.server.util.HttpException;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ProxyUtil;
@@ -163,7 +163,7 @@ public Future<?> listPublishedResources() {
                 .body()
                 .compose(body -> {
                     ListPublishedResourcesRequest request = ProxyUtil.convertToObject(body, ListPublishedResourcesRequest.class);
-                    String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+                    String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
                     String bucket = encryptService.encrypt(bucketLocation);
                     return vertx.executeBlocking(() -> {
                         Collection<MetadataBase> metadata =
@@ -245,7 +245,7 @@ private void checkAccess(ResourceDescriptor resource, boolean allowUser) {
         boolean hasAccess = isAdmin();
 
         if (!hasAccess && allowUser) {
-            String bucket = BlobStorageUtil.buildInitiatorBucket(context);
+            String bucket = BucketBuilder.buildInitiatorBucket(context);
             hasAccess = resource.getBucketLocation().equals(bucket);
         }
 

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

@@ -8,9 +8,9 @@
 import com.epam.aidial.core.server.upstream.RouteEndpointProvider;
 import com.epam.aidial.core.server.upstream.UpstreamProvider;
 import com.epam.aidial.core.server.upstream.UpstreamRoute;
-import com.epam.aidial.core.server.util.BufferingReadStream;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ProxyUtil;
+import com.epam.aidial.core.server.vertx.stream.BufferingReadStream;
 import io.vertx.core.Future;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpClientRequest;

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

@@ -15,11 +15,10 @@
 import com.epam.aidial.core.server.service.InvitationService;
 import com.epam.aidial.core.server.service.LockService;
 import com.epam.aidial.core.server.service.ShareService;
-import com.epam.aidial.core.server.storage.BlobStorageUtil;
+import com.epam.aidial.core.server.util.BucketBuilder;
 import com.epam.aidial.core.server.util.HttpException;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ProxyUtil;
-import com.epam.aidial.core.server.util.ResourceUtil;
 import io.vertx.core.Future;
 import io.vertx.core.buffer.Buffer;
 import lombok.extern.slf4j.Slf4j;
@@ -76,7 +75,7 @@ public Future<?> listSharedResources() {
                         throw new IllegalArgumentException("Can't list shared resources. Incorrect body");
                     }
 
-                    String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+                    String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
                     String bucket = encryptionService.encrypt(bucketLocation);
                     String with = request.getWith();
 
@@ -105,7 +104,7 @@ public Future<?> createSharedResources() {
                         throw new IllegalArgumentException("Can't initiate share request. Incorrect body");
                     }
 
-                    String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+                    String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
                     String bucket = encryptionService.encrypt(bucketLocation);
                     return proxy.getVertx().executeBlocking(() -> shareService.initializeShare(bucket, bucketLocation, request), false);
                 })
@@ -118,7 +117,7 @@ public Future<?> discardSharedResources() {
                 .body()
                 .compose(buffer -> {
                     ResourceLinkCollection request = getResourceLinkCollection(buffer, Operation.DISCARD);
-                    String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+                    String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
                     String bucket = encryptionService.encrypt(bucketLocation);
                     return proxy.getVertx()
                             .executeBlocking(() -> {
@@ -135,11 +134,11 @@ public Future<?> revokeSharedResources() {
                 .body()
                 .compose(buffer -> {
                     RevokeResourcesRequest request = getRevokeResourcesRequest(buffer, Operation.REVOKE);
-                    String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+                    String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
                     String bucket = encryptionService.encrypt(bucketLocation);
                     Map<ResourceDescriptor, Set<ResourceAccessType>> permissionsToRevoke = request.getResources().stream()
                             .collect(Collectors.toUnmodifiableMap(
-                                    resource -> ResourceUtil.resourceFromUrl(resource.url(), encryptionService),
+                                    resource -> ShareService.resourceFromUrl(resource.url(), encryptionService),
                                     SharedResource::permissions));
                     return proxy.getVertx()
                             .executeBlocking(() -> lockService.underBucketLock(bucketLocation, () -> {
@@ -173,7 +172,7 @@ public Future<?> copySharedAccess() {
                         throw new IllegalArgumentException("destinationUrl must be provided");
                     }
 
-                    String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+                    String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
                     String bucket = encryptionService.encrypt(bucketLocation);
 
                     ResourceDescriptor source = ResourceDescriptorFactory.fromPrivateUrl(sourceUrl, encryptionService);

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

@@ -5,10 +5,10 @@
 import com.epam.aidial.core.server.data.FileMetadata;
 import com.epam.aidial.core.server.resource.ResourceDescriptor;
 import com.epam.aidial.core.server.resource.ResourceDescriptorFactory;
-import com.epam.aidial.core.server.storage.BlobWriteStream;
 import com.epam.aidial.core.server.util.EtagHeader;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ProxyUtil;
+import com.epam.aidial.core.server.vertx.stream.BlobWriteStream;
 import io.vertx.core.Future;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpHeaders;

server/src/main/java/com/epam/aidial/core/server/data/SharedResources.java

@@ -1,6 +1,6 @@
 package com.epam.aidial.core.server.data;
 
-import com.epam.aidial.core.server.util.ResourceUtil;
+import com.epam.aidial.core.server.service.ShareService;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -28,7 +28,7 @@ public SharedResources(
     }
 
     public void addSharedResources(Map<String, Set<ResourceAccessType>> sharedResources) {
-        Map<String, Set<ResourceAccessType>> resourcesMap = ResourceUtil.sharedResourcesToMap(resources);
+        Map<String, Set<ResourceAccessType>> resourcesMap = ShareService.sharedResourcesToMap(resources);
         sharedResources.forEach((url, permissions) -> {
             Set<ResourceAccessType> existingPermissions = resourcesMap.get(url);
             if (existingPermissions == null) {

server/src/main/java/com/epam/aidial/core/server/function/CollectResponseAttachmentsFn.java

@@ -6,8 +6,8 @@
 import com.epam.aidial.core.server.data.AutoSharedData;
 import com.epam.aidial.core.server.data.ResourceAccessType;
 import com.epam.aidial.core.server.resource.ResourceDescriptor;
+import com.epam.aidial.core.server.resource.ResourceUtil;
 import com.epam.aidial.core.server.security.AccessService;
-import com.epam.aidial.core.server.storage.BlobStorageUtil;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.vertx.core.Future;
@@ -48,7 +48,7 @@ private String updateAutoSharedAttachments(String json, Set<String> collectedUrl
             throw new IllegalArgumentException(errorMsg);
         }
         for (String url : collectedUrls) {
-            if (BlobStorageUtil.isFolder(url)) {
+            if (ResourceUtil.isFolder(url)) {
                 apiKeyData.getAttachedFolders().put(url, new AutoSharedData(ResourceAccessType.ALL));
             } else {
                 apiKeyData.getAttachedFiles().put(url, new AutoSharedData(ResourceAccessType.ALL));

server/src/main/java/com/epam/aidial/core/server/limiter/RateLimiter.java

@@ -10,8 +10,8 @@
 import com.epam.aidial.core.server.resource.ResourceDescriptor;
 import com.epam.aidial.core.server.resource.ResourceDescriptorFactory;
 import com.epam.aidial.core.server.service.ResourceService;
-import com.epam.aidial.core.server.storage.BlobStorageUtil;
 import com.epam.aidial.core.server.token.TokenUsage;
+import com.epam.aidial.core.server.util.BucketBuilder;
 import com.epam.aidial.core.server.util.HttpStatus;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import io.vertx.core.Future;
@@ -148,7 +148,7 @@ private ResourceDescriptor getResourceDescription(ProxyContext context, String p
         // use bucket location of request's initiator,
         // e.g. user -> core -> application -> core -> model, limits must be applied to the user by JWT
         // e.g. service -> core -> application -> core -> model, limits must be applied to service by API key
-        String bucketLocation = BlobStorageUtil.buildInitiatorBucket(context);
+        String bucketLocation = BucketBuilder.buildInitiatorBucket(context);
         return ResourceDescriptorFactory.fromEncoded(ResourceTypes.LIMIT, bucketLocation, bucketLocation, path);
     }
 

server/src/main/java/com/epam/aidial/core/server/resource/ResourceDescriptorFactory.java

@@ -2,7 +2,6 @@
 
 import com.epam.aidial.core.server.data.ResourceTypes;
 import com.epam.aidial.core.server.security.EncryptionService;
-import com.epam.aidial.core.server.storage.BlobStorageUtil;
 import com.epam.aidial.core.server.util.UrlUtil;
 import org.apache.commons.lang3.StringUtils;
 
@@ -34,7 +33,7 @@ public static ResourceDescriptor fromEncoded(ResourceTypes type, String bucketNa
                 verify(isValidFilename(element), "Invalid path provided " + urlEncodedRelativePath)
         );
 
-        ResourceDescriptor resource = from(type, bucketName, bucketLocation, elements, BlobStorageUtil.isFolder(urlEncodedRelativePath));
+        ResourceDescriptor resource = from(type, bucketName, bucketLocation, elements, ResourceUtil.isFolder(urlEncodedRelativePath));
         verify(resource.getAbsoluteFilePath().getBytes(StandardCharsets.UTF_8).length <= MAX_PATH_SIZE,
                 "Resource path exceeds max allowed size: " + MAX_PATH_SIZE);
 
@@ -53,7 +52,7 @@ public static ResourceDescriptor fromDecoded(ResourceType type, String bucketNam
         verify(bucketLocation.endsWith(ResourceDescriptor.PATH_SEPARATOR), "Bucket location must end with /");
 
         List<String> elements = Arrays.asList(path.split(ResourceDescriptor.PATH_SEPARATOR));
-        return from(type, bucketName, bucketLocation, elements, BlobStorageUtil.isFolder(path));
+        return from(type, bucketName, bucketLocation, elements, ResourceUtil.isFolder(path));
     }
 
     public static ResourceDescriptor fromPublicUrl(String url) {

server/src/main/java/com/epam/aidial/core/server/resource/ResourceUtil.java

@@ -0,0 +1,12 @@
+package com.epam.aidial.core.server.resource;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class ResourceUtil {
+
+    public boolean isFolder(String path) {
+        return path.endsWith(ResourceDescriptor.PATH_SEPARATOR);
+    }
+
+}