From b7fd03c371eed9aca1ae1a13f50da86689c75463 Mon Sep 17 00:00:00 2001 From: Leo310 Date: Tue, 26 Mar 2024 10:36:04 +0100 Subject: [PATCH 1/8] style: minor changes + logo updates --- src/components/Chat/Input.svelte | 4 +- src/components/Chat/MessageContainer.svelte | 3 +- .../Chat/QuickSettingsDrawer.svelte | 4 +- src/components/Logos/LogoDetailed.svelte | 166 ++++++++++++++++++ src/components/Logos/LogoSimple.svelte | 113 ++++++++++++ src/components/Onboarding/Onboarding.svelte | 2 +- src/components/Settings/Settings.svelte | 7 +- src/components/base/Logo.svelte | 114 ------------ 8 files changed, 290 insertions(+), 123 deletions(-) create mode 100644 src/components/Logos/LogoDetailed.svelte create mode 100644 src/components/Logos/LogoSimple.svelte delete mode 100644 src/components/base/Logo.svelte diff --git a/src/components/Chat/Input.svelte b/src/components/Chat/Input.svelte index bb7450d..0192925 100644 --- a/src/components/Chat/Input.svelte +++ b/src/components/Chat/Input.svelte @@ -16,7 +16,7 @@ } from '../../store'; import ProgressCircle from '../base/ProgressCircle.svelte'; import { addMessage } from '../../controller/Messages'; - import Logo from '../base/Logo.svelte'; + import Logo from '../Logos/LogoSimple.svelte'; export let textarea: HTMLTextAreaElement; @@ -87,7 +87,7 @@
{/if} {:else if $data.isChatComfy} -
+
{:else} @@ -33,3 +33,4 @@
{/if} + diff --git a/src/components/Chat/QuickSettingsDrawer.svelte b/src/components/Chat/QuickSettingsDrawer.svelte index f7ee11a..1b3f776 100644 --- a/src/components/Chat/QuickSettingsDrawer.svelte +++ b/src/components/Chat/QuickSettingsDrawer.svelte @@ -183,7 +183,7 @@
{$t('quick_settings.creativity')} -
+
{temperature}% @@ -192,7 +192,7 @@ {#if $data.isUsingRag}
{$t('quick_settings.similarity_threshold')} -
+
{similarityThreshold}% diff --git a/src/components/Logos/LogoDetailed.svelte b/src/components/Logos/LogoDetailed.svelte new file mode 100644 index 0000000..33b0ce8 --- /dev/null +++ b/src/components/Logos/LogoDetailed.svelte @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Logos/LogoSimple.svelte b/src/components/Logos/LogoSimple.svelte new file mode 100644 index 0000000..cec371f --- /dev/null +++ b/src/components/Logos/LogoSimple.svelte @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Onboarding/Onboarding.svelte b/src/components/Onboarding/Onboarding.svelte index c1e6bdd..aad68e1 100644 --- a/src/components/Onboarding/Onboarding.svelte +++ b/src/components/Onboarding/Onboarding.svelte @@ -7,7 +7,7 @@ import DaemonComponent from './OllamaDaemon.svelte'; import IncognitoToggle from '../Settings/IncognitoToggle.svelte'; import { t } from 'svelte-i18n'; - import Logo from '../base/Logo.svelte'; + import Logo from '../Logos/LogoDetailed.svelte'; const osType = os.type(); diff --git a/src/components/Settings/Settings.svelte b/src/components/Settings/Settings.svelte index 3d679c2..7e12e85 100644 --- a/src/components/Settings/Settings.svelte +++ b/src/components/Settings/Settings.svelte @@ -62,6 +62,10 @@ }; + + + + {#if $data.excludeFF.length !== 0} @@ -113,9 +117,6 @@ - - - - import { data } from '../../store'; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 5918e02af420728a2280535b48f82cb95ac7d546 Mon Sep 17 00:00:00 2001 From: Leo310 Date: Tue, 26 Mar 2024 11:22:56 +0100 Subject: [PATCH 2/8] feat(settings): exposed number of documents to retrieve --- src/SmartSecondBrain.ts | 4 +++ src/components/Settings/Settings.svelte | 35 +++++++++++++------------ src/lang/en.json | 2 ++ src/main.ts | 4 +-- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/SmartSecondBrain.ts b/src/SmartSecondBrain.ts index 2e30943..39c9afb 100644 --- a/src/SmartSecondBrain.ts +++ b/src/SmartSecondBrain.ts @@ -214,6 +214,10 @@ export default class SmartSecondBrain { if (this.papa) this.papa.setSimilarityThreshold(value); } + setNumOfDocsToRetrieve(k: number) { + if (this.papa) this.papa.setNumOfDocsToRetrieve(k); + } + setGenModel(genModel: GenModel) { if (this.papa) this.papa.setGenModel(genModel); } diff --git a/src/components/Settings/Settings.svelte b/src/components/Settings/Settings.svelte index 7e12e85..9ffe2fc 100644 --- a/src/components/Settings/Settings.svelte +++ b/src/components/Settings/Settings.svelte @@ -2,7 +2,7 @@ import TextComponent from '../base/Text.svelte'; import FFExcludeComponent from './FFExclude.svelte'; import { plugin, data, papaState } from '../../store'; - import { setIcon, App } from 'obsidian'; + import { setIcon } from 'obsidian'; import SettingContainer from './SettingContainer.svelte'; import { LogLvl, Papa } from 'papa-ts'; import ToggleComponent from '../base/Toggle.svelte'; @@ -35,13 +35,14 @@ $plugin.saveSettings(); } - // async function changeDocNum(docNum: number) { - // if (docNum < 1) { - // return new Notice('Number of documents to retrieve must be greater than 0', 4000); - // } - // $data.docRetrieveNum = docNum; - // await $plugin.saveSettings(); - // } + function setNumOfDocsToRetrieve(num: number) { + if (num < 1) num = 1; + if ($data.isIncognitoMode) $data.ollamaEmbedModel.k = num; + else $data.openAIEmbedModel.k = num; + $plugin.s2b.setNumOfDocsToRetrieve(num); + $plugin.saveSettings(); + } + const changeLangsmithKey = (newKey: string) => { $data.debugginLangchainKey = newKey; $plugin.saveSettings(); @@ -68,6 +69,8 @@ + + {#if $data.excludeFF.length !== 0}
@@ -75,8 +78,6 @@
{ff} - - {#if isFFExpanded} - - {:else if isFFOverflowingY} - - {/if}
@@ -114,9 +111,13 @@
{$t('settings.advanced')} - - - + + setNumOfDocsToRetrieve(parseInt(docNum))} + /> + ; defaultChatName: string; - docRetrieveNum: number; debugginLangchainKey: string; isQuickSettingsOpen: boolean; isVerbose: boolean; @@ -50,6 +49,7 @@ export const DEFAULT_SETTINGS: Partial = { model: 'nomic-embed-text', baseUrl: 'http://localhost:11434', similarityThreshold: 0.75, + k: 100, }, openAIGenModel: { model: 'gpt-3.5-turbo', @@ -60,11 +60,11 @@ export const DEFAULT_SETTINGS: Partial = { model: 'text-embedding-ada-002', openAIApiKey: '', similarityThreshold: 0.75, + k: 100, }, targetFolder: 'Chats', defaultChatName: 'New Chat', excludeFF: ['Chats', '*.excalidraw.md'], - docRetrieveNum: 5, isQuickSettingsOpen: true, isVerbose: false, isOnboarded: false, From 201c6f7c18a7f62755a8aa9d054d4154a4ecbd0c Mon Sep 17 00:00:00 2001 From: nicobrauchtgit Date: Tue, 26 Mar 2024 16:02:41 +0100 Subject: [PATCH 3/8] style(chatview): theming Co-authored-by: Leo310 --- src/components/Chat/Chat.svelte | 4 +--- src/components/Chat/MessageContainer.svelte | 12 +++++------- src/components/Chat/QuickSettingsDrawer.svelte | 4 ++-- src/components/base/ProgressBar.svelte | 2 +- src/components/base/ProgressCircle.svelte | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/components/Chat/Chat.svelte b/src/components/Chat/Chat.svelte index 7aeafdb..a8ebc86 100644 --- a/src/components/Chat/Chat.svelte +++ b/src/components/Chat/Chat.svelte @@ -76,9 +76,7 @@
(isAutoScrolling = chatWindow.scrollTop + chatWindow.clientHeight + 1 >= chatWindow.scrollHeight)} - class="chat-window w-full flex-grow select-text overflow-y-scroll rounded-md border border-solid border-[--background-modifier-border] {$isChatInSidebar - ? 'bg-[--background-secondary]' - : 'bg-[--background-primary]'}" + class="chat-window w-full flex-grow select-text overflow-y-scroll rounded-md border border-solid border-[--background-modifier-border] bg-[--background-primary]" > {#each $chatHistory as message (message.id)} diff --git a/src/components/Chat/MessageContainer.svelte b/src/components/Chat/MessageContainer.svelte index 631a26d..718d04d 100644 --- a/src/components/Chat/MessageContainer.svelte +++ b/src/components/Chat/MessageContainer.svelte @@ -1,8 +1,11 @@ {#if role === 'User'} @@ -20,17 +23,12 @@
{/if} {:else if $data.isChatComfy} -
+
{:else} -
+
{$t('chat.assistant')}
{/if} - diff --git a/src/components/Chat/QuickSettingsDrawer.svelte b/src/components/Chat/QuickSettingsDrawer.svelte index 1b3f776..0e64d32 100644 --- a/src/components/Chat/QuickSettingsDrawer.svelte +++ b/src/components/Chat/QuickSettingsDrawer.svelte @@ -183,7 +183,7 @@
{$t('quick_settings.creativity')} -
+
{temperature}% @@ -192,7 +192,7 @@ {#if $data.isUsingRag}
{$t('quick_settings.similarity_threshold')} -
+
{similarityThreshold}% diff --git a/src/components/base/ProgressBar.svelte b/src/components/base/ProgressBar.svelte index 8c55657..c3976db 100644 --- a/src/components/base/ProgressBar.svelte +++ b/src/components/base/ProgressBar.svelte @@ -5,7 +5,7 @@ diff --git a/src/components/base/ProgressCircle.svelte b/src/components/base/ProgressCircle.svelte index a1debc4..a13b79c 100644 --- a/src/components/base/ProgressCircle.svelte +++ b/src/components/base/ProgressCircle.svelte @@ -23,7 +23,7 @@ }); - + Date: Tue, 26 Mar 2024 16:09:06 +0100 Subject: [PATCH 4/8] style: QuickSettingsDrawer h2 in accent color --- src/components/Chat/QuickSettingsDrawer.svelte | 16 ++++++++-------- src/lang/en.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/Chat/QuickSettingsDrawer.svelte b/src/components/Chat/QuickSettingsDrawer.svelte index 0e64d32..7b3f74b 100644 --- a/src/components/Chat/QuickSettingsDrawer.svelte +++ b/src/components/Chat/QuickSettingsDrawer.svelte @@ -94,7 +94,7 @@
{#if isOpen} {#if $papaState === 'uninitialized'} -

{$t('quick_settings.initialize')}

+

{$t('quick_settings.initialize')}