Revert "[core] - feature: support eu-cluster-0 in Qdrant" (#9634)

* Revert "[core] - feature: support `eu-cluster-0` in Qdrant (#9625)" This reverts commit 69c48d3. * [core] - refactor: simplify Qdrant cluster variants array - Removed redundant QdrantCluster enum variant to streamline cluster management
dust-tt · Dec 26, 2024 · 6e0715f · 6e0715f
1 parent e32b106
commit 6e0715f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git a/core/src/data_sources/qdrant.rs b/core/src/data_sources/qdrant.rs
@@ -23,21 +23,17 @@ use super::data_source::EmbedderConfig;
 pub enum QdrantCluster {
     #[serde(rename = "cluster-0")]
     Cluster0,
-    #[serde(rename = "eu-cluster-0")]
-    EUCluster0,
 }
 
 // See: https://www.notion.so/dust-tt/Design-Doc-Qdrant-re-arch-d0ebdd6ae8244ff593cdf10f08988c27
 pub const SHARD_KEY_COUNT: u64 = 24;
 
-static QDRANT_CLUSTER_VARIANTS: &[QdrantCluster] =
-    &[QdrantCluster::Cluster0, QdrantCluster::EUCluster0];
+static QDRANT_CLUSTER_VARIANTS: &[QdrantCluster] = &[QdrantCluster::Cluster0];
 
 impl fmt::Display for QdrantCluster {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             QdrantCluster::Cluster0 => write!(f, "cluster-0"),
-            QdrantCluster::EUCluster0 => write!(f, "eu-cluster-0"),
         }
     }
 }
@@ -47,7 +43,6 @@ impl FromStr for QdrantCluster {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "cluster-0" => Ok(QdrantCluster::Cluster0),
-            "eu-cluster-0" => Ok(QdrantCluster::EUCluster0),
             _ => Err(ParseError::with_message("Unknown QdrantCluster"))?,
         }
     }
@@ -56,7 +51,6 @@ impl FromStr for QdrantCluster {
 pub fn env_var_prefix_for_cluster(cluster: QdrantCluster) -> &'static str {
     match cluster {
         QdrantCluster::Cluster0 => "QDRANT_CLUSTER_0",
-        QdrantCluster::EUCluster0 => "QDRANT_EU_CLUSTER_0",
     }
 }
 

diff --git a/front/lib/api/config.ts b/front/lib/api/config.ts
@@ -1,4 +1,3 @@
-import type { QdrantCluster } from "@dust-tt/types";
 import { EnvironmentConfig } from "@dust-tt/types";
 
 export const PRODUCTION_DUST_API = "https://dust.tt";
@@ -162,9 +161,6 @@ 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,6 +25,7 @@ import {
   ConnectorsAPI,
   CoreAPI,
   DEFAULT_EMBEDDING_PROVIDER_ID,
+  DEFAULT_QDRANT_CLUSTER,
   dustManagedCredentials,
   EMBEDDING_CONFIGS,
   Err,
@@ -849,7 +850,7 @@ export async function createDataSourceWithoutProvider(
     projectId: dustProject.value.project.project_id.toString(),
     config: {
       qdrant_config: {
-        cluster: config.getQdrantCluster(),
+        cluster: DEFAULT_QDRANT_CLUSTER,
         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,6 +9,7 @@ import {
   ConnectorsAPI,
   CoreAPI,
   DEFAULT_EMBEDDING_PROVIDER_ID,
+  DEFAULT_QDRANT_CLUSTER,
   dustManagedCredentials,
   EMBEDDING_CONFIGS,
   ioTsParsePayload,
@@ -276,7 +277,7 @@ async function handler(
             },
           },
           qdrant_config: {
-            cluster: config.getQdrantCluster(),
+            cluster: DEFAULT_QDRANT_CLUSTER,
             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,6 +11,7 @@ import {
   ConnectorsAPI,
   CoreAPI,
   DEFAULT_EMBEDDING_PROVIDER_ID,
+  DEFAULT_QDRANT_CLUSTER,
   dustManagedCredentials,
   EMBEDDING_CONFIGS,
   ioTsParsePayload,
@@ -363,7 +364,7 @@ const handleDataSourceWithProvider = async ({
         },
       },
       qdrant_config: {
-        cluster: config.getQdrantCluster(),
+        cluster: DEFAULT_QDRANT_CLUSTER,
         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,4 +1,5 @@
-export type QdrantCluster = "cluster-0" | "eu-cluster-0";
+export type QdrantCluster = "cluster-0";
+export const DEFAULT_QDRANT_CLUSTER: QdrantCluster = "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
       }
-    }
+    }