saving work for review

janhq · Feb 9, 2024 · d2d885a · d2d885a
1 parent 9e7348e
commit d2d885a
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 5 deletions.
diff --git a/core/src/types/message/index.ts b/core/src/types/message/index.ts
@@ -1,3 1,4 @@
 export * from './messageEntity'
 export * from './messageInterface'
 export * from './messageEvent'
 export * from './messageRequestType'
diff --git a/core/src/types/message/messageEntity.ts b/core/src/types/message/messageEntity.ts
@@ -27,6 27,8 @@ export type ThreadMessage = {
  updated: number
  /** The additional metadata of this message. **/
  metadata?: Record<string, unknown>
 
  type?: string
 }
 
 /**
@@ -56,6 58,8 @@ export type MessageRequest = {
  /** The thread of this message is belong to. **/
  // TODO: deprecate threadId field
  thread?: Thread
 
  type?: string
 }
 
 /**

diff --git a/core/src/types/message/messageRequestType.ts b/core/src/types/message/messageRequestType.ts
@@ -0,0 1,5 @@
 export enum MessageRequestType {
  Thread = "Thread",
  Assistant = "Assistant",
  Summary = "Summary",
 }
diff --git a/extensions/inference-nitro-extension/src/index.ts b/extensions/inference-nitro-extension/src/index.ts
@@ -10,6 10,7 @@ import {
  ChatCompletionRole,
  ContentType,
  MessageRequest,
  MessageRequestType,
  MessageStatus,
  ThreadContent,
  ThreadMessage,
@@ -250,6 251,7 @@ export default class JanInferenceNitroExtension extends InferenceExtension {
  const message: ThreadMessage = {
  id: ulid(),
  thread_id: data.threadId,
  type: data.type,
  assistant_id: data.assistantId,
  role: ChatCompletionRole.Assistant,
  content: [],
@@ -258,7 260,10 @@ export default class JanInferenceNitroExtension extends InferenceExtension {
  updated: timestamp,
  object: "thread.message",
  };
- events.emit(MessageEvent.OnMessageResponse, message);
 
  if (data.type != MessageRequestType.Summary) {
  events.emit(MessageEvent.OnMessageResponse, message);
  }
 
  this.isCancelled = false;
  this.controller = new AbortController();

diff --git a/extensions/inference-openai-extension/src/index.ts b/extensions/inference-openai-extension/src/index.ts
@@ -18,6 18,7 @@ import {
  InferenceEngine,
  BaseExtension,
  MessageEvent,
  MessageRequestType,
  ModelEvent,
  InferenceEvent,
  AppConfigurationEventName,
@@ -157,6 158,7 @@ export default class JanInferenceOpenAIExtension extends BaseExtension {
  const message: ThreadMessage = {
  id: ulid(),
  thread_id: data.threadId,
  type: data.type,
  assistant_id: data.assistantId,
  role: ChatCompletionRole.Assistant,
  content: [],
@@ -165,7 167,10 @@ export default class JanInferenceOpenAIExtension extends BaseExtension {
  updated: timestamp,
  object: "thread.message",
  };
- events.emit(MessageEvent.OnMessageResponse, message);
 
  if (data.type != MessageRequestType.Summary) {
  events.emit(MessageEvent.OnMessageResponse, message);
  }
 
  instance.isCancelled = false;
  instance.controller = new AbortController();

diff --git a/web/containers/Providers/EventHandler.tsx b/web/containers/Providers/EventHandler.tsx
@@ -9,6 9,7 @@ import {
  Model,
  ConversationalExtension,
  MessageEvent,
  MessageRequestType,
  ModelEvent,
 } from '@janhq/core'
 import { useAtomValue, useSetAtom } from 'jotai'
@@ -134,6 135,11 @@ export default function EventHandler({ children }: { children: ReactNode }) {
  ...(messageContent && { lastMessage: messageContent }),
  }
 
  // Update the Thread title with the response of the inference on the 1st prompt
  if (message.type == MessageRequestType.Summary) {
  thread.title = messageContent
  }
 
  updateThread({
  ...thread,
  metadata,
@@ -146,9 152,12 @@ export default function EventHandler({ children }: { children: ReactNode }) {
  metadata,
  })
 
- extensionManager
- .get<ConversationalExtension>(ExtensionTypeEnum.Conversational)
- ?.addNewMessage(message)
  // If this is not the summary of the Thread, don't need to add it to the Thread
  if (message.type != MessageRequestType.Summary) {
  extensionManager
  .get<ConversationalExtension>(ExtensionTypeEnum.Conversational)
  ?.addNewMessage(message)
  }
  }
  },
  [updateMessage, updateThreadWaiting, setIsGeneratingResponse, updateThread]

diff --git a/web/hooks/useSendChatMessage.ts b/web/hooks/useSendChatMessage.ts
@@ -6,6 6,7 @@ import {
  ChatCompletionRole,
  ContentType,
  MessageRequest,
  MessageRequestType,
  MessageStatus,
  ExtensionTypeEnum,
  Thread,
@@ -112,6 113,7 @@ export default function useSendChatMessage() {
 
  const messageRequest: MessageRequest = {
  id: ulid(),
  type: MessageRequestType.Thread,
  messages: messages,
  threadId: activeThread.id,
  model: activeThread.assistants[0].model ?? selectedModel,
@@ -209,6 211,7 @@ export default function useSendChatMessage() {
  }
  const messageRequest: MessageRequest = {
  id: msgId,
  type: MessageRequestType.Thread,
  threadId: activeThread.id,
  messages,
  model: {
@@ -295,6 298,49 @@ export default function useSendChatMessage() {
 
  setReloadModel(false)
  setEngineParamsUpdate(false)
 
  // If this is the first ever prompt in the thread
  if (messages.length == 1) {
  updateThreadWaiting(activeThread.id, true)
  // This is the first time message comes in on a new thread
  // Summarize the first message, and make that the title of the Thread
  // 1. Get the summary of the first prompt using whatever engine user is currently using
  const firstPrompt = message.trim()
  const summarizeFirstPrompt =
  'Summarize "'   firstPrompt   '" in 5 words as a title'
 
  // Prompt: Given this query from user {query}, return to me the summary in 5 words as the title
  const msgId = ulid()
  const messages: ChatCompletionMessage[] = [
  {
  role: ChatCompletionRole.User,
  content: summarizeFirstPrompt,
  } as ChatCompletionMessage,
  ]
 
  const firstPromptRequest: MessageRequest = {
  id: msgId,
  threadId: activeThread.id,
  type: MessageRequestType.Summary,
  messages,
  model: {
  ...modelRequest,
  settings: settingParams,
  parameters: runtimeParams,
  },
  }
 
  // Make sure the model is started so that we can summarize the first ever message
  const modelId = selectedModel?.id ?? activeThread.assistants[0].model.id
  if (activeModel?.id !== modelId) {
  startModel(modelId)
  await waitForModelStarting(modelId)
  }
 
  // 2. Update the title with the result of the inference
  // the title will be updated as part of the `EventName.OnFirstPromptUpdate`
  events.emit(MessageEvent.OnMessageSent, firstPromptRequest)
  }
  }
 
  const waitForModelStarting = async (modelId: string) => {