fix: update message object

Signed-off-by: James <namnh0122@gmail.com>

Author: namchuai

cortex-js/src/domain/models/assistant.interface.ts

@@ -3,10 +3,6 @@ import { AssistantResponseFormatOption as OpenAIAssistantResponseFormatOption }
 
 export interface Assistant extends OpenAiAssistant {
   avatar?: string;
-
-  response_format?: AssistantResponseFormatOption;
-
-  tool_resources?: AssistantToolResources;
 }
 
 export type AssistantResponseFormatOption = OpenAIAssistantResponseFormatOption;

cortex-js/src/domain/models/message.interface.ts

@@ -1,81 +1,16 @@
-export enum ChatCompletionRole {
-  System = 'system',
-  Assistant = 'assistant',
-  User = 'user',
-}
+import {
+  Message as OpenAiMessage,
+  MessageContent as OpenAiMessageContent,
+  TextContentBlock as OpenAiTextContentBlock,
+} from 'openai/resources/beta/threads/messages';
 
-export enum ContentType {
-  Text = 'text',
-  Image = 'image',
-  Pdf = 'pdf',
-}
+export interface Message extends OpenAiMessage {}
 
-export interface ContentValue {
-  value: string;
-  annotations: string[];
-  name?: string;
-  size?: number;
-}
+export type MessageContent = OpenAiMessageContent;
 
-export interface ThreadContent {
-  type: ContentType;
-  text: ContentValue;
-}
+export type TextContentBlock = OpenAiTextContentBlock;
 
-/**
- * The status of the message.
- * @data_transfer_object
- */
-export enum MessageStatus {
-  /** Message is fully loaded. **/
-  Ready = 'ready',
-  /** Message is not fully loaded. **/
-  Pending = 'pending',
-  /** Message loaded with error. **/
-  Error = 'error',
-  /** Message is cancelled streaming */
-  Stopped = 'stopped',
-}
+export interface MessageIncompleteDetails
+  extends OpenAiMessage.IncompleteDetails {}
 
-/**
- * The error code which explain what error type. Used in conjunction with MessageStatus.Error
- */
-export enum ErrorCode {
-  InvalidApiKey = 'invalid_api_key',
-
-  InsufficientQuota = 'insufficient_quota',
-
-  InvalidRequestError = 'invalid_request_error',
-
-  Unknown = 'unknown',
-}
-
-export interface Message {
-  /** Unique identifier for the message, generated by default using the ULID method. **/
-  id: string;
-  /** Object name **/
-  object: string;
-  /** Thread id, default is a ulid. **/
-  thread_id: string;
-  /** The assistant id of this thread. **/
-  assistant_id?: string;
-  /** The role of the author of this message. **/
-  role: ChatCompletionRole;
-  /** The content of this message. **/
-  content: ThreadContent[];
-  /** The status of this message. **/
-  status: MessageStatus;
-  /** The timestamp indicating when this message was created. Represented in Unix time. **/
-  created: number;
-  /** The timestamp indicating when this message was updated. Represented in Unix time. **/
-  updated?: number;
-  /** The additional metadata of this message. **/
-  metadata?: MessageMetadata;
-  /** The error code which explain what error type. Used in conjunction with MessageStatus.Error */
-  error_code?: ErrorCode;
-}
-
-/**
- * The additional metadata of this message.
- */
-export interface MessageMetadata {}
+export interface MessageAttachment extends OpenAiMessage.Attachment {}

cortex-js/src/infrastructure/commanders/usecases/chat.cli.usecases.ts

@@ -1,8 +1,3 @@
-import {
-  ChatCompletionRole,
-  ContentType,
-  MessageStatus,
-} from '@/domain/models/message.interface';
 import { exit, stdin, stdout } from 'node:process';
 import * as readline from 'node:readline/promises';
 import { ChatCompletionMessage } from '@/infrastructure/dtos/chat/chat-completion-message.dto';
@@ -19,6 +14,7 @@ import { CreateMessageDto } from '@/infrastructure/dtos/messages/create-message.
 import { MessagesUsecases } from '@/usecases/messages/messages.usecases';
 import { ModelParameterParser } from '@/utils/model-parameter.parser';
 import { ChatUsecases } from '@/usecases/chat/chat.usecases';
