From 4bc74f7e9006fc7f182c9dc6ea309ea83c5bb4f9 Mon Sep 17 00:00:00 2001 From: sigoden Date: Tue, 8 Oct 2024 12:38:31 +0800 Subject: refactor: NO_COLOR, highlight and render_error (#915) - If NO_COLOR is enabled, AIChat will not output any ANSI color codes. - `config.highlight` will only affect rendering markdown - improve rendering error --- src/render/mod.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/render') diff --git a/src/render/mod.rs b/src/render/mod.rs index 4e55e9f..97161f8 100644 --- a/src/render/mod.rs +++ b/src/render/mod.rs @@ -4,7 +4,7 @@ mod stream; pub use self::markdown::{MarkdownRender, RenderOptions}; use self::stream::{markdown_stream, raw_stream}; -use crate::utils::{error_text, AbortSignal, IS_STDOUT_TERMINAL}; +use crate::utils::{error_text, pretty_error, AbortSignal, IS_STDOUT_TERMINAL}; use crate::{client::SseEvent, config::GlobalConfig}; use anyhow::Result; @@ -25,11 +25,6 @@ pub async fn render_stream( ret.map_err(|err| err.context("Failed to reader stream")) } -pub fn render_error(err: anyhow::Error, highlight: bool) { - let err = format!("Error: {err:?}"); - if highlight { - eprintln!("{}", error_text(&err)); - } else { - eprintln!("{err}"); - } +pub fn render_error(err: anyhow::Error) { + eprintln!("{}", error_text(&pretty_error(&err))); } -- cgit v1.2.3