Avoid requiring env variable when importing file (#4573)

* Avoid requiring env variable when importing file * s/dfs/file_storage
dust-tt · May 26, 2024 · a0d6dc0 · a0d6dc0
1 parent c3f2d12
commit a0d6dc0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 21 deletions.
diff --git a/front/lib/api/assistant/configuration.ts b/front/lib/api/assistant/configuration.ts
@@ -34,7 +34,7 @@ import { agentConfigurationWasUpdatedBy } from "@app/lib/api/assistant/recent_au
 import { agentUserListStatus } from "@app/lib/api/assistant/user_relation";
 import { compareAgentsForSort } from "@app/lib/assistant";
 import type { Authenticator } from "@app/lib/auth";
-import { getPublicUploadBucket } from "@app/lib/dfs";
+import { getPublicUploadBucket } from "@app/lib/file_storage";
 import {
   AgentConfiguration,
   AgentDataSourceConfiguration,

diff --git a/front/lib/dfs/config.ts → front/lib/file_storage/config.ts b/front/lib/dfs/config.ts → front/lib/file_storage/config.ts
diff --git a/front/lib/dfs/index.ts → front/lib/file_storage/index.ts b/front/lib/dfs/index.ts → front/lib/file_storage/index.ts
@@ -4,24 +4,18 @@ import type formidable from "formidable";
 import fs from "fs";
 import { pipeline } from "stream/promises";
 
-import config from "@app/lib/dfs/config";
+import config from "@app/lib/file_storage/config";
 
-type BucketKeyType = "PRIVATE_UPLOAD" | "PUBLIC_UPLOAD";
-
-const storage = new Storage({
-  keyFilename: config.getServiceAccount(),
-});
-
-const bucketKeysToBucket: Record<BucketKeyType, Bucket> = {
-  PRIVATE_UPLOAD: storage.bucket(config.getGcsPrivateUploadsBucket()),
-  PUBLIC_UPLOAD: storage.bucket(config.getGcsPublicUploadBucket()),
-};
-
-class DFS {
+class FileStorage {
   private readonly bucket: Bucket;
+  private readonly storage: Storage;
+
+  constructor(bucketKey: string) {
+    this.storage = new Storage({
+      keyFilename: config.getServiceAccount(),
+    });
 
-  constructor(bucketKey: BucketKeyType) {
-    this.bucket = bucketKeysToBucket[bucketKey];
+    this.bucket = this.storage.bucket(bucketKey);
   }
 
   /**
@@ -87,6 +81,8 @@ class DFS {
   }
 }
 
-export const getPrivateUploadBucket = () => new DFS("PRIVATE_UPLOAD");
+export const getPrivateUploadBucket = () =>
+  new FileStorage(config.getGcsPrivateUploadsBucket());
 
-export const getPublicUploadBucket = () => new DFS("PUBLIC_UPLOAD");
+export const getPublicUploadBucket = () =>
+  new FileStorage(config.getGcsPublicUploadBucket());
diff --git a/front/lib/resources/content_fragment_resource.ts b/front/lib/resources/content_fragment_resource.ts
@@ -8,7 +8,7 @@ import type {
 } from "sequelize";
 
 import appConfig from "@app/lib/api/config";
-import { getPrivateUploadBucket } from "@app/lib/dfs";
+import { getPrivateUploadBucket } from "@app/lib/file_storage";
 import { Message } from "@app/lib/models";
 import { BaseResource } from "@app/lib/resources/base_resource";
 import { ContentFragmentModel } from "@app/lib/resources/storage/models/content_fragment";

diff --git a/front/pages/api/w/[wId]/assistant/agent_configurations/avatar.ts b/front/pages/api/w/[wId]/assistant/agent_configurations/avatar.ts
@@ -1,7 +1,7 @@
 import { IncomingForm } from "formidable";
 import type { NextApiRequest, NextApiResponse } from "next";
 
-import { getPublicUploadBucket } from "@app/lib/dfs";
+import { getPublicUploadBucket } from "@app/lib/file_storage";
 import { withLogging } from "@app/logger/withlogging";
 
 export const config = {

diff --git a/...es/api/w/[wId]/assistant/conversations/[cId]/messages/[mId]/raw_content_fragment/index.ts b/...es/api/w/[wId]/assistant/conversations/[cId]/messages/[mId]/raw_content_fragment/index.ts
@@ -5,7 +5,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
 
 import { getConversation } from "@app/lib/api/assistant/conversation";
 import { Authenticator, getSession } from "@app/lib/auth";
-import { getPrivateUploadBucket } from "@app/lib/dfs";
+import { getPrivateUploadBucket } from "@app/lib/file_storage";
 import { fileAttachmentLocation } from "@app/lib/resources/content_fragment_resource";
 import { apiError, withLogging } from "@app/logger/withlogging";