by default use open ai message format (#479)

* Refactor chat stream function selection logic * Add placeholder comment for unimplemented summarize mode feature
swuecho · Jun 28, 2024 · 41cd6c5 · 41cd6c5
1 parent 4600dd4
commit 41cd6c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/api/chat_main_handler.go b/api/chat_main_handler.go
@@ -274,7 +274,6 @@ func (h *ChatHandler) chooseChatStreamFn(chat_session sqlc_queries.ChatSession,
 		isClaude = false
 		isClaude3 = true
 	}
-	isChatGPT := strings.HasPrefix(model, "gpt") || strings.HasPrefix(model, "deepseek") || strings.HasPrefix(model, "yi") || strings.HasPrefix(model, "qwen")
 	isOllama := strings.HasPrefix(model, "ollama-")
 	isGemini := strings.HasPrefix(model, "gemini")
 
@@ -283,22 +282,23 @@ func (h *ChatHandler) chooseChatStreamFn(chat_session sqlc_queries.ChatSession,
 	completionModel.Add(openai.GPT3TextDavinci003)
 	completionModel.Add(openai.GPT3TextDavinci002)
 	isCompletion := completionModel.Contains(model)
+	isCustom := strings.HasPrefix(model, "custom-")
 
-	chatStreamFn := h.customChatStream
+	chatStreamFn := h.chatStream
 	if isClaude {
 		chatStreamFn = h.chatStreamClaude
 	} else if isClaude3 {
 		chatStreamFn = h.chatStreamClaude3
 	} else if isTestChat {
 		chatStreamFn = h.chatStreamTest
-	} else if isChatGPT {
-		chatStreamFn = h.chatStream
 	} else if isOllama {
 		chatStreamFn = h.chatOllamStram
 	} else if isCompletion {
 		chatStreamFn = h.CompletionStream
 	} else if isGemini {
 		chatStreamFn = h.chatStreamGemini
+	} else if isCustom {
+		chatStreamFn = h.customChatStream
 	}
 	return chatStreamFn
 }

diff --git a/web/src/views/chat/components/Session/SessionConfig.vue b/web/src/views/chat/components/Session/SessionConfig.vue
@@ -120,6 +120,7 @@ const defaultToken = computed(() => {
           </NSpace>
         </NRadioGroup>
       </NFormItem>
+      <!-- not implemented
       <NFormItem :label="$t('chat.summarize_mode')" path="summarize_mode">
         <NSwitch v-model:value="modelRef.summarizeMode" data-testid="summarize_mode">
           <template #checked>
@@ -130,6 +131,7 @@ const defaultToken = computed(() => {
           </template>
         </NSwitch>
       </NFormItem>
+      -->
       <NFormItem :label="$t('chat.contextCount', { contextCount: modelRef.contextCount })" path="contextCount">
         <NSlider v-model:value="modelRef.contextCount" :min="1" :max="40" :tooltip="false" show-tooltip />
       </NFormItem>