Replace cloneDeep to native structuredclone and remove unused import
This commit is contained in:
@@ -4,7 +4,6 @@ import { changeLanguage, language } from '../../lang';
|
||||
import type { RisuPlugin } from '../plugins/plugins';
|
||||
import type {triggerscript as triggerscriptMain} from '../process/triggers';
|
||||
import { downloadFile, saveAsset as saveImageGlobal } from './globalApi';
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { defaultAutoSuggestPrompt, defaultJailbreak, defaultMainPrompt } from './defaultPrompts';
|
||||
import { alertNormal, alertSelect } from '../alert';
|
||||
import type { NAISettings } from '../process/models/nai';
|
||||
@@ -312,16 +311,16 @@ export function setDatabase(data:Database){
|
||||
largePortrait: false
|
||||
}]
|
||||
data.classicMaxWidth ??= false
|
||||
data.ooba ??= cloneDeep(defaultOoba)
|
||||
data.ainconfig ??= cloneDeep(defaultAIN)
|
||||
data.ooba ??= structuredClone(defaultOoba)
|
||||
data.ainconfig ??= structuredClone(defaultAIN)
|
||||
data.openrouterKey ??= ''
|
||||
data.openrouterRequestModel ??= 'openai/gpt-3.5-turbo'
|
||||
data.toggleConfirmRecommendedPreset ??= true
|
||||
data.officialplugins ??= {}
|
||||
data.NAIsettings ??= cloneDeep(prebuiltNAIpresets)
|
||||
data.NAIsettings ??= structuredClone(prebuiltNAIpresets)
|
||||
data.assetWidth ??= -1
|
||||
data.animationSpeed ??= 0.4
|
||||
data.colorScheme ??= cloneDeep(defaultColorScheme)
|
||||
data.colorScheme ??= structuredClone(defaultColorScheme)
|
||||
data.colorSchemeName ??= 'default'
|
||||
data.NAIsettings.starter ??= ""
|
||||
data.hypaModel ??= 'MiniLM'
|
||||
@@ -1049,8 +1048,8 @@ export const presetTemplate:botPreset = {
|
||||
promptPreprocess: false,
|
||||
proxyKey: '',
|
||||
bias: [],
|
||||
ooba: cloneDeep(defaultOoba),
|
||||
ainconfig: cloneDeep(defaultAIN),
|
||||
ooba: structuredClone(defaultOoba),
|
||||
ainconfig: structuredClone(defaultAIN),
|
||||
reverseProxyOobaArgs: {
|
||||
mode: 'instruct'
|
||||
},
|
||||
@@ -1070,7 +1069,7 @@ const defaultSdData:[string,string][] = [
|
||||
]
|
||||
|
||||
export const defaultSdDataFunc = () =>{
|
||||
return cloneDeep(defaultSdData)
|
||||
return structuredClone(defaultSdData)
|
||||
}
|
||||
|
||||
export function saveCurrentPreset(){
|
||||
@@ -1100,20 +1099,20 @@ export function saveCurrentPreset(){
|
||||
bias: db.bias,
|
||||
koboldURL: db.koboldURL,
|
||||
proxyKey: db.proxyKey,
|
||||
ooba: cloneDeep(db.ooba),
|
||||
ainconfig: cloneDeep(db.ainconfig),
|
||||
ooba: structuredClone(db.ooba),
|
||||
ainconfig: structuredClone(db.ainconfig),
|
||||
proxyRequestModel: db.proxyRequestModel,
|
||||
openrouterRequestModel: db.openrouterRequestModel,
|
||||
NAISettings: cloneDeep(db.NAIsettings),
|
||||
NAISettings: structuredClone(db.NAIsettings),
|
||||
promptTemplate: db.promptTemplate ?? null,
|
||||
NAIadventure: db.NAIadventure ?? false,
|
||||
NAIappendName: db.NAIappendName ?? false,
|
||||
localStopStrings: db.localStopStrings,
|
||||
autoSuggestPrompt: db.autoSuggestPrompt,
|
||||
customProxyRequestModel: db.customProxyRequestModel,
|
||||
reverseProxyOobaArgs: cloneDeep(db.reverseProxyOobaArgs) ?? null,
|
||||
reverseProxyOobaArgs: structuredClone(db.reverseProxyOobaArgs) ?? null,
|
||||
top_p: db.top_p ?? 1,
|
||||
promptSettings: cloneDeep(db.promptSettings) ?? null,
|
||||
promptSettings: structuredClone(db.promptSettings) ?? null,
|
||||
repetition_penalty: db.repetition_penalty,
|
||||
min_p: db.min_p,
|
||||
top_a: db.top_a,
|
||||
@@ -1128,7 +1127,7 @@ export function copyPreset(id:number){
|
||||
saveCurrentPreset()
|
||||
let db = get(DataBase)
|
||||
let pres = db.botPresets
|
||||
const newPres = cloneDeep(pres[id])
|
||||
const newPres = structuredClone(pres[id])
|
||||
newPres.name += " Copy"
|
||||
db.botPresets.push(newPres)
|
||||
setDatabase(db)
|
||||
@@ -1168,8 +1167,8 @@ export function setPreset(db:Database, newPres: botPreset){
|
||||
db.bias = newPres.bias ?? db.bias
|
||||
db.koboldURL = newPres.koboldURL ?? db.koboldURL
|
||||
db.proxyKey = newPres.proxyKey ?? db.proxyKey
|
||||
db.ooba = cloneDeep(newPres.ooba ?? db.ooba)
|
||||
db.ainconfig = cloneDeep(newPres.ainconfig ?? db.ainconfig)
|
||||
db.ooba = structuredClone(newPres.ooba ?? db.ooba)
|
||||
db.ainconfig = structuredClone(newPres.ainconfig ?? db.ainconfig)
|
||||
db.openrouterRequestModel = newPres.openrouterRequestModel ?? db.openrouterRequestModel
|
||||
db.proxyRequestModel = newPres.proxyRequestModel ?? db.proxyRequestModel
|
||||
db.NAIsettings = newPres.NAISettings ?? db.NAIsettings
|
||||
@@ -1184,12 +1183,12 @@ export function setPreset(db:Database, newPres: botPreset){
|
||||
db.NAIsettings.mirostat_lr ??= 1
|
||||
db.localStopStrings = newPres.localStopStrings
|
||||
db.customProxyRequestModel = newPres.customProxyRequestModel ?? ''
|
||||
db.reverseProxyOobaArgs = cloneDeep(newPres.reverseProxyOobaArgs) ?? {
|
||||
db.reverseProxyOobaArgs = structuredClone(newPres.reverseProxyOobaArgs) ?? {
|
||||
mode: 'instruct'
|
||||
}
|
||||
db.top_p = newPres.top_p ?? 1
|
||||
//@ts-ignore //for legacy mistpings
|
||||
db.promptSettings = cloneDeep(newPres.promptSettings) ?? {
|
||||
db.promptSettings = structuredClone(newPres.promptSettings) ?? {
|
||||
assistantPrefill: '',
|
||||
postEndInnerFormat: '',
|
||||
sendChatAsSystem: false,
|
||||
@@ -1212,7 +1211,7 @@ import type { RisuModule } from '../process/modules';
|
||||
export async function downloadPreset(id:number){
|
||||
saveCurrentPreset()
|
||||
let db = get(DataBase)
|
||||
let pres = cloneDeep(db.botPresets[id])
|
||||
let pres = structuredClone(db.botPresets[id])
|
||||
console.log(pres)
|
||||
pres.openAIKey = ''
|
||||
pres.forceReplaceUrl = ''
|
||||
@@ -1258,7 +1257,7 @@ export async function importPreset(){
|
||||
let db = get(DataBase)
|
||||
if(pre.presetVersion && pre.presetVersion >= 3){
|
||||
//NAI preset
|
||||
const pr = cloneDeep(prebuiltPresets.NAI2)
|
||||
const pr = structuredClone(prebuiltPresets.NAI2)
|
||||
pr.temperature = pre.parameters.temperature * 100
|
||||
pr.maxResponse = pre.parameters.max_length
|
||||
pr.NAISettings.topK = pre.parameters.top_k
|
||||
@@ -1283,7 +1282,7 @@ export async function importPreset(){
|
||||
|
||||
if(Array.isArray(pre?.prompt_order?.[0]?.order) && Array.isArray(pre?.prompts)){
|
||||
//ST preset
|
||||
const pr = cloneDeep(presetTemplate)
|
||||
const pr = structuredClone(presetTemplate)
|
||||
pr.promptTemplate = []
|
||||
|
||||
function findPrompt(identifier:number){
|
||||
|
||||
@@ -15,7 +15,6 @@ import { alertConfirm, alertError, alertNormal, alertNormalWait } from "../alert
|
||||
import { checkDriverInit, syncDrive } from "../drive/drive";
|
||||
import { hasher } from "../parser";
|
||||
import { characterURLImport, hubURL } from "../characterCards";
|
||||
import { cloneDeep } from "lodash";
|
||||
import { defaultJailbreak, defaultMainPrompt, oldJailbreak, oldMainPrompt } from "./defaultPrompts";
|
||||
import { loadRisuAccountData } from "../drive/accounter";
|
||||
import { decodeRisuSave, encodeRisuSave } from "./risuSave";
|
||||
@@ -940,7 +939,7 @@ async function checkNewFormat() {
|
||||
name: "Global Regex",
|
||||
description: "Converted from legacy global regex",
|
||||
id: id,
|
||||
regex: cloneDeep(db.globalscript)
|
||||
regex: structuredClone(db.globalscript)
|
||||
}
|
||||
db.modules.push(regexModule)
|
||||
db.enabledModules.push(id)
|
||||
@@ -954,7 +953,7 @@ async function checkNewFormat() {
|
||||
name: db.loreBook[i].name || "Unnamed Global Lorebook",
|
||||
description: "Converted from legacy global lorebook",
|
||||
id: id,
|
||||
lorebook: cloneDeep(db.loreBook[i].data)
|
||||
lorebook: structuredClone(db.loreBook[i].data)
|
||||
}
|
||||
db.modules.push(lbModule)
|
||||
if(i === selIndex){
|
||||
@@ -983,7 +982,7 @@ async function checkNewFormat() {
|
||||
export function checkCharOrder() {
|
||||
let db = get(DataBase)
|
||||
db.characterOrder = db.characterOrder ?? []
|
||||
let ordered = cloneDeep(db.characterOrder ?? [])
|
||||
let ordered = structuredClone(db.characterOrder ?? [])
|
||||
for(let i=0;i<db.characterOrder.length;i++){
|
||||
const folder =db.characterOrder[i]
|
||||
if(typeof(folder) !== 'string' && folder){
|
||||
|
||||
Reference in New Issue
Block a user