[front] - feature: use dynamic Qdrant cluster configuration from env …

…variables - Replaced the hardcoded default Qdrant cluster with a dynamic one fetched from the environment configuration - Updated data source creation logic to utilize the new Qdrant cluster configuration method [types] - refactor: support multiple Qdrant cluster options in type definitions - Expanded the `QdrantCluster` type to support an additional cluster called "eu-cluster-0"
dust-tt · Dec 23, 2024 · 34b14d5 · 34b14d5
1 parent f49bae4
commit 34b14d5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/front/lib/api/config.ts b/front/lib/api/config.ts
@@ -1,4 +1,4 @@
-import { EnvironmentConfig } from "@dust-tt/types";
+import { EnvironmentConfig, QdrantCluster } from "@dust-tt/types";
 
 export const PRODUCTION_DUST_API = "https://dust.tt";
 
@@ -161,6 +161,9 @@ const config = {
   getStatusPageApiToken: (): string => {
     return EnvironmentConfig.getEnvVariable("STATUS_PAGE_API_TOKEN");
   },
+  getQdrantCluster: (): QdrantCluster => {
+    return EnvironmentConfig.getEnvVariable("QDRANT_CLUSTER") as QdrantCluster;
+  },
 };
 
 export default config;
diff --git a/front/lib/api/data_sources.ts b/front/lib/api/data_sources.ts
@@ -25,7 +25,6 @@ import {
   ConnectorsAPI,
   CoreAPI,
   DEFAULT_EMBEDDING_PROVIDER_ID,
-  DEFAULT_QDRANT_CLUSTER,
   dustManagedCredentials,
   EMBEDDING_CONFIGS,
   Err,
@@ -850,7 +849,7 @@ export async function createDataSourceWithoutProvider(
     projectId: dustProject.value.project.project_id.toString(),
     config: {
       qdrant_config: {
-        cluster: DEFAULT_QDRANT_CLUSTER,
+        cluster: config.getQdrantCluster(),
         shadow_write_cluster: null,
       },
       embedder_config: {

diff --git a/front/pages/api/w/[wId]/data_sources/managed.ts b/front/pages/api/w/[wId]/data_sources/managed.ts
@@ -9,7 +9,6 @@ import {
   ConnectorsAPI,
   CoreAPI,
   DEFAULT_EMBEDDING_PROVIDER_ID,
-  DEFAULT_QDRANT_CLUSTER,
   dustManagedCredentials,
   EMBEDDING_CONFIGS,
   ioTsParsePayload,
@@ -277,7 +276,7 @@ async function handler(
             },
           },
           qdrant_config: {
-            cluster: DEFAULT_QDRANT_CLUSTER,
+            cluster: config.getQdrantCluster(),
             shadow_write_cluster: null,
           },
         },

diff --git a/front/pages/api/w/[wId]/spaces/[spaceId]/data_sources/index.ts b/front/pages/api/w/[wId]/spaces/[spaceId]/data_sources/index.ts
@@ -11,7 +11,6 @@ import {
   ConnectorsAPI,
   CoreAPI,
   DEFAULT_EMBEDDING_PROVIDER_ID,
-  DEFAULT_QDRANT_CLUSTER,
   dustManagedCredentials,
   EMBEDDING_CONFIGS,
   ioTsParsePayload,
@@ -364,7 +363,7 @@ const handleDataSourceWithProvider = async ({
         },
       },
       qdrant_config: {
-        cluster: DEFAULT_QDRANT_CLUSTER,
+        cluster: config.getQdrantCluster(),
         shadow_write_cluster: null,
       },
     },

diff --git a/types/package.json b/types/package.json
@@ -47,4 +47,4 @@
     "hot-shots": false,
     "child_process": false
   }
-}
+}
diff --git a/types/src/core/data_source.ts b/types/src/core/data_source.ts
@@ -1,5 +1,4 @@
-export type QdrantCluster = "cluster-0";
-export const DEFAULT_QDRANT_CLUSTER: QdrantCluster = "cluster-0";
+export type QdrantCluster = "cluster-0" | "eu-cluster-0";
 
 export interface EmbedderType {
   provider_id: string;
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,4 +47,4 @@ @@
         "hot-shots": false,
         "child_process": false
       }
-    }
+    }