Merge branch 'main' into cezudas/OPS-3021-infrastructure

Author: cezudas

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/openops/src/lib/cloud-cli-common.ts

@@ -10,10 +10,12 @@ export function handleCliError({
   command: string;
   error: unknown;
 }): never {
-  logger.error(`${provider} CLI execution failed.`, {
-    command,
-    error,
-  });
+  logger.error(
+    `${provider} CLI execution failed.`,
+    error instanceof Error
+      ? { command, error }
+      : { command, errorMessage: error },
+  );
 
   const message = `An error occurred while running ${provider} CLI command: ${error}`;
 

packages/openops/src/lib/command-wrapper.ts

@@ -42,10 +42,10 @@ export async function executeFile(
 
 async function getResult(childProcess: ChildProcess, fullCommand: string) {
   let stdout = '';
-  let error = '';
+  let errorMessage = '';
 
   childProcess.stderr?.on('data', function (data) {
-    error += data;
+    errorMessage += data;
   });
 
   childProcess.stdout?.on('data', (data) => {
@@ -62,13 +62,13 @@ async function getResult(childProcess: ChildProcess, fullCommand: string) {
     command: fullCommand,
     exitCode,
     stdout,
-    error,
+    errorMessage,
   });
 
   return {
     exitCode: exitCode,
     stdOut: trimNewLines(stdout),
-    stdError: trimNewLines(error),
+    stdError: trimNewLines(errorMessage),
   };
 }
 

packages/react-ui/public/locales/en/translation.json

@@ -9,16 +9,13 @@
   "+{remainingBlocksCount} more": "+{remainingBlocksCount} more",
   "General": "General",
   "Appearance": "Appearance",
-  "AI": "AI",
+  "OpenOps AI": "OpenOps AI",
   "No results found.": "No results found.",
   "Something went wrong": "Something went wrong",
   "If it's a persistant issue, please contact support with steps to reproduce and include any relevant error messages.": "If it's a persistant issue, please contact support with steps to reproduce and include any relevant error messages.",
   "Refresh Page": "Refresh Page",
   "Contact Support": "Contact Support",
-  "AI Assistant": "AI Assistant",
-  "OpenOps Assistant": "OpenOps Assistant",
-  "OpenOps Agent": "OpenOps Agent",
-  "Enable AI": "Enable AI",
+  "Enable OpenOps AI": "Enable OpenOps AI",
   "Save": "Save",
   "Valid Connection": "Valid Connection",
   "Loading chat...": "Loading chat...",
@@ -31,6 +28,11 @@
   "AI Chat Error": "AI Chat Error",
   "There was an error while processing your request, please try again or open a new chat": "There was an error while processing your request, please try again or open a new chat",
   "There was an error creating the new chat, please try again": "There was an error creating the new chat, please try again",
+  "Your network connection was lost. Please check your internet connection and try again.": "Your network connection was lost. Please check your internet connection and try again.",
+  "Failed to delete chat. Please try again.": "Failed to delete chat. Please try again.",
+  "Failed to rename chat. Please try again.": "Failed to rename chat. Please try again.",
+  "OpenOps Assistant": "OpenOps Assistant",
+  "OpenOps Agent": "OpenOps Agent",
   "MCP": "MCP",
   "AWS Cost": "AWS Cost",
   "Connection": "Connection",
@@ -434,7 +436,6 @@
   "The redirection works!": "The redirection works!",
   "You will be redirected in a few seconds.": "You will be redirected in a few seconds.",
   "Base URL is required for OpenAI-compatible providers": "Base URL is required for OpenAI-compatible providers",
-  "AI providers": "AI providers",
   "Customize the appearance of the app. Automatically switch between day and night themes.": "Customize the appearance of the app. Automatically switch between day and night themes.",
   "Select the theme for the dashboard.": "Select the theme for the dashboard.",
   "Light": "Light",
@@ -460,6 +461,8 @@
   "It looks like AI hasn’t been configured in OpenOps yet.": "It looks like AI hasn’t been configured in OpenOps yet.",
   "Please go to ": "Please go to ",
   " to complete the setup.": " to complete the setup.",
+  "Close history": "Close history",
+  "Open history": "Open history",
   "New chat": "New chat",
   "Generating ...": "Generating ...",
   "Use code": "Use code",
@@ -469,7 +472,7 @@
   "AI Chat": "AI Chat",
   "Toggle AI Chat": "Toggle AI Chat",
   "How can I help you today?": "How can I help you today?",
-  "The AI is taking a bit longer than expected. Please wait...": "The AI is taking a bit longer than expected. Please wait...",
+  "Looks like your connection is a bit slow, this may cause delays in the AI responses.": "Looks like your connection is a bit slow, this may cause delays in the AI responses.",
   "Scroll to bottom": "Scroll to bottom",
   "Write a message...": "Write a message...",
   "Send": "Send",

packages/react-ui/src/app/common/auth/lib/utils.ts

@@ -1,6 +1,6 @@
 import { FlagsMap } from '@/app/lib/flags-api';
 
-export const getFederatedUrlBasedOnFlags = (flags: FlagsMap) =>
-  flags.FEDERATED_LOGIN_ENABLED
+export const getFederatedUrlBasedOnFlags = (flags?: FlagsMap) =>
+  flags?.FEDERATED_LOGIN_ENABLED
     ? (flags.FRONTEGG_URL as string | undefined)
     : undefined;

packages/react-ui/src/app/common/components/project-settings-layout.tsx

@@ -22,7 +22,7 @@ const appearanceNavItem = {
 };
 
 const aiNavItem = {
-  title: t('AI'),
+  title: t('OpenOps AI'),
   href: '/settings/ai',
   icon: <Sparkles size={iconSize} />,
 };

packages/react-ui/src/app/features/ai/ai-settings-form.tsx

@@ -84,32 +84,47 @@ const AiSettingsForm = ({
     });
   };
 
+  const descriptionText =
+    'Enables OpenOps Assistant and other AI-powered features such as the CLI command generation.';
+
   return (
     <Form {...form}>
-      <form className="flex-1 flex flex-col gap-4 max-w-[516px]">
+      <form className="flex-1 flex flex-col gap-4">
         <FormField
           control={form.control}
           name="enabled"
           render={({ field }) => (
-            <FormItem className="flex gap-[6px]">
-              <Switch
-                id="enabled"
-                checked={field.value}
-                onCheckedChange={field.onChange}
-              />
-              <Label htmlFor="enabled">{t('Enable AI')}</Label>
+            <FormItem className="flex flex-col">
+              <div className="flex items-center gap-[6px]">
+                <Switch
+                  id="enabled"
+                  checked={field.value}
+                  onCheckedChange={field.onChange}
+                />
+                <Label
+                  className="text-lg font-bold leading-6"
+                  htmlFor="enabled"
+                >
+                  {t('Enable OpenOps AI')}
+                </Label>
+              </div>
+              <p className="mt-8 text-base font-normal leading-6 text-primary-900">
+                {descriptionText}
+              </p>
             </FormItem>
           )}
         />
-        <ConnectionSelect
-          disabled={!currentFormValue.enabled}
-          allowDynamicValues={false}
-          block={block}
-          providerKey={'AI'}
-          name={'connection'}
-        />
+        <div className="max-w-[516px]">
+          <ConnectionSelect
+            disabled={!currentFormValue.enabled}
+            allowDynamicValues={false}
+            block={block}
+            providerKey={'AI'}
+            name={'connection'}
+          />
+        </div>
 
-        <div className="flex items-center justify-between ">
+        <div className="flex items-center justify-between max-w-[516px]">
           <div className="flex gap-2">
             <Button
               variant="outline"

packages/react-ui/src/app/features/builder/blocks-selector/block-selector-utils.ts

@@ -13,7 +13,6 @@ import {
   Trigger,
   TriggerType,
 } from '@openops/shared';
-
 import { createDefaultOptionSettings } from '../step-settings/split-settings/utils';
 
 const defaultCode = `export const code = async (inputs) => {
@@ -37,13 +36,7 @@ const getStepName = (block: StepMetadata, flowVersion: FlowVersion) => {
   if (block.type === TriggerType.BLOCK) {
     return 'trigger';
   }
-  const baseName = 'step_';
-  let number = 1;
-  const steps = flowHelper.getAllSteps(flowVersion.trigger);
-  while (steps.some((step) => step.name === `${baseName}${number}`)) {
-    number++;
-  }
-  return `${baseName}${number}`;
+  return flowHelper.findAvailableStepName(flowVersion, 'step');
 };
 
 const getDefaultStep = ({