diff --git a/main.go b/main.go
index bbab86e..d104897 100644
--- a/main.go
+++ b/main.go
@@ -57,6 +57,8 @@ func main() {
//登录界面
e.GET("/", static.Login)
e.GET("/chat", static.Chat)
+ e.GET("/chat1", static.Chat1)
+ e.GET("/chat2", static.Chat2)
//user
apps.InitUserGroup(e.Group("/v1/user/"))
diff --git a/static/ai-chat.html b/static/ai-chat.html
index 74c0fc6..e7011b2 100644
--- a/static/ai-chat.html
+++ b/static/ai-chat.html
@@ -50,14 +50,15 @@
background-color: #d6eaff;
color: #000000;
}
- .gpt{
+
+ .gpt {
margin-bottom: 10px;
justify-content: flex-start;
background-color: #e5ece7;
color: #000;
}
- .gpt span{
+ .gpt span {
white-space: pre-line;
}
@@ -65,7 +66,7 @@
font-weight: bold;
}
</style>
- <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+ <!-- <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>-->
</head>
@@ -79,7 +80,8 @@
</div>
</body>
-<script>
+<script type="module">
+ import {marked} from "https://cdn.jsdelivr.net/npm/marked/lib/marked.esm.js";
// --------------------init--------------------------------------
const API_KEY = "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";
const ENDPOINT = "https://openrouter.ai/api/v1/chat/completions";
@@ -101,7 +103,7 @@
// 等待
let waiting = false;
// -------------------------------------------------------------------------------------------------
- let reg=/\\n/ig; //o为要替换的关键字，不能加引号，否则替换不生效，i忽略大小写，g表示全局查找。
+ let reg = /\\n/ig; //o为要替换的关键字，不能加引号，否则替换不生效，i忽略大小写，g表示全局查找。
/**
* 发送消息
*/
@@ -127,12 +129,13 @@
const htmlSpanElement = displayChatGPTMessageAndGetContainer();
// 发送消息到ChatGPT
addMessage("user", message);
- const body = JSON.stringify({model: "google/gemma-7b-it:free", messages: messages, stream: true});
+ const body = JSON.stringify({model: "google/gemma-7b-it:free", messages: messages, stream: false});
+ alert(body)
ssePost(
// 请求地址
ENDPOINT,
// 请求头
- {"Content-Type": "application/json", Authorization: "Bearer " + API_KEY },
+ {"Content-Type": "application/json", Authorization: "Bearer " + API_KEY},
// params，这里没有参数
{},
// body
@@ -140,20 +143,25 @@
// 收到事件时的回调。这里将事件的data显示在htmlSpanElement中
(event) => {
const content = getContent(event.data);
- console.log(event.data)
- let ccc=content.toString().replace(reg,"<br/>")
- console.log(ccc);
- // content.replace("world", "js");
- if (content) htmlSpanElement.innerHTML += ccc;
+ // console.log(event.data)
+
+ if (content) {
+ let ccc = content.toString().replace(reg, "<br/>")
+ console.log(ccc);
+ htmlSpanElement.innerHTML += ccc;
+ }
},
// 结束时的回调。1.将消息添加到历史消息中 2.将等待状态设置为false
() => {
addMessage("assistant", htmlSpanElement.innerHTML);
- htmlSpanElement.innerHTML=marked.parse(htmlSpanElement.innerHTML);
+ htmlSpanElement.innerHTML = marked.parse(htmlSpanElement.innerHTML);
waiting = false;
},
// 发生错误时的回调
- (error) => {console.log(error); waiting = false}
+ (error) => {
+ console.log(error);
+ waiting = false
+ }
);
}
@@ -231,12 +239,6 @@
}
-
-
-
-
-
-
function objectToQueryString(obj) {
return Object.keys(obj)
.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`)
diff --git a/static/ai-chat1.html b/static/ai-chat1.html
index 34cb371..e0d748e 100644
--- a/static/ai-chat1.html
+++ b/static/ai-chat1.html
@@ -183,28 +183,37 @@
chatlog.scrollTop = chatlog.scrollHeight;
}
+ // 历史消息
+ const messagesList = [];
+
// 调用api
- function chatApi(message) {
+ function chatApi(msg) {
slideBottom();
- data = {
- questions: message,
- history: messageHistory
- };
+
+ messagesList.push({role: "user", content: msg});
+ const body = JSON.stringify({model: "google/gemma-7b-it:free", messages: messagesList});
+ // alert(body)
$.ajax({
- url: "http://127.0.0.1:11434/api/chat",
- type: "POST",
- contentType: "application/json",
- dataType: "json",
- data: JSON.stringify(data),
+ method: 'POST',
+ url: 'https://openrouter.ai/api/v1/chat/completions',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': 'Bearer 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'
+ },
+ data: body,
success: function (res) {
- if (res.code === 200) {
- let answer = res.answer;
- answer = marked.parse(answer);
- addAIMessage(answer);
- messageHistory = res.history;
- } else {
- addAIMessage("服务接口调用错误。");
- }
+ let res1=res?.choices[0]?.message?.content;
+ res1 = marked.parse(res1);
+ addAIMessage(res1);
+
+ // if (res.code === 200) {
+ // let answer = res.answer;
+ // answer = marked.parse(answer);
+ // addAIMessage(answer);
+ // messageHistory = res.history;
+ // } else {
+ // addAIMessage("服务接口调用错误。");
+ // }
},
error: function (e) {
addAIMessage("服务接口调用异常。");
diff --git a/static/ai-chat2.html b/static/ai-chat2.html
new file mode 100644
index 0000000..6cfe27d
--- /dev/null
+++ b/static/ai-chat2.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+ <meta name="renderer" content="webkit"/>
+ <meta name="force-rendering" content="webkit"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta charset="UTF-8"/>
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0, viewport-fit=cover"/>
+ <title>智能助理</title>
+ <link rel="stylesheet" href="https://g.alicdn.com/chatui/sdk-v2/0.3.8/sdk.css">
+</head>
+<body>
+<div id="root"></div>
+<script src="https://g.alicdn.com/chatui/sdk-v2/0.3.8/sdk.js"></script>
+<script src="https://g.alicdn.com/chatui/extensions/5.18.0/isv-parser.js"></script>
+<script>
+ const messages = [];
+
+ var bot = new ChatSDK({
+ config: {
+ navbar: {
+ title: '智能助理'
+ },
+ robot: {
+ avatar: 'https://gw.alicdn.com/tfs/TB1U7FBiAT2gK0jSZPcXXcKkpXa-108-108.jpg'
+ },
+ // 用户头像
+ user: {
+ avatar: 'https://gw.alicdn.com/tfs/TB1DYHLwMHqK1RjSZFEXXcGMXXa-56-62.svg',
+ },
+ messages: [
+ {
+ type: 'text',
+ content: {
+ text: '智能助理为您服务，请问有什么可以帮您？'
+ }
+ }
+ ]
+ },
+ requests: {
+ send: function (msg) {
+ // alert(msg.content.text)
+ messages.push({role: "user", content: msg.content.text});
+ const body = JSON.stringify({model: "google/gemma-7b-it:free", messages: messages});
+ // alert(body)
+ if (msg.type === 'text') {
+ return {
+ method: 'POST',
+ url: 'https://openrouter.ai/api/v1/chat/completions',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': 'Bearer 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'
+ },
+ body: body
+ };
+ }
+ }
+ },
+ handlers: {
+ parseResponse: function (res, requestType) {
+ // alert(requestType);
+ console.log(res);
+ if (requestType === 'send' && res?.choices?.length > 0) {
+ let res1=res?.choices[0]?.message?.content;
+ return {type: 'text', content: {text: res1}};
+ }
+ return res;
+ }
+ }
+ });
+
+ bot.run();
+</script>
+<script src="https://g.alicdn.com/chatui/icons/2.0.2/index.js" async></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/static/page.go b/static/page.go
index 5f89441..e071ab3 100644
--- a/static/page.go
+++ b/static/page.go
@@ -19,6 +19,20 @@ func Chat(c echo.Context) error {
return c.Blob(http.StatusOK, "text/html; charset=utf-8", pageMap["ai-chat.html"])
}
+func Chat1(c echo.Context) error {
+ c.Response().Header().Set("Content-Type", "text/html; charset=utf-8")
+ c.Response().Header().Set("Cache-Control", "max-age=3600")
+
+ return c.Blob(http.StatusOK, "text/html; charset=utf-8", pageMap["ai-chat1.html"])
+}
+
+func Chat2(c echo.Context) error {
+ c.Response().Header().Set("Content-Type", "text/html; charset=utf-8")
+ c.Response().Header().Set("Cache-Control", "max-age=3600")
+
+ return c.Blob(http.StatusOK, "text/html; charset=utf-8", pageMap["ai-chat2.html"])
+}
+
func InitStaticGroup(g *echo.Group) {
g.GET("login.html", func(c echo.Context) error {