Merge branch 'main' into ops-3103

Author: ravikiranvm

packages/blocks/ai/src/index.ts

@@ -1,7 +1,7 @@
 import { createBlock } from '@openops/blocks-framework';
 import { aiAuth } from '@openops/common';
 import { BlockCategory } from '@openops/shared';
-import { askAi } from './lib/actions/askAi';
+import { aiStep } from './lib/actions/ai-step';
 
 export const ai = createBlock({
   displayName: 'AI',
@@ -10,6 +10,6 @@ export const ai = createBlock({
   minimumSupportedRelease: '0.7.1',
   logoUrl: 'https://static.openops.com/blocks/openops-ai.svg',
   authors: [],
-  actions: [askAi],
+  actions: [aiStep],
   triggers: [],
 });

…kages/blocks/ai/src/lib/actions/askAi.ts …ges/blocks/ai/src/lib/actions/ai-step.tspackages/blocks/ai/src/lib/actions/askAi.ts renamed to packages/blocks/ai/src/lib/actions/ai-step.ts packages/blocks/ai/src/lib/actions/askAi.ts renamed to packages/blocks/ai/src/lib/actions/ai-step.ts

@@ -13,10 +13,10 @@ import {
 import { AiProviderEnum, analysisLLMSchema } from '@openops/shared';
 import { generateObject, generateText } from 'ai';
 
-export const askAi = createAction({
-  displayName: 'Ask AI',
+export const aiStep = createAction({
+  displayName: 'AI Step',
   description:
-    'Ask AI a question or transform input using an LLM based on a prompt',
+    'Transform an input into a desired output through an AI analysis',
   name: 'analyze',
   auth: aiAuth,
   isWriteAction: false,

…ages/blocks/ai/test/askAi-action.test.ts …es/blocks/ai/test/ai-step-action.test.tspackages/blocks/ai/test/askAi-action.test.ts renamed to packages/blocks/ai/test/ai-step-action.test.ts packages/blocks/ai/test/askAi-action.test.ts renamed to packages/blocks/ai/test/ai-step-action.test.ts

@@ -13,15 +13,15 @@ jest.mock('ai', () => ({
 
 import { AiProviderEnum, analysisLLMSchema } from '@openops/shared';
 import { generateObject, generateText } from 'ai';
-import { askAi } from '../src/lib/actions/askAi';
+import { aiStep } from '../src/lib/actions/ai-step';
 
 describe('analyze action', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   test('should expose correct props', () => {
-    expect(askAi.props).toMatchObject({
+    expect(aiStep.props).toMatchObject({
       model: {
         type: 'DYNAMIC',
         displayName: 'Model',
@@ -59,7 +59,7 @@ describe('analyze action', () => {
 
     const context = createContext(auth, { prompt: 'Hello' });
 
-    const result = await askAi.run(context as any);
+    const result = await aiStep.run(context as any);
 
     expect(generateObject).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -100,7 +100,7 @@ describe('analyze action', () => {
       additionalInput: ['s1', 's2'],
     });
 
-    const result = await askAi.run(context as any);
+    const result = await aiStep.run(context as any);
 
     expect(generateObject).toHaveBeenCalledTimes(1);
     const args = (generateObject as jest.Mock).mock.calls[0][0];
@@ -134,7 +134,7 @@ describe('analyze action', () => {
 
     const context = createContext(auth, { prompt: 'Hi' });
 
-    const result = await askAi.run(context as any);
+    const result = await aiStep.run(context as any);
 
     expect(getAiProviderLanguageModel).toHaveBeenCalledWith({
       provider: AiProviderEnum.OPENAI,
@@ -174,7 +174,7 @@ describe('analyze action', () => {
       model: { model: 'gpt-from-props' },
     });
 
-    const result = await askAi.run(context as any);
+    const result = await aiStep.run(context as any);
 
     expect(getAiProviderLanguageModel).toHaveBeenCalledWith({
       provider: AiProviderEnum.OPENAI,
@@ -217,7 +217,7 @@ describe('analyze action', () => {
       const context = createContext(auth, { prompt: 'P' });
 
       isLLMTelemetryEnabled.mockReturnValueOnce(isLLMTelemetryEnabledValue);
-      await askAi.run(context as any);
+      await aiStep.run(context as any);
 
       expect(generateObject).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -247,7 +247,7 @@ describe('analyze action', () => {
 
     const context = createContext(auth, { prompt: 'Q' });
 
-    const result = await askAi.run(context as any);
+    const result = await aiStep.run(context as any);
 
     expect(generateText).toHaveBeenCalledWith(
       expect.objectContaining({ model: 'lm', prompt: 'Q' }),

packages/blocks/framework/src/lib/context.ts

@@ -1,5 +1,6 @@
 import {
   AppConnectionValue,
+  EncryptedObject,
   ExecutionType,
   FlowRunId,
   PauseMetadata,
@@ -125,6 +126,8 @@ export type ServerContext = {
   apiUrl: string;
   publicUrl: string;
   token: string;
+  tablesDatabaseId: number;
+  tablesDatabaseToken: EncryptedObject;
 };
 export type BaseActionContext<
   ET extends ExecutionType,

packages/engine/src/lib/handler/block-executor.ts

@@ -189,6 +189,8 @@ const executeAction: ActionHandler<BlockAction> = async ({
         token: constants.engineToken,
         apiUrl: constants.internalApiUrl,
         publicUrl: constants.publicUrl,
+        tablesDatabaseId: constants.tablesDatabaseId,
+        tablesDatabaseToken: constants.tablesDatabaseToken,
       },
       propsValue: processedInput,
       tags: createTagsManager(hookResponse),

packages/engine/src/lib/handler/context/engine-constants.ts

@@ -1,4 +1,5 @@
 import {
+  EncryptedObject,
   ExecuteFlowOperation,
   ExecutePropsOptions,
   ExecuteStepOperation,
@@ -38,8 +39,6 @@ export class EngineConstants {
   public static readonly BLOCK_SOURCES =
     process.env.OPS_BLOCKS_SOURCE ?? 'FILE';
 
-  private project: Project | null = null;
-
   public get baseCodeDirectory(): string {
     return EngineConstants.BASE_CODE_DIRECTORY;
   }
@@ -67,12 +66,19 @@ export class EngineConstants {
     public readonly serverHandlerId: string | null,
     public readonly testRunActionLimits: TestRunLimitSettings,
     public readonly isTestRun: boolean,
+    public readonly tablesDatabaseId: number,
+    public readonly tablesDatabaseToken: EncryptedObject,
     public readonly resumePayload?: ResumePayload,
   ) {}
 
-  public static fromExecuteFlowInput(
+  public static async fromExecuteFlowInput(
     input: ExecuteFlowOperation,
-  ): EngineConstants {
+  ): Promise<EngineConstants> {
+    const project = await EngineConstants.fetchProject(
+      input.internalApiUrl,
+      input.engineToken,
+    );
+
     return new EngineConstants(
       input.executionCorrelationId,
       input.flowVersion.flowId,
@@ -96,15 +102,22 @@ export class EngineConstants {
       input.serverHandlerId ?? null,
       input.flowVersion.testRunActionLimits,
       input.runEnvironment === 'TESTING',
+      project.tablesDatabaseId,
+      project.tablesDatabaseToken,
       input.executionType === ExecutionType.RESUME
         ? input.resumePayload
         : undefined,
     );
   }
 
-  public static fromExecuteStepInput(
+  public static async fromExecuteStepInput(
     input: ExecuteStepOperation,
-  ): EngineConstants {
+  ): Promise<EngineConstants> {
+    const project = await EngineConstants.fetchProject(
+      input.internalApiUrl,
+      input.engineToken,
+    );
+
     return new EngineConstants(
       null,
       input.flowVersion.flowId,
@@ -128,12 +141,19 @@ export class EngineConstants {
       null,
       input.flowVersion.testRunActionLimits,
       true,
+      project.tablesDatabaseId,
+      project.tablesDatabaseToken,
     );
   }
 
-  public static fromExecutePropertyInput(
+  public static async fromExecutePropertyInput(
     input: ExecutePropsOptions,
-  ): EngineConstants {
+  ): Promise<EngineConstants> {
+    const project = await EngineConstants.fetchProject(
+      input.internalApiUrl,
+      input.engineToken,
+    );
+
     return new EngineConstants(
       null,
       input.flowVersion.flowId,
@@ -157,12 +177,19 @@ export class EngineConstants {
       null,
       input.flowVersion.testRunActionLimits,
       true,
+      project.tablesDatabaseId,
+      project.tablesDatabaseToken,
     );
   }
 
-  public static fromExecuteTriggerInput(
+  public static async fromExecuteTriggerInput(
     input: ExecuteTriggerOperation<TriggerHookType>,
-  ): EngineConstants {
+  ): Promise<EngineConstants> {
+    const project = await EngineConstants.fetchProject(
+      input.internalApiUrl,
+      input.engineToken,
+    );
+
     return new EngineConstants(
       null,
       input.flowVersion.flowId,
@@ -186,24 +213,26 @@ export class EngineConstants {
       null,
       input.flowVersion.testRunActionLimits,
       input.test,
+      project.tablesDatabaseId,
+      project.tablesDatabaseToken,
     );
   }
 
-  private async getProject(): Promise<Project> {
-    if (this.project) {
-      return this.project;
-    }
-
-    const getWorkerProjectEndpoint = `${this.internalApiUrl}v1/worker/project`;
+  private static async fetchProject(
+    internalApiUrl: string,
+    engineToken: string,
+  ): Promise<Project> {
+    const getWorkerProjectEndpoint = `${addTrailingSlashIfMissing(
+      internalApiUrl,
+    )}v1/worker/project`;
 
     const response = await fetch(getWorkerProjectEndpoint, {
       headers: {
-        Authorization: `Bearer ${this.engineToken}`,
+        Authorization: `Bearer ${engineToken}`,
       },
     });
 
-    this.project = (await response.json()) as Project;
-    return this.project;
+    return (await response.json()) as Project;
   }
 }
 

packages/engine/src/lib/helper/block-helper.ts

@@ -124,6 +124,8 @@ export const blockHelper = {
           token: params.engineToken,
           apiUrl: constants.internalApiUrl,
           publicUrl: params.publicUrl,
+          tablesDatabaseId: constants.tablesDatabaseId,
+          tablesDatabaseToken: constants.tablesDatabaseToken,
         },
         project: {
           id: params.projectId,

packages/engine/src/lib/operations.ts

@@ -45,7 +45,7 @@ const executeFlow = async (
   context: FlowExecutorContext,
 ): Promise<EngineResponse<Pick<FlowRunResponse, 'status' | 'error'>>> => {
   try {
-    const constants = EngineConstants.fromExecuteFlowInput(input);
+    const constants = await EngineConstants.fromExecuteFlowInput(input);
 
     const response = await flowExecutor.triggerFlowExecutor({
       trigger: input.flowVersion.trigger,
@@ -92,7 +92,7 @@ async function executeStep(
       engineToken: input.engineToken,
       stepTestOutputs: input.stepTestOutputs,
     }),
-    constants: EngineConstants.fromExecuteStepInput(input),
+    constants: await EngineConstants.fromExecuteStepInput(input),
   });
 
   const stepResult = output.steps[step.name];
@@ -203,7 +203,7 @@ export async function execute(
             stepTestOutputs: input.stepTestOutputs,
           }),
           searchValue: input.searchValue,
-          constants: EngineConstants.fromExecutePropertyInput(input),
+          constants: await EngineConstants.fromExecutePropertyInput(input),
         });
 
         return {
@@ -222,7 +222,7 @@ export async function execute(
 
         const output = await triggerHelper.executeTrigger({
           params: input,
-          constants: EngineConstants.fromExecuteTriggerInput(input),
+          constants: await EngineConstants.fromExecuteTriggerInput(input),
         });
 
         return {

packages/engine/src/lib/resolve-variable.ts

@@ -9,7 +9,7 @@ export async function resolveVariable(
   input: ResolveVariableOperation,
 ): Promise<ResolveVariableResponse> {
   try {
-    const constants = EngineConstants.fromExecuteStepInput({
+    const constants = await EngineConstants.fromExecuteStepInput({
       projectId: input.projectId,
       engineToken: input.engineToken,
       internalApiUrl: input.internalApiUrl,

packages/engine/test/handler/test-helper.ts

@@ -30,6 +30,8 @@ export const generateMockEngineConstants = (params?: Partial<EngineConstants>):
         params?.serverHandlerId ?? null,
         params?.testRunActionLimits ?? { isEnabled: false, limits: [] },
         params?.isTestRun ?? false,
+        params?.tablesDatabaseId ?? 1,
+        params?.tablesDatabaseToken ?? { iv: 'test-iv', data: 'test-data' },
         params?.resumePayload,
     )
 }