Feature/filter params v2 (#280)

* Enable useV2States for everyone in analyst mode

* Add web & ext commit ID to requests

* Add relevantEntitiesWithFields for state v2

Author: ppsreejith

apps/src/metabase/helpers/DOMToState.ts

@@ -106,6 +106,65 @@ export { type MetabasePageType } from '../defaultState'
 
 export type MetabaseAppState = MetabaseAppStateSQLEditor | MetabaseAppStateDashboard | MetabaseSemanticQueryAppState | MetabaseAppStateMBQLEditor;
 
+async function getRelevantEntitiesWithFields(sqlQuery: string): Promise<FormattedTable[]> {
+  const appSettings = RPCs.getAppSettings();
+  
+  // Early return if conditions not met
+  if (!appSettings.analystMode || !appSettings.manuallyLimitContext) {
+    return [];
+  }
+  
+  const dbId = await getSelectedDbId();
+  const selectedDatabaseInfo = dbId ? await getDatabaseInfo(dbId) : undefined;
+  const defaultSchema = selectedDatabaseInfo?.default_schema;
+  
+  const sqlTables = getTablesFromSqlRegex(sqlQuery);
+  const selectedCatalogObj = find(appSettings.availableCatalogs, { name: appSettings.selectedCatalog });
+  const selectedCatalog = get(selectedCatalogObj, 'content');
+  
+  // Apply default schema to tables if needed
+  if (defaultSchema) {
+    sqlTables.forEach((table) => {
+      if (table.schema === undefined || table.schema === '') {
+        table.schema = defaultSchema;
+      }
+    });
+  }
+  
+  let relevantTablesWithFields = await getTablesWithFields(appSettings.tableDiff, appSettings.drMode, !!selectedCatalog, sqlTables, []);
+  
+  // Add defaultSchema back to relevantTablesWithFields
+  relevantTablesWithFields = relevantTablesWithFields.map(table => {
+    if (table.schema === undefined || table.schema === '') {
+      table.schema = defaultSchema || 'unknown';
+    }
+    return table;
+  });
+  
+  const allModels = dbId ? await getAllRelevantModelsForSelectedDb(dbId) : [];
+  const relevantModels = await getSelectedAndRelevantModels(sqlQuery || "", appSettings.selectedModels, allModels);
+  const relevantModelsWithFields = await getModelsWithFields(relevantModels);
+  
+  // Transform and combine tables and models with type annotations
+  const relevantTablesWithFieldsAndType = relevantTablesWithFields.map(table => ({
+    ...table,
+    type: 'table',
+  }));
+  
+  const relevantModelsWithFieldsAndType = relevantModelsWithFields.map(model => ({
+    ...model,
+    type: 'model',
+    name: model.modelName || '',
+    id: model.modelId || 0,
+    schema: '',
+    table: undefined,
+    modelId: undefined,
+    modelName: undefined,
+  }));
+  
+  return [...relevantTablesWithFieldsAndType, ...relevantModelsWithFieldsAndType] as FormattedTable[];
+}
+
 export async function convertDOMtoStateSQLQueryV2() : Promise<MetabaseAppStateSQLEditorV2> {
   const [metabaseUrl, currentCardRaw, outputMarkdown, parameterValues] = await Promise.all([
     RPCs.queryURL(),
@@ -116,7 +175,9 @@ export async function convertDOMtoStateSQLQueryV2() : Promise<MetabaseAppStateSQ
   const currentCard = processCard(currentCardRaw);
   const metabaseOrigin = new URL(metabaseUrl).origin;
   const isEmbedded = getParsedIframeInfo().isEmbedded
-  const limitedEntities: MetabaseTableOrModel[] = []
+  const limitedEntities = await getRelevantEntitiesWithFields(
+    get(currentCard, 'dataset_query.native.query', '') || ''
+  );
   return {
     type: MetabaseAppStateType.SQLEditor,
     version: '2',
@@ -268,7 +329,7 @@ export async function convertDOMtoState() {
 //     return await semanticQueryState();
 //   }
   const appSettings = RPCs.getAppSettings()
-  if (appSettings.useV2States) {
+  if (appSettings.useV2States && appSettings.analystMode) {
     return await convertDOMtoStateSQLQueryV2();
   }
   return await convertDOMtoStateSQLQuery();

web/src/helpers/LLM/index.ts

@@ -2,7 +2,7 @@ import { planActionsOpenAI } from "./OpenAI";
 import { getState } from '../../state/store'
 import { planActionsRemote } from "./remote";
 import { Tasks, ToolCalls } from "../../state/chat/reducer";
-import { LLMContext, LLMResponse, LLMSettings } from "./types";
+import { LLMContext, LLMResponse, LLMSettings, LLMMetadata } from "./types";
 
 export type researchMode = 'simple' | 'deepResearchPlanner' | 'deepResearchTool'
 
@@ -14,10 +14,7 @@ export type PlanActionsParams = {
   deepResearch: researchMode,
   tasks: Tasks,
   conversationID: string,
-  meta?: {
-    timeDelta: number;
-    threadTimeDelta?: number;
-  },
+  meta?: LLMMetadata,
 }
 export async function planActions(params: PlanActionsParams ) : Promise<LLMResponse> { 
   const { isLocal } = getState().settings

web/src/helpers/LLM/types.ts

@@ -3,12 +3,16 @@ import { Tasks, ToolCalls } from "../../state/chat/reducer";
 
 export type LLMContext = Array<ChatCompletionMessageParam>
 
+export type LLMMetadata = {
+  timeDelta: number; // Time difference in milliseconds between current and last message
+  threadTimeDelta?: number; // Time difference from last user message in previous thread (when timeDelta is 0)
+  gitCommitId?: string; // Git commit ID from iframe props (extension/host)
+  webGitCommitId?: string; // Git commit ID from web package
+}
+
 export type LLMContextWithMeta = {
   context: LLMContext;
-  meta: {
-    timeDelta: number; // Time difference in milliseconds between current and last message
-    threadTimeDelta?: number; // Time difference from last user message in previous thread (when timeDelta is 0)
-  };
+  meta: LLMMetadata;
 }
 export type LLMResponse = {
   tool_calls: ToolCalls,

web/src/planner/utils.ts

@@ -1,11 +1,12 @@
 
-import { LLMContext, LLMContextWithMeta } from '../helpers/LLM/types';
+import { LLMContext, LLMContextWithMeta, LLMMetadata } from '../helpers/LLM/types';
 import { ChatMessage, UserChatMessage } from '../state/chat/reducer';
 import { renderString } from '../helpers/templatize';
 import { formatLLMMessageHistory } from '../helpers/LLM/context';
 import _ from 'lodash';
 import { AppState } from 'apps/types';
 import { getState } from '../state/store';
+import { getParsedIframeInfo } from '../helpers/origin';
 
 
 type LLMPrompts = {
@@ -107,13 +108,22 @@ export function getLLMContextFromState(
     ...context,
   ];
 
-  const meta: { timeDelta: number; threadTimeDelta?: number } = {
+  const iframeInfo = getParsedIframeInfo();
+  const meta: LLMMetadata = {
     timeDelta
   };
 
   if (threadTimeDelta !== undefined) {
     meta.threadTimeDelta = threadTimeDelta;
   }
+  
+  if (iframeInfo.gitCommitId) {
+    meta.gitCommitId = iframeInfo.gitCommitId;
+  }
+  
+  if (iframeInfo.webGitCommitId) {
+    meta.webGitCommitId = iframeInfo.webGitCommitId;
+  }
 
   return {
     context: llmContext,

web/src/state/store.ts

@@ -509,6 +509,11 @@ const migrations = {
     newState.settings.currentEmail = newState.auth?.email
     return newState
   },
+  51: (state: RootState) => {
+    let newState = {...state}
+    newState.settings.useV2States = true
+    return newState
+  }
 }
 
 const BLACKLIST = ['billing', 'cache', userStateApi.reducerPath]
@@ -519,7 +524,7 @@ if (isEmbedded) {
 
 const persistConfig = {
   key: 'root',
-  version: 50,
+  version: 51,
   storage,
   blacklist: BLACKLIST,
   // @ts-ignore