[feat] new oai handling

src/ts/process/request.ts

@@ -15,6 +15,7 @@ import { risuChatParser } from "../parser";
 import { SignatureV4 } from "@smithy/signature-v4";
 import { HttpRequest } from "@smithy/protocol-http";
 import { Sha256 } from "@aws-crypto/sha256-js";
+import { v4 } from "uuid";
 
 
 
@@ -130,13 +131,25 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
                 if(formated[i].role !== 'function'){
                     if(arg.isGroupChat && formated[i].name){
                         formated[i].content = formated[i].name + ": " + formated[i].content
+                        formated[i].name = undefined
+                    }
+                    if(!(formated[i].name && formated[i].name.startsWith('example_') && db.newOAIHandle)){
+                        formated[i].name = undefined
+                    }
+                    if(db.newOAIHandle && formated[i].memo && formated[i].memo.startsWith('NewChat')){
+                        formated[i].content === ''
                     }
-                    formated[i].name = undefined
                     delete formated[i].memo
                     delete formated[i].removable
                 }
             }
 
+            if(db.newOAIHandle){
+                formated = formated.filter(m => {
+                    return m.content !== ''
+                })
+            }
+
             for(let i=0;i<biasString.length;i++){
                 const bia = biasString[i]
                 const tokens = await tokenizeNum(bia[0])
@@ -213,6 +226,11 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
                 body.seed = db.generationSeed
             }
 
+            if(db.newOAIHandle){
+                // @ts-ignore
+                body.user = getOpenUserString()
+            }
+
             let replacerURL = aiModel === 'openrouter' ? "https://openrouter.ai/api/v1/chat/completions" :
                 (aiModel === 'reverse_proxy') ? (db.forceReplaceUrl) : ('https://api.openai.com/v1/chat/completions')
 
@@ -1142,4 +1160,19 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
             }
         }
     }
-}
+}
+
+
+let userString = ''
+let requestedTimes = 999
+let refreshTime = 0
+function getOpenUserString(){
+    if(refreshTime < Date.now() && requestedTimes > 2 ){
+        refreshTime = Date.now() + (300000 * Math.random()) + 60000
+        userString = v4()
+        requestedTimes = 0
+    }
+    requestedTimes += 1
+    console.log(userString)
+    return userString
+}

src/ts/storage/database.ts

@@ -318,6 +318,7 @@ export function setDatabase(data:Database){
     data.autofillRequestUrl ??= true
     data.customProxyRequestModel ??= ''
     data.generationSeed ??= -1
+    data.newOAIHandle ??= true
     changeLanguage(data.language)
     DataBase.set(data)
 }
@@ -492,6 +493,7 @@ export interface Database{
     autofillRequestUrl:boolean
     customProxyRequestModel:string
     generationSeed:number
+    newOAIHandle:boolean
 }
 
 export interface customscript{
@@ -920,7 +922,6 @@ export function changeToPreset(id =0, savecurrent = true){
 
 export function setPreset(db:Database, newPres: botPreset){
     db.apiType = newPres.apiType ?? db.apiType
-    db.openAIKey = newPres.openAIKey ?? db.openAIKey
     db.mainPrompt = newPres.mainPrompt ?? db.mainPrompt
     db.jailbreak = newPres.jailbreak ?? db.jailbreak
     db.globalNote = newPres.globalNote ?? db.globalNote