From d5837e51a676b4ba3b6e4d836e9467ad1bc18b4a Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sat, 24 Aug 2024 15:14:54 +0900 Subject: [PATCH 1/9] Add claude plain fetch header --- src/ts/process/request.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index e139b6fe..277a8a0b 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -1997,6 +1997,10 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' headers['anthropic-beta'] = 'prompt-caching-2024-07-31' } + if(db.usePlainFetch){ + headers['anthropic-dangerous-direct-browser-access'] = 'true' + } + if(useStreaming){ const res = await fetchNative(replacerURL, { From d51e168590232815cd76c064aff1c10fd03af060 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sat, 24 Aug 2024 15:16:33 +0900 Subject: [PATCH 2/9] Add gemini pro exp 0801 --- src/lib/UI/ModelList.svelte | 1 + src/ts/model/names.ts | 2 ++ src/ts/process/request.ts | 1 + 3 files changed, 4 insertions(+) diff --git a/src/lib/UI/ModelList.svelte b/src/lib/UI/ModelList.svelte index 38f452f3..a519f447 100644 --- a/src/lib/UI/ModelList.svelte +++ b/src/lib/UI/ModelList.svelte @@ -104,6 +104,7 @@ + diff --git a/src/ts/model/names.ts b/src/ts/model/names.ts index ffc08d98..701e232a 100644 --- a/src/ts/model/names.ts +++ b/src/ts/model/names.ts @@ -109,6 +109,8 @@ export function getModelName(name:string){ return 'GPT-4o Mini (2024-07-18)' case 'gemini-1.5-pro-latest': return 'Gemini 1.5 Pro' + case 'gemini-1.5-pro-exp-0801': + return 'Gemini 1.5 Pro Exp (0801)' case 'gemini-1.5-flash': return 'Gemini 1.5 Flash' case 'ollama-hosted': diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index 277a8a0b..24cc1d2c 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -1153,6 +1153,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' case 'gemini-pro': case 'gemini-pro-vision': case 'gemini-1.5-pro-latest': + case 'gemini-1.5-pro-exp-0801': case 'gemini-1.5-flash': case 'gemini-ultra': case 'gemini-ultra-vision':{ From 83e1b8705f16d7cdc6dd490e8eeedaf7c200c0ba Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sat, 24 Aug 2024 15:17:31 +0900 Subject: [PATCH 3/9] Remove unnessesery imports --- src/lib/Setting/Pages/UserSettings.svelte | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/Setting/Pages/UserSettings.svelte b/src/lib/Setting/Pages/UserSettings.svelte index 7418e4d5..6130a87c 100644 --- a/src/lib/Setting/Pages/UserSettings.svelte +++ b/src/lib/Setting/Pages/UserSettings.svelte @@ -1,10 +1,10 @@
diff --git a/src/ts/gui/colorscheme.ts b/src/ts/gui/colorscheme.ts index 790147e9..32783836 100644 --- a/src/ts/gui/colorscheme.ts +++ b/src/ts/gui/colorscheme.ts @@ -230,8 +230,8 @@ export function updateTextTheme(){ root.style.setProperty('--FontColorItalic', db.customTextTheme.FontColorItalic); root.style.setProperty('--FontColorBold', db.customTextTheme.FontColorBold); root.style.setProperty('--FontColorItalicBold', db.customTextTheme.FontColorItalicBold); - root.style.setProperty('--FontColorQuote1', db.customTextTheme.FontColorQuote1); - root.style.setProperty('--FontColorQuote2', db.customTextTheme.FontColorQuote2); + root.style.setProperty('--FontColorQuote1', db.customTextTheme.FontColorQuote1 ?? '#8BE9FD'); + root.style.setProperty('--FontColorQuote2', db.customTextTheme.FontColorQuote2 ?? '#FFB86C'); break } } diff --git a/src/ts/parser.ts b/src/ts/parser.ts index 3d4ff799..86907784 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -79,11 +79,19 @@ DOMPurify.addHook("uponSanitizeAttribute", (node, data) => { function renderMarkdown(md:markdownit, data:string){ - return md.render(data.replace(/“|”/g, '"').replace(/‘|’/g, "'")) - .replace(/\uE9b0/gu, '“') - .replace(/\uE9b1/gu, '”') - .replace(/\uE9b2/gu, '‘') - .replace(/\uE9b3/gu, '’') + const db = get(DataBase) + let text = md.render(data.replace(/“|”/g, '"').replace(/‘|’/g, "'")) + + if(db?.unformatQuotes){ + text = text.replace(/\uE9b0/gu, '“').replace(/\uE9b1/gu, '”') + text = text.replace(/\uE9b2/gu, '‘').replace(/\uE9b3/gu, '’') + } + else{ + text = text.replace(/\uE9b0/gu, '“').replace(/\uE9b1/gu, '”') + text = text.replace(/\uE9b2/gu, '‘').replace(/\uE9b3/gu, '’') + } + + return text } async function renderHighlightableMarkdown(data:string) { diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index d007f8ec..8ee858fd 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -429,6 +429,7 @@ export function setDatabase(data:Database){ timeout: 30 } data.hideApiKey ??= true + data.unformatQuotes ??= false changeLanguage(data.language) DataBase.set(data) @@ -712,6 +713,7 @@ export interface Database{ useLegacyGUI: boolean claudeCachingExperimental: boolean hideApiKey: boolean + unformatQuotes: boolean } export interface customscript{ From b1d98741e838ccf8e0275a6c878fb39199807e60 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sat, 24 Aug 2024 18:46:49 +0900 Subject: [PATCH 9/9] Add persona and preset hotkey --- src/App.svelte | 10 ++++++- src/lib/Setting/Pages/BotSettings.svelte | 6 ++-- src/lib/Setting/Settings.svelte | 6 +--- src/lib/Setting/listedPersona.svelte | 38 ++++++++++++++++++++++++ src/lib/SideBars/Sidebar.svelte | 9 ------ src/ts/hotkey.ts | 14 ++++++++- src/ts/stores.ts | 3 +- 7 files changed, 66 insertions(+), 20 deletions(-) create mode 100644 src/lib/Setting/listedPersona.svelte diff --git a/src/App.svelte b/src/App.svelte index 9efe1fb5..3f718658 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -1,6 +1,6 @@ + +
+
+
+

{language.persona}

+
+ +
+
+ {#each $DataBase.personas as persona, i} + + {/each} +
+
+ + \ No newline at end of file diff --git a/src/lib/SideBars/Sidebar.svelte b/src/lib/SideBars/Sidebar.svelte index 47322209..e3a73290 100644 --- a/src/lib/SideBars/Sidebar.svelte +++ b/src/lib/SideBars/Sidebar.svelte @@ -52,7 +52,6 @@ import SideChatList from "./SideChatList.svelte"; import { joinMultiuserRoom } from "src/ts/sync/multiuser"; import { sideBarSize } from "src/ts/gui/guisize"; - let openPresetList = false; let sideBarMode = 0; let editMode = false; let menuMode = 0; @@ -703,14 +702,6 @@ {/if} -{#if openPresetList} - { - openPresetList = false; - }} - /> -{/if} - {#if $DynamicGUI}
{ if($sideBarClosing){ diff --git a/src/ts/hotkey.ts b/src/ts/hotkey.ts index c58b9086..a6681556 100644 --- a/src/ts/hotkey.ts +++ b/src/ts/hotkey.ts @@ -1,7 +1,7 @@ import { get } from "svelte/store" import { alertToast, doingAlert } from "./alert" import { DataBase, changeToPreset as changeToPreset2 } from "./storage/database" -import { selectedCharID, settingsOpen } from "./stores" +import { openPersonaList, openPresetList, selectedCharID, settingsOpen } from "./stores" export function initHotkey(){ document.addEventListener('keydown', (ev) => { @@ -73,6 +73,18 @@ export function initHotkey(){ ev.stopPropagation() break } + case 'p':{ + openPresetList.set(!get(openPresetList)) + ev.preventDefault() + ev.stopPropagation() + break + } + case 'e':{ + openPersonaList.set(!get(openPersonaList)) + ev.preventDefault() + ev.stopPropagation() + break + } } } if(ev.key === 'Escape'){ diff --git a/src/ts/stores.ts b/src/ts/stores.ts index 2b3a6f2d..0bfeb59a 100644 --- a/src/ts/stores.ts +++ b/src/ts/stores.ts @@ -26,7 +26,8 @@ export const ViewBoxsize = writable({ width: 12 * 16, height: 12 * 16 }); // Def export const settingsOpen = writable(false) export const botMakerMode = writable(false) export const moduleBackgroundEmbedding = writable('') - +export const openPresetList = writable(false) +export const openPersonaList = writable(false) //optimization export const CurrentCharacter = writable(null) as Writable