Timothy Jaeryang Baek 5 months ago
parent
commit
17ed7351a4
2 changed files with 5 additions and 4 deletions
  1. 1 1
      backend/open_webui/utils/task.py
  2. 4 3
      src/lib/components/common/Textarea.svelte

+ 1 - 1
backend/open_webui/utils/task.py

@@ -122,7 +122,7 @@ def replace_messages_variable(template: str, messages: list[str]) -> str:
 
 
 def rag_template(template: str, context: str, query: str):
-    if template == "":
+    if template.strip() == "":
         template = DEFAULT_RAG_TEMPLATE
 
     if "[context]" not in template and "{{CONTEXT}}" not in template:

+ 4 - 3
src/lib/components/common/Textarea.svelte

@@ -25,7 +25,8 @@
 	function handlePaste(event: ClipboardEvent) {
 		event.preventDefault(); // Prevent the default paste action
 		const clipboardData = event.clipboardData?.getData('text/plain'); // Get plaintext from clipboard
-		document.execCommand('insertText', false, clipboardData); // Insert plaintext into contenteditable
+
+		value = `${value}${clipboardData}`; // Append the plaintext to the current value
 	}
 </script>
 
@@ -35,8 +36,8 @@
 	class="{className} whitespace-pre-wrap relative {!value.trim() ? 'placeholder' : ''}"
 	style="field-sizing: content; -moz-user-select: text !important;"
 	on:input={() => {
-		value = textareaElement.innerText;
-		console.log(value);
+		const text = textareaElement.innerText;
+		value = text.trim();
 	}}
 	on:paste={handlePaste}
 	data-placeholder={placeholder}