Merge branch 'main' into upgrade-angular

Author: lyubov-voloshko

backend/.development.env

@@ -71,6 +71,9 @@ IS_SAAS=true
 # api key for using openai service
 OPENAI_API_KEY=
 
+# assistant id for using openai service
+OPENAI_ASSISTANT_ID=
+
 # optional parameters (it's only for testing)
 POSTGRES_CONNECTION_USERNAME=TEST_POSTGRES_CONNECTION_USERNAME
 POSTGRES_CONNECTION_PASSWORD=TEST_POSTGRES_CONNECTION_PASSWORD

backend/package.json

@@ -69,6 +69,7 @@
     "eslint-plugin-security": "3.0.1",
     "express": "4.21.2",
     "express-rate-limit": "7.4.1",
+    "fetch-blob": "^4.0.0",
     "helmet": "8.0.0",
     "ip-range-check": "0.2.0",
     "json2csv": "^5.0.7",

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

@@ -36,6 +36,10 @@ import { UserApiKeyEntity } from '../../entities/api-key/api-key.entity.js';
 import { IUserApiKeyRepository } from '../../entities/api-key/repository/user-api-key-repository.interface.js';
 import { ActionEventsEntity } from '../../entities/table-actions/table-action-events-module/action-event.entity.js';
 import { TableActionEntity } from '../../entities/table-actions/table-actions-module/table-action.entity.js';
