@fr-data-fabric/chatbot-api-nest 0.0.2 → 0.0.4

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@fr-data-fabric/chatbot-api-nest",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "main": "dist/index.js",
   "scripts": {
-    "build": "tsc -p tsconfig.json"
+    "build": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json"
   },
   "author": "PM Data Fabric",
   "license": "Apache-2.0",
@@ -17,7 +17,8 @@
     "rxjs": "^7.8.2"
   },
   "devDependencies": {
-    "@types/express": "^5.0.6"
+    "@types/express": "^5.0.6",
+    "tsc-alias": "^1.8.16"
   },
   "publishConfig": {
     "access": "public"

package/src/chatbot-api.module.ts

@@ -1,3 +1,4 @@
+import { UserEntity } from '@domain/entities/UserEntity';
 import {
   CONVERSATION_REPOSITORY,
   ConversationRepository,
@@ -23,12 +24,12 @@ import { ChatsController } from 'src/inputs/controllers/ChatsController';
 import { GetChatsResolver } from 'src/inputs/resolvers/ChatsResolver';
 import { GetConversationsResolver } from 'src/inputs/resolvers/ConversationsResolver';
 
-export type ChatbotApiModuleOptions = {
+export type ChatbotApiModuleOptions<TUser extends UserEntity> = {
   useCases: {
-    getConversation: Type<IGetConversationUC>;
-    getConversations: Type<IGetConversationsUC>;
-    createConversation: Type<ICreateConversationUC>;
-    sendChat: Type<SendChatUC<never>>;
+    getConversation: Type<IGetConversationUC<TUser>>;
+    getConversations: Type<IGetConversationsUC<TUser>>;
+    createConversation: Type<ICreateConversationUC<TUser>>;
+    sendChat: Type<SendChatUC<never, TUser>>;
   };
   conversationRepository: Type<ConversationRepository>;
   gql: {
@@ -43,7 +44,9 @@ export type ChatbotApiModuleOptions = {
 
 @Module({})
 export class ChatbotApiModule {
-  static register(options: ChatbotApiModuleOptions): DynamicModule {
+  static register<TUser extends UserEntity>(
+    options: ChatbotApiModuleOptions<TUser>,
+  ): DynamicModule {
     return {
       module: ChatbotApiModule,
       providers: [

package/src/domain/use-cases/_common.ts

@@ -1,9 +1,9 @@
 import { UserEntity } from '@domain/entities/UserEntity';
 import { Field, ID, InputType, Int } from '@nestjs/graphql';
 
-export type UCInput<Input> = {
+export type UCInput<Input, TUser extends UserEntity> = {
   input: Input;
-  currentUser: UserEntity;
+  currentUser?: TUser;
 };
 
 @InputType()

package/src/domain/use-cases/chats/GetChatCompletionUC.ts

@@ -17,19 +17,23 @@ import {
 } from 'langchain';
 import { Observable } from 'rxjs';
 
-export type GetChatCompletionInput<AvailableTools extends AvailableTool[]> = {
+export type GetChatCompletionInput<
+  AvailableTools extends AvailableTool[],
+  TUser extends UserEntity,
+> = {
   message: string;
   previousMessages: { role: 'user' | 'assistant'; content: string }[];
   conversation: ConversationEntity;
   runId: string;
   tools?: AvailableTools;
   documents: DocumentEntity[];
-  currentUser: UserEntity;
+  currentUser: TUser;
   model?: string;
 };
 
 export abstract class GetChatCompletionUC<
   AvailableTools extends AvailableTool[],
+  TUser extends UserEntity,
 > {
   abstract getTools(
     toolOptions: ToolOptions,
@@ -52,7 +56,7 @@ export abstract class GetChatCompletionUC<
     currentUser: UserEntity,
   ): Promise<{ content: string; id: string }[]>;
 
-  execute(input: GetChatCompletionInput<AvailableTools>) {
+  execute(input: GetChatCompletionInput<AvailableTools, TUser>) {
     return new Observable<StreamEvents<AvailableTools>>((observer) => {
       const model = this.getLLM({
         model: input.model,

package/src/domain/use-cases/chats/SendChatUC.ts

@@ -50,17 +50,23 @@ export class SendMessageInput<AvailableTools extends AvailableTool[]> {
 
 export const SEND_CHAT_UC = 'SendChatUC';
 
-export abstract class SendChatUC<AvailableTools extends AvailableTool[]> {
+export abstract class SendChatUC<
+  AvailableTools extends AvailableTool[],
+  TUser extends UserEntity,
+> {
   constructor(
-    private readonly getConversationUC: IGetConversationUC,
+    private readonly getConversationUC: IGetConversationUC<TUser>,
     private readonly chatRepository: ChatRepository,
     private readonly eventEmitter: EventEmitter2,
-    private readonly getChatCompletionUC: GetChatCompletionUC<AvailableTools>,
+    private readonly getChatCompletionUC: GetChatCompletionUC<
+      AvailableTools,
+      TUser
+    >,
   ) {}
 
   abstract getDocuments(
     documentIds: string[],
-    currentUser: UserEntity,
+    currentUser: TUser,
   ): Promise<DocumentEntity[]>;
 
   abstract createChatEntity(
@@ -73,7 +79,10 @@ export abstract class SendChatUC<AvailableTools extends AvailableTool[]> {
   async execute({
     input,
     currentUser,
-  }: UCInput<SendMessageInput<AvailableTools>>) {
+  }: UCInput<SendMessageInput<AvailableTools>, TUser>) {
+    if (!currentUser) {
+      throw new Error('currentUser is required');
+    }
     const { conversationId, content, selectedTools, documentIds, model } =
       input;
     const conversation = await this.getConversationUC.execute({

package/src/domain/use-cases/conversations/CreateConversationUC.ts

@@ -1,7 +1,8 @@
 import { ConversationEntity } from '@domain/entities/ConversationEntity';
+import { UserEntity } from '@domain/entities/UserEntity';
 import { UCInput } from '@domain/use-cases/_common';
 
 export const CREATE_CONVERSATION_UC = 'CreateConversationUC';
-export interface ICreateConversationUC {
-  execute(input: UCInput<undefined>): Promise<ConversationEntity>;
+export interface ICreateConversationUC<TUser extends UserEntity> {
+  execute(input: UCInput<undefined, TUser>): Promise<ConversationEntity>;
 }

package/src/domain/use-cases/conversations/DeleteConversationUC.ts

@@ -1,4 +1,5 @@
 import { ConversationEntity } from '@domain/entities/ConversationEntity';
+import { UserEntity } from '@domain/entities/UserEntity';
 import type { ConversationRepository } from '@domain/interfaces/ConversationRepository';
 import { CONVERSATION_REPOSITORY } from '@domain/interfaces/ConversationRepository';
 import { DeleteByIdInput, UCInput } from '@domain/use-cases/_common';
@@ -12,13 +13,13 @@ export class DeleteConversationUC {
     @Inject(CONVERSATION_REPOSITORY)
     private readonly conversationRepository: ConversationRepository,
     @Inject(GET_CONVERSATION_UC)
-    private readonly getConversationUC: IGetConversationUC,
+    private readonly getConversationUC: IGetConversationUC<UserEntity>,
   ) {}
 
   async execute({
     input,
     currentUser,
-  }: UCInput<DeleteByIdInput>): Promise<ConversationEntity> {
+  }: UCInput<DeleteByIdInput, UserEntity>): Promise<ConversationEntity> {
     const conversation = await this.getConversationUC.execute({
       input: { id: input.id },
       currentUser,

package/src/domain/use-cases/conversations/GenerateConversationTitleUC.ts

@@ -1,4 +1,5 @@
 import { ConversationEntity } from '@domain/entities/ConversationEntity';
+import { UserEntity } from '@domain/entities/UserEntity';
 import type { ConversationRepository } from '@domain/interfaces/ConversationRepository';
 import { CONVERSATION_REPOSITORY } from '@domain/interfaces/ConversationRepository';
 import type { LLMService } from '@domain/interfaces/LLMService';
@@ -28,7 +29,7 @@ export class GenerateConversationTitleUC {
     @Inject(PROMPT_SERVICE)
     private readonly promptService: PromptService,
     @Inject(GET_CONVERSATION_UC)
-    private readonly getConversationUC: IGetConversationUC,
+    private readonly getConversationUC: IGetConversationUC<UserEntity>,
     @Inject(CONVERSATION_REPOSITORY)
     private readonly conversationRepository: ConversationRepository,
   ) {}
@@ -36,7 +37,10 @@ export class GenerateConversationTitleUC {
   async execute({
     input,
     currentUser,
-  }: UCInput<GenerateConversationTitleInput>): Promise<ConversationEntity> {
+  }: UCInput<
+    GenerateConversationTitleInput,
+    UserEntity
+  >): Promise<ConversationEntity> {
     const conversation = await this.getConversationUC.execute({
       currentUser,
       input: { id: input.conversationId },

package/src/domain/use-cases/conversations/GetConversationUC.ts

@@ -1,4 +1,5 @@
 import { ConversationEntity } from '@domain/entities/ConversationEntity';
+import { UserEntity } from '@domain/entities/UserEntity';
 import { UCInput } from '@domain/use-cases/_common';
 import { Field, ID, InputType } from '@nestjs/graphql';
 
@@ -13,6 +14,8 @@ export class GetConversationInput {
 
 export const GET_CONVERSATION_UC = 'GetConversationUC';
 
-export interface IGetConversationUC {
-  execute(input: UCInput<GetConversationInput>): Promise<ConversationEntity>;
+export interface IGetConversationUC<TUser extends UserEntity> {
+  execute(
+    input: UCInput<GetConversationInput, TUser>,
+  ): Promise<ConversationEntity>;
 }

package/src/domain/use-cases/conversations/GetConversationsUC.ts

@@ -1,4 +1,5 @@
 import { ConversationEntity } from '@domain/entities/ConversationEntity';
+import { UserEntity } from '@domain/entities/UserEntity';
 import {
   PaginatedInput,
   PaginatedOutput,
@@ -14,8 +15,8 @@ export class GetConversationsInput extends PaginatedInput {
 
 export const GET_CONVERSATIONS_UC = 'GetConversationsUC';
 
-export interface IGetConversationsUC {
+export interface IGetConversationsUC<TUser extends UserEntity> {
   execute(
-    input: UCInput<GetConversationsInput>,
+    input: UCInput<GetConversationsInput, TUser>,
   ): Promise<PaginatedOutput<ConversationEntity>>;
 }

package/src/domain/use-cases/conversations/UpdateConversationUC.ts

@@ -1,4 +1,5 @@
 import { ConversationEntity } from '@domain/entities/ConversationEntity';
+import { UserEntity } from '@domain/entities/UserEntity';
 import type { ConversationRepository } from '@domain/interfaces/ConversationRepository';
 import { CONVERSATION_REPOSITORY } from '@domain/interfaces/ConversationRepository';
 import { UCInput } from '@domain/use-cases/_common';
@@ -25,13 +26,16 @@ export class UpdateConversationUC {
     @Inject(CONVERSATION_REPOSITORY)
     private readonly conversationRepository: ConversationRepository,
     @Inject(GET_CONVERSATION_UC)
-    private readonly getConversationUC: IGetConversationUC,
+    private readonly getConversationUC: IGetConversationUC<UserEntity>,
   ) {}
 
   async execute({
     input,
     currentUser,
-  }: UCInput<UpdateConversationInput>): Promise<ConversationEntity> {
+  }: UCInput<
+    UpdateConversationInput,
+    UserEntity
+  >): Promise<ConversationEntity> {
     const conversation = await this.getConversationUC.execute({
       input: { id: input.id },
       currentUser,

package/src/inputs/controllers/ChatsController.ts

@@ -12,7 +12,7 @@ import { CurrentUserRest } from 'src/inputs/controllers/_common/CurrentUserRest'
 export class ChatsController {
   constructor(
     @Inject(SEND_CHAT_UC)
-    private readonly sendChatUC: SendChatUC<never>,
+    private readonly sendChatUC: SendChatUC<never, UserEntity>,
   ) {}
 
   @Post('/')

package/src/inputs/resolvers/ConversationsResolver.ts

@@ -48,11 +48,11 @@ export function GetConversationsResolver(
   class ConversationsResolver {
     constructor(
       @Inject(GET_CONVERSATIONS_UC)
-      readonly getConversationsUC: IGetConversationsUC,
+      readonly getConversationsUC: IGetConversationsUC<UserEntity>,
       @Inject(GET_CONVERSATION_UC)
-      readonly getConversationUC: IGetConversationUC,
+      readonly getConversationUC: IGetConversationUC<UserEntity>,
       @Inject(CREATE_CONVERSATION_UC)
-      readonly createConversationUC: ICreateConversationUC,
+      readonly createConversationUC: ICreateConversationUC<UserEntity>,
       readonly updateConversationUC: UpdateConversationUC,
       readonly deleteConversationUC: DeleteConversationUC,
       readonly generateConversationTitleUC: GenerateConversationTitleUC,