Bug fixes (#1102)

- fix final placeholder insertion
- fix range inputs

Author: sceuick

common/template-parser.ts

@@ -263,6 +263,9 @@ export async function parseTemplate(
     }
   }
 
+  opts.isFinal = true
+  output = render(output, opts).replace(/\r\n/g, '\n').replace(/\n\n+/g, '\n\n').trim()
+
   sections.sections.history = history
 
   // console.log(

web/shared/PresetSettings/Fields.tsx

@@ -8,7 +8,6 @@ import RangeInput from '../RangeInput'
 import { settingStore } from '/web/store'
 import Select from '../Select'
 import { MODEL_FORMATS } from './General'
-import { defaultPresets } from '/common/default-preset'
 import { FormLabel } from '../FormLabel'
 import { SubscriptionModelLevel } from '/common/types/presets'
 import { Card } from '../Card'
@@ -239,7 +238,7 @@ export const Temperature: Field = (props) => {
         min={0.1}
         max={props.state.presetMode === 'simple' ? 1.5 : 10}
         step={0.01}
-        value={props.state.temp || defaultPresets.basic.temp}
+        value={props.state.temp}
         disabled={props.state.disabled}
         aiSetting={'temp'}
         recommended={props.sub?.preset.temp}

web/shared/PresetSettings/Memory.tsx

@@ -15,7 +15,7 @@ export const MemorySettings: Component<PresetTabProps> = (props) => {
           min={1}
           max={2000}
           step={1}
-          value={props.state.memoryContextLimit || defaultPresets.basic.memoryContextLimit}
+          value={props.state.memoryContextLimit ?? defaultPresets.basic.memoryContextLimit}
           disabled={props.state.disabled}
           onChange={(ev) => props.setter('memoryContextLimit', ev)}
         />
@@ -27,7 +27,7 @@ export const MemorySettings: Component<PresetTabProps> = (props) => {
           min={1}
           max={10000}
           step={1}
-          value={props.state.memoryChatEmbedLimit || defaultPresets.basic.memoryContextLimit}
+          value={props.state.memoryChatEmbedLimit ?? defaultPresets.basic.memoryContextLimit}
           disabled={props.state.disabled}
           onChange={(ev) => props.setter('memoryChatEmbedLimit', ev)}
         />
@@ -39,7 +39,7 @@ export const MemorySettings: Component<PresetTabProps> = (props) => {
           min={1}
           max={10000}
           step={1}
-          value={props.state.memoryUserEmbedLimit || defaultPresets.basic.memoryContextLimit}
+          value={props.state.memoryUserEmbedLimit ?? defaultPresets.basic.memoryContextLimit}
           disabled={props.state.disabled}
           onChange={(ev) => props.setter('memoryUserEmbedLimit', ev)}
         />

web/shared/RangeInput.tsx

@@ -2,7 +2,6 @@ import { Component, Show, createEffect, createSignal, on } from 'solid-js'
 import type { JSX } from 'solid-js'
 import { PresetAISettings, samplerDisableValues } from '../../common/adapters'
 import { markdown } from './markdown'
-import { round } from '/common/util'
 
 const RangeInput: Component<{
   label: string | JSX.Element
@@ -26,21 +25,23 @@ const RangeInput: Component<{
 
   const [display, setDisplay] = createSignal(props.value.toString())
 
-  function updateRangeSliders(next?: string) {
+  function updateRangeSliders(evented: boolean, next?: string) {
     if (!input || !slider) return
 
-    if (next === undefined && props.value === +display()) {
+    if (!evented && next === undefined) {
       return
     }
 
-    const parsed = next !== undefined ? next || '0' : props.value.toString()
+    const parsed = next !== undefined ? next || '0' : '0'
+
     if (isNaN(+parsed)) {
       input.value = display()
       slider.value = display()
       return
     }
+
     input.value = parsed
-    slider.value = parsed
+    // slider.value = parsed
     setDisplay(parsed)
 
     const percent = Math.min(+parsed, +input.max)
@@ -64,22 +65,22 @@ const RangeInput: Component<{
   }
 
   const onInput: JSX.EventHandler<HTMLInputElement, InputEvent> = (event) => {
-    updateRangeSliders(event.currentTarget.value as any)
-    props.onChange(+event.currentTarget.value)
+    updateRangeSliders(true, event.currentTarget.value as any)
+    // props.onChange(+event.currentTarget.value)
   }
 
   createEffect(
     on(
       () => props.value,
-      () => updateRangeSliders()
+      () => updateRangeSliders(false, props.value.toString())
     )
   )
 
   const disableSampler = () => {
     if (!props.aiSetting) return
     const value = samplerDisableValues[props.aiSetting]
     if (value === undefined) return
-    updateRangeSliders(value.toString())
+    updateRangeSliders(true, value.toString())
   }
 
   return (
@@ -145,17 +146,16 @@ const RangeInput: Component<{
           max={props.max}
           step={props.step}
           onInput={onInput}
-          onKeyDown={(ev) => {
-            if (!props.step) return
-            if (ev.key !== 'ArrowDown' && ev.key !== 'ArrowUp') return
+          // onKeyDown={(ev) => {
+          //   if (ev.key !== 'ArrowDown' && ev.key !== 'ArrowUp') return
 
-            const places = (props.step.toString().split('.')[1] || '').length
-            const dir = ev.key === 'ArrowDown' ? -props.step : props.step
-            let value = round(props.value + dir, places)
-            if (props.max !== undefined) value = Math.min(value, props.max)
-            if (props.min !== undefined) value = Math.max(value, props.min)
-            updateRangeSliders(value.toString())
-          }}
+          //   const places = (props.step.toString().split('.')[1] || '').length
+          //   const dir = ev.key === 'ArrowDown' ? -props.step : props.step
+          //   let value = round(props.value + dir, places)
+          //   if (props.max !== undefined) value = Math.min(value, props.max)
+          //   if (props.min !== undefined) value = Math.max(value, props.min)
+          //   updateRangeSliders(value.toString())
+          // }}
           disabled={props.disabled}
         />
       </div>

web/store/user.ts

@@ -113,7 +113,7 @@ export const userStore = createStore<UserState>(
     /**
      * While introducing persisted UI settings, we'll automatically persist settings that the user has in local storage
      */
-    if (!init.user.ui) {
+    if (!init.user || !init.user.ui) {
       userStore.saveUI(defaultUIsettings)
     } else {
       userStore.receiveUI(init.user.ui)