Merge Latest Frontier (#1991)

* logging sys to loguru: stage 1 complete

* import loguru: stage 2

* logging -> loguru: stage 3

* support o1-preview and o1-mini

* logging -> loguru stage 4

* update social helper

* logging -> loguru: final stage

* fix: console output

* update translation matrix

* fix: loguru argument error with proxy enabled (#1977)

* relax llama index version

* remove comment

* Added some modules to support openrouter (#1975)

* Added some modules for supporting openrouter model

Added some modules for supporting openrouter model

* Update config.py

* Update .gitignore

* Update bridge_openrouter.py

* Not changed actually

* Refactor logging in bridge_openrouter.py

---------

Co-authored-by: binary-husky <qingxu.fu@outlook.com>

* remove logging extra

---------

Co-authored-by: Steven Moder <java20131114@gmail.com>
Co-authored-by: Ren Lifei <2602264455@qq.com>
这个提交包含在:
binary-husky
2024-10-05 17:09:18 +08:00
提交者 GitHub
父节点 597c320808
当前提交 a01ca93362
共有 91 个文件被更改,包括 2558 次插入742 次删除

查看文件

@@ -1,6 +1,7 @@
import os
import gradio as gr
from toolbox import get_conf
from loguru import logger
CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf("CODE_HIGHLIGHT", "ADD_WAIFU", "LAYOUT")
theme_dir = os.path.dirname(__file__)
@@ -85,7 +86,7 @@ def adjust_theme():
)
except:
set_theme = None
print("gradio版本较旧, 不能自定义字体和颜色")
logger.error("gradio版本较旧, 不能自定义字体和颜色")
return set_theme

查看文件

@@ -1,6 +1,7 @@
import os
import gradio as gr
from toolbox import get_conf
from loguru import logger
CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf("CODE_HIGHLIGHT", "ADD_WAIFU", "LAYOUT")
theme_dir = os.path.dirname(__file__)
@@ -84,7 +85,7 @@ def adjust_theme():
)
except:
set_theme = None
print("gradio版本较旧, 不能自定义字体和颜色")
logger.error("gradio版本较旧, 不能自定义字体和颜色")
return set_theme

查看文件

@@ -1,6 +1,7 @@
import os
import gradio as gr
from toolbox import get_conf, ProxyNetworkActivate
from loguru import logger
CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf("CODE_HIGHLIGHT", "ADD_WAIFU", "LAYOUT")
theme_dir = os.path.dirname(__file__)
@@ -9,7 +10,7 @@ theme_dir = os.path.dirname(__file__)
def dynamic_set_theme(THEME):
set_theme = gr.themes.ThemeClass()
with ProxyNetworkActivate("Download_Gradio_Theme"):
print("正在下载Gradio主题,请稍等。")
logger.info("正在下载Gradio主题,请稍等。")
try:
if THEME.startswith("Huggingface-"):
THEME = THEME.lstrip("Huggingface-")
@@ -17,7 +18,7 @@ def dynamic_set_theme(THEME):
THEME = THEME.lstrip("huggingface-")
set_theme = set_theme.from_hub(THEME.lower())
except:
print("下载Gradio主题时出现异常。")
logger.error("下载Gradio主题时出现异常。")
return set_theme
@@ -25,7 +26,7 @@ def adjust_theme():
try:
set_theme = gr.themes.ThemeClass()
with ProxyNetworkActivate("Download_Gradio_Theme"):
print("正在下载Gradio主题,请稍等。")
logger.info("正在下载Gradio主题,请稍等。")
try:
THEME = get_conf("THEME")
if THEME.startswith("Huggingface-"):
@@ -34,7 +35,7 @@ def adjust_theme():
THEME = THEME.lstrip("huggingface-")
set_theme = set_theme.from_hub(THEME.lower())
except:
print("下载Gradio主题时出现异常。")
logger.error("下载Gradio主题时出现异常。")
from themes.common import get_common_html_javascript_code
js = get_common_html_javascript_code()
@@ -54,7 +55,7 @@ def adjust_theme():
)
except Exception:
set_theme = None
print("gradio版本较旧, 不能自定义字体和颜色。")
logger.error("gradio版本较旧, 不能自定义字体和颜色。")
return set_theme

查看文件

@@ -1,6 +1,7 @@
import os
import gradio as gr
from toolbox import get_conf
from loguru import logger
CODE_HIGHLIGHT, ADD_WAIFU, LAYOUT = get_conf("CODE_HIGHLIGHT", "ADD_WAIFU", "LAYOUT")
theme_dir = os.path.dirname(__file__)
@@ -97,7 +98,7 @@ def adjust_theme():
)
except:
set_theme = None
print("gradio版本较旧, 不能自定义字体和颜色")
logger.error("gradio版本较旧, 不能自定义字体和颜色")
return set_theme