Merge pull request #339 from erupts/develop

1.13.3

Author: erupts

deploy/erupt-cloud-server-docker/Dockerfile

@@ -1,5 +1,5 @@
 # 默认使用阿里云镜像
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:17-jre
 
 # 设置工作目录
 WORKDIR /app

deploy/erupt-cloud-server-docker/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.13.2</version>
+        <version>1.13.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

erupt-admin/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.13.2</version>
+        <version>1.13.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

erupt-ai-web/package.json

@@ -23,6 +23,7 @@
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-highlightjs": "^4.2.0",
     "markdown-it-ins": "^4.0.0",
+    "markdown-it-katex": "^2.0.3",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-mark": "^4.0.0",
     "markdown-it-mermaid": "^0.2.5",

erupt-ai-web/src/App.vue

@@ -127,7 +127,6 @@ const send = (message: string) => {
     eventSource.onmessage = (event) => {
       sending.value = false;
       sendDisabled.value = true;
-      console.log(JSON.parse(event.data).text)
       accumulatedMarkdown.value += JSON.parse(event.data).text;
       let msg = messages.value[messages.value.length - 1];
       if (msg.loading) {

erupt-ai-web/src/app.less

@@ -148,4 +148,9 @@
     background: #ddd;
     margin: @base-margin * 2 0;
   }
+
+  /* 修复 KaTeX 上下标显示问题 */
+  .katex .vlist {
+    vertical-align: baseline !important;
+  }
 }

erupt-ai-web/src/components/markdown.ts

@@ -11,34 +11,37 @@ import abbr from 'markdown-it-abbr';
 import deflist from 'markdown-it-deflist';
 import linkAttributes from 'markdown-it-link-attributes';
 import taskLists from 'markdown-it-task-lists';
-import katex from 'katex';
+import markdownItKatex from 'markdown-it-katex';
 import 'katex/dist/katex.min.css';
+import mermaid from 'mermaid';
 
+// 初始化 mermaid
+// if (typeof window !== 'undefined') {
+//     mermaid.initialize({
+//         startOnLoad: true,
+//         theme: 'default',
+//         securityLevel: 'loose'
+//     });
+// }
 
-// 自定义数学公式渲染
-// @ts-ignore
-const renderMath = (md) => {
-    const defaultRender = md.renderer.rules.text;
-    md.renderer.rules.text = (tokens: {
-        [x: string]: any;
-    }, idx: string | number, options: any, env: any, self: any) => {
-        const token = tokens[idx];
-        const match = token.content.match(/(\$\$?)([\s\S]*?)\1/g);
-        if (match) {
-            match.forEach((m: string) => {
-                const isBlock = m.startsWith('$$');
-                const tex = m.slice(2, -2);
-                try {
-                    const html = katex.renderToString(tex, {displayMode: isBlock});
-                    token.content = token.content.replace(m, html);
-                } catch (e: any) {
-                    token.content = token.content.replace(m, `<span class="error">Error rendering math: ${e.message}</span>`);
-                }
-            });
-        }
-        return defaultRender(tokens, idx, options, env, self);
-    };
-};
+function preprocessLatex(text: string): string {
+    // 1. 先将 ```latex 代码块的内容提取出来（保留原始内容）
+    text = text.replace(/```latex\s*([\s\S]*?)```/g, (_match, content) => {
+        return '\n' + content.trim() + '\n';
+    });
+
+    // 2. 统一将 \[ ... \] 转换为 $$...$$（LaTeX 块级公式）
+    text = text.replace(/\\\[([\s\S]*?)\\\]/g, (_match, formula) => {
+        return '$$' + formula.trim() + '$$';
+    });
+
+    // 3. 将 \( ... \) 转换为 $...$（LaTeX 行内公式）
+    text = text.replace(/\\\(([\s\S]*?)\\\)/g, (_match, formula) => {
+        return '$' + formula.trim() + '$';
+    });
+
+    return text;
+}
 
 // 创建 markdown-it 实例并加载插件
 const md = new MarkdownIt({
@@ -47,6 +50,12 @@ const md = new MarkdownIt({
     linkify: true,
     typographer: true,
     highlight: (str: string, lang: string) => {
+        // 处理 mermaid 图表
+        if (lang === 'mermaid') {
+            return `<div class="mermaid">${str}</div>`;
+        }
+
+        // 处理代码高亮
         if (lang && hljs.getLanguage(lang)) {
             return `<pre class="hljs"><code>${hljs.highlight(str, {language: lang}).value}</code></pre>`;
         }
@@ -63,6 +72,26 @@ const md = new MarkdownIt({
     .use(deflist)
     .use(linkAttributes, {attrs: {target: '_blank', rel: 'noopener'}})
     .use(taskLists)
-    .use(renderMath);
+    .use(markdownItKatex, {
+        throwOnError: false,
+        errorColor: '#cc0000'
+    });
+
+// 重写 render 方法，添加预处理
+const originalRender = md.render.bind(md);
+md.render = function (text: string, env?: any): string {
+    const preprocessedText = preprocessLatex(text);
+    const html = originalRender(preprocessedText, env);
+
+    if (html.indexOf('<div class="mermaid">') !== -1) {
+        setTimeout(() => {
+            mermaid.run({
+                querySelector: '.mermaid'
+            });
+        }, 0);
+    }
+
+    return html;
+};
 
 export default md;

erupt-ai/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.13.2</version>
+        <version>1.13.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

erupt-ai/src/main/java/xyz/erupt/ai/config/AiProp.java

@@ -19,4 +19,6 @@ public class AiProp {
 
     private boolean devMode = false;
 
+    private boolean enableFunctionCall = true;
+
 }

erupt-ai/src/main/java/xyz/erupt/ai/core/OpenAi.java

@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 /**
@@ -30,6 +31,14 @@
 @Slf4j
 public abstract class OpenAi extends LlmCore {
 
+    private final OkHttpClient client = new OkHttpClient().newBuilder()
+            .connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(5, TimeUnit.MINUTES)    // 流式需要很长！
+            .writeTimeout(30, TimeUnit.SECONDS)
+            .pingInterval(10, TimeUnit.SECONDS)  // 保持连接心跳
+            .build();
+    ;
+
     private final Gson gson = new GsonBuilder().create();
 
     public String chatApiPath() {
@@ -50,7 +59,6 @@ public LlmConfig config() {
     public ChatCompletionResponse chat(LlmRequest llmRequest, String userPrompt, List<ChatCompletionMessage> assistantPrompt) {
         assistantPrompt.add(new ChatCompletionMessage(MessageRole.user, userPrompt));
         ChatCompletion completion = ChatCompletion.builder().model(llmRequest.getModel()).stream(false).messages(assistantPrompt).build();
-        OkHttpClient client = new OkHttpClient();
         RequestBody body = RequestBody.create(
                 gson.toJson(completion),
                 MediaType.parse("application/json; charset=utf-8")
@@ -77,6 +85,7 @@ public ChatCompletionResponse chat(LlmRequest llmRequest, String userPrompt, Lis
     @Override
     @SneakyThrows
     public void chatSse(LlmRequest llmRequest, String userPrompt, List<ChatCompletionMessage> assistantPrompt, Consumer<SseListener> listener) {
+        assistantPrompt.removeIf(it -> StringUtils.isBlank(it.getContent()));
         ChatCompletion completion = ChatCompletion.builder().model(llmRequest.getModel()).messages(assistantPrompt).stream(true).build();
         completion.setResponse_format(new HashMap<>() {{
             this.put("type", String.valueOf(llmRequest.getResponseFormat()));
@@ -118,8 +127,8 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
                             String line = source.readUtf8Line();
                             if (StringUtils.isNotBlank(line)) {
                                 if (!response.isSuccessful()) {
-                                    this.onFailure(call, new IOException(response.body().string()));
-                                    log.error("Failed to get llm response from server: {}", response.body());
+                                    this.onFailure(call, new IOException(response.body().string() + line));
+                                    log.error("Failed to get llm response from server: {}", response.body() + " → " + line);
                                     return;
                                 } else {
                                     try {
@@ -146,7 +155,8 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
                                             listener.accept(sseListener);
                                         }
                                     } catch (Exception e) {
-                                        this.onFailure(call, new IOException(e));
+                                        this.onFailure(call, new IOException(e + "→" + line));
+                                        break;
                                     }
                                 }
                             }