From ccf1a44c001e233c158bd168dc2d0d96721af929 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 12 十月 2026 09:31:53 +0800
Subject: [PATCH] fix: 修改后台
---
src/main/java/com/custom/webui/service/impl/OllamaLlmService.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/custom/webui/service/impl/OllamaLlmService.java b/src/main/java/com/custom/webui/service/impl/OllamaLlmService.java
index b1a934e..8de63e6 100644
--- a/src/main/java/com/custom/webui/service/impl/OllamaLlmService.java
+++ b/src/main/java/com/custom/webui/service/impl/OllamaLlmService.java
@@ -74,10 +74,9 @@
int status = conn.getResponseCode();
if (status != 200) {
String err = readErrorBody(conn);
- log.error("Ollama 杩斿洖闈� 200: status={}, body={}", status, err);
- throw BusinessException.serverError(
- "LLM 鏈嶅姟杩斿洖閿欒 (HTTP " + status + ")銆傝纭妯″瀷 "
- + resolveModel(options) + " 宸查�氳繃 `ollama pull` 涓嬭浇銆傝鎯�: " + err);
+ log.error("Ollama 杩斿洖闈� 200: status={}, url={}/api/chat, body={}",
+ status, properties.getOllama().getBaseUrl(), err);
+ throw BusinessException.serverError(describeFailure(status, err, resolveModel(options)));
}
try (BufferedReader reader = new BufferedReader(
@@ -229,6 +228,66 @@
return properties.getOllama().getDefaultModel();
}
+ /**
+ * 鎷艰銆岃兘瀹氫綅闂銆嶇殑澶辫触淇℃伅銆�
+ *
+ * <p><b>涓轰粈涔堣涓撻棬鍐欒繖涓柟娉�</b>锛氭棭鍏堣繖閲屽彧鏈変竴鍙�
+ * 銆岃纭妯″瀷 X 宸查�氳繃 {@code ollama pull} 涓嬭浇銆嶃�傞棶棰樺湪浜庯紝
+ * 瑙﹀彂闈� 200 鐨勫師鍥犻噷锛�**妯″瀷娌′笅杞藉彧鍗犲緢灏忎竴閮ㄥ垎**锛�
+ * <ul>
+ * <li>Ollama 鏍规湰娌″惎鍔紙杩炴帴琚嫆锛屾鏃惰繛闈� 200 閮借蛋涓嶅埌锛�</li>
+ * <li>base-url 琚寚鍒颁簡鍒殑鏈嶅姟涓� 鈥斺�� 姣斿 OpenAI 鍏煎鏈嶅姟锛�
+ * 瀹冨彧鏈� {@code /v1/chat/completions}锛屾病鏈� {@code /api/chat}锛�
+ * 浜庢槸杩斿洖 404</li>
+ * </ul>
+ * 杩欏嚑绉嶆儏鍐电敤鎴烽兘浼氱湅鍒般�屾ā鍨嬫病涓嬭浇銆嶏紝鐒跺悗鑺卞ぇ閲忔椂闂村幓
+ * {@code ollama pull}锛岃�岀湡瀹炲師鍥犱笌妯″瀷姣棤鍏崇郴銆�
+ *
+ * <p>鎵�浠ヨ繖閲屾妸**瀹為檯璇锋眰鍦板潃**鍜�**鍗忚鏄惁鍖归厤鐨勫垽鏂�**涓�骞剁粰鍑恒��
+ * 灏ゅ叾 404锛氬畠鍑犱箮浠庝笉鎰忓懗鐫�銆屾ā鍨嬫病涓嬭浇銆嶏紝鍥犱负妯″瀷涓嶅瓨鍦ㄦ椂
+ * Ollama 杩斿洖鐨勬槸 200 + 娴佸唴 {@code {"error": "model ... not found"}}銆�
+ */
+ private String describeFailure(int status, String err, String model) {
+ String baseUrl = properties.getOllama().getBaseUrl();
+ StringBuilder sb = new StringBuilder(256);
+ sb.append("LLM 鏈嶅姟杩斿洖閿欒 (HTTP ").append(status).append(")銆�")
+ .append("璇锋眰鍦板潃: ").append(baseUrl).append("/api/chat")
+ .append("锛屾ā鍨�: ").append(model).append("銆�");
+
+ if (status == 404) {
+ sb.append("404 鍩烘湰鍙互鏂畾**涓嶆槸**妯″瀷娌′笅杞� 鈥斺�� Ollama 鐨勬ā鍨嬩笉瀛樺湪鏃惰繑鍥炵殑鏄� HTTP 200 "
+ + "鍜屾祦鍐呯殑 model not found 娑堟伅銆�404 璇存槑杩欎釜鍦板潃涓婅窇鐨勪笉鏄� Ollama锛�")
+ .append("瀹冪殑鍘熺敓鎺ュ彛鏄� /api/chat锛岃�� OpenAI 鍏煎鏈嶅姟锛坴LLM / LM Studio / SGLang / one-api 绛夛級")
+ .append("鍙湁 /v1/chat/completions銆傝嫢浣犵敤鐨勬槸鍚庤�咃紝璇锋妸 webui.llm.provider 鏀逛负 openai-compat锛�")
+ .append("骞舵妸 webui.llm.openaiCompat.base-url 閰嶆垚浠� /v1 缁撳熬鐨勫湴鍧�銆�");
+ } else if (status == 401 || status == 403) {
+ sb.append("杩欓�氬父鏄綉鍏虫垨閴存潈灞傛嫆缁濓紝璇锋鏌� webui.llm.ollama.base-url 鏄惁鎸囧悜浜嗛渶瑕� API Key 鐨勬湇鍔°��");
+ } else {
+ sb.append("璇风‘璁� Ollama 宸插惎鍔紝涓旀ā鍨嬪凡涓嬭浇锛坄ollama pull ").append(model).append("`锛夈��");
+ }
+
+ sb.append("璇︽儏: ").append(sanitize(err));
+ return sb.toString();
+ }
+
+ /**
+ * 娓呮礂閿欒鍝嶅簲浣撱��
+ *
+ * <p>韪╄繃鐨勫潙锛氭煇浜涙湇鍔★紙瀹炴祴閭d釜 node 鍐欑殑杞彂鍣級杩斿洖鐨� 404 鏂囨湰
+ * 鍚庨潰璺熺潃鍑犲崄涓� NUL 瀛楄妭锛屽師鏍峰杩� JSON 涔嬪悗鍓嶇鎻愮ず閲屾樉绀烘垚涓�涓叉柟鍧楋紝
+ * 鐢ㄦ埛瀹屽叏鐪嬩笉鍑哄唴瀹广�傝繖閲屾妸鎺у埗瀛楃鍘绘帀骞堕檺闀裤��
+ */
+ private String sanitize(String body) {
+ if (body == null || body.isBlank()) {
+ return "(鏃犲搷搴斾綋)";
+ }
+ String cleaned = body.replaceAll("[\\p{Cntrl}&&[^\r\n\t]]", "").trim();
+ if (cleaned.isEmpty()) {
+ return "(鍝嶅簲浣撳彧鏈夋帶鍒跺瓧绗︼紝鍐呭涓嶅彲璇�)";
+ }
+ return abbreviate(cleaned);
+ }
+
private void writeBody(HttpURLConnection conn, String body) throws IOException {
try (var out = conn.getOutputStream()) {
out.write(body.getBytes(StandardCharsets.UTF_8));
--
Gitblit v1.9.1