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

Update version, gemini models, and new progress dialoge, and charxjpeg

Browse Source
This commit is contained in:
Kwaroran
2025-02-06 09:48:55 +09:00
parent 0242fd27cc
commit 1b171cab66
18 changed files with 231 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ts/alert.ts
View File

@@ -10,7 +10,7 @@ export interface alertData{
type: 'error'|'normal'|'none'|'ask'|'wait'|'selectChar'
|'input'|'toast'|'wait2'|'markdown'|'select'|'login'
|'tos'|'cardexport'|'requestdata'|'addchar'|'hypaV2'|'selectModule'
|'chatOptions'|'pukmakkurit'|'branches'|'hypaV3',
|'chatOptions'|'pukmakkurit'|'branches'|'hypaV3'|'progress',
msg: string,
submsg?: string
}

84
src/ts/characterCards.ts
View File

@@ -120,6 +120,36 @@ export async function importCharacterProcess(f:{
let readedChara = ''
let readedCCv3 = ''
let img:Uint8Array
let pngChunks = 0
let readedPngChunks = 0
{
let readData:File | Uint8Array | ReadableStream<Uint8Array>
if(f.data instanceof ReadableStream){
const tee = f.data.tee()
f.data = tee[0]
readData = tee[1]
}
else{
readData = f.data
}
const prereader = PngChunk.readGenerator(readData, {
})
for await(const chunk of prereader){
if(chunk instanceof AppendableBuffer){
break
}
if(chunk.key.startsWith('chara-ext-asset_')){
pngChunks++
}
}
}
const readGenerator = PngChunk.readGenerator(f.data, {
returnTrimed: true
})
@@ -151,8 +181,20 @@ export async function importCharacterProcess(f:{
}
if(chunk.key.startsWith('chara-ext-asset_')){
const assetIndex = chunk.key.replace('chara-ext-asset_:', '').replace('chara-ext-asset_', '')
alertWait('Loading... (Reading Asset ' + assetIndex + ')' )
const assetData = Buffer.from(chunk.value, 'base64')
if(pngChunks === 0){
alertWait('Loading... (Loaded ' + readedPngChunks + ' Assets)')
}
else{
alertStore.set({
type: 'progress',
msg: 'Loading... (Loading Assets)',
submsg: (readedPngChunks / pngChunks * 100).toFixed(2)
})
}
readedPngChunks++
if(db.account?.useSync && f.lightningRealmImport){
const id = await hasher(assetData)
const xid = 'assets/' + id + '.png'
@@ -656,8 +698,9 @@ async function importCharacterCardSpec(card:CharacterCardV2Risu|CharacterCardV3,
if(risuext.emotions){
for(let i=0;i<risuext.emotions.length;i++){
alertStore.set({
type: 'wait',
msg: `Loading... (Getting Emotions ${i} / ${risuext.emotions.length})`
type: 'progress',
msg: `Loading... (Loading Emotions)`,
submsg: (i / risuext.emotions.length * 100).toFixed(2)
})
await sleep(10)
if(risuext.emotions[i][1].startsWith('__asset:')){
@@ -676,8 +719,9 @@ async function importCharacterCardSpec(card:CharacterCardV2Risu|CharacterCardV3,
if(risuext.additionalAssets){
for(let i=0;i<risuext.additionalAssets.length;i++){
alertStore.set({
type: 'wait',
msg: `Loading... (Getting Assets ${i} / ${risuext.additionalAssets.length})`
type: 'progress',
msg: `Loading... (Loading Assets)`,
submsg: (i / risuext.additionalAssets.length * 100).toFixed(2)
})
await sleep(10)
let fileName = ''
@@ -700,8 +744,9 @@ async function importCharacterCardSpec(card:CharacterCardV2Risu|CharacterCardV3,
const keys = Object.keys(risuext.vits)
for(let i=0;i<keys.length;i++){
alertStore.set({
type: 'wait',
msg: `Loading... (Getting VITS ${i} / ${keys.length})`
type: 'progress',
msg: `Loading... (Loading VITS)`,
submsg: (i / keys.length * 100).toFixed(2)
})
await sleep(10)
const key = keys[i]
@@ -742,8 +787,9 @@ async function importCharacterCardSpec(card:CharacterCardV2Risu|CharacterCardV3,
if(data.assets){
for(let i=0;i<data.assets.length;i++){
alertStore.set({
type: 'wait',
msg: `Loading... (Getting Assets ${i} / ${data.assets.length})`
type: 'progress',
msg: `Loading... (Assets)`,
submsg: (i / data.assets.length * 100).toFixed(2)
})
await sleep(10)
let fileName = ''
@@ -1164,8 +1210,9 @@ export async function exportCharacterCard(char:character, type:'png'|'json'|'cha
if(card.data.extensions.risuai.emotions && card.data.extensions.risuai.emotions.length > 0){
for(let i=0;i<card.data.extensions.risuai.emotions.length;i++){
alertStore.set({
type: 'wait',
msg: `Loading... (Adding Emotions ${i} / ${card.data.extensions.risuai.emotions.length})`
type: 'progress',
msg: 'Loading... (Adding Emotions)',
submsg: (i / card.data.extensions.risuai.emotions.length * 100).toFixed(2)
})
const key = card.data.extensions.risuai.emotions[i][1]
const rData = await readImage(key)
@@ -1180,8 +1227,9 @@ export async function exportCharacterCard(char:character, type:'png'|'json'|'cha
if(card.data.extensions.risuai.additionalAssets && card.data.extensions.risuai.additionalAssets.length > 0){
for(let i=0;i<card.data.extensions.risuai.additionalAssets.length;i++){
alertStore.set({
type: 'wait',
msg: `Loading... (Adding Additional Assets ${i} / ${card.data.extensions.risuai.additionalAssets.length})`
type: 'progress',
msg: 'Loading... (Adding Additional Assets)',
submsg: (i / card.data.extensions.risuai.additionalAssets.length * 100).toFixed(2)
})
const key = card.data.extensions.risuai.additionalAssets[i][1]
const rData = await readImage(key)
@@ -1196,8 +1244,9 @@ export async function exportCharacterCard(char:character, type:'png'|'json'|'cha
const keys = Object.keys(char.vits.files)
for(let i=0;i<keys.length;i++){
alertStore.set({
type: 'wait',
msg: `Loading... (Adding VITS ${i} / ${keys.length})`
type: 'progress',
msg: 'Loading... (Adding VITS)',
submsg: (i / keys.length * 100).toFixed(2)
})
const key = keys[i]
const rData = await loadAsset(char.vits.files[key])
@@ -1226,8 +1275,9 @@ export async function exportCharacterCard(char:character, type:'png'|'json'|'cha
if(card.data.assets && card.data.assets.length > 0){
for(let i=0;i<card.data.assets.length;i++){
alertStore.set({
type: 'wait',
msg: `Loading... (Adding Assets ${i} / ${card.data.assets.length})`
type: 'progress',
msg: 'Loading... (Adding Assets)',
submsg: (i / card.data.assets.length * 100).toFixed(2)
})
let key = card.data.assets[i].uri
let rData:Uint8Array

22
src/ts/model/modellist.ts
View File

@@ -22,6 +22,7 @@ export enum LLMFlags{
deepSeekPrefix,
deepSeekThinkingInput,
deepSeekThinkingOutput,
noCivilIntegrity
}
export enum LLMProvider{
@@ -874,6 +875,16 @@ export const LLMModels: LLMModel[] = [
tokenizer: LLMTokenizer.GoogleCloud,
recommended: true
},
{
name: "Gemini Flash Lite Preview 2.0 0205",
id: 'gemini-2.0-flash-lite-preview-02-05',
provider: LLMProvider.GoogleCloud,
format: LLMFormat.GoogleCloud,
flags: [LLMFlags.geminiBlockOff,LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.poolSupported, LLMFlags.hasAudioInput, LLMFlags.hasVideoInput, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole, LLMFlags.noCivilIntegrity],
parameters: ['temperature', 'top_k', 'top_p', 'presence_penalty', 'frequency_penalty'],
tokenizer: LLMTokenizer.GoogleCloud,
recommended: true
},
{
name: "Gemini Pro 2.0 Exp 0128",
id: 'gemini-2.0-pro-exp-01-28',
@@ -882,6 +893,15 @@ export const LLMModels: LLMModel[] = [
flags: [LLMFlags.geminiBlockOff,LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.poolSupported, LLMFlags.hasAudioInput, LLMFlags.hasVideoInput, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole],
parameters: ['temperature', 'top_k', 'top_p', 'presence_penalty', 'frequency_penalty'],
tokenizer: LLMTokenizer.GoogleCloud,
},
{
name: "Gemini Pro 2.0 Exp",
id: 'gemini-2.0-pro-exp',
provider: LLMProvider.GoogleCloud,
format: LLMFormat.GoogleCloud,
flags: [LLMFlags.geminiBlockOff,LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.poolSupported, LLMFlags.hasAudioInput, LLMFlags.hasVideoInput, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole, LLMFlags.noCivilIntegrity],
parameters: ['temperature', 'top_k', 'top_p', 'presence_penalty', 'frequency_penalty'],
tokenizer: LLMTokenizer.GoogleCloud,
recommended: true
},
{
@@ -900,7 +920,6 @@ export const LLMModels: LLMModel[] = [
provider: LLMProvider.GoogleCloud,
format: LLMFormat.GoogleCloud,
flags: [LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.hasStreaming, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole],
recommended: true,
parameters: ['temperature', 'top_k', 'top_p'],
tokenizer: LLMTokenizer.GoogleCloud
},
@@ -910,7 +929,6 @@ export const LLMModels: LLMModel[] = [
provider: LLMProvider.GoogleCloud,
format: LLMFormat.GoogleCloud,
flags: [LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole],
recommended: true,
parameters: ['temperature', 'top_k', 'top_p'],
tokenizer: LLMTokenizer.GoogleCloud
},

7
src/ts/process/processzip.ts
View File

@@ -205,9 +205,10 @@ export class CharXReader{
const alertInfo = () => {
if(arg.alertInfo){
alertStore.set({
type: 'wait',
msg: `Loading... (Getting Data: ${Math.floor(pointer / getLength() * 100)}%)`
alertStore.set({
type: 'progress',
msg: `Loading...`,
submsg: (pointer / getLength() * 100).toFixed(2)
})
}
}

4
src/ts/process/request.ts
View File

@@ -1738,6 +1738,10 @@ async function requestGoogleCloudVertex(arg:RequestDataArgumentExtended):Promise
}
]
if(arg.modelInfo.flags.includes(LLMFlags.noCivilIntegrity)){
uncensoredCatagory.splice(4, 1)
}
if(arg.modelInfo.flags.includes(LLMFlags.geminiBlockOff)){
for(let i=0;i<uncensoredCatagory.length;i++){
uncensoredCatagory[i].threshold = "OFF"

8
src/ts/storage/accountStorage.ts
View File

@@ -114,7 +114,6 @@ export class AccountStorage{
}
}
if(da.status === 303){
console.log(performance.now() - perf)
const data = await da.json()
if(data.match){
const c = Buffer.from(await cachedForage.getItem(key))
@@ -144,19 +143,12 @@ export class AccountStorage{
const appendable = new Uint8Array(size)
const reader = da.body.getReader()
//log all headers
console.log('logging headers')
for(const [key, value] of da.headers.entries()){
console.log(key, value)
}
let i = 0
while(true){
const {done, value} = await reader.read()
if(done){
break
}
console.log(value, size)
appendable.set(value, i)
i += value.length
callback(i/size)

2
src/ts/storage/database.svelte.ts
View File

@@ -12,7 +12,7 @@ import { defaultColorScheme, type ColorScheme } from '../gui/colorscheme';
import type { PromptItem, PromptSettings } from '../process/prompt';
import type { OobaChatCompletionRequestParams } from '../model/ooba';
export let appVer = "149.0.0"
export let appVer = "149.1.0"
export let webAppSubVer = ''