Merge pull request #3445 from RedisInsight/latest

Latest to main

Author: rsergeenko

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.48.0)
+-v - Semver (2.50.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.circleci/config.yml

@@ -187,6 +187,15 @@ executors:
     machine:
       image: ubuntu-2004:2023.04.2
       docker_layer_caching: true
+  docker-node:
+    docker:
+      - image: cimg/node:18.15.0
+  docker:
+    docker:
+      - image: cibuilds/docker:19.03.5
+  macos:
+    macos:
+      xcode: 14.2.0
 
 parameters:
   linux:
@@ -208,8 +217,7 @@ parameters:
 jobs:
   # Test jobs
   unit-tests-ui:
-    docker:
-      - image: cimg/node:18.15.0
+    executor: docker-node
     steps:
       - checkout
       - restore_cache:
@@ -252,8 +260,7 @@ jobs:
           paths:
             - ./node_modules
   unit-tests-api:
-    docker:
-      - image: cimg/node:18.15.0
+    executor: docker-node
     steps:
       - checkout
       - restore_cache:
@@ -522,15 +529,14 @@ jobs:
 
   # Build jobs
   manual-build-validate:
+    executor: docker-node
     parameters:
       os:
         type: string
         default: ""
       target:
         type: string
         default: ""
-    docker:
-      - image: cimg/node:18.15.0
     steps:
       - checkout
       - run:
@@ -552,14 +558,13 @@ jobs:
           paths:
             - certs
   setup-build:
+    executor: docker
     parameters:
       env:
         description: Build environment (stage || prod)
         type: enum
         default: stage
         enum: [ 'dev', 'stage', 'prod' ]
-    docker:
-      - image: cibuilds/docker:19.03.5
     steps:
       - checkout
       - run:
@@ -577,8 +582,7 @@ jobs:
           paths:
             - electron
   linux:
-    machine:
-      image: ubuntu-2004:202101-01
+    executor: linux-executor
     resource_class: large
     parameters:
       env:
@@ -652,8 +656,7 @@ jobs:
             - release/Redis-Insight*.snap
             - release/*-linux.yml
   macosx:
-    macos:
-      xcode: 14.2.0
+    executor: macos
     resource_class: macos.x86.medium.gen2
     parameters:
       env:

redisinsight/api/config/default.ts

@@ -76,7 +76,7 @@ export default {
     tlsKey: process.env.RI_SERVER_TLS_KEY,
     staticContent: !!process.env.RI_SERVE_STATICS || true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.48.0',
+    appVersion: process.env.RI_APP_VERSION || '2.50.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

redisinsight/api/config/production.ts

@@ -23,7 +23,7 @@ export default {
       join(os.homedir(), '.redisinsight-preview'),
       join(os.homedir(), '.redisinsight-v2'),
       process.env.RI_GUIDES_PATH || join(homedir, 'guides'),
-    ]
+    ],
   },
   server: {
     env: 'production',
@@ -40,5 +40,7 @@ export default {
   },
   ai: {
     convAiApiUrl: process.env.RI_AI_CONVAI_API_URL || 'https://redis.io/convai/api',
+    querySocketUrl: process.env.RI_AI_QUERY_SOCKET_URL || 'https://app.redislabs.com',
+    querySocketPath: process.env.RI_AI_QUERY_SOCKET_PATH || '/api/v1/cloud-copilot-service/socket.io/',
   },
 };

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'Redis Insight Backend API',
     description: 'Redis Insight Backend API',
-    version: '2.48.0',
+    version: '2.50.0',
   },
   tags: [],
 };

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.48.0",
+  "version": "2.50.0",
   "description": "Redis Insight API",
   "private": true,
   "author": {

redisinsight/api/src/modules/ai/query/ai-query.service.ts

@@ -1,11 +1,12 @@
+import { isArray } from 'lodash';
 import { Socket } from 'socket.io-client';
 import { Injectable, Logger } from '@nestjs/common';
 import { ClientContext, SessionMetadata } from 'src/common/models';
 import { AiQueryProvider } from 'src/modules/ai/query/providers/ai-query.provider';
 import { SendAiQueryMessageDto } from 'src/modules/ai/query/dto/send.ai-query.message.dto';
 import { wrapAiQueryError } from 'src/modules/ai/query/exceptions';
 import { DatabaseClientFactory } from 'src/modules/database/providers/database.client.factory';
-import { getFullDbContext, getIndexContext } from 'src/modules/ai/query/utils/context.util';
+import { getFullDbContext, getIndexContext, quotesIfNeeded } from 'src/modules/ai/query/utils/context.util';
 import { Response } from 'express';
 import {
   AiQueryMessage,
@@ -56,6 +57,24 @@ export class AiQueryService {
     return steps;
   }
 
+  static prepareToolReply(toolReply: any) {
+    try {
+      const prepared = JSON.parse(toolReply);
+
+      if (prepared?.name === 'query' && prepared.content) {
+        const query = JSON.parse(prepared.content);
+        if (isArray(query)) {
+          prepared.content.query = JSON.stringify(query.map(quotesIfNeeded));
+        }
+        return JSON.stringify(prepared);
+      }
+    } catch (e) {
+      // ignore error
+    }
+
+    return toolReply;
+  }
+
   static prepareHistory(messages: AiQueryMessage[]): string[][] {
     const history = [];
     messages.forEach((message) => {
@@ -178,7 +197,7 @@ export class AiQueryService {
         socket.on(AiQueryWsEvents.TOOL_REPLY, async (data) => {
           answer.steps.push(plainToClass(AiQueryIntermediateStep, {
             type: AiQueryIntermediateStepType.TOOL,
-            data,
+            data: AiQueryService.prepareToolReply(data),
           }));
         });
 

redisinsight/api/src/modules/ai/query/utils/context.util.ts

@@ -9,7 +9,7 @@ type RedisClient = { sendCommand: (args: any, options: any) => Promise<any> };
 const DOCUMENT_SAMPLES_PER_PREFIX = 5;
 const HSCAN_COUNT = 500;
 
-const quotesIfNeeded = (str: string) => (str.indexOf(' ') > -1 ? JSON.stringify(str) : str);
+export const quotesIfNeeded = (str: string) => (str.indexOf(' ') > -1 ? JSON.stringify(str) : str);
 
 // ====================================================================
 // Reply converter
@@ -77,7 +77,7 @@ export const getAttributeTopValues = async (client: RedisClient, index: string,
 
         return {
           distinct_count: parseInt(distinct, 10),
-          top_values: top?.map(([, value, , count]) => ({ value, count })),
+          top_values: top?.map(([, value]) => ({ value })),
         };
       default:
         return {};

redisinsight/api/src/modules/cloud/common/models/cloud-request-utm.ts

@@ -37,4 +37,12 @@ export class CloudRequestUtm {
   @IsString()
   @IsNotEmpty()
   amp?: string;
+
+  @ApiPropertyOptional({
+    type: String,
+  })
+  @IsOptional()
+  @IsString()
+  @IsNotEmpty()
+  package?: string;
 }

redisinsight/api/src/modules/cloud/common/providers/cloud.api.provider.ts

@@ -41,6 +41,7 @@ export class CloudApiProvider {
       utm_medium: utm?.medium,
       utm_campaign: utm?.campaign,
       utm_amp: utm?.amp,
+      utm_package: utm?.package,
     };
   }