Fix missing prompt parts for providers (#1188)

* bump to chat list if chat fails to load
* Fix missing prompt parts for providers
* Adjust button horz paddings

Author: sceuick

common/prompt.ts

@@ -584,7 +584,7 @@ function getSupplementaryParts(opts: PromptPartsOptions, replyAs: AppSchema.Char
     system: '' as string | undefined,
   }
 
-  if (!settings?.service) return parts
+  if (!settings) return parts
 
   parts.ujb = settings.ultimeJailbreak
   parts.system = settings.systemPrompt

tests/__snapshots__/prompt.spec.js.snap

@@ -197,8 +197,8 @@ Object {
       "SAMPLECHAT OtherBot",
     ],
     "scenario": "MAIN MainChar",
-    "systemPrompt": "",
-    "ujb": "",
+    "systemPrompt": undefined,
+    "ujb": "!!UJB_PROMPT!!",
     "userEmbeds": Array [],
   },
   "template": Object {

web/pages/Chat/ChatDetail.tsx

@@ -269,7 +269,14 @@ const ChatDetail: Component = () => {
 
     events.emit(EVENTS.chatOpened, params.id)
     if (params.id !== chats.chat?._id) {
-      chatStore.openChat(params.id)
+      chatStore.openChat(params.id, {
+        onDone: (success) => {
+          if (success) return
+
+          // If the chat fails to load, return to the chat list
+          nav('/chats')
+        },
+      })
     } else {
       characterStore.loadImpersonate()
     }

web/pages/GenerationPresets/PresetList.tsx

@@ -4,9 +4,9 @@ import { Component, createMemo, createSignal, For, onMount, Show } from 'solid-j
 import Button from '../../shared/Button'
 import Modal, { ConfirmModal } from '../../shared/Modal'
 import PageHeader from '../../shared/PageHeader'
-import { defaultPresets, presetValidator } from '../../../common/presets'
-import { exportPreset, presetStore, settingStore, toastStore } from '../../store'
-import { getUsableServices, setComponentPageTitle } from '../../shared/util'
+import { presetValidator } from '../../../common/presets'
+import { exportPreset, presetStore, toastStore } from '../../store'
+import { setComponentPageTitle } from '../../shared/util'
 import { getServiceName, sortByLabel } from '/web/shared/adapter'
 import FileInput, { FileInputResult, getFileAsString } from '/web/shared/FileInput'
 import { validateBody } from '/common/valid'
@@ -21,19 +21,6 @@ const PresetList: Component = () => {
       .map((pre) => ({ ...pre, label: `[${getServiceName(pre.service)}] ${pre.name}` }))
       .sort(sortByLabel),
   }))
-  const cfg = settingStore((s) => s.config)
-
-  const useableServices = createMemo(() => getUsableServices())
-
-  const defaults = Object.entries(defaultPresets)
-    .filter(([_, pre]) => {
-      if (!cfg.adapters.includes(pre.service)) return false
-      if (!useableServices().includes(pre.service)) return false
-      if (pre.service !== 'agnaistic') return true
-      return cfg.subs.length > 0
-    })
-    .map(([id, cfg]) => ({ ...cfg, label: `[${cfg.service}] ${cfg.name}`, _id: id }))
-    .sort(sortByLabel)
 
   const [deleting, setDeleting] = createSignal<string>()
   const [importing, setImporting] = createSignal(false)
@@ -60,7 +47,7 @@ const PresetList: Component = () => {
 
   return (
     <Page>
-      <PageHeader title="Generation Presets" />
+      <PageHeader title="Presets" />
       <div class="flex justify-between">
         <div>
           <TextInput placeholder="Filter..." onChange={(ev) => setFilter(ev.currentTarget.value)} />
@@ -78,10 +65,19 @@ const PresetList: Component = () => {
         </div>
       </div>
 
+      {/* <div class="flex gap-2 pb-1">
+        <Button size="sm" schema="clear" class="icon-button">
+          <Sliders size={20} />
+        </Button>
+        <Button size="sm" schema="clear" class="icon-button">
+          <Image size={20} />
+        </Button>
+      </div> */}
+
       <div class="flex flex-col items-center gap-2">
         <For each={presets()}>
           {(preset) => (
-            <div class="bg-800 flex w-full items-center gap-2 rounded-xl py-1 hover:bg-[var(--bg-600)]">
+            <div class="bg-800 flex w-full items-center gap-1 rounded-xl py-1 hover:bg-[var(--bg-600)]">
               <A href={`/presets/${preset._id}`} class=" flex w-full">
                 <div class="ml-4 flex w-full flex-col items-start">
                   <div>
@@ -119,26 +115,6 @@ const PresetList: Component = () => {
             </div>
           )}
         </For>
-
-        <div>Built-in Presets</div>
-        <For each={defaults}>
-          {(preset) => (
-            <div class="flex w-full items-center gap-2">
-              <A
-                href={`/presets/new?preset=${preset._id}`}
-                class="bg-800 flex w-full gap-2 rounded-xl hover:bg-[var(--bg-600)]"
-              >
-                <div class="x ml-4 flex w-full flex-col items-start">
-                  {' '}
-                  <div class="text-md">{preset.name}</div>
-                  <div class="mr-1 text-xs italic text-[var(--text-600)]">
-                    {getServiceName(preset.service)}
-                  </div>
-                </div>
-              </A>
-            </div>
-          )}
-        </For>
       </div>
 
       <Show when={importing()}>

web/shared/Button.tsx

@@ -48,13 +48,13 @@ const Button: Component<{
         ...props.classList,
         [schema()]: true,
         'leading-5': props.size === 'pill',
-        'py-0': props.size === 'pill',
-        'py-1': props.size === 'sm',
-        'py-2': !props.size || props.size === 'md',
-        'py-4': props.size === 'lg',
-        'text-sm': props.size === 'sm' || props.size === 'pill',
-        'text-lg': props.size === 'lg',
-        'justify-center': !props.alignLeft,
+        '!px-1 !py-0': props.size === 'pill',
+        '!px-1.5 !py-1': props.size === 'sm',
+        '!px-2.5 !py-2': !props.size || props.size === 'md',
+        '!px-3 !py-4': props.size === 'lg',
+        '!text-sm': props.size === 'sm' || props.size === 'pill',
+        '!text-lg': props.size === 'lg',
+        '!justify-center': !props.alignLeft,
       }}
       disabled={props.disabled}
       onClick={props.onClick}

web/store/chat.ts

@@ -222,7 +222,12 @@ export const chatStore = createStore<ChatState>('chat', {
         },
       }
     },
-    async *openChat(_, id: string, clear = true) {
+    async *openChat(
+      _,
+      id: string,
+      opts?: { clear?: boolean; onDone?: (success: boolean) => void }
+    ) {
+      const clear = opts?.clear ?? true
       if (clear) {
         yield { loaded: false, active: undefined }
       }
@@ -280,6 +285,8 @@ export const chatStore = createStore<ChatState>('chat', {
           memberIds: res.result.members.reduce(toMemberKeys, {}),
         }
       }
+
+      opts?.onDone?.(!!res.result)
     },
     setAutoReplyAs({ active }, charId: string | undefined) {
       if (!active) return
@@ -575,7 +582,7 @@ export const chatStore = createStore<ChatState>('chat', {
     async restartChat(_, chatId: string) {
       const res = await chatsApi.restartChat(chatId)
       if (res.result) {
-        chatStore.openChat(chatId, false)
+        chatStore.openChat(chatId, { clear: false })
       }
 
       if (res.error) {