refac

backend/open_webui/routers/channels.py

@@ -344,7 +344,7 @@ async def model_response_handler(request, channel, message, user):
                     "role": "system",
                     "content": f"You are {model.get('name', model_id)}, participating in a threaded conversation. Be concise and conversational."
                     + (
-                        f"Here's the thread history:\n\n{''.join([f'{msg}' for msg in thread_history])}\n\nContinue the conversation naturally as {model.get('name', model_id)}, addressing the most recent message while being aware of the full context."
+                        f"Here's the thread history:\n\n\n{''.join([f'{msg}\n\n' for msg in thread_history])}\n\n\nContinue the conversation naturally as {model.get('name', model_id)}, addressing the most recent message while being aware of the full context."
                         if thread_history
                         else ""
                     ),
@@ -384,6 +384,7 @@ async def model_response_handler(request, channel, message, user):
                 )
 
                 if res:
+                    if res.get("choices", []) and len(res["choices"]) > 0:
                         await update_message_by_id(
                             channel.id,
                             response_message.id,
@@ -397,6 +398,20 @@ async def model_response_handler(request, channel, message, user):
                             ),
                             user,
                         )
+                    elif res.get("error", None):
+                        await update_message_by_id(
+                            channel.id,
+                            response_message.id,
+                            MessageForm(
+                                **{
+                                    "content": f"Error: {res['error']}",
+                                    "meta": {
+                                        "done": True,
+                                    },
+                                }
+                            ),
+                            user,
+                        )
             except Exception as e:
                 log.info(e)
                 pass

src/lib/components/common/RichTextInput.svelte

@@ -775,6 +775,8 @@
 
 				htmlValue = editor.getHTML();
 				jsonValue = editor.getJSON();
+
+				if (richText) {
 					mdValue = turndownService
 						.turndown(
 							htmlValue
@@ -782,20 +784,26 @@
 								.replace(/ {2,}/g, (m) => m.replace(/ /g, '\u00a0'))
 						)
 						.replace(/\u00a0/g, ' ');
+				} else {
+					mdValue = turndownService
+						.turndown(
+							htmlValue
+								// Replace empty paragraphs with line breaks
+								.replace(/<p><\/p>/g, '<br/>')
+								// Replace multiple spaces with non-breaking spaces
+								.replace(/ {2,}/g, (m) => m.replace(/ /g, '\u00a0'))
+								// Replace tabs with non-breaking spaces (preserve indentation)
+								.replace(/\t/g, '\u00a0\u00a0\u00a0\u00a0') // 1 tab = 4 spaces
+						)
+						// Convert non-breaking spaces back to regular spaces for markdown
+						.replace(/\u00a0/g, ' ');
+				}
 
-				if (richText) {
 				onChange({
 					html: htmlValue,
 					json: jsonValue,
 					md: mdValue
 				});
-				} else {
-					// Plain text path: preserve \t and \n exactly
-					const doc = editor.view.state.doc;
-					const plain = doc.textBetween(0, doc.content.size, '\n\n', '\n'); // keeps \t intact
-					value = plain;
-					onChange({ html: null, json: null, md: plain });
-				}
 
 				if (json) {
 					value = jsonValue;