Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ import { Repository } from 'typeorm';
import { IAgentRepository } from '../../entities/agent/repository/agent.repository.interface.js';
import { IAiResponsesToUserRepository } from '../../entities/ai/ai-data-entities/ai-reponses-to-user/ai-responses-to-user-repository.interface.js';
import { AiResponsesToUserEntity } from '../../entities/ai/ai-data-entities/ai-reponses-to-user/ai-responses-to-user.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';
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 { UserApiKeyEntity } from '../../entities/api-key/api-key.entity.js';
import { IUserApiKeyRepository } from '../../entities/api-key/repository/user-api-key-repository.interface.js';
import { CompanyFaviconEntity } from '../../entities/company-favicon/company-favicon.entity.js';
Expand Down Expand Up @@ -79,8 +75,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;
companyLogoRepository: Repository<CompanyLogoEntity>;
companyFaviconRepository: Repository<CompanyFaviconEntity>;
companyTabTitleRepository: Repository<CompanyTabTitleEntity>;
Expand Down
22 changes: 0 additions & 22 deletions backend/src/common/application/global-database-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ 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';
import { CompanyLogoEntity } from '../../entities/company-logo/company-logo.entity.js';
import { CompanyFaviconEntity } from '../../entities/company-favicon/company-favicon.entity.js';
import { CompanyTabTitleEntity } from '../../entities/company-tab-title/company-tab-title.entity.js';
Expand Down Expand Up @@ -126,8 +120,6 @@ 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;
private _companyLogoRepository: Repository<CompanyLogoEntity>;
private _companyFaviconRepository: Repository<CompanyFaviconEntity>;
private _companyTabTitleRepository: Repository<CompanyTabTitleEntity>;
Expand Down Expand Up @@ -210,12 +202,6 @@ 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);
this._companyLogoRepository = this.appDataSource.getRepository(CompanyLogoEntity);
this._companyFaviconRepository = this.appDataSource.getRepository(CompanyFaviconEntity);
this._companyTabTitleRepository = this.appDataSource.getRepository(CompanyTabTitleEntity);
Expand Down Expand Up @@ -336,14 +322,6 @@ 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 get companyLogoRepository(): Repository<CompanyLogoEntity> {
return this._companyLogoRepository;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ import { IAiResponsesToUserRepository } from './ai-responses-to-user-repository.
import { AiResponsesToUserEntity } from './ai-responses-to-user.entity.js';

export const aiResponsesToUserRepositoryExtension: IAiResponsesToUserRepository = {
async findResponsesByUserId(userId: string): Promise<Array<AiResponsesToUserEntity>> {
return await this.createQueryBuilder('ai_responses_to_user')
.leftJoin('ai_responses_to_user.user', 'user')
.where('user.id = :userId', { userId })
.getMany();
},

async findResponseByIdAndUserId(responseId: string, userId: string): Promise<AiResponsesToUserEntity> {
return await this.createQueryBuilder('ai_responses_to_user')
.leftJoin('ai_responses_to_user.user', 'user')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { AiResponsesToUserEntity } from './ai-responses-to-user.entity.js';

export interface IAiResponsesToUserRepository {
findResponsesByUserId(userId: string): Promise<Array<AiResponsesToUserEntity>>;

findResponseByIdAndUserId(responseId: string, userId: string): Promise<AiResponsesToUserEntity>;
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

40 changes: 1 addition & 39 deletions backend/src/entities/ai/ai-use-cases.interface.ts
Original file line number Diff line number Diff line change
@@ -1,44 +1,6 @@
import { InTransactionEnum } from '../../enums/in-transaction.enum.js';
import { SuccessResponse } from '../../microservices/saas-microservice/data-structures/common-responce.ds.js';
import { AddMessageToThreadWithAssistantDS } from './application/data-structures/add-message-to-thread-with-assistant.ds.js';
import { CreateThreadWithAssistantDS } from './application/data-structures/create-thread-with-assistant.ds.js';
import { DeleteThreadWithAssistantDS } from './application/data-structures/delete-thread-with-assistant.ds.js';
import { FindAllThreadMessagesDS } from './application/data-structures/find-all-thread-messages.ds.js';
import {
RequestInfoFromTableDS,
RequestInfoFromTableDSV2,
} from './application/data-structures/request-info-from-table.ds.js';
import { ResponseInfoDS } from './application/data-structures/response-info.ds.js';
import { FoundUserThreadMessagesRO } from './application/dto/found-user-thread-messages.ro.js';
import { FoundUserThreadsWithAiRO } from './application/dto/found-user-threads-with-ai.ro.js';

export interface IRequestInfoFromTable {
execute(inputData: RequestInfoFromTableDS, inTransaction: InTransactionEnum): Promise<ResponseInfoDS>;
}
import { RequestInfoFromTableDSV2 } from './application/data-structures/request-info-from-table.ds.js';

export interface IRequestInfoFromTableV2 {
execute(inputData: RequestInfoFromTableDSV2, inTransaction: InTransactionEnum): Promise<void>;
}

export interface ICreateThreadWithAIAssistant {
execute(inputData: CreateThreadWithAssistantDS, inTransaction: InTransactionEnum): Promise<void>;
}

export interface IAddMessageToThreadWithAIAssistant {
execute(inputData: AddMessageToThreadWithAssistantDS, inTransaction: InTransactionEnum): Promise<void>;
}

export interface IGetAllUserThreadsWithAIAssistant {
execute(userId: string, inTransaction: InTransactionEnum): Promise<Array<FoundUserThreadsWithAiRO>>;
}

export interface IGetAllThreadMessages {
execute(
inputData: FindAllThreadMessagesDS,
inTransaction: InTransactionEnum,
): Promise<Array<FoundUserThreadMessagesRO>>;
}

export interface IDeleteThreadWithAIAssistant {
execute(inputData: DeleteThreadWithAssistantDS, inTransaction: InTransactionEnum): Promise<SuccessResponse>;
}
41 changes: 3 additions & 38 deletions backend/src/entities/ai/ai.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,8 @@ import { GlobalDatabaseContext } from '../../common/application/global-database-
import { BaseType, UseCaseType } from '../../common/data-injection.tokens.js';
import { LogOutEntity } from '../log-out/log-out.entity.js';
import { UserEntity } from '../user/user.entity.js';
import { AddMessageToThreadWithAIAssistantUseCase } from './use-cases/add-message-to-thread-with-ai.use.case.js';
import { CreateThreadWithAIAssistantUseCase } from './use-cases/create-thread-with-ai-assistant.use.case.js';
import { DeleteThreadWithAIAssistantUseCase } from './use-cases/delete-thread-with-ai-assistant.use.case.js';
import { FindAllMessagesInAiThreadUseCase } from './use-cases/find-all-messages-in-ai-thread.use.case.js';
import { FindAllUserThreadsWithAssistantUseCase } from './use-cases/find-all-user-threads-with-assistant.use.case.js';
import { UserAIRequestsControllerV2 } from './user-ai-requests-v2.controller.js';
import { UserAIThreadsController } from './user-ai-threads.controller.js';
import { RequestInfoFromTableWithAIUseCaseV4 } from './use-cases/request-info-from-table-with-ai-v4.use.case.js';
import { UserAIRequestsControllerV2 } from './user-ai-requests-v2.controller.js';

@Module({
imports: [TypeOrmModule.forFeature([UserEntity, LogOutEntity])],
Expand All @@ -25,40 +19,11 @@ import { RequestInfoFromTableWithAIUseCaseV4 } from './use-cases/request-info-fr
provide: UseCaseType.REQUEST_INFO_FROM_TABLE_WITH_AI_V2,
useClass: RequestInfoFromTableWithAIUseCaseV4,
},
{
provide: UseCaseType.CREATE_THREAD_WITH_AI_ASSISTANT,
useClass: CreateThreadWithAIAssistantUseCase,
},
{
provide: UseCaseType.ADD_MESSAGE_TO_THREAD_WITH_AI_ASSISTANT,
useClass: AddMessageToThreadWithAIAssistantUseCase,
},
{
provide: UseCaseType.GET_ALL_USER_THREADS_WITH_AI_ASSISTANT,
useClass: FindAllUserThreadsWithAssistantUseCase,
},
{
provide: UseCaseType.GET_ALL_THREAD_MESSAGES,
useClass: FindAllMessagesInAiThreadUseCase,
},
{
provide: UseCaseType.DELETE_THREAD_WITH_AI_ASSISTANT,
useClass: DeleteThreadWithAIAssistantUseCase,
},
],
controllers: [UserAIThreadsController, UserAIRequestsControllerV2],
controllers: [UserAIRequestsControllerV2],
})
export class AIModule implements NestModule {
public configure(consumer: MiddlewareConsumer): any {
consumer
.apply(AuthMiddleware)
.forRoutes(
{ path: '/ai/v2/request/:connectionId', method: RequestMethod.POST },
{ path: '/ai/thread/:connectionId', method: RequestMethod.POST },
{ path: '/ai/thread/message/:connectionId/:threadId', method: RequestMethod.POST },
{ path: '/ai/threads', method: RequestMethod.GET },
{ path: '/ai/thread/messages/:threadId', method: RequestMethod.GET },
{ path: '/ai/thread/:threadId', method: RequestMethod.DELETE },
);
consumer.apply(AuthMiddleware).forRoutes({ path: '/ai/v2/request/:connectionId', method: RequestMethod.POST });
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading