Skip to content

Commit

Permalink
fix loading chatglm3 (#1937)
Browse files Browse the repository at this point in the history
* update welcome svg

* update welcome message

* fix loading chatglm3

---------

Co-authored-by: binary-husky <qingxu.fu@outlook.com>
Co-authored-by: binary-husky <96192199+binary-husky@users.noreply.github.com>
  • Loading branch information
3 people authored Aug 19, 2024
1 parent 5010537 commit a95b3da
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 22 deletions.
8 changes: 3 additions & 5 deletions request_llms/bridge_chatglm3.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def load_model_info(self):

def load_model_and_tokenizer(self):
# 🏃‍♂️🏃‍♂️🏃‍♂️ 子进程执行
from transformers import AutoModel, AutoTokenizer
from transformers import AutoModel, AutoTokenizer, BitsAndBytesConfig
import os, glob
import os
import platform
Expand All @@ -45,15 +45,13 @@ def load_model_and_tokenizer(self):
chatglm_model = AutoModel.from_pretrained(
pretrained_model_name_or_path=_model_name_,
trust_remote_code=True,
device="cuda",
load_in_4bit=True,
quantization_config=BitsAndBytesConfig(load_in_4bit=True),
)
elif LOCAL_MODEL_QUANT == "INT8": # INT8
chatglm_model = AutoModel.from_pretrained(
pretrained_model_name_or_path=_model_name_,
trust_remote_code=True,
device="cuda",
load_in_8bit=True,
quantization_config=BitsAndBytesConfig(load_in_8bit=True),
)
else:
chatglm_model = AutoModel.from_pretrained(
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ tiktoken>=0.3.3
requests[socks]
pydantic==2.5.2
protobuf==3.18
transformers>=4.27.1
transformers>=4.27.1,<4.42
scipdf_parser>=0.52
anthropic>=0.18.1
python-markdown-math
Expand Down
44 changes: 28 additions & 16 deletions themes/welcome.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class WelcomeMessage {
url: "https://github.com/binary-husky/gpt_academic/wiki/%E9%A1%B9%E7%9B%AE%E9%85%8D%E7%BD%AE%E8%AF%B4%E6%98%8E",
},
{
title: "Arxiv论文一键翻译",
title: "Arxiv论文翻译",
content: "无缝切换学术阅读语言,最优英文转中文的学术论文阅读体验。",
svg: "file=themes/svg/arxiv.svg",
url: "https://www.bilibili.com/video/BV1dz4y1v77A/",
Expand Down Expand Up @@ -67,6 +67,18 @@ class WelcomeMessage {
svg: "file=themes/svg/check.svg",
url: "https://github.com/binary-husky/gpt_academic/wiki",
},
{
title: "接入更多新模型",
content: "模型迭代日新月异,一起动手接入更多新的在线或本地大模型吧。",
svg: "file=themes/svg/box.svg",
url: "https://github.com/binary-husky/gpt_academic/blob/master/request_llms/README.md",
},
{
title: "联动VLLM等服务",
content: "借助VLLM和OneApi等第三方服务高效地部署和运行大模型。",
svg: "file=themes/svg/location.svg",
url: "https://github.com/binary-husky/gpt_academic/wiki/如何更便捷地接入one-api",
},
];
this.visible = false;
this.max_welcome_card_num = 6;
Expand Down Expand Up @@ -99,7 +111,7 @@ class WelcomeMessage {
}, 1);
}
}

async reflesh_cards() {
if (!this.visible){
return;
Expand All @@ -121,7 +133,7 @@ class WelcomeMessage {
if (index >= this.max_welcome_card_num) {
break;
}

const card = this.card_array[index];
// 已经包含了 hide 属性?
if (card.classList.contains('hide') || card.classList.contains('show')) {
Expand Down Expand Up @@ -151,9 +163,9 @@ class WelcomeMessage {
card.classList.add('show');

}, { once: true });

card.classList.add('hide');

// 等待 250 毫秒
await new Promise(r => setTimeout(r, 200));
}
Expand All @@ -162,22 +174,22 @@ class WelcomeMessage {

shuffle(array) {
var currentIndex = array.length, randomIndex;

// While there remain elements to shuffle...
while (currentIndex != 0) {

// Pick a remaining element...
randomIndex = Math.floor(Math.random() * currentIndex);
currentIndex--;

// And swap it with the current element.
[array[currentIndex], array[randomIndex]] = [
array[randomIndex], array[currentIndex]];
}

return array;
}

async update() {
// console.log('update')
var page_width = document.documentElement.clientWidth;
Expand All @@ -189,7 +201,7 @@ class WelcomeMessage {
this.card_array = [];
this.static_welcome_message_previous = [];
}
return;
return;
}
if (this.visible){
return;
Expand Down Expand Up @@ -245,7 +257,7 @@ class WelcomeMessage {
// 创建一个新的div元素
const welcome_card_container = document.createElement('div');
welcome_card_container.classList.add('welcome-card-container');

// 创建主标题
const major_title = document.createElement('div');
major_title.classList.add('welcome-title');
Expand All @@ -264,7 +276,7 @@ class WelcomeMessage {
});

elem_chatbot.appendChild(welcome_card_container);

// 添加显示动画
requestAnimationFrame(() => {
welcome_card_container.classList.add('show');
Expand Down Expand Up @@ -297,19 +309,19 @@ class PageFocusHandler {
constructor() {
this.hasReturned = false;
this.focusCallbacks = [];

// Bind the focus and blur event handlers
window.addEventListener('visibilitychange', this.handleFocus.bind(this));
}

// Method to handle the focus event
handleFocus() {
if (this.hasReturned) {
this.focusCallbacks.forEach(callback => callback());
}
this.hasReturned = true;
}

// Method to add a custom callback function
addFocusCallback(callback) {
if (typeof callback === 'function') {
Expand Down

0 comments on commit a95b3da

Please sign in to comment.