mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate all DataBase to DBState

Browse Source
This commit is contained in:
kwaroran
2024-10-24 01:59:57 +09:00
parent 4e9190f1b5
commit b3fddb814e
65 changed files with 331 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ts/process/templates/chatTemplate.ts
View File

@@ -1,7 +1,6 @@
import { Template } from '@huggingface/jinja';
import type { OpenAIChat } from '..';
import { get } from 'svelte/store';
import { DataBase, getCurrentCharacter } from 'src/ts/storage/database.svelte';
import { getCurrentCharacter, getDatabase } from 'src/ts/storage/database.svelte';
import { getUserName } from 'src/ts/util';
export const chatTemplates = {
@@ -29,7 +28,7 @@ export const applyChatTemplate = (messages:OpenAIChat[], arg:{
type?: string
custom?: string
} = {}) => {
const db = get(DataBase)
const db = getDatabase()
const currentChar = getCurrentCharacter()
const type = arg.type ?? db.instructChatTemplate
if(!type){

7
src/ts/process/templates/getRecomended.ts
View File

@@ -1,12 +1,11 @@
import { DataBase, setPreset, type botPreset, setDatabase } from "src/ts/storage/database.svelte";
import { setPreset, type botPreset, setDatabase, getDatabase } from "src/ts/storage/database.svelte";
import { defaultAutoSuggestPrefixOoba, defaultAutoSuggestPrompt, defaultAutoSuggestPromptOoba } from "src/ts/storage/defaultPrompts";
import { get } from "svelte/store";
import { prebuiltNAIpresets, prebuiltPresets } from "./templates";
import { prebuiltPresets } from "./templates";
import { alertConfirm, alertSelect } from "src/ts/alert";
import { language } from "src/lang";
export async function setRecommended(model: string, ask:'ask'|'force') {
const db = get(DataBase)
const db = getDatabase()
if(!(recommendedPresetExist(model))){
return
}

5
src/ts/process/templates/jsonSchema.ts
View File

@@ -1,6 +1,5 @@
import { risuChatParser } from "src/ts/parser"
import { DataBase } from "src/ts/storage/database.svelte"
import { get } from "svelte/store"
import { getDatabase } from "src/ts/storage/database.svelte"
export function convertInterfaceToSchema(int:string){
if(!int.startsWith('interface ') && !int.startsWith('export interface ')){
@@ -122,7 +121,7 @@ export function convertInterfaceToSchema(int:string){
}
export function getOpenAIJSONSchema(){
const db = get(DataBase)
const db = getDatabase()
const schema = {
"name": "format",
"strict": db.strictJsonSchema,