Merge branch 'master' into frontier
This commit is contained in:
commit
b24fef8a61
@ -258,39 +258,7 @@ function loadTipsMessage(result) {
|
||||
});
|
||||
|
||||
window.showWelcomeMessage = function(result) {
|
||||
var text;
|
||||
if (window.location.href == live2d_settings.homePageUrl) {
|
||||
var now = (new Date()).getHours();
|
||||
if (now > 23 || now <= 5) text = getRandText(result.waifu.hour_tips['t23-5']);
|
||||
else if (now > 5 && now <= 7) text = getRandText(result.waifu.hour_tips['t5-7']);
|
||||
else if (now > 7 && now <= 11) text = getRandText(result.waifu.hour_tips['t7-11']);
|
||||
else if (now > 11 && now <= 14) text = getRandText(result.waifu.hour_tips['t11-14']);
|
||||
else if (now > 14 && now <= 17) text = getRandText(result.waifu.hour_tips['t14-17']);
|
||||
else if (now > 17 && now <= 19) text = getRandText(result.waifu.hour_tips['t17-19']);
|
||||
else if (now > 19 && now <= 21) text = getRandText(result.waifu.hour_tips['t19-21']);
|
||||
else if (now > 21 && now <= 23) text = getRandText(result.waifu.hour_tips['t21-23']);
|
||||
else text = getRandText(result.waifu.hour_tips.default);
|
||||
} else {
|
||||
var referrer_message = result.waifu.referrer_message;
|
||||
if (document.referrer !== '') {
|
||||
var referrer = document.createElement('a');
|
||||
referrer.href = document.referrer;
|
||||
var domain = referrer.hostname.split('.')[1];
|
||||
if (window.location.hostname == referrer.hostname)
|
||||
text = referrer_message.localhost[0] + document.title.split(referrer_message.localhost[2])[0] + referrer_message.localhost[1];
|
||||
else if (domain == 'baidu')
|
||||
text = referrer_message.baidu[0] + referrer.search.split('&wd=')[1].split('&')[0] + referrer_message.baidu[1];
|
||||
else if (domain == 'so')
|
||||
text = referrer_message.so[0] + referrer.search.split('&q=')[1].split('&')[0] + referrer_message.so[1];
|
||||
else if (domain == 'google')
|
||||
text = referrer_message.google[0] + document.title.split(referrer_message.google[2])[0] + referrer_message.google[1];
|
||||
else {
|
||||
$.each(result.waifu.referrer_hostname, function(i,val) {if (i==referrer.hostname) referrer.hostname = getRandText(val)});
|
||||
text = referrer_message.default[0] + referrer.hostname + referrer_message.default[1];
|
||||
}
|
||||
} else text = referrer_message.none[0] + document.title.split(referrer_message.none[2])[0] + referrer_message.none[1];
|
||||
}
|
||||
showMessage(text, 6000);
|
||||
showMessage('欢迎使用GPT-Academic', 6000);
|
||||
}; if (live2d_settings.showWelcomeMessage) showWelcomeMessage(result);
|
||||
|
||||
var waifu_tips = result.waifu;
|
||||
|
@ -83,8 +83,8 @@
|
||||
"很多强大的函数插件隐藏在下拉菜单中呢。",
|
||||
"红色的插件,使用之前需要把文件上传进去哦。",
|
||||
"想添加功能按钮吗?读读readme很容易就学会啦。",
|
||||
"敏感或机密的信息,不可以问chatGPT的哦!",
|
||||
"chatGPT究竟是划时代的创新,还是扼杀创造力的毒药呢?"
|
||||
"敏感或机密的信息,不可以问AI的哦!",
|
||||
"LLM究竟是划时代的创新,还是扼杀创造力的毒药呢?"
|
||||
] }
|
||||
],
|
||||
"click": [
|
||||
@ -92,8 +92,6 @@
|
||||
"selector": ".waifu #live2d",
|
||||
"text": [
|
||||
"是…是不小心碰到了吧",
|
||||
"萝莉控是什么呀",
|
||||
"你看到我的小熊了吗",
|
||||
"再摸的话我可要报警了!⌇●﹏●⌇",
|
||||
"110吗,这里有个变态一直在摸我(ó﹏ò。)"
|
||||
]
|
||||
|
@ -1,6 +1,8 @@
|
||||
import os
|
||||
import gradio as gr
|
||||
from toolbox import get_conf
|
||||
CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf('CODE_HIGHLIGHT', 'ADD_WAIFU', 'LAYOUT')
|
||||
theme_dir = os.path.dirname(__file__)
|
||||
|
||||
def adjust_theme():
|
||||
|
||||
@ -57,7 +59,7 @@ def adjust_theme():
|
||||
button_cancel_text_color_dark="white",
|
||||
)
|
||||
|
||||
with open('themes/common.js', 'r', encoding='utf8') as f:
|
||||
with open(os.path.join(theme_dir, 'common.js'), 'r', encoding='utf8') as f:
|
||||
js = f"<script>{f.read()}</script>"
|
||||
|
||||
# 添加一个萌萌的看板娘
|
||||
@ -67,7 +69,9 @@ def adjust_theme():
|
||||
<script src="file=docs/waifu_plugin/jquery-ui.min.js"></script>
|
||||
<script src="file=docs/waifu_plugin/autoload.js"></script>
|
||||
"""
|
||||
gradio_original_template_fn = gr.routes.templates.TemplateResponse
|
||||
if not hasattr(gr, 'RawTemplateResponse'):
|
||||
gr.RawTemplateResponse = gr.routes.templates.TemplateResponse
|
||||
gradio_original_template_fn = gr.RawTemplateResponse
|
||||
def gradio_new_template_fn(*args, **kwargs):
|
||||
res = gradio_original_template_fn(*args, **kwargs)
|
||||
res.body = res.body.replace(b'</html>', f'{js}</html>'.encode("utf8"))
|
||||
@ -79,7 +83,7 @@ def adjust_theme():
|
||||
print('gradio版本较旧, 不能自定义字体和颜色')
|
||||
return set_theme
|
||||
|
||||
with open("themes/contrast.css", "r", encoding="utf-8") as f:
|
||||
with open(os.path.join(theme_dir, 'contrast.css'), "r", encoding="utf-8") as f:
|
||||
advanced_css = f.read()
|
||||
with open("themes/common.css", "r", encoding="utf-8") as f:
|
||||
with open(os.path.join(theme_dir, 'common.css'), "r", encoding="utf-8") as f:
|
||||
advanced_css += f.read()
|
||||
|
@ -68,7 +68,9 @@ def adjust_theme():
|
||||
<script src="file=docs/waifu_plugin/jquery-ui.min.js"></script>
|
||||
<script src="file=docs/waifu_plugin/autoload.js"></script>
|
||||
"""
|
||||
gradio_original_template_fn = gr.routes.templates.TemplateResponse
|
||||
if not hasattr(gr, 'RawTemplateResponse'):
|
||||
gr.RawTemplateResponse = gr.routes.templates.TemplateResponse
|
||||
gradio_original_template_fn = gr.RawTemplateResponse
|
||||
def gradio_new_template_fn(*args, **kwargs):
|
||||
res = gradio_original_template_fn(*args, **kwargs)
|
||||
res.body = res.body.replace(b'</html>', f'{js}</html>'.encode("utf8"))
|
||||
|
@ -1,7 +1,9 @@
|
||||
import gradio as gr
|
||||
import logging
|
||||
import os
|
||||
import gradio as gr
|
||||
from toolbox import get_conf, ProxyNetworkActivate
|
||||
CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf('CODE_HIGHLIGHT', 'ADD_WAIFU', 'LAYOUT')
|
||||
theme_dir = os.path.dirname(__file__)
|
||||
|
||||
def dynamic_set_theme(THEME):
|
||||
set_theme = gr.themes.ThemeClass()
|
||||
@ -13,7 +15,6 @@ def dynamic_set_theme(THEME):
|
||||
return set_theme
|
||||
|
||||
def adjust_theme():
|
||||
|
||||
try:
|
||||
set_theme = gr.themes.ThemeClass()
|
||||
with ProxyNetworkActivate('Download_Gradio_Theme'):
|
||||
@ -23,7 +24,7 @@ def adjust_theme():
|
||||
if THEME.startswith('huggingface-'): THEME = THEME.lstrip('huggingface-')
|
||||
set_theme = set_theme.from_hub(THEME.lower())
|
||||
|
||||
with open('themes/common.js', 'r', encoding='utf8') as f:
|
||||
with open(os.path.join(theme_dir, 'common.js'), 'r', encoding='utf8') as f:
|
||||
js = f"<script>{f.read()}</script>"
|
||||
|
||||
# 添加一个萌萌的看板娘
|
||||
@ -33,7 +34,9 @@ def adjust_theme():
|
||||
<script src="file=docs/waifu_plugin/jquery-ui.min.js"></script>
|
||||
<script src="file=docs/waifu_plugin/autoload.js"></script>
|
||||
"""
|
||||
gradio_original_template_fn = gr.routes.templates.TemplateResponse
|
||||
if not hasattr(gr, 'RawTemplateResponse'):
|
||||
gr.RawTemplateResponse = gr.routes.templates.TemplateResponse
|
||||
gradio_original_template_fn = gr.RawTemplateResponse
|
||||
def gradio_new_template_fn(*args, **kwargs):
|
||||
res = gradio_original_template_fn(*args, **kwargs)
|
||||
res.body = res.body.replace(b'</html>', f'{js}</html>'.encode("utf8"))
|
||||
@ -46,7 +49,5 @@ def adjust_theme():
|
||||
logging.error('gradio版本较旧, 不能自定义字体和颜色:', trimmed_format_exc())
|
||||
return set_theme
|
||||
|
||||
# with open("themes/default.css", "r", encoding="utf-8") as f:
|
||||
# advanced_css = f.read()
|
||||
with open("themes/common.css", "r", encoding="utf-8") as f:
|
||||
with open(os.path.join(theme_dir, 'common.css'), "r", encoding="utf-8") as f:
|
||||
advanced_css = f.read()
|
||||
|
@ -1,6 +1,8 @@
|
||||
import os
|
||||
import gradio as gr
|
||||
from toolbox import get_conf
|
||||
CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf('CODE_HIGHLIGHT', 'ADD_WAIFU', 'LAYOUT')
|
||||
theme_dir = os.path.dirname(__file__)
|
||||
|
||||
def adjust_theme():
|
||||
try:
|
||||
@ -73,7 +75,7 @@ def adjust_theme():
|
||||
chatbot_code_background_color_dark="*neutral_950",
|
||||
)
|
||||
|
||||
with open('themes/common.js', 'r', encoding='utf8') as f:
|
||||
with open(os.path.join(theme_dir, 'common.js'), 'r', encoding='utf8') as f:
|
||||
js = f"<script>{f.read()}</script>"
|
||||
|
||||
# 添加一个萌萌的看板娘
|
||||
@ -84,10 +86,12 @@ def adjust_theme():
|
||||
<script src="file=docs/waifu_plugin/autoload.js"></script>
|
||||
"""
|
||||
|
||||
with open('themes/green.js', 'r', encoding='utf8') as f:
|
||||
with open(os.path.join(theme_dir, 'green.js'), 'r', encoding='utf8') as f:
|
||||
js += f"<script>{f.read()}</script>"
|
||||
|
||||
gradio_original_template_fn = gr.routes.templates.TemplateResponse
|
||||
if not hasattr(gr, 'RawTemplateResponse'):
|
||||
gr.RawTemplateResponse = gr.routes.templates.TemplateResponse
|
||||
gradio_original_template_fn = gr.RawTemplateResponse
|
||||
def gradio_new_template_fn(*args, **kwargs):
|
||||
res = gradio_original_template_fn(*args, **kwargs)
|
||||
res.body = res.body.replace(b'</html>', f'{js}</html>'.encode("utf8"))
|
||||
@ -99,8 +103,7 @@ def adjust_theme():
|
||||
print('gradio版本较旧, 不能自定义字体和颜色')
|
||||
return set_theme
|
||||
|
||||
|
||||
with open("themes/green.css", "r", encoding="utf-8") as f:
|
||||
with open(os.path.join(theme_dir, 'green.css'), "r", encoding="utf-8") as f:
|
||||
advanced_css = f.read()
|
||||
with open("themes/common.css", "r", encoding="utf-8") as f:
|
||||
with open(os.path.join(theme_dir, 'common.css'), "r", encoding="utf-8") as f:
|
||||
advanced_css += f.read()
|
||||
|
Loading…
x
Reference in New Issue
Block a user