diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 98ce50bd..24457681 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "1.22.4" + "version": "1.23.0" }, "tauri": { "allowlist": { diff --git a/src/lang/en.ts b/src/lang/en.ts index f3e9ace4..5e46dfa9 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -65,7 +65,7 @@ export const languageEnglish = { + "\n\n- $(name)\n\n - inserts the named group" + "\n\nIf OUT starts with **@@**, it doesn't replaces the string, but instead does a special effect if matching string founds." + "\n\n- @@emo (emotion name)\n\n - if character is Emotion Images mode, sets (emotion name) as emotion and prevents default.", - experimental: "This is a experimental setting. it might be unstable.", + experimental: "This is a experimental feature. it might be unstable.", oogaboogaURL: "If your WebUI supports older version of api, your url should look *like https:.../run/textgen*\n\n" + "If your WebUI supports newVersion of api, your url should look like *https://.../api/v1/generate* and use the api server as host, and add --api to arguments.", exampleMessage: "Example conversations that effects output of the character. it dosen't uses tokens permanently." @@ -297,5 +297,8 @@ export const languageEnglish = { talkness: "Talkativeness", active: "Active", loreRandomActivation: "Use Probability Condition", - activationProbability: "Probability" + activationProbability: "Probability", + shareCloud: "Share to RisuRealm", + hub: "RisuRealm", + tags: "Tags" } \ No newline at end of file diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte index 551df72f..8b3da038 100644 --- a/src/lib/ChatScreens/DefaultChatScreen.svelte +++ b/src/lib/ChatScreens/DefaultChatScreen.svelte @@ -3,9 +3,9 @@ import { DatabaseIcon, DicesIcon, LanguagesIcon, MenuIcon, MicOffIcon, PowerIcon, RefreshCcwIcon, ReplyIcon, Send } from "lucide-svelte"; import { selectedCharID } from "../../ts/stores"; import Chat from "./Chat.svelte"; - import { DataBase, appVer, type Message, type character } from "../../ts/storage/database"; + import { DataBase, type Message } from "../../ts/storage/database"; import { getCharImage } from "../../ts/characters"; - import { doingChat, sendChat, type OpenAIChat } from "../../ts/process/index"; + import { doingChat, sendChat } from "../../ts/process/index"; import { findCharacterbyId, messageForm, sleep } from "../../ts/util"; import { language } from "../../lang"; import { translate } from "../../ts/translator/translator"; @@ -13,9 +13,9 @@ import sendSound from '../../etc/send.mp3' import {cloneDeep} from 'lodash' import { processScript } from "src/ts/process/scripts"; - import GithubStars from "../Others/GithubStars.svelte"; import CreatorQuote from "./CreatorQuote.svelte"; import { stopTTS } from "src/ts/process/tts"; + import MainMenu from '../UI/MainMenu.svelte'; let messageInput = '' let openMenu = false @@ -186,11 +186,7 @@ openMenu = false }}> {#if $selectedCharID < 0} -
-

RisuAI

-

Version {appVer}

- -
+ {:else}
{ //@ts-ignore diff --git a/src/lib/ChatScreens/Suggestion.svelte b/src/lib/ChatScreens/Suggestion.svelte index 1ad34eab..9ae4309f 100644 --- a/src/lib/ChatScreens/Suggestion.svelte +++ b/src/lib/ChatScreens/Suggestion.svelte @@ -1,7 +1,7 @@
-
+
{#if window.innerWidth >= 700 || selected === -1}
@@ -135,17 +135,17 @@ {:else if selected === 11} {/if} -
+ {/if}
diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte index ee3f5c19..14ae070e 100644 --- a/src/lib/SideBars/CharConfig.svelte +++ b/src/lib/SideBars/CharConfig.svelte @@ -14,13 +14,14 @@ import {isEqual, cloneDeep} from 'lodash' import Help from "../Others/Help.svelte"; import RegexData from "./RegexData.svelte"; - import { exportChar } from "src/ts/characterCards"; + import { exportChar, shareRisuHub } from "src/ts/characterCards"; import { getElevenTTSVoices, getWebSpeechTTSVoices, getVOICEVOXVoices } from "src/ts/process/tts"; import { checkCharOrder } from "src/ts/storage/globalApi"; - import { addGroupChar, rmCharFromGroup } from "src/ts/process/group"; + import { addGroupChar, rmCharFromGroup } from "src/ts/process/group"; + import HubUpload from "../UI/HubUpload.svelte"; let subMenu = 0 - let subberMenu = 0 + let openHubUpload = false let emos:[string, string][] = [] let tokens = { desc: 0, @@ -118,7 +119,7 @@ - {#if currentChar.type === 'character'} @@ -663,7 +664,15 @@ - + + {#if $DataBase.useExperimental} + + {/if} + {#if openHubUpload} + {openHubUpload=false}}/> + {/if} {:else} {#if currentChar.data.chats[currentChar.data.chatPage].supaMemoryData && currentChar.data.chats[currentChar.data.chatPage].supaMemoryData.length > 4} {language.SuperMemory} diff --git a/src/lib/SideBars/Sidebar.svelte b/src/lib/SideBars/Sidebar.svelte index 4bc405c2..89349522 100644 --- a/src/lib/SideBars/Sidebar.svelte +++ b/src/lib/SideBars/Sidebar.svelte @@ -23,6 +23,7 @@ PlusIcon, FolderIcon, FolderOpenIcon, + HomeIcon, } from "lucide-svelte"; import { characterFormatUpdate, @@ -51,18 +52,27 @@ function createScratch() { reseter(); - const cid = createNewCharacter(); - selectedCharID.set(-1); + createNewCharacter(); + let db = get(DataBase) + if(db.characters[db.characters.length-1]){ + changeChar(db.characters.length-1) + } } function createGroup() { reseter(); - const cid = createNewGroup(); - selectedCharID.set(-1); + createNewGroup(); + let db = get(DataBase) + if(db.characters[db.characters.length-1]){ + changeChar(db.characters.length-1) + } } async function createImport() { reseter(); await importCharacter(); - selectedCharID.set(-1); + let db = get(DataBase) + if(db.characters[db.characters.length-1]){ + changeChar(db.characters.length-1) + } } function changeChar(index: number) { @@ -498,6 +508,12 @@ }}>
+ { + reseter(); + selectedCharID.set(-1) + }}> +
{ reseter(); @@ -509,8 +525,8 @@
1000} + class:flex-grow={$SizeStore.w <= 1028} + class:minw96={$SizeStore.w > 1028} > -

Edit

- {/if}
@@ -574,9 +579,6 @@ .minw96 { min-width: 24rem; /* 384px */ } - .title { - margin-bottom: 0.5rem; - } .editMode { min-width: 6rem; } diff --git a/src/lib/UI/Hub.svelte b/src/lib/UI/Hub.svelte new file mode 100644 index 00000000..3fa1f89f --- /dev/null +++ b/src/lib/UI/Hub.svelte @@ -0,0 +1,140 @@ + +
+
+ + + +
+
+
+ {#each charas as chara} + + {/each} +
+ + +{#if openedData} + +
{ + openedData = null + }}> +
+
+
+ {openedData.name} +

{openedData.name}

+
+ {openedData.desc} +
+
+ + +
+
+
+ +{/if} + +{#if menuOpen} + +
{ + menuOpen = false + }}> +
+

+ + Menu + + +

+
+ +
+
+{/if} \ No newline at end of file diff --git a/src/lib/UI/HubUpload.svelte b/src/lib/UI/HubUpload.svelte new file mode 100644 index 00000000..40ba89dd --- /dev/null +++ b/src/lib/UI/HubUpload.svelte @@ -0,0 +1,65 @@ + +
+
+

+ + Share {char.name} to {language.hub} + + +

+
+ {language.creatorNotes} + A description that displays when you search and when you first open a bot. + More than 20 characters. + + {language.tags} + Tags to search your character easily. latin alphabets only. seperate by comma. + { + tags = tags.replace(/[^a-zA-Z,]/g, '').toLocaleLowerCase() + }}> +
+ + +
+
+ + +
+ {#if nsfwMode} + Grotesque Contents and non-adult characters with NSFW would be banned. + {/if} + {#if privateMode} + Private characters can be removed from the server if there is only a few downloads. + {/if} + +
+
+ + + \ No newline at end of file diff --git a/src/lib/UI/MainMenu.svelte b/src/lib/UI/MainMenu.svelte new file mode 100644 index 00000000..101051bd --- /dev/null +++ b/src/lib/UI/MainMenu.svelte @@ -0,0 +1,59 @@ + +
+ {#if !openHub} +

RisuAI

+

Version {appVer}

+ + {/if} +
+ {#if !openHub} +
+ + + + {#if $DataBase.useExperimental} + + {:else} + + {/if} +
+ {:else} +
+ +

{language.hub}

+
+ + {/if} +
+
\ No newline at end of file diff --git a/src/ts/characterCards.ts b/src/ts/characterCards.ts index 6053ade8..3de9d94e 100644 --- a/src/ts/characterCards.ts +++ b/src/ts/characterCards.ts @@ -1,5 +1,5 @@ import { get } from "svelte/store" -import { alertConfirm, alertError, alertNormal, alertSelect, alertStore } from "./alert" +import { alertConfirm, alertError, alertMd, alertNormal, alertSelect, alertStore } from "./alert" import { DataBase, defaultSdDataFunc, type character, setDatabase, type customscript, type loreSettings, type loreBook } from "./storage/database" import { checkNullish, selectMultipleFile, selectSingleFile, sleep } from "./util" import { language } from "src/lang" @@ -10,7 +10,9 @@ import { PngMetadata } from "./exif" import { characterFormatUpdate } from "./characters" import { checkCharOrder, downloadFile, readImage, saveAsset } from "./storage/globalApi" import { cloneDeep } from "lodash" +import { selectedCharID } from "./stores" +export const hubURL = import.meta.env.DEV ? "http://127.0.0.1:8787" : "https://sv.risuai.xyz" export async function importCharacter() { try { @@ -200,7 +202,7 @@ function convertOldTavernAndJSON(charaData:OldTavernChar, imgp:string|undefined alternateGreetings:[], tags:[], creator:"", - characterVersion: 0, + characterVersion: '', personality: charaData.personality ?? '', scenario:charaData.scenario ?? '', firstMsgIndex: -1, @@ -307,10 +309,13 @@ export async function exportChar(charaID:number) { } -async function importSpecv2(card:CharacterCardV2, img?:Uint8Array):Promise{ +async function importSpecv2(card:CharacterCardV2, img?:Uint8Array, mode?:'hub'|'normal'):Promise{ if(!card ||card.spec !== 'chara_card_v2'){ return false } + if(!mode){ + mode = 'normal' + } const data = card.data const im = img ? await saveAsset(PngMetadata.filter(img)) : undefined @@ -333,7 +338,7 @@ async function importSpecv2(card:CharacterCardV2, img?:Uint8Array):Promise r.trim()), + secondary_keys: lore.selective ? lore.secondkey.split(',').map(r => r.trim()) : undefined, + content: lore.content, + extensions: ext, + enabled: true, + insertion_order: lore.insertorder, + constant: lore.alwaysActive, + selective:lore.selective, + name: lore.comment, + comment: lore.comment, + case_sensitive: caseSensitive, + }) + } + + const card:CharacterCardV2 = { + spec: "chara_card_v2", + spec_version: "2.0", + data: { + name: char.name, + description: char.desc ?? '', + personality: char.personality ?? '', + scenario: char.scenario ?? '', + first_mes: char.firstMessage ?? '', + mes_example: char.exampleMessage ?? '', + creator_notes: char.creatorNotes ?? '', + system_prompt: char.systemPrompt ?? '', + post_history_instructions: char.replaceGlobalNote ?? '', + alternate_greetings: char.alternateGreetings ?? [], + character_book: { + scan_depth: char.loreSettings?.scanDepth, + token_budget: char.loreSettings?.tokenBudget, + recursive_scanning: char.loreSettings?.recursiveScanning, + extensions: char.loreExt ?? {}, + entries: charBook + }, + tags: char.tags ?? [], + creator: char.additionalData?.creator ?? '', + character_version: `${char.additionalData?.character_version}` ?? '', + extensions: { + risuai: { + emotions: char.emotionImages, + bias: char.bias, + viewScreen: char.viewScreen, + customScripts: char.customscript, + utilityBot: char.utilityBot, + sdData: char.sdData, + additionalAssets: char.additionalAssets + } + } + } + } + console.log(card) + return card +} + + export async function exportSpecV2(char:character) { let img = await readImage(char.image) try{ - - let charBook:charBookEntry[] = [] - for(const lore of char.globalLore){ - let ext:{ - risu_case_sensitive?: boolean; - risu_activationPercent?: number - } = cloneDeep(lore.extentions ?? {}) - - let caseSensitive = ext.risu_case_sensitive ?? false - ext.risu_activationPercent = lore.activationPercent - - charBook.push({ - keys: lore.key.split(',').map(r => r.trim()), - secondary_keys: lore.selective ? lore.secondkey.split(',').map(r => r.trim()) : undefined, - content: lore.content, - extensions: ext, - enabled: true, - insertion_order: lore.insertorder, - constant: lore.alwaysActive, - selective:lore.selective, - name: lore.comment, - comment: lore.comment, - case_sensitive: caseSensitive, - }) - } - - const card:CharacterCardV2 = { - spec: "chara_card_v2", - spec_version: "2.0", - data: { - name: char.name, - description: char.desc, - personality: char.personality, - scenario: char.scenario, - first_mes: char.firstMessage, - mes_example: char.exampleMessage, - creator_notes: char.creatorNotes, - system_prompt: char.systemPrompt, - post_history_instructions: char.replaceGlobalNote, - alternate_greetings: char.alternateGreetings, - character_book: { - scan_depth: char.loreSettings?.scanDepth, - token_budget: char.loreSettings?.tokenBudget, - recursive_scanning: char.loreSettings?.recursiveScanning, - extensions: char.loreExt ?? {}, - entries: charBook - }, - tags: char.additionalData?.tag ?? [], - creator: char.additionalData?.creator ?? '', - character_version: char.additionalData?.character_version ?? 0, - extensions: { - risuai: { - emotions: char.emotionImages, - bias: char.bias, - viewScreen: char.viewScreen, - customScripts: char.customscript, - utilityBot: char.utilityBot, - sdData: char.sdData, - additionalAssets: char.additionalAssets - } - } - } - } - + const card = await createBaseV2(char) if(card.data.extensions.risuai.emotions && card.data.extensions.risuai.emotions.length > 0){ for(let i=0;i { + return (!!v) && (tagList.indexOf(v) === i) + }) + char.tags = tags + + + let img = await readImage(char.image) + + try{ + const card = await createBaseV2(char) + let resources:[string,string][] = [] + if(card.data.extensions.risuai.emotions && card.data.extensions.risuai.emotions.length > 0){ + for(let i=0;i 0){ + for(let i=0;i { + const da = await fetch(hubURL + '/hub/list', { + method: "POST", + body: JSON.stringify(arg ?? {}) + }) + if(da.status !== 200){ + return [] + } + console.log(da) + return da.json() +} + +export async function downloadRisuHub(id:string) { + alertStore.set({ + type: "wait", + msg: "Downloading..." + }) + const res = await fetch(hubURL + '/hub/get', { + method: "POST", + body: JSON.stringify({ + id: id + }) + }) + if(res.status !== 200){ + alertError(await res.text()) + } + + const result = await res.json() + const data:CharacterCardV2 = result.card + const img:string = result.img + + await importSpecv2(data, await getHubResources(img), 'hub') + checkCharOrder() + let db = get(DataBase) + if(db.characters[db.characters.length-1]){ + const index = db.characters.length-1 + characterFormatUpdate(index); + selectedCharID.set(index); + } + +} + +export async function getHubResources(id:string) { + const res = await fetch(`${hubURL}/resource/${id}`) + if(res.status !== 200){ + throw (await res.text()) + } + return Buffer.from(await (res).arrayBuffer()) +} + + type CharacterCardV2 = { spec: 'chara_card_v2' @@ -581,7 +730,7 @@ type CharacterCardV2 = { character_book?: CharacterBook tags: string[] creator: string - character_version: number + character_version: string extensions: { risuai?:{ emotions?:[string, string][] diff --git a/src/ts/characters.ts b/src/ts/characters.ts index 5380f15f..63a309d5 100644 --- a/src/ts/characters.ts +++ b/src/ts/characters.ts @@ -280,14 +280,14 @@ export function characterFormatUpdate(index:number|character){ cha.systemPrompt = cha.systemPrompt ?? '' cha.tags = cha.tags ?? [] cha.creator = cha.creator ?? '' - cha.characterVersion = cha.characterVersion ?? 0 + cha.characterVersion = cha.characterVersion ?? '' cha.personality = cha.personality ?? '' cha.scenario = cha.scenario ?? '' cha.firstMsgIndex = cha.firstMsgIndex ?? -1 cha.additionalData = cha.additionalData ?? { tag: [], creator: '', - character_version: 0 + character_version: '' } cha.voicevoxConfig = cha.voicevoxConfig ?? { SPEED_SCALE: 1, @@ -356,7 +356,7 @@ export function createBlankChar():character{ alternateGreetings:[], tags:[], creator:"", - characterVersion: 0, + characterVersion: '', personality:"", scenario:"", firstMsgIndex: -1, diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index a42d2a72..61b33d22 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -8,7 +8,7 @@ import { defaultAutoSuggestPrompt, defaultJailbreak, defaultMainPrompt } from '. export const DataBase = writable({} as any as Database) export const loadedStore = writable(false) -export let appVer = '1.22.4' +export let appVer = '1.23.0' export function setDatabase(data:Database){ if(checkNullish(data.characters)){ @@ -311,7 +311,7 @@ export interface character{ alternateGreetings:string[] tags:string[] creator:string - characterVersion: number + characterVersion: string personality:string scenario:string firstMsgIndex:number @@ -320,7 +320,7 @@ export interface character{ additionalData?: { tag?:string[] creator?:string - character_version?:number + character_version?:string } ttsMode?:string ttsSpeech?:string diff --git a/src/ts/stores.ts b/src/ts/stores.ts index 4ab51a40..8ad71504 100644 --- a/src/ts/stores.ts +++ b/src/ts/stores.ts @@ -11,7 +11,7 @@ export const SizeStore = writable({ w: 0, h: 0 }) -export const sideBarStore = writable(true) +export const sideBarStore = writable(false) export const selectedCharID = writable(-1) export const CharEmotion = writable({} as {[key:string]: [string, string, number][]}) export const ViewBoxsize = writable({ width: 12 * 16, height: 12 * 16 }); // Default width and height in pixels diff --git a/tailwind.config.js b/tailwind.config.js index ec5f8e37..992bf6c6 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -23,6 +23,8 @@ export default { '80p': '80%', '80vw': '80vw', '14': '3.5rem', + '24': '6rem', + '36': '9rem', '100vw': '100vw' }, borderWidth: { diff --git a/version.json b/version.json index 711d9365..6b92a3be 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"1.22.4"} \ No newline at end of file +{"version":"1.23.0"} \ No newline at end of file