From 5293a19f8bac3566f140c8113a137c733323efd6 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Wed, 22 Nov 2023 21:04:14 +0900
Subject: [PATCH] [fix] ooba system

---
 src/ts/process/request.ts | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts
index 23ea5519..8fceb79e 100644
--- a/src/ts/process/request.ts
+++ b/src/ts/process/request.ts
@@ -188,6 +188,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
                 formatedChat = formated
             }
             
+            let oobaSystemPrompts:string[] = []
             for(let i=0;i<formatedChat.length;i++){
                 if(formatedChat[i].role !== 'function'){
                     if(arg.isGroupChat && formatedChat[i].name){
@@ -203,6 +204,20 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
                     delete formatedChat[i].memo
                     delete formatedChat[i].removable
                 }
+                if(aiModel === 'reverse_proxy' && db.reverseProxyOobaMode && formatedChat[i].role === 'system'){
+                    const cont = formatedChat[i].content
+                    if(typeof(cont) === 'string'){
+                        oobaSystemPrompts.push(cont)
+                        formatedChat[i].content = ''
+                    }
+                }
+            }
+
+            if(oobaSystemPrompts.length > 0){
+                formatedChat.push({
+                    role: 'system',
+                    content: oobaSystemPrompts.join('\n')
+                })
             }
 
 
@@ -223,6 +238,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
 
 
 
+
             let oaiFunctions:OaiFunctions[] = []
 
 
@@ -305,7 +321,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
                         body[key] = OobaBodyTemplate[key]
                     }
                 }
-                arg.useStreaming = false
+
             }
 
             if(supportsInlayImage()){