feat(gpt-runner-web): add system prompt as user prompt feature

2214962083 · 2214962083 · commit 2277592f4ac0 · 2023-07-18T15:59:25.000+08:00
diff --git a/packages/gpt-runner-core/src/langchain/llm-chain/llm-chain.ts b/packages/gpt-runner-core/src/langchain/llm-chain/llm-chain.ts
@@ -3,6 +3,7 @@ import {
   ChatPromptTemplate, HumanMessagePromptTemplate, SystemMessagePromptTemplate,
 } from 'langchain/prompts'
 import { LLMChain } from 'langchain/chains'
+import { ChatRole } from '@nicepkg/gpt-runner-shared/common'
 import { mapStoredMessageToChatTemplateMessages } from '../helper'
 import type { GetLLMChainParams } from './type'
 import { getLLM } from './get-llm'
@@ -13,13 +14,29 @@ export async function llmChain(params: LLmChainParams) {
   const {
     messages,
     systemPrompt,
+    systemPromptAsUserPrompt,
   } = params
 
   const llm = getLLM(params)
 
+  const DEFAULT_SYSTEM_PROMPT = 'You are a friendly assistant.'
+  const finalMessages = [...messages]
+  let finalSystemPrompt = systemPrompt || DEFAULT_SYSTEM_PROMPT
+
+  if (systemPromptAsUserPrompt) {
+    finalMessages.unshift({
+      text: `Now I am user, you will answer my questions as follows setup or role play: \n\n${finalSystemPrompt}`,
+      name: ChatRole.User,
+    }, {
+      text: 'Ok',
+      name: ChatRole.Assistant,
+    })
+    finalSystemPrompt = DEFAULT_SYSTEM_PROMPT
+  }
+
   const chatPrompt = ChatPromptTemplate.fromPromptMessages([
-    SystemMessagePromptTemplate.fromTemplate(systemPrompt || 'You are a friendly assistant.'),
-    ...mapStoredMessageToChatTemplateMessages(messages),
+    SystemMessagePromptTemplate.fromTemplate(finalSystemPrompt),
+    ...mapStoredMessageToChatTemplateMessages(finalMessages),
     HumanMessagePromptTemplate.fromTemplate('{global.input}'),
   ])
 
diff --git a/packages/gpt-runner-core/src/langchain/types.ts b/packages/gpt-runner-core/src/langchain/types.ts
@@ -1,6 +1,7 @@
 export interface BaseStreamChainParams<Message> {
   messages: Message[]
   systemPrompt?: string
+  systemPromptAsUserPrompt?: boolean
   onTokenStream?: (token: string) => void
   onComplete?: () => void
   onError?: (err: any) => void
diff --git a/packages/gpt-runner-shared/src/common/types/server.ts b/packages/gpt-runner-shared/src/common/types/server.ts
@@ -27,6 +27,12 @@ export interface ChatStreamReqParams {
    */
   systemPrompt?: string
   appendSystemPrompt?: string
+
+  /**
+   * send system prompt as user prompt
+   * @default false
+   */
+  systemPromptAsUserPrompt?: boolean
   singleFilePath?: string
 
   /**
diff --git a/packages/gpt-runner-shared/src/common/zod/server.zod.ts b/packages/gpt-runner-shared/src/common/zod/server.zod.ts
@@ -8,6 +8,7 @@ export const ChatStreamReqParamsSchema = z.object({
   prompt: z.string(),
   systemPrompt: z.string().optional(),
   appendSystemPrompt: z.string().optional(),
+  systemPromptAsUserPrompt: z.boolean().optional(),
   singleFilePath: z.string().optional(),
   singleFileConfig: SingleFileConfigSchema.optional(),
   overrideModelType: ChatModelTypeSchema.optional(),
diff --git a/packages/gpt-runner-web/client/public/locales/de.json b/packages/gpt-runner-web/client/public/locales/de.json
@@ -56,6 +56,7 @@
     "override_settings": "Einstellungen überschreiben",
     "override_all_settings": "Alle Einstellungen überschreiben",
     "context_settings": "Kontext-Einstellungen",
+    "context_settings_system_prompt_as_user_prompt_tips": "Senden Sie Systemprompt als Nachricht, nützlich für APIs, die keine Systemprompt unterstützen",
     "context_settings_selected_text_checkbox_tips": "Ausgewählter Text als Aufforderung<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper>Token.",
     "context_settings_opening_ide_file_contents_checkbox_tips": "Öffnen von IDE-Dateiinhalten als Aufforderung<FileNumWrapper>{{fileNum}}</FileNumWrapper>Dateien<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper>Token.",
     "context_settings_active_ide_file_contents_checkbox_tips": "Aktive IDE-Dateiinhalte als Aufforderung<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper>Token.",
@@ -98,4 +99,4 @@
     "file_editor_forgot_save_tips_title": "Möchten Sie die Änderungen an {{fileName}} speichern?",
     "file_editor_forgot_save_tips_content": "Ihre Änderungen gehen verloren, wenn Sie sie nicht speichern."
   }
-}
+}
diff --git a/packages/gpt-runner-web/client/public/locales/en.json b/packages/gpt-runner-web/client/public/locales/en.json
@@ -56,6 +56,7 @@
     "override_settings": "Override Settings",
     "override_all_settings": "Override All Settings",
     "context_settings": "Context Settings",
+    "context_settings_system_prompt_as_user_prompt_tips": "Send System Prompt as message, useful for APIs that don't support System Prompt",
     "context_settings_selected_text_checkbox_tips": "Selected Text As Prompt <TokenNumWrapper>{{tokenNum}}</TokenNumWrapper> Tokens.",
     "context_settings_opening_ide_file_contents_checkbox_tips": "Opening IDE File Contents As Prompt <FileNumWrapper>{{fileNum}}</FileNumWrapper> Files <TokenNumWrapper>{{tokenNum}}</TokenNumWrapper> Tokens.",
     "context_settings_active_ide_file_contents_checkbox_tips": "Active IDE File Contents As Prompt <TokenNumWrapper>{{tokenNum}}</TokenNumWrapper> Tokens.",
@@ -98,4 +99,4 @@
     "file_editor_forgot_save_tips_title": "Do you want to save changes to {{fileName}}?",
     "file_editor_forgot_save_tips_content": "Your changes will be lost if you don't save them."
   }
-}
+}
diff --git a/packages/gpt-runner-web/client/public/locales/ja.json b/packages/gpt-runner-web/client/public/locales/ja.json
@@ -56,6 +56,7 @@
     "override_settings": "設定を上書き",
     "override_all_settings": "すべての設定を上書きする",
     "context_settings": "コンテキスト設定",
+    "context_settings_system_prompt_as_user_prompt_tips": "システムプロンプトをメッセージとして送信します。システムプロンプトをサポートしていないAPIに便利です",
     "context_settings_selected_text_checkbox_tips": "選択したテキストをプロンプトとして使用<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper>トークン。",
     "context_settings_opening_ide_file_contents_checkbox_tips": "開いているIDEファイルの内容をプロンプトとして使用<FileNumWrapper>{{fileNum}}</FileNumWrapper>ファイル<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper>トークン。",
     "context_settings_active_ide_file_contents_checkbox_tips": "アクティブなIDEファイルの内容をプロンプトとして使用<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper>トークン。",
@@ -98,4 +99,4 @@
     "file_editor_forgot_save_tips_title": "変更を{{fileName}}に保存しますか？",
     "file_editor_forgot_save_tips_content": "保存しない場合、変更は失われます。"
   }
-}
+}
diff --git a/packages/gpt-runner-web/client/public/locales/zh_CN.json b/packages/gpt-runner-web/client/public/locales/zh_CN.json
@@ -56,6 +56,7 @@
     "override_settings": "覆盖设置",
     "override_all_settings": "覆盖所有设置",
     "context_settings": "上下文设置",
+    "context_settings_system_prompt_as_user_prompt_tips": "将系统提示作为消息发送，对于不支持系统提示的 API 很有用",
     "context_settings_selected_text_checkbox_tips": "将选定的文本作为提示，<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper> tokens",
     "context_settings_opening_ide_file_contents_checkbox_tips": "将 IDE 正在打开的文件内容作为提示，<FileNumWrapper>{{fileNum}}</FileNumWrapper> 个文件， <TokenNumWrapper>{{tokenNum}}</TokenNumWrapper> tokens",
     "context_settings_active_ide_file_contents_checkbox_tips": "将 IDE 正在编辑的文件内容作为提示，<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper> tokens",
@@ -98,4 +99,4 @@
     "file_editor_forgot_save_tips_title": "你想要保存对{{fileName}}的更改吗?",
     "file_editor_forgot_save_tips_content": "如果你不保存，你的改动将会丢失."
   }
-}
+}
diff --git a/packages/gpt-runner-web/client/public/locales/zh_Hant.json b/packages/gpt-runner-web/client/public/locales/zh_Hant.json
@@ -56,6 +56,7 @@
     "override_settings": "覆寫設置",
     "override_all_settings": "覆蓋所有設置",
     "context_settings": "上下文設置",
+    "context_settings_system_prompt_as_user_prompt_tips": "將系統提示作為訊息發送，對於不支援系統提示的 API 很有用",
     "context_settings_selected_text_checkbox_tips": "將選定的文本作為提示，<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper> tokens",
     "context_settings_opening_ide_file_contents_checkbox_tips": "將 IDE 正在打開的文件內容作為提示，<FileNumWrapper>{{fileNum}}</FileNumWrapper> 個文件， <TokenNumWrapper>{{tokenNum}}</TokenNumWrapper> tokens",
     "context_settings_active_ide_file_contents_checkbox_tips": "將 IDE 正在編輯的文件內容作為提示，<TokenNumWrapper>{{tokenNum}}</TokenNumWrapper> tokens",
@@ -98,4 +99,4 @@
     "file_editor_forgot_save_tips_title": "你想要保存對{{fileName}}的更改嗎?",
     "file_editor_forgot_save_tips_content": "如果你不保存，你的改動將會丟失."
   }
-}
+}
diff --git a/packages/gpt-runner-web/client/src/networks/llm.ts b/packages/gpt-runner-web/client/src/networks/llm.ts
@@ -20,6 +20,7 @@ export async function fetchLlmStream(
     prompt,
     systemPrompt,
     appendSystemPrompt,
+    systemPromptAsUserPrompt,
     singleFilePath,
     singleFileConfig,
     contextFilePaths,
@@ -55,6 +56,7 @@ export async function fetchLlmStream(
         messages,
         systemPrompt,
         appendSystemPrompt,
+        systemPromptAsUserPrompt,
         singleFilePath,
         singleFileConfig,
         contextFilePaths,
diff --git a/packages/gpt-runner-web/client/src/pages/chat/components/settings/components/context-settings/index.tsx b/packages/gpt-runner-web/client/src/pages/chat/components/settings/components/context-settings/index.tsx
@@ -21,9 +21,11 @@ export const ContextSettings = memo((props: ContextSettingsProps) => {
 
   const { t } = useTranslation()
   const {
+    systemPromptAsUserPrompt,
     provideFileInfoToGptMap,
     checkedFilePaths,
     updateProvideFileInfoToGptMap,
+    updateSystemPromptAsUserPrompt,
   } = useGlobalStore()
 
   const {
@@ -82,6 +84,14 @@ export const ContextSettings = memo((props: ContextSettingsProps) => {
   return <StyledForm>
     {isLoading && <LoadingView absolute></LoadingView>}
 
+    {/* system prompt as user prompt */}
+    <StyledVSCodeCheckbox
+      checked={systemPromptAsUserPrompt}
+      onClick={() => updateSystemPromptAsUserPrompt(!systemPromptAsUserPrompt)}
+    >
+      {t('chat_page.context_settings_system_prompt_as_user_prompt_tips')}
+    </StyledVSCodeCheckbox>
+
     {/* selected text */}
     {getGlobalConfig().showUserSelectedTextContextOptions && <StyledVSCodeCheckbox
       checked={provideFileInfoToGptMap.userSelectedText}
diff --git a/packages/gpt-runner-web/client/src/pages/chat/components/settings/components/model-settings/openai-settings/model-settings.tsx b/packages/gpt-runner-web/client/src/pages/chat/components/settings/components/model-settings/openai-settings/model-settings.tsx
@@ -28,6 +28,10 @@ export const OpenaiModelSettings: FC<OpenaiModelSettingsProps> = memo((props) =>
       label: 'gpt-4',
       value: 'gpt-4',
     },
+    {
+      label: 'gpt-4-32k',
+      value: 'gpt-4-32k',
+    },
     {
       label: 'gpt-3.5-turbo',
       value: 'gpt-3.5-turbo',
diff --git a/packages/gpt-runner-web/client/src/store/zustand/global/chat.slice.ts b/packages/gpt-runner-web/client/src/store/zustand/global/chat.slice.ts
@@ -19,6 +19,7 @@ export type OverrideModelType = ChatModelType | ''
 export interface ChatSlice {
   activeChatId: string
   chatInstances: SingleChat[]
+  systemPromptAsUserPrompt: boolean
   overrideModelType: OverrideModelType
   overrideModelsConfig: PartialChatModelTypeMap
   updateActiveChatId: (activeChatId: string) => void
@@ -46,6 +47,7 @@ export interface ChatSlice {
   updateOverrideModelType: (overrideModelType: OverrideModelType) => void
   updateOverrideModelsConfig: (overrideModelsConfig: PartialChatModelTypeMap | ((oldModelOverrideConfig: PartialChatModelTypeMap) => PartialChatModelTypeMap)) => void
   getContextFilePaths: () => string[]
+  updateSystemPromptAsUserPrompt: (systemPromptAsUserPrompt: boolean) => void
 }
 
 export type ChatState = GetState<ChatSlice>
@@ -54,6 +56,7 @@ function getInitialState() {
   return {
     activeChatId: '',
     chatInstances: [],
+    systemPromptAsUserPrompt: false,
     overrideModelType: '',
     overrideModelsConfig: {},
   } satisfies ChatState
@@ -303,6 +306,7 @@ export const createChatSlice: StateCreator<
       messages: sendMessages,
       prompt: sendInputtingPrompt,
       appendSystemPrompt,
+      systemPromptAsUserPrompt: state.systemPromptAsUserPrompt,
       singleFilePath,
       contextFilePaths,
       editingFilePath: shouldProvideEditingPath ? tempState.ideActiveFilePath : undefined,
@@ -386,4 +390,7 @@ export const createChatSlice: StateCreator<
 
     return [...new Set(contextPaths)]
   },
+  updateSystemPromptAsUserPrompt(systemPromptAsUserPrompt) {
+    set({ systemPromptAsUserPrompt })
+  },
 })
diff --git a/packages/gpt-runner-web/server/src/controllers/llm.controller.ts b/packages/gpt-runner-web/server/src/controllers/llm.controller.ts
@@ -32,6 +32,7 @@ export const llmControllers: ControllerConfig = {
           singleFilePath,
           singleFileConfig: singleFileConfigFromParams,
           appendSystemPrompt = '',
+          systemPromptAsUserPrompt = false,
           contextFilePaths,
           editingFilePath,
           overrideModelType,
@@ -110,6 +111,7 @@ export const llmControllers: ControllerConfig = {
           const chain = await llmChain({
             messages,
             systemPrompt: finalSystemPrompt,
+            systemPromptAsUserPrompt,
             model: {
               ...model!,
               secrets: finalSecrets,
