From 50ebf63aeca1a3b578be2dd6c1a888b8c34df392 Mon Sep 17 00:00:00 2001
From: Flavien David <flavien@dust.tt>
Date: Fri, 9 Aug 2024 15:14:07 +0200
Subject: [PATCH] Pass data source view id to core for process action

---
 front/lib/api/assistant/actions/process.ts | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/front/lib/api/assistant/actions/process.ts b/front/lib/api/assistant/actions/process.ts
index c41ba164ef34..87d52c1c85af 100644
--- a/front/lib/api/assistant/actions/process.ts
+++ b/front/lib/api/assistant/actions/process.ts
@@ -247,18 +247,32 @@ export class ProcessConfigurationServerRunner extends BaseActionConfigurationSer
       DustProdActionRegistry["assistant-v2-process"].config
     );
 
+    // Transform each data source in actionConfiguration.dataSources by adding a
+    // `dataSourceOrViewId` field. This field will hold the value of `dataSourceViewId`
+    // if it exists; otherwise, it will fall back to `dataSourceId`
+    const actionConfigurationDataSources = actionConfiguration.dataSources.map(
+      (d) => {
+        const { dataSourceViewId, dataSourceId, ...rest } = d;
+        return {
+          ...rest,
+          // We use dataSourceViewId if it exists, otherwise dataSourceId.
+          dataSourceOrViewId: dataSourceViewId ?? dataSourceId,
+        };
+      }
+    );
+
     // Set the process action model configuration to the assistant model configuration.
     config.MODEL.provider_id = model.providerId;
     config.MODEL.model_id = model.modelId;
     config.MODEL.temperature = model.temperature;
 
     // Handle data sources list and parents/tags filtering.
-    config.DATASOURCE.data_sources = actionConfiguration.dataSources.map(
+    config.DATASOURCE.data_sources = actionConfigurationDataSources.map(
       (d) => ({
         workspace_id: isDevelopment()
           ? PRODUCTION_DUST_WORKSPACE_ID
           : d.workspaceId,
-        data_source_id: d.dataSourceId,
+        data_source_id: d.dataSourceOrViewId,
       })
     );
 
@@ -275,7 +289,7 @@ export class ProcessConfigurationServerRunner extends BaseActionConfigurationSer
       config.DATASOURCE.filter.tags.in = actionConfiguration.tagsFilter.in;
     }
 
-    for (const ds of actionConfiguration.dataSources) {
+    for (const ds of actionConfigurationDataSources) {
       if (!config.DATASOURCE.filter.parents) {
         config.DATASOURCE.filter.parents = {};
       }
@@ -283,7 +297,7 @@ export class ProcessConfigurationServerRunner extends BaseActionConfigurationSer
         if (!config.DATASOURCE.filter.parents.in_map) {
           config.DATASOURCE.filter.parents.in_map = {};
         }
-        config.DATASOURCE.filter.parents.in_map[ds.dataSourceId] =
+        config.DATASOURCE.filter.parents.in_map[ds.dataSourceOrViewId] =
           ds.filter.parents.in;
       }
       if (ds.filter.parents?.not) {