+import { IAiUserThreadsRepository } from '../../entities/ai/ai-data-entities/ai-user-threads/ai-user-threads-repository.interface.js';
+import { AiUserThreadEntity } from '../../entities/ai/ai-data-entities/ai-user-threads/ai-user-threads.entity.js';
+import { IAiUserFilesRepository } from '../../entities/ai/ai-data-entities/ai-user-files/ai-user-files-repository.interface.js';
+import { AiUserFileEntity } from '../../entities/ai/ai-data-entities/ai-user-files/ai-user-files.entity.js';
 
 export interface IGlobalDatabaseContext extends IDatabaseContext {
   userRepository: Repository<UserEntity> & IUserRepository;
@@ -65,4 +69,6 @@ export interface IGlobalDatabaseContext extends IDatabaseContext {
   actionRulesRepository: Repository<ActionRulesEntity> & IActionRulesRepository;
   actionEventsRepository: Repository<ActionEventsEntity> & IActionEventsRepository;
   userApiKeysRepository: Repository<UserApiKeyEntity> & IUserApiKeyRepository;
+  aiUserThreadsRepository: Repository<AiUserThreadEntity> & IAiUserThreadsRepository;
+  aiUserFilesRepository: Repository<AiUserFileEntity> & IAiUserFilesRepository;
 }

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

@@ -78,6 +78,12 @@ import { actionEventsCustomRepositoryExtension } from '../../entities/table-acti
 import { IUserApiKeyRepository } from '../../entities/api-key/repository/user-api-key-repository.interface.js';
 import { UserApiKeyEntity } from '../../entities/api-key/api-key.entity.js';
 import { userApiRepositoryExtension } from '../../entities/api-key/repository/user-api-key-repository.extension.js';
+import { AiUserThreadEntity } from '../../entities/ai/ai-data-entities/ai-user-threads/ai-user-threads.entity.js';
+import { IAiUserThreadsRepository } from '../../entities/ai/ai-data-entities/ai-user-threads/ai-user-threads-repository.interface.js';
+import { IAiUserFilesRepository } from '../../entities/ai/ai-data-entities/ai-user-files/ai-user-files-repository.interface.js';
+import { AiUserFileEntity } from '../../entities/ai/ai-data-entities/ai-user-files/ai-user-files.entity.js';
+import { aiUserThreadRepositoryExtension } from '../../entities/ai/ai-data-entities/ai-user-threads/ai-user-threads-repository.extension.js';
+import { aiUserFileRepositoryExtension } from '../../entities/ai/ai-data-entities/ai-user-files/ai-user-file-repository.extension.js';
 
 @Injectable({ scope: Scope.REQUEST })
 export class GlobalDatabaseContext implements IGlobalDatabaseContext {
@@ -110,6 +116,8 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
   private _actionRulesRepository: Repository<ActionRulesEntity> & IActionRulesRepository;
   private _actionEventsRepository: Repository<ActionEventsEntity> & IActionEventsRepository;
   private _userApiKeysRepository: Repository<UserApiKeyEntity> & IUserApiKeyRepository;
+  private _aiUserThreadsRepository: Repository<AiUserThreadEntity> & IAiUserThreadsRepository;
+  private _aiUserFilesRepository: Repository<AiUserFileEntity> & IAiUserFilesRepository;
 
   public constructor(
     @Inject(BaseType.DATA_SOURCE)
@@ -186,6 +194,12 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
       .getRepository(ActionEventsEntity)
       .extend(actionEventsCustomRepositoryExtension);
     this._userApiKeysRepository = this.appDataSource.getRepository(UserApiKeyEntity).extend(userApiRepositoryExtension);
+    this._aiUserThreadsRepository = this.appDataSource
+      .getRepository(AiUserThreadEntity)
+      .extend(aiUserThreadRepositoryExtension);
+    this._aiUserFilesRepository = this.appDataSource
+      .getRepository(AiUserFileEntity)
+      .extend(aiUserFileRepositoryExtension);
   }
 
   public get userRepository(): Repository<UserEntity> & IUserRepository {
@@ -296,6 +310,14 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
     return this._userApiKeysRepository;
   }
 
+  public get aiUserThreadsRepository(): Repository<AiUserThreadEntity> & IAiUserThreadsRepository {
+    return this._aiUserThreadsRepository;
+  }
+
+  public get aiUserFilesRepository(): Repository<AiUserFileEntity> & IAiUserFilesRepository {
+    return this._aiUserFilesRepository;
+  }
+
   public startTransaction(): Promise<void> {
     this._queryRunner = this.appDataSource.createQueryRunner();
     this._queryRunner.startTransaction();

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

@@ -164,4 +164,10 @@ export enum UseCaseType {
   DELETE_API_KEY = 'DELETE_API_KEY',
 
   REQUEST_INFO_FROM_TABLE_WITH_AI = 'REQUEST_INFO_FROM_TABLE_WITH_AI',
+
+  CREATE_THREAD_WITH_AI_ASSISTANT = 'CREATE_THREAD_WITH_AI_ASSISTANT',
+  ADD_MESSAGE_TO_THREAD_WITH_AI_ASSISTANT = 'ADD_MESSAGE_TO_THREAD_WITH_AI_ASSISTANT',
+  GET_ALL_USER_THREADS_WITH_AI_ASSISTANT = 'GET_ALL_USER_THREADS_WITH_AI_ASSISTANT',
+  GET_ALL_THREAD_MESSAGES = 'GET_ALL_THREAD_MESSAGES',
+  DELETE_THREAD_WITH_AI_ASSISTANT = 'DELETE_THREAD_WITH_AI_ASSISTANT',
 }

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

@@ -12,11 +12,12 @@ export type SlugUuidParameter =
   | 'ruleId'
   | 'eventId'
   | 'apiKeyId'
-  | 'companyId';
+  | 'companyId'
+  | 'threadId';
 export const SlugUuid = createParamDecorator(
   (parameterName: SlugUuidParameter = 'slug', ctx: ExecutionContext): string => {
     const request: IRequestWithCognitoInfo = ctx.switchToHttp().getRequest();
-    const availableSlagParameters = [
+    const availableSlagParameters: Array<SlugUuidParameter> = [
       'slug',
       'connectionId',
       'groupId',
@@ -26,6 +27,7 @@ export const SlugUuid = createParamDecorator(
       'ruleId',
       'eventId',
       'companyId',
+      'threadId',
     ];
     if (!availableSlagParameters.includes(parameterName)) {
       throw new BadRequestException(Messages.UUID_INVALID);

backend/src/entities/ai/ai-data-entities/ai-user-files/ai-user-file-repository.extension.ts

@@ -0,0 +1,19 @@
+import { IAiUserFilesRepository } from './ai-user-files-repository.interface.js';
+import { AiUserFileEntity } from './ai-user-files.entity.js';
+
+export const aiUserFileRepositoryExtension: IAiUserFilesRepository = {
+  async findFileNyThreadId(threadId: string): Promise<AiUserFileEntity> {
+    return await this.createQueryBuilder('ai_user_file')
+      .leftJoin('ai_user_file.thread', 'thread')
+      .where('thread.id = :threadId', { threadId })
+      .getOne();
+  },
+
+  async findAllFilesByUserId(userId: string): Promise<Array<AiUserFileEntity>> {
+    return await this.createQueryBuilder('ai_user_file')
+      .leftJoin('ai_user_file.thread', 'thread')
+      .leftJoin('thread.user', 'user')
+      .where('user.id = :userId', { userId })
+      .getMany();
+  },
+};

backend/src/entities/ai/ai-data-entities/ai-user-files/ai-user-files-repository.interface.ts

@@ -0,0 +1,7 @@
+import { AiUserFileEntity } from './ai-user-files.entity.js';
+
+export interface IAiUserFilesRepository {
+  findFileNyThreadId(threadId: string): Promise<AiUserFileEntity>;
+
+  findAllFilesByUserId(userId: string): Promise<Array<AiUserFileEntity>>;
+}

backend/src/entities/ai/ai-data-entities/ai-user-files/ai-user-files.entity.ts

@@ -0,0 +1,18 @@
+import { Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn, Relation } from 'typeorm';
+import { AiUserThreadEntity } from '../ai-user-threads/ai-user-threads.entity.js';
+
+@Entity('ai_user_files')
+export class AiUserFileEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column({ type: 'varchar', length: 128 })
+  file_ai_id: string;
+
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  createdAt: Date;
+
+  @OneToOne((_) => AiUserThreadEntity, (thread) => thread.thread_file, { onDelete: 'CASCADE' })
+  @JoinColumn()
+  thread: Relation<AiUserThreadEntity>;
+}

backend/src/entities/ai/ai-data-entities/ai-user-threads/ai-user-threads-repository.extension.ts

@@ -0,0 +1,28 @@
+import { IAiUserThreadsRepository } from './ai-user-threads-repository.interface.js';
+import { AiUserThreadEntity } from './ai-user-threads.entity.js';
+
+export const aiUserThreadRepositoryExtension: IAiUserThreadsRepository = {
+  async findThreadsByUserId(userId: string): Promise<Array<AiUserThreadEntity>> {
+    return await this.createQueryBuilder('ai_user_thread')
+      .leftJoin('ai_user_thread.user', 'user')
+      .where('user.id = :userId', { userId })
+      .getMany();
+  },
+
+  async findThreadByIdAndUserId(threadId: string, userId: string): Promise<AiUserThreadEntity> {
+    return await this.createQueryBuilder('ai_user_thread')
+      .leftJoin('ai_user_thread.user', 'user')
+      .where('user.id = :userId', { userId })
+      .andWhere('ai_user_thread.id = :threadId', { threadId })
+      .getOne();
+  },
+
+  async findThreadByIdAndUserIdWithFile(threadId: string, userId: string): Promise<AiUserThreadEntity> {
+    return await this.createQueryBuilder('ai_user_thread')
+      .leftJoin('ai_user_thread.user', 'user')
+      .leftJoinAndSelect('ai_user_thread.thread_file', 'thread_file')
+      .where('user.id = :userId', { userId })
+      .andWhere('ai_user_thread.id = :threadId', { threadId })
+      .getOne();
+  },
+};