wip

Author: cezudas

packages/openops/src/index.ts

@@ -40,8 +40,6 @@ export * from './lib/openops-tables/applications-service';
 export * from './lib/openops-tables/auth-user';
 export * from './lib/openops-tables/fields';
 export * from './lib/openops-tables/filters';
-export * from './lib/openops-tables/get-encrypted-token-for-block';
-export * from './lib/openops-tables/get-project-database-token';
 export * from './lib/openops-tables/openops-tables-common-properties';
 export * from './lib/openops-tables/requests-helpers';
 export * from './lib/openops-tables/rows';

packages/openops/src/lib/openops-tables/applications-service.ts

@@ -1,19 +1,13 @@
-import { AxiosHeaders } from 'axios';
-import {
-  createAxiosHeaders,
-  createAxiosHeadersForOpenOpsTablesBlock,
-  makeOpenOpsTablesGet,
-} from './requests-helpers';
+import { createAxiosHeaders, makeOpenOpsTablesGet } from './requests-helpers';
 import { Application } from './types';
 
 export const OPENOPS_DEFAULT_DATABASE_NAME = 'OpenOps Dataset';
 
-async function getDefaultDatabaseIdInternal(
+export async function getDefaultDatabaseId(
   token: string,
-  authenticationHeaderCallback: (token: string) => AxiosHeaders,
   databaseName = OPENOPS_DEFAULT_DATABASE_NAME, // TODO: remove this when all environments are migrated
 ): Promise<number> {
-  const authenticationHeader = authenticationHeaderCallback(token);
+  const authenticationHeader = createAxiosHeaders(token);
 
   const getTablesResult: Application[] =
     await makeOpenOpsTablesGet<Application>(
@@ -31,19 +25,3 @@ async function getDefaultDatabaseIdInternal(
 
   return defaultDatabase.id;
 }
-
-export const getDefaultDatabaseId = (
-  token: string,
-  databaseName = OPENOPS_DEFAULT_DATABASE_NAME,
-): Promise<number> =>
-  getDefaultDatabaseIdInternal(token, createAxiosHeaders, databaseName);
-
-export const getDefaultDatabaseIdForOpenOpsTablesBlock = (
-  token: string,
-  databaseName = OPENOPS_DEFAULT_DATABASE_NAME,
-): Promise<number> =>
-  getDefaultDatabaseIdInternal(
-    token,
-    createAxiosHeadersForOpenOpsTablesBlock,
-    databaseName,
-  );

packages/openops/src/lib/openops-tables/tables.ts

@@ -1,12 +1,6 @@
 import { encryptUtils } from '@openops/server-shared';
-import {
-  createAxiosHeaders,
-  makeOpenOpsTablesGet,
-} from '../openops-tables/requests-helpers';
-import {
-  getDefaultDatabaseId,
-  getDefaultDatabaseIdForOpenOpsTablesBlock,
-} from './applications-service';
+import { makeOpenOpsTablesGet } from '../openops-tables/requests-helpers';
+import { getDefaultDatabaseId } from './applications-service';
 import { authenticateDefaultUserInOpenOpsTables } from './auth-user';
 import { createRequestContext, type RequestContext } from './request-context';
 
@@ -48,6 +42,9 @@ export async function getTableByName(
   return table;
 }
 
+/**
+ * @deprecated Use getTableNamesWithContext with block context instead
+ */
 export async function getTableNames(
   token?: string,
   useJwt = false,
@@ -57,6 +54,9 @@ export async function getTableNames(
   return tables.map((t) => t.name);
 }
 
+/**
+ * Get table names using block context (optimized - uses provided tablesDatabaseId and token)
+ */
 export async function getTableNamesWithContext(ctx: {
   server: {
     tablesDatabaseId: number;
@@ -75,22 +75,18 @@ async function getAvailableTablesWithContext(
   ctx?: RequestContext,
   tablesDatabaseId?: number,
 ): Promise<OpenOpsTable[]> {
-  const requestContext =
-    ctx ??
-    (await (async () => {
-      const { token } = await authenticateDefaultUserInOpenOpsTables();
-      return createRequestContext(token, true);
-    })());
-
+  let requestContext: RequestContext;
   let databaseId: number;
-  if (tablesDatabaseId !== undefined) {
+
+  if (ctx && tablesDatabaseId !== undefined) {
+    // Block context path - both provided
+    requestContext = ctx;
     databaseId = tablesDatabaseId;
   } else {
-    const isJwt = requestContext.createHeaders === createAxiosHeaders;
-    const getDatabaseId = isJwt
-      ? getDefaultDatabaseId
-      : getDefaultDatabaseIdForOpenOpsTablesBlock;
-    databaseId = await getDatabaseId(requestContext.token);
+    // Migration/seed path - fall back to JWT authentication
+    const { token } = await authenticateDefaultUserInOpenOpsTables();
+    requestContext = createRequestContext(token, true);
+    databaseId = await getDefaultDatabaseId(token);
   }
 
   const tables = await getTablesWithContext(requestContext, databaseId);
@@ -99,7 +95,8 @@ async function getAvailableTablesWithContext(
 }
 
 /**
- * @deprecated Use getAvailableTablesWithContext with RequestContext instead
+ * @deprecated Use getAvailableTablesWithContext with block context instead
+ * Only used by migrations/seeds
  */
 async function getAvailableTablesInOpenopsTables(
   token?: string,

packages/server/api/src/app/ai/mcp/llm-query-router.ts

@@ -1,8 +1,13 @@
-import { getTableNames, isLLMTelemetryEnabled } from '@openops/common';
-import { logger } from '@openops/server-shared';
+import {
+  getTableNames,
+  getTableNamesWithContext,
+  isLLMTelemetryEnabled,
+} from '@openops/common';
+import { AppSystemProp, logger, system } from '@openops/server-shared';
 import { AiConfigParsed, ChatFlowContext } from '@openops/shared';
 import { generateObject, LanguageModel, ModelMessage, ToolSet } from 'ai';
 import { z } from 'zod';
+import { projectService } from '../../project/project-service';
 import { getChatTools } from '../chat/ai-chat.service';
 import { buildUIContextSection } from '../chat/prompts.service';
 import { getAdditionalQueryClassificationDescriptions } from './extensions';
@@ -107,7 +112,7 @@ export async function routeQuery({
   }));
 
   try {
-    const openopsTablesNames = await getOpenOpsTablesNames();
+    const openopsTablesNames = await getOpenOpsTablesNames(projectId);
 
     const { object: selectionResult } = await generateObject({
       model: languageModel,
@@ -178,9 +183,22 @@ const getPreviousToolsForChat = async (
   }
 };
 
-const getOpenOpsTablesNames = async (): Promise<string[]> => {
+const getOpenOpsTablesNames = async (projectId: string): Promise<string[]> => {
   try {
-    return await getTableNames();
+    const useDatabaseToken =
+      system.getBoolean(AppSystemProp.USE_DATABASE_TOKEN) ?? false;
+
+    if (useDatabaseToken) {
+      const project = await projectService.getOneOrThrow(projectId);
+      return await getTableNamesWithContext({
+        server: {
+          tablesDatabaseId: project.tablesDatabaseId,
+          tablesDatabaseToken: project.tablesDatabaseToken,
+        },
+      });
+    } else {
+      return await getTableNames();
+    }
   } catch (error) {
     logger.error('Error getting OpenOps table names for the LLM query router', {
       error,