Merge branch 'mg/OPS-2396-2' into mg/OPS-2396-3

Author: MarceloRGonc

packages/blocks/aws/src/lib/actions/ec2/ec2-modify-instance-action.ts

@@ -56,7 +56,7 @@ export const ec2ModifyInstanceAction = createAction({
                 attributeName,
               }): Promise<{ [key: string]: any }> => {
                 if (!attributeName) {
-                  return {};
+                  return { attributeValue: {} };
                 }
                 const attributeNameProp = attributeName as unknown as string;
 

packages/blocks/end-flow/src/index.ts

@@ -1,16 +1,16 @@
 import { BlockAuth, createBlock } from '@openops/blocks-framework';
 import { BlockCategory } from '@openops/shared';
-import { endFlowAction } from './lib/actions/end-workflow';
+import { stopFlowAction } from './lib/actions/end-workflow';
 
-export const endFlow = createBlock({
-  displayName: 'End Workflow',
-  description: 'End the current workflow',
+export const stopFlow = createBlock({
+  displayName: 'Stop Execution',
+  description: 'Stop the current scope execution (flow or loop iteration)',
   auth: BlockAuth.None(),
   minimumSupportedRelease: '0.20.0',
   logoUrl:
     'data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3C!--%20License%3A%20MIT.%20Made%20by%20phosphor%3A%20https%3A%2F%2Fgithub.com%2Fphosphor-icons%2Fphosphor-icons%20--%3E%3Csvg%20fill%3D%22%23000000%22%20width%3D%22800px%22%20height%3D%22800px%22%20viewBox%3D%220%200%20256%20256%22%20id%3D%22Flat%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M128%2C20.00012a108%2C108%2C0%2C1%2C0%2C108%2C108A108.12217%2C108.12217%2C0%2C0%2C0%2C128%2C20.00012Zm0%2C192a84%2C84%2C0%2C1%2C1%2C84-84A84.0953%2C84.0953%2C0%2C0%2C1%2C128%2C212.00012Zm40.48535-107.51465L144.9707%2C128.00012l23.51465%2C23.51465a12.0001%2C12.0001%2C0%2C0%2C1-16.9707%2C16.9707L128%2C144.97082l-23.51465%2C23.51465a12.0001%2C12.0001%2C0%2C0%2C1-16.9707-16.9707l23.51465-23.51465L87.51465%2C104.48547a12.0001%2C12.0001%2C0%2C0%2C1%2C16.9707-16.9707L128%2C111.02942l23.51465-23.51465a12.0001%2C12.0001%2C0%2C0%2C1%2C16.9707%2C16.9707Z%22%2F%3E%3C%2Fsvg%3E',
   authors: [],
-  actions: [endFlowAction],
+  actions: [stopFlowAction],
   triggers: [],
   categories: [BlockCategory.WORKFLOW],
 });

packages/blocks/end-flow/src/lib/actions/end-workflow.ts

@@ -1,9 +1,9 @@
 import { createAction } from '@openops/blocks-framework';
 
-export const endFlowAction = createAction({
+export const stopFlowAction = createAction({
   name: 'end_workflow',
-  displayName: 'End Workflow',
-  description: 'End the current workflow',
+  displayName: 'Stop Execution',
+  description: 'Stop the current scope execution (flow or loop iteration)',
   props: {},
   errorHandlingOptions: {
     continueOnFailure: {

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

@@ -125,10 +125,9 @@ export const triggerHelper = {
         await trigger.onEnable(context);
         return {
           listeners: appListeners,
-          scheduleOptions:
-            trigger.type === TriggerStrategy.POLLING
-              ? scheduleOptions
-              : undefined,
+          scheduleOptions: isSchedulable(trigger.type)
+            ? scheduleOptions
+            : undefined,
         };
       case TriggerHookType.RENEW:
         assertEqual(
@@ -247,6 +246,10 @@ export const triggerHelper = {
   },
 };
 
+function isSchedulable(type: TriggerStrategy): boolean {
+  return type === TriggerStrategy.POLLING || type === TriggerStrategy.SCHEDULED;
+}
+
 type ExecuteTriggerParams = {
   params: ExecuteTriggerOperation<TriggerHookType>;
   constants: EngineConstants;

packages/openops/src/lib/ai/providers.ts

@@ -165,9 +165,3 @@ function sanitizeProviderSettings(
 
   return sanitized;
 }
-
-export const providerOptions = {
-  openai: {
-    structuredOutputs: false,
-  },
-};

packages/react-ui/src/app/features/builder/block-properties/builder-json-wrapper.tsx

@@ -36,7 +36,7 @@ const BuilderJsonEditorWrapper = ({
                   endLineNumber: position.lineNumber,
                   endColumn: position.column,
                 },
-                text: `"{{${propertyPath}}}"`,
+                text: `{{${propertyPath}}}`,
               },
             ]);
           }

packages/server/api/src/app/ai/chat/code.service.ts

@@ -1,4 +1,4 @@
-import { isLLMTelemetryEnabled, providerOptions } from '@openops/common';
+import { isLLMTelemetryEnabled } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import {
   AiConfig,
@@ -49,7 +49,6 @@ export const streamCode = ({
     onError,
     schema: unifiedCodeLLMSchema,
     experimental_telemetry: { isEnabled: isLLMTelemetryEnabled() },
-    providerOptions,
   });
 };
 
@@ -80,6 +79,5 @@ export const generateCode = ({
     ...aiConfig.modelSettings,
     schema: unifiedCodeLLMSchema,
     experimental_telemetry: { isEnabled: isLLMTelemetryEnabled() },
-    providerOptions,
   });
 };

packages/server/api/src/app/ai/chat/llm-stream-handler.ts

@@ -1,4 +1,4 @@
-import { isLLMTelemetryEnabled, providerOptions } from '@openops/common';
+import { isLLMTelemetryEnabled } from '@openops/common';
 import { AiConfig } from '@openops/shared';
 import {
   LanguageModel,
@@ -57,7 +57,6 @@ export function getLLMAsyncStream(
     async onError({ error }): Promise<void> {
       throw error;
     },
-    providerOptions,
   });
 
   return fullStream;

packages/server/api/src/app/ai/mcp/tools-selector.ts

@@ -1,4 +1,4 @@
-import { isLLMTelemetryEnabled, providerOptions } from '@openops/common';
+import { isLLMTelemetryEnabled } from '@openops/common';
 import { logger } from '@openops/server-shared';
 import { AiConfig } from '@openops/shared';
 import { generateObject, LanguageModel, ModelMessage, ToolSet } from 'ai';
@@ -36,7 +36,6 @@ export async function selectRelevantTools({
       messages,
       ...aiConfig.modelSettings,
       experimental_telemetry: { isEnabled: isLLMTelemetryEnabled() },
-      providerOptions,
     });
 
     let selectedToolNames = toolSelectionResult.tool_names;

packages/server/api/src/app/flows/trigger/hooks/enable-trigger-hook.ts

@@ -17,6 +17,7 @@ import {
   OpsEdition,
   ProjectId,
   RunEnvironment,
+  ScheduleOptions,
   TriggerHookType,
   TriggerType,
 } from '@openops/shared';
@@ -125,29 +126,32 @@ export const enableBlockTrigger = async (
       }
       break;
     }
-    case TriggerStrategy.POLLING:
-    case TriggerStrategy.SCHEDULED: {
+    case TriggerStrategy.POLLING: {
       if (isNil(engineHelperResponse.result.scheduleOptions)) {
         engineHelperResponse.result.scheduleOptions = {
           cronExpression: POLLING_FREQUENCY_CRON_EXPRESSON,
           timezone: 'UTC',
           failureCount: 0,
         };
       }
-      await flowQueue.add({
-        executionCorrelationId: flowVersion.id,
-        type: JobType.REPEATING,
-        data: {
-          schemaVersion: LATEST_JOB_DATA_SCHEMA_VERSION,
-          projectId,
-          environment: RunEnvironment.PRODUCTION,
-          flowVersionId: flowVersion.id,
-          flowId: flowVersion.flowId,
-          triggerType: TriggerType.BLOCK,
-          jobType: RepeatableJobType.EXECUTE_TRIGGER,
-        },
-        scheduleOptions: engineHelperResponse.result.scheduleOptions,
-      });
+
+      const scheduleOptions = engineHelperResponse.result.scheduleOptions;
+
+      await addBlockTriggerToQueue(projectId, flowVersion, scheduleOptions);
+
+      break;
+    }
+    case TriggerStrategy.SCHEDULED: {
+      const scheduleOptions = engineHelperResponse.result.scheduleOptions;
+
+      if (isNil(scheduleOptions)) {
+        throw new Error(
+          'No schedule options set for trigger of Schedule type.',
+        );
+      }
+
+      await addBlockTriggerToQueue(projectId, flowVersion, scheduleOptions);
+
       break;
     }
   }
@@ -160,3 +164,24 @@ type EnableParams = {
   flowVersion: FlowVersion;
   simulate: boolean;
 };
+
+async function addBlockTriggerToQueue(
+  projectId: string,
+  flowVersion: FlowVersion,
+  scheduleOptions: ScheduleOptions,
+): Promise<void> {
+  await flowQueue.add({
+    executionCorrelationId: flowVersion.id,
+    type: JobType.REPEATING,
+    data: {
+      schemaVersion: LATEST_JOB_DATA_SCHEMA_VERSION,
+      projectId,
+      environment: RunEnvironment.PRODUCTION,
+      flowVersionId: flowVersion.id,
+      flowId: flowVersion.flowId,
+      triggerType: TriggerType.BLOCK,
+      jobType: RepeatableJobType.EXECUTE_TRIGGER,
+    },
+    scheduleOptions,
+  });
+}