+import { TextContentBlock } from '@/domain/models/message.interface';
 
 @Injectable()
 export class ChatCliUsecases {
@@ -46,7 +42,7 @@ export class ChatCliUsecases {
     const messages: ChatCompletionMessage[] = (
       await this.messagesUsecases.getLastMessagesByThread(thread.id, 10)
     ).map((message) => ({
-      content: message.content[0].text.value,
+      content: (message.content[0] as TextContentBlock).text.value,
       role: message.role,
     }));
 
@@ -76,22 +72,22 @@ export class ChatCliUsecases {
 
       messages.push({
         content: userInput,
-        role: ChatCompletionRole.User,
+        role: 'user',
       });
 
       const createMessageDto: CreateMessageDto = {
         thread_id: thread.id,
-        role: ChatCompletionRole.User,
+        role: 'user',
         content: [
           {
-            type: ContentType.Text,
+            type: 'text',
             text: {
               value: userInput,
               annotations: [],
             },
           },
         ],
-        status: MessageStatus.Ready,
+        status: 'completed',
       };
       this.messagesUsecases.create(createMessageDto);
 
@@ -127,22 +123,22 @@ export class ChatCliUsecases {
             stdout.write(assistantResponse);
             messages.push({
               content: assistantResponse,
-              role: ChatCompletionRole.Assistant,
+              role: 'assistant',
             });
 
             const createMessageDto: CreateMessageDto = {
               thread_id: thread.id,
-              role: ChatCompletionRole.Assistant,
+              role: 'assistant',
               content: [
                 {
-                  type: ContentType.Text,
+                  type: 'text',
                   text: {
                     value: assistantResponse,
                     annotations: [],
                   },
                 },
               ],
-              status: MessageStatus.Ready,
+              status: 'completed',
             };
 
             this.messagesUsecases.create(createMessageDto).then(() => {
@@ -164,21 +160,21 @@ export class ChatCliUsecases {
           response.on('end', () => {
             messages.push({
               content: assistantResponse,
-              role: ChatCompletionRole.Assistant,
+              role: 'assistant',
             });
             const createMessageDto: CreateMessageDto = {
               thread_id: thread.id,
-              role: ChatCompletionRole.Assistant,
+              role: 'assistant',
               content: [
                 {
-                  type: ContentType.Text,
+                  type: 'text',
                   text: {
                     value: assistantResponse,
                     annotations: [],
                   },
                 },
               ],
-              status: MessageStatus.Ready,
+              status: 'completed',
             };
 
             this.messagesUsecases.create(createMessageDto).then(() => {

cortex-js/src/infrastructure/dtos/assistants/create-assistant.dto.ts

@@ -1,4 +1,4 @@
-import { IsArray, IsOptional, IsString } from 'class-validator';
+import { IsArray, IsNumber, IsOptional, IsString } from 'class-validator';
 import { Assistant } from '@/domain/models/assistant.interface';
 import { ApiProperty } from '@nestjs/swagger';
 
@@ -63,4 +63,22 @@ export class CreateAssistantDto implements Partial<Assistant> {
   })
   @IsOptional()
   metadata: unknown | null;
+
+  @ApiProperty({
+    description: 'Top p.',
+    example: '0.7',
+    default: '0.7',
+  })
+  @IsOptional()
+  @IsNumber()
+  top_p?: number;
+
+  @ApiProperty({
+    description: 'Temperature.',
+    example: '0.7',
+    default: '0.7',
+  })
+  @IsOptional()
+  @IsNumber()
+  temperature?: number;
 }

cortex-js/src/infrastructure/dtos/chat/chat-completion-message.dto.ts

@@ -1,5 +1,4 @@
-import { IsEnum, IsString } from 'class-validator';
-import { ChatCompletionRole } from '@/domain/models/message.interface';
+import { IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class ChatCompletionMessage {
@@ -10,6 +9,5 @@ export class ChatCompletionMessage {
   @ApiProperty({
     description: 'The role of the entity in the chat completion.',
   })
-  @IsEnum(ChatCompletionRole)
-  role: ChatCompletionRole;
+  role: 'user' | 'assistant';
 }

cortex-js/src/infrastructure/dtos/messages/content-value.dto.ts

@@ -1,13 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsArray, IsEnum, IsString, ValidateNested } from 'class-validator';
-import {
-  ChatCompletionRole,
-  ErrorCode,
-  Message,
-  MessageStatus,
-} from '@/domain/models/message.interface';
-import { ThreadContentDto } from './thread-content.dto';
-import { Type } from 'class-transformer';
+import { IsArray, IsString } from 'class-validator';
+import { Message, MessageContent } from '@/domain/models/message.interface';
 
 export class CreateMessageDto implements Partial<Message> {
   @ApiProperty({
@@ -21,18 +14,14 @@ export class CreateMessageDto implements Partial<Message> {
   assistant_id?: string;
 
   @ApiProperty({ description: 'The sources of the messages.' })
-  @IsEnum(ChatCompletionRole)
-  role: ChatCompletionRole;
+  role: 'user' | 'assistant';
 
   @ApiProperty({ description: 'The content of the messages.' })
   @IsArray()
-  @ValidateNested({ each: true })
-  @Type(() => ThreadContentDto)
-  content: ThreadContentDto[];
+  content: MessageContent[];
 
   @ApiProperty({ description: 'Current status of the message.' })
-  @IsEnum(MessageStatus)
-  status: MessageStatus;
+  status: 'in_progress' | 'incomplete' | 'completed';
 
   @ApiProperty({
     description:
@@ -43,8 +32,4 @@ export class CreateMessageDto implements Partial<Message> {
   @ApiProperty({ description: 'Type of the message.' })
   @IsString()
   type?: string;
-
-  @ApiProperty({ description: 'Specifies the cause of any error.' })
-  @IsEnum(ErrorCode)
-  error_code?: ErrorCode;
 }

cortex-js/src/infrastructure/dtos/messages/create-message.dto.ts

@@ -1,15 +1,12 @@
-import { ChatCompletionRole } from '@/domain/models/message.interface';
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum } from 'class-validator';
 
 export class CreateMessageDto {
   @ApiProperty({
     description: `The role of the entity that is creating the message. Allowed values include:
       - user: Indicates the message is sent by an actual user and should be used in most cases to represent user-generated messages.
       - assistant: Indicates the message is generated by the assistant. Use this value to insert messages from the assistant into the conversation.`,
   })
-  @IsEnum(ChatCompletionRole)
-  role: ChatCompletionRole;
+  role: 'user' | 'assistant';
 
   @ApiProperty({
     description: 'The text contents of the message.',

cortex-js/src/infrastructure/dtos/messages/thread-content.dto.ts

@@ -2,9 +2,9 @@ import { IsArray, IsNumber, IsOptional, IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 import {
   Assistant,
+  AssistantResponseFormatOption,
   AssistantToolResources,
 } from '@/domain/models/assistant.interface';
-import { AssistantResponseFormatOption } from 'openai/resources/beta/threads/threads';
 
 export class CreateThreadAssistantDto implements Assistant {
   @ApiProperty({