Merge branch 'main' into move-zapier-to-user-menu

Author: lyubov-voloshko

backend/src/ai-core/tools/query-validators.ts

@@ -107,5 +107,11 @@ export function cleanAIJsonResponse(response: string): string {
 	if (cleanedResponse.endsWith('```')) {
 		cleanedResponse = cleanedResponse.slice(0, -3);
 	}
+	cleanedResponse = cleanedResponse.trim();
+
+	cleanedResponse = cleanedResponse.replace(/^\s*\/\/.*$/gm, '');
+	cleanedResponse = cleanedResponse.replace(/\/\*[\s\S]*?\*\//g, '');
+	cleanedResponse = cleanedResponse.replace(/,(\s*[}\]])/g, '$1');
+
 	return cleanedResponse.trim();
 }

backend/src/common/application/global-database-context.interface.ts

@@ -62,6 +62,10 @@ import { DashboardEntity } from '../../entities/visualizations/dashboard/dashboa
 import { DashboardWidgetEntity } from '../../entities/visualizations/dashboard-widget/dashboard-widget.entity.js';
 import { IDashboardRepository } from '../../entities/visualizations/dashboard/repository/dashboard.repository.interface.js';
 import { IDashboardWidgetRepository } from '../../entities/visualizations/dashboard-widget/repository/dashboard-widget.repository.interface.js';
+import { UserAiChatEntity } from '../../entities/ai/ai-conversation-history/user-ai-chat/user-ai-chat.entity.js';
+import { IUserAiChatRepository } from '../../entities/ai/ai-conversation-history/user-ai-chat/repository/user-ai-chat-repository.interface.js';
+import { AiChatMessageEntity } from '../../entities/ai/ai-conversation-history/ai-chat-messages/ai-chat-message.entity.js';
+import { IAiChatMessageRepository } from '../../entities/ai/ai-conversation-history/ai-chat-messages/repository/ai-chat-message-repository.interface.js';
 
 export interface IGlobalDatabaseContext extends IDatabaseContext {
 	userRepository: Repository<UserEntity> & IUserRepository;
@@ -104,4 +108,6 @@ export interface IGlobalDatabaseContext extends IDatabaseContext {
 	savedDbQueryRepository: Repository<SavedDbQueryEntity> & ISavedDbQueryRepository;
 	dashboardRepository: Repository<DashboardEntity> & IDashboardRepository;
 	dashboardWidgetRepository: Repository<DashboardWidgetEntity> & IDashboardWidgetRepository;
+	userAiChatRepository: Repository<UserAiChatEntity> & IUserAiChatRepository;
+	aiChatMessageRepository: Repository<AiChatMessageEntity> & IAiChatMessageRepository;
 }

backend/src/common/application/global-database-context.ts

@@ -111,6 +111,12 @@ import { IDashboardRepository } from '../../entities/visualizations/dashboard/re
 import { IDashboardWidgetRepository } from '../../entities/visualizations/dashboard-widget/repository/dashboard-widget.repository.interface.js';
 import { dashboardCustomRepositoryExtension } from '../../entities/visualizations/dashboard/repository/dashboard-custom-repository-extension.js';
 import { dashboardWidgetCustomRepositoryExtension } from '../../entities/visualizations/dashboard-widget/repository/dashboard-widget-custom-repository-extension.js';
+import { UserAiChatEntity } from '../../entities/ai/ai-conversation-history/user-ai-chat/user-ai-chat.entity.js';
+import { IUserAiChatRepository } from '../../entities/ai/ai-conversation-history/user-ai-chat/repository/user-ai-chat-repository.interface.js';
+import { userAiChatRepositoryExtension } from '../../entities/ai/ai-conversation-history/user-ai-chat/repository/user-ai-chat-repository.extension.js';
+import { AiChatMessageEntity } from '../../entities/ai/ai-conversation-history/ai-chat-messages/ai-chat-message.entity.js';
+import { IAiChatMessageRepository } from '../../entities/ai/ai-conversation-history/ai-chat-messages/repository/ai-chat-message-repository.interface.js';
+import { aiChatMessageRepositoryExtension } from '../../entities/ai/ai-conversation-history/ai-chat-messages/repository/ai-chat-message-repository.extension.js';
 
 @Injectable({ scope: Scope.REQUEST })
 export class GlobalDatabaseContext implements IGlobalDatabaseContext {
@@ -156,6 +162,8 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 	private _savedDbQueryRepository: Repository<SavedDbQueryEntity> & ISavedDbQueryRepository;
 	private _dashboardRepository: Repository<DashboardEntity> & IDashboardRepository;
 	private _dashboardWidgetRepository: Repository<DashboardWidgetEntity> & IDashboardWidgetRepository;
+	private _userAiChatRepository: Repository<UserAiChatEntity> & IUserAiChatRepository;
+	private _aiChatMessageRepository: Repository<AiChatMessageEntity> & IAiChatMessageRepository;
 
 	public constructor(
 		@Inject(BaseType.DATA_SOURCE)
@@ -265,6 +273,12 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 		this._dashboardWidgetRepository = this.appDataSource
 			.getRepository(DashboardWidgetEntity)
 			.extend(dashboardWidgetCustomRepositoryExtension);
+		this._userAiChatRepository = this.appDataSource
+			.getRepository(UserAiChatEntity)
+			.extend(userAiChatRepositoryExtension);
+		this._aiChatMessageRepository = this.appDataSource
+			.getRepository(AiChatMessageEntity)
+			.extend(aiChatMessageRepositoryExtension);
 	}
 
 	public get userRepository(): Repository<UserEntity> & IUserRepository {
@@ -429,6 +443,14 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
 		return this._dashboardWidgetRepository;
 	}
 
+	public get userAiChatRepository(): Repository<UserAiChatEntity> & IUserAiChatRepository {
+		return this._userAiChatRepository;
+	}
+
+	public get aiChatMessageRepository(): Repository<AiChatMessageEntity> & IAiChatMessageRepository {
+		return this._aiChatMessageRepository;
+	}
+
 	public startTransaction(): Promise<void> {
 		this._queryRunner = this.appDataSource.createQueryRunner();
 		this._queryRunner.startTransaction();

backend/src/common/data-injection.tokens.ts

@@ -159,7 +159,11 @@ export enum UseCaseType {
 
 	REQUEST_INFO_FROM_TABLE_WITH_AI_V2 = 'REQUEST_INFO_FROM_TABLE_WITH_AI_V2',
 	REQUEST_INFO_FROM_TABLE_WITH_AI_V3 = 'REQUEST_INFO_FROM_TABLE_WITH_AI_V3',
+	REQUEST_INFO_FROM_TABLE_WITH_AI_V4 = 'REQUEST_INFO_FROM_TABLE_WITH_AI_V4',
 	REQUEST_AI_SETTINGS_AND_WIDGETS_CREATION = 'REQUEST_AI_SETTINGS_AND_WIDGETS_CREATION',
+	FIND_USER_AI_CHATS = 'FIND_USER_AI_CHATS',
+	FIND_USER_AI_CHAT_BY_ID = 'FIND_USER_AI_CHAT_BY_ID',
+	DELETE_USER_AI_CHAT = 'DELETE_USER_AI_CHAT',
 
 	CREATE_TABLE_FILTERS = 'CREATE_TABLE_FILTERS',
 	FIND_TABLE_FILTERS = 'FIND_TABLE_FILTERS',

backend/src/decorators/slug-uuid.decorator.ts

@@ -14,7 +14,8 @@ export type SlugUuidParameter =
   | 'apiKeyId'
   | 'companyId'
   | 'threadId'
-  | 'filterId';
+  | 'filterId'
+  | 'chatId';
 export const SlugUuid = createParamDecorator(
   (parameterName: SlugUuidParameter = 'slug', ctx: ExecutionContext): string => {
     const request: IRequestWithCognitoInfo = ctx.switchToHttp().getRequest();
@@ -29,7 +30,8 @@ export const SlugUuid = createParamDecorator(
       'eventId',
       'companyId',
       'threadId',
-      'filterId'
+      'filterId',
+      'chatId'
     ];
     if (!availableSlagParameters.includes(parameterName)) {
       throw new BadRequestException(Messages.UUID_INVALID);

backend/src/entities/ai/ai-conversation-history/ai-chat-messages/ai-chat-message.entity.ts

@@ -0,0 +1,43 @@
+import {
+	Column,
+	CreateDateColumn,
+	Entity,
+	JoinColumn,
+	ManyToOne,
+	PrimaryGeneratedColumn,
+	Relation,
+	UpdateDateColumn,
+} from 'typeorm';
+import { MessageRole } from './message-role.enum.js';
+import { UserAiChatEntity } from '../user-ai-chat/user-ai-chat.entity.js';
+
+@Entity('ai_chat_message')
+export class AiChatMessageEntity {
+	@PrimaryGeneratedColumn('uuid')
+	id: string;
+
+	@Column({ default: null, type: 'text' })
+	message: string;
+
+	@Column({ nullable: true, default: null, type: 'enum', enum: MessageRole })
+	role: MessageRole;
+
+	@Column({ nullable: true, default: null, type: 'varchar', length: 255 })
+	response_id: string;
+
+	@CreateDateColumn({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+	created_at: Date;
+
+	@UpdateDateColumn({ type: 'timestamp', nullable: true, default: null })
+	updated_at: Date;
+
+	@ManyToOne(
+		() => UserAiChatEntity,
+		(ai_chat) => ai_chat.messages,
+	)
+	@JoinColumn({ name: 'ai_chat_id' })
+	ai_chat: Relation<UserAiChatEntity>;
+
+	@Column()
+	ai_chat_id: string;
+}

backend/src/entities/ai/ai-conversation-history/ai-chat-messages/message-role.enum.ts

@@ -0,0 +1,5 @@
+export enum MessageRole {
+	user = 'user',
+	ai = 'ai',
+	system = 'system',
+}

backend/src/entities/ai/ai-conversation-history/ai-chat-messages/repository/ai-chat-message-repository.extension.ts

@@ -0,0 +1,43 @@
+import { IAiChatMessageRepository } from './ai-chat-message-repository.interface.js';
+import { AiChatMessageEntity } from '../ai-chat-message.entity.js';
+import { MessageRole } from '../message-role.enum.js';
+
+export const aiChatMessageRepositoryExtension: IAiChatMessageRepository = {
+	async findMessagesForChat(chatId: string): Promise<AiChatMessageEntity[]> {
+		return await this.createQueryBuilder('ai_chat_message')
+			.where('ai_chat_message.ai_chat_id = :chatId', { chatId })
+			.orderBy('ai_chat_message.created_at', 'ASC')
+			.getMany();
+	},
+
+	async findLastAiMessageForChat(chatId: string): Promise<AiChatMessageEntity | null> {
+		return await this.createQueryBuilder('ai_chat_message')
+			.where('ai_chat_message.ai_chat_id = :chatId', { chatId })
+			.andWhere('ai_chat_message.role = :role', { role: MessageRole.ai })
+			.orderBy('ai_chat_message.created_at', 'DESC')
+			.getOne();
+	},
+
+	async deleteMessagesForChat(chatId: string): Promise<void> {
+		await this.createQueryBuilder()
+			.delete()
+			.from('ai_chat_message')
+			.where('ai_chat_id = :chatId', { chatId })
+			.execute();
+	},
+
+	async saveMessage(
+		chatId: string,
+		message: string,
+		role: MessageRole,
+		responseId?: string,
+	): Promise<AiChatMessageEntity> {
+		const newMessage = this.create({
+			ai_chat_id: chatId,
+			message,
+			role,
+			response_id: responseId,
+		});
+		return await this.save(newMessage);
+	},
+};

backend/src/entities/ai/ai-conversation-history/ai-chat-messages/repository/ai-chat-message-repository.interface.ts

@@ -0,0 +1,9 @@
+import { AiChatMessageEntity } from '../ai-chat-message.entity.js';
+import { MessageRole } from '../message-role.enum.js';
+
+export interface IAiChatMessageRepository {
+	findMessagesForChat(chatId: string): Promise<AiChatMessageEntity[]>;
+	findLastAiMessageForChat(chatId: string): Promise<AiChatMessageEntity | null>;
+	deleteMessagesForChat(chatId: string): Promise<void>;
+	saveMessage(chatId: string, message: string, role: MessageRole, responseId?: string): Promise<AiChatMessageEntity>;
+}

backend/src/entities/ai/ai-conversation-history/application/data-structures/user-ai-chat.ds.ts

@@ -0,0 +1,13 @@
+export class FindUserAiChatsDs {
+	userId: string;
+}
+
+export class FindUserAiChatByIdDs {
+	userId: string;
+	chatId: string;
+}
+
+export class DeleteUserAiChatDs {
+	userId: string;
+	chatId: string;
+}