From 341ea3c3642f6ca57f228298a66cd39a3495c552 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sun, 10 Dec 2023 03:38:21 +0900 Subject: [PATCH] [ref] remove unused --- src/ts/characters.ts | 6 +++--- src/ts/parser.ts | 7 ------- src/ts/process/index.ts | 4 ++-- src/ts/process/request.ts | 3 --- src/ts/process/stringlize.ts | 1 - src/ts/storage/autoStorage.ts | 4 ++-- src/ts/storage/database.ts | 2 +- src/ts/tokenizer.ts | 1 - src/ts/update.ts | 2 +- 9 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/ts/characters.ts b/src/ts/characters.ts index 0755a5c8..a68f3d00 100644 --- a/src/ts/characters.ts +++ b/src/ts/characters.ts @@ -1,12 +1,12 @@ import { get, writable } from "svelte/store"; import { DataBase, saveImage, setDatabase, type character, type Chat, defaultSdDataFunc } from "./storage/database"; -import { alertConfirm, alertError, alertNormal, alertSelect, alertStore } from "./alert"; +import { alertError, alertNormal, alertSelect, alertStore } from "./alert"; import { language } from "../lang"; -import { encode as encodeMsgpack, decode as decodeMsgpack } from "msgpackr"; +import { decode as decodeMsgpack } from "msgpackr"; import { checkNullish, findCharacterbyId, selectMultipleFile, selectSingleFile, sleep } from "./util"; import { v4 as uuidv4 } from 'uuid'; import { selectedCharID } from "./stores"; -import { checkCharOrder, downloadFile, getFileSrc, readImage } from "./storage/globalApi"; +import { checkCharOrder, downloadFile, getFileSrc } from "./storage/globalApi"; import * as yuso from 'yuso' import { reencodeImage } from "./image"; import { updateInlayScreen } from "./process/inlayScreen"; diff --git a/src/ts/parser.ts b/src/ts/parser.ts index 09752a90..2c2af9ad 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -11,15 +11,8 @@ import { selectedCharID } from './stores'; import { calcString } from './process/infunctions'; import { findCharacterbyId } from './util'; import { getInlayImage } from './image'; -import { cloneDeep } from 'lodash'; import { autoMarkNew } from './plugins/automark'; -const convertora = new showdown.Converter({ - simpleLineBreaks: true, - strikethrough: true, - tables: true -}) - const mconverted = new Marked({ gfm: true, breaks: true, diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts index 5106015d..7d8946f5 100644 --- a/src/ts/process/index.ts +++ b/src/ts/process/index.ts @@ -13,9 +13,9 @@ import { exampleMessage } from "./exampleMessages"; import { sayTTS } from "./tts"; import { supaMemory } from "./memory/supaMemory"; import { v4 } from "uuid"; -import { clone, cloneDeep } from "lodash"; +import { cloneDeep } from "lodash"; import { groupOrder } from "./group"; -import { runTrigger, type additonalSysPrompt } from "./triggers"; +import { runTrigger } from "./triggers"; import { HypaProcesser } from "./memory/hypamemory"; import { additionalInformations } from "./embedding/addinfo"; import { cipherChat, decipherChat } from "./cipherChat"; diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index 5a8662ef..4d286ac3 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -47,14 +47,12 @@ type requestDataResponse = { }|{ type: "streaming", result: ReadableStream, - noRetry?: boolean, special?: { emotion?: string } }|{ type: "multiline", result: ['user'|'char',string][], - noRetry?: boolean, special?: { emotion?: string } @@ -117,7 +115,6 @@ export interface OpenAIChatExtra { export async function requestChatDataMain(arg:requestDataArgument, model:'model'|'submodel', abortSignal:AbortSignal=null):Promise { const db = get(DataBase) - let result = '' let formated = cloneDeep(arg.formated) let maxTokens = arg.maxTokens ??db.maxResponse let temperature = arg.temperature ?? (db.temperature / 100) diff --git a/src/ts/process/stringlize.ts b/src/ts/process/stringlize.ts index 8b56ff5f..ff58028f 100644 --- a/src/ts/process/stringlize.ts +++ b/src/ts/process/stringlize.ts @@ -1,6 +1,5 @@ import { get } from "svelte/store"; import type { OpenAIChat } from "."; -import { tokenize } from "../tokenizer"; import { DataBase } from "../storage/database"; export function multiChatReplacer(){ diff --git a/src/ts/storage/autoStorage.ts b/src/ts/storage/autoStorage.ts index ccd2cfdd..c8ba7010 100644 --- a/src/ts/storage/autoStorage.ts +++ b/src/ts/storage/autoStorage.ts @@ -1,8 +1,8 @@ import localforage from "localforage" -import { getUnpargeables, isNodeServer, replaceDbResources } from "./globalApi" +import { isNodeServer, replaceDbResources } from "./globalApi" import { NodeStorage } from "./nodeStorage" import { OpfsStorage } from "./opfsStorage" -import { alertConfirm, alertSelect, alertStore } from "../alert" +import { alertSelect, alertStore } from "../alert" import { get } from "svelte/store" import { DataBase, type Database } from "./database" import { AccountStorage } from "./accountStorage" diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index 573c046e..3dcd198b 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -4,7 +4,7 @@ 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 { clone, cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash'; import { defaultAutoSuggestPrompt, defaultJailbreak, defaultMainPrompt } from './defaultPrompts'; import { alertNormal, alertSelect } from '../alert'; import type { NAISettings } from '../process/models/nai'; diff --git a/src/ts/tokenizer.ts b/src/ts/tokenizer.ts index 4a77f785..6e6a9ed0 100644 --- a/src/ts/tokenizer.ts +++ b/src/ts/tokenizer.ts @@ -5,7 +5,6 @@ import { get } from "svelte/store"; import type { OpenAIChat } from "./process"; import { supportsInlayImage } from "./image"; import { risuChatParser } from "./parser"; -import type { Proompt } from "./process/proompt"; async function encode(data:string):Promise<(number[]|Uint32Array|Int32Array)>{ let db = get(DataBase) diff --git a/src/ts/update.ts b/src/ts/update.ts index 2fa888dd..e05047ba 100644 --- a/src/ts/update.ts +++ b/src/ts/update.ts @@ -9,7 +9,7 @@ const isOldDomain = location.hostname.includes('pages.dev') export async function checkUpdate(){ try { - let db = get(DataBase) + let db = get(DataBase) const da = await fetch('https://raw.githubusercontent.com/kwaroran/RisuAI-release/main/version.json') //@ts-ignore const v:string = da.data.version