Revert "修复API系统提示词无效问题"

This reverts commit ffb90d7.
wangpan6987 · Apr 6, 2024 · f1906be · f1906be
1 parent ffb90d7
commit f1906be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/lib/bots/bing/index.ts b/src/lib/bots/bing/index.ts
@@ -33,7 +33,6 @@ const getOptionSets = (conversationStyle: BingConversationStyle, allowSeach = tr
       'h3imaginative',
       'clgalileo',
       'gencontentv3',
-      'nojbfedge'
     ],
     [BingConversationStyle.Balanced]: [
       'deepleo',
@@ -44,7 +43,6 @@ const getOptionSets = (conversationStyle: BingConversationStyle, allowSeach = tr
       'iycapbing',
       'galileo',
       'saharagenconv5'
-      'nojbfedge',
     ],
     [BingConversationStyle.Precise]: [
       'deepleo',
@@ -56,7 +54,6 @@ const getOptionSets = (conversationStyle: BingConversationStyle, allowSeach = tr
       'h3precise',
       'clgalileo',
       'gencontentv3',
-      'nojbfedge',
     ],
     [BingConversationStyle.Base]: [
       'deepleo',
@@ -133,7 +130,7 @@ export class BingWebBot {
     }
 
     const argument = {
-      optionsSets: getOptionSets(conversation.conversationStyle, conversation.allowSearch),
+      optionsSets: getOptionSets(useBaseSets ? BingConversationStyle.Base : conversation.conversationStyle, conversation.allowSearch),
       sliceIds: [],
       message,
       source: 'cib',
@@ -166,7 +163,7 @@ export class BingWebBot {
       gptId: "copilot",
       previousMessages: conversation.context?.length ? [{
         author: 'system',
-        description: conversation.context.replace('[system](#message)','[system](#additional_instructions)'),
+        description: conversation.context,
         contextType: 'WebPage',
         messageType: 'Context',
         sourceName: '',

diff --git a/src/pages/api/openai/chat/completions.ts b/src/pages/api/openai/chat/completions.ts
@@ -33,7 +33,7 @@ function parseOpenAIMessage(request: APIRequest) {
     prompt,
     context,
     stream: request.stream,
-    allowSearch: /Creative|Balanced|Precise/i.test(request.model),
+    allowSearch: !/Creative|Balanced|Precise/i.test(request.model),
     model: /Creative|gpt-?4/i.test(request.model) ? 'Creative' : request.model,
   };
 }