feat: optimize code and bump version to 1.2.4
This commit is contained in:
@@ -45,7 +45,9 @@ app = _cfg.get("app", {})
|
|||||||
whisper = _cfg.get("whisper", {})
|
whisper = _cfg.get("whisper", {})
|
||||||
proxy = _cfg.get("proxy", {})
|
proxy = _cfg.get("proxy", {})
|
||||||
azure = _cfg.get("azure", {})
|
azure = _cfg.get("azure", {})
|
||||||
ui = _cfg.get("ui", {})
|
ui = _cfg.get("ui", {
|
||||||
|
"hide_log": False,
|
||||||
|
})
|
||||||
|
|
||||||
hostname = socket.gethostname()
|
hostname = socket.gethostname()
|
||||||
|
|
||||||
@@ -57,7 +59,7 @@ project_description = _cfg.get(
|
|||||||
"project_description",
|
"project_description",
|
||||||
"<a href='https://github.com/harry0703/MoneyPrinterTurbo'>https://github.com/harry0703/MoneyPrinterTurbo</a>",
|
"<a href='https://github.com/harry0703/MoneyPrinterTurbo'>https://github.com/harry0703/MoneyPrinterTurbo</a>",
|
||||||
)
|
)
|
||||||
project_version = _cfg.get("project_version", "1.2.3")
|
project_version = _cfg.get("project_version", "1.2.4")
|
||||||
reload_debug = False
|
reload_debug = False
|
||||||
|
|
||||||
imagemagick_path = app.get("imagemagick_path", "")
|
imagemagick_path = app.get("imagemagick_path", "")
|
||||||
|
|||||||
@@ -138,7 +138,6 @@ def combine_videos(
|
|||||||
)
|
)
|
||||||
|
|
||||||
shuffle_side = random.choice(["left", "right", "top", "bottom"])
|
shuffle_side = random.choice(["left", "right", "top", "bottom"])
|
||||||
logger.info(f"Using transition mode: {video_transition_mode}")
|
|
||||||
if video_transition_mode.value == VideoTransitionMode.none.value:
|
if video_transition_mode.value == VideoTransitionMode.none.value:
|
||||||
clip = clip
|
clip = clip
|
||||||
elif video_transition_mode.value == VideoTransitionMode.fade_in.value:
|
elif video_transition_mode.value == VideoTransitionMode.fade_in.value:
|
||||||
|
|||||||
537
webui/Main.py
537
webui/Main.py
@@ -42,10 +42,15 @@ st.set_page_config(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
hide_streamlit_style = """
|
streamlit_style = """
|
||||||
<style>#root > div:nth-child(1) > div > div > div > div > section > div {padding-top: 0rem;}</style>
|
<style>
|
||||||
|
h1 {
|
||||||
|
padding-top: 0 !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
"""
|
"""
|
||||||
st.markdown(hide_streamlit_style, unsafe_allow_html=True)
|
st.markdown(streamlit_style, unsafe_allow_html=True)
|
||||||
|
|
||||||
# 定义资源目录
|
# 定义资源目录
|
||||||
font_dir = os.path.join(root_dir, "resource", "fonts")
|
font_dir = os.path.join(root_dir, "resource", "fonts")
|
||||||
song_dir = os.path.join(root_dir, "resource", "songs")
|
song_dir = os.path.join(root_dir, "resource", "songs")
|
||||||
@@ -93,8 +98,6 @@ support_locales = [
|
|||||||
"th-TH",
|
"th-TH",
|
||||||
]
|
]
|
||||||
|
|
||||||
# print(f"******** system locale: {system_locale} ********")
|
|
||||||
|
|
||||||
if "video_subject" not in st.session_state:
|
if "video_subject" not in st.session_state:
|
||||||
st.session_state["video_subject"] = ""
|
st.session_state["video_subject"] = ""
|
||||||
if "video_script" not in st.session_state:
|
if "video_script" not in st.session_state:
|
||||||
@@ -195,311 +198,231 @@ def tr(key):
|
|||||||
loc = locales.get(st.session_state["ui_language"], {})
|
loc = locales.get(st.session_state["ui_language"], {})
|
||||||
return loc.get("Translation", {}).get(key, key)
|
return loc.get("Translation", {}).get(key, key)
|
||||||
|
|
||||||
|
# 创建基础设置折叠框
|
||||||
# 加载用户认证配置
|
|
||||||
# 确保用户配置存在并包含所有必需的字段
|
|
||||||
if "user" not in config._cfg:
|
|
||||||
config._cfg["user"] = {
|
|
||||||
"username": "admin",
|
|
||||||
"password": "admin",
|
|
||||||
"email": "admin@example.com",
|
|
||||||
}
|
|
||||||
config.save_config()
|
|
||||||
elif "email" not in config._cfg["user"]:
|
|
||||||
# 如果用户配置存在但没有email字段,添加默认email
|
|
||||||
config._cfg["user"]["email"] = f"{config._cfg['user']['username']}@example.com"
|
|
||||||
config.save_config()
|
|
||||||
|
|
||||||
# 创建认证对象
|
|
||||||
authenticator = None
|
|
||||||
auth_status = False
|
|
||||||
|
|
||||||
# 检查是否需要身份验证才能访问配置
|
|
||||||
if not config.app.get("hide_config", False):
|
if not config.app.get("hide_config", False):
|
||||||
# 创建认证配置
|
|
||||||
credentials = {
|
|
||||||
"usernames": {
|
|
||||||
config._cfg["user"]["username"]: {
|
|
||||||
"name": config._cfg["user"]["username"],
|
|
||||||
"password": config._cfg["user"]["password"],
|
|
||||||
"email": config._cfg["user"]["email"],
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cookie_name = "mpt_auth_cookie"
|
|
||||||
cookie_key = "mpt_auth_key_123"
|
|
||||||
cookie_expiry_days = 30
|
|
||||||
|
|
||||||
authenticator = stauth.Authenticate(
|
|
||||||
credentials, cookie_name, cookie_key, cookie_expiry_days
|
|
||||||
)
|
|
||||||
|
|
||||||
# 从 session_state 获取认证状态
|
|
||||||
auth_status = st.session_state.get("authentication_status")
|
|
||||||
|
|
||||||
st.write(tr("Get Help"))
|
|
||||||
|
|
||||||
llm_provider = config.app.get("llm_provider", "").lower()
|
|
||||||
|
|
||||||
if not config.app.get("hide_config", False):
|
|
||||||
# 创建基础设置折叠框
|
|
||||||
with st.expander(tr("Basic Settings"), expanded=False):
|
with st.expander(tr("Basic Settings"), expanded=False):
|
||||||
# 检查用户是否已登录
|
config_panels = st.columns(3)
|
||||||
if not auth_status:
|
left_config_panel = config_panels[0]
|
||||||
# 用户未登录,显示登录表单
|
middle_config_panel = config_panels[1]
|
||||||
st.warning(tr("Please login to access settings"))
|
right_config_panel = config_panels[2]
|
||||||
|
|
||||||
# 显示登录表单
|
# 左侧面板 - 日志设置
|
||||||
try:
|
with left_config_panel:
|
||||||
# 自定义登录表单文本,使用我们的翻译系统
|
# 是否隐藏配置面板
|
||||||
login_form_fields = {
|
hide_config = st.checkbox(
|
||||||
"Form name": tr("Login"),
|
tr("Hide Basic Settings"), value=config.app.get("hide_config", False)
|
||||||
"Username": tr("Username"),
|
)
|
||||||
"Password": tr("Password"),
|
config.app["hide_config"] = hide_config
|
||||||
"Login": tr("Login"),
|
|
||||||
}
|
|
||||||
|
|
||||||
authenticator.login(location="main", fields=login_form_fields)
|
# 是否禁用日志显示
|
||||||
|
hide_log = st.checkbox(
|
||||||
|
tr("Hide Log"), value=config.ui.get("hide_log", False)
|
||||||
|
)
|
||||||
|
config.ui["hide_log"] = hide_log
|
||||||
|
|
||||||
# 从 session_state 获取认证状态
|
# 中间面板 - LLM 设置
|
||||||
auth_status = st.session_state.get("authentication_status")
|
|
||||||
|
with middle_config_panel:
|
||||||
|
st.write(tr("LLM Settings"))
|
||||||
|
llm_providers = [
|
||||||
|
"OpenAI",
|
||||||
|
"Moonshot",
|
||||||
|
"Azure",
|
||||||
|
"Qwen",
|
||||||
|
"DeepSeek",
|
||||||
|
"Gemini",
|
||||||
|
"Ollama",
|
||||||
|
"G4f",
|
||||||
|
"OneAPI",
|
||||||
|
"Cloudflare",
|
||||||
|
"ERNIE",
|
||||||
|
]
|
||||||
|
saved_llm_provider = config.app.get("llm_provider", "OpenAI").lower()
|
||||||
|
saved_llm_provider_index = 0
|
||||||
|
for i, provider in enumerate(llm_providers):
|
||||||
|
if provider.lower() == saved_llm_provider:
|
||||||
|
saved_llm_provider_index = i
|
||||||
|
break
|
||||||
|
|
||||||
if auth_status is False:
|
llm_provider = st.selectbox(
|
||||||
st.error(tr("Incorrect username or password"))
|
tr("LLM Provider"),
|
||||||
elif auth_status is None:
|
options=llm_providers,
|
||||||
st.info(tr("Please enter your username and password"))
|
index=saved_llm_provider_index,
|
||||||
|
)
|
||||||
|
llm_helper = st.container()
|
||||||
|
llm_provider = llm_provider.lower()
|
||||||
|
config.app["llm_provider"] = llm_provider
|
||||||
|
|
||||||
# 如果用户登录成功,刷新页面以显示配置面板
|
llm_api_key = config.app.get(f"{llm_provider}_api_key", "")
|
||||||
if auth_status:
|
llm_secret_key = config.app.get(
|
||||||
st.rerun()
|
f"{llm_provider}_secret_key", ""
|
||||||
except Exception as e:
|
) # only for baidu ernie
|
||||||
st.error(f"{tr('Login Error')}: {e}")
|
llm_base_url = config.app.get(f"{llm_provider}_base_url", "")
|
||||||
|
llm_model_name = config.app.get(f"{llm_provider}_model_name", "")
|
||||||
|
llm_account_id = config.app.get(f"{llm_provider}_account_id", "")
|
||||||
|
|
||||||
# 只有在用户已登录时才显示配置面板
|
tips = ""
|
||||||
if auth_status:
|
if llm_provider == "ollama":
|
||||||
config_panels = st.columns(3)
|
if not llm_model_name:
|
||||||
left_config_panel = config_panels[0]
|
llm_model_name = "qwen:7b"
|
||||||
middle_config_panel = config_panels[1]
|
if not llm_base_url:
|
||||||
right_config_panel = config_panels[2]
|
llm_base_url = "http://localhost:11434/v1"
|
||||||
|
|
||||||
# 左侧面板 - 日志设置
|
with llm_helper:
|
||||||
with left_config_panel:
|
tips = """
|
||||||
# 是否禁用日志显示
|
##### Ollama配置说明
|
||||||
hide_log = st.checkbox(
|
- **API Key**: 随便填写,比如 123
|
||||||
tr("Hide Log"), value=config.app.get("hide_log", False)
|
- **Base Url**: 一般为 http://localhost:11434/v1
|
||||||
)
|
- 如果 `MoneyPrinterTurbo` 和 `Ollama` **不在同一台机器上**,需要填写 `Ollama` 机器的IP地址
|
||||||
config.ui["hide_log"] = hide_log
|
- 如果 `MoneyPrinterTurbo` 是 `Docker` 部署,建议填写 `http://host.docker.internal:11434/v1`
|
||||||
|
- **Model Name**: 使用 `ollama list` 查看,比如 `qwen:7b`
|
||||||
# 中间面板 - LLM 设置
|
|
||||||
with middle_config_panel:
|
|
||||||
# openai
|
|
||||||
# moonshot (月之暗面)
|
|
||||||
# oneapi
|
|
||||||
# g4f
|
|
||||||
# azure
|
|
||||||
# qwen (通义千问)
|
|
||||||
# gemini
|
|
||||||
# ollama
|
|
||||||
llm_providers = [
|
|
||||||
"OpenAI",
|
|
||||||
"Moonshot",
|
|
||||||
"Azure",
|
|
||||||
"Qwen",
|
|
||||||
"DeepSeek",
|
|
||||||
"Gemini",
|
|
||||||
"Ollama",
|
|
||||||
"G4f",
|
|
||||||
"OneAPI",
|
|
||||||
"Cloudflare",
|
|
||||||
"ERNIE",
|
|
||||||
]
|
|
||||||
saved_llm_provider = config.app.get("llm_provider", "OpenAI").lower()
|
|
||||||
saved_llm_provider_index = 0
|
|
||||||
for i, provider in enumerate(llm_providers):
|
|
||||||
if provider.lower() == saved_llm_provider:
|
|
||||||
saved_llm_provider_index = i
|
|
||||||
break
|
|
||||||
|
|
||||||
llm_provider = st.selectbox(
|
|
||||||
tr("LLM Provider"),
|
|
||||||
options=llm_providers,
|
|
||||||
index=saved_llm_provider_index,
|
|
||||||
)
|
|
||||||
llm_helper = st.container()
|
|
||||||
llm_provider = llm_provider.lower()
|
|
||||||
config.app["llm_provider"] = llm_provider
|
|
||||||
|
|
||||||
llm_api_key = config.app.get(f"{llm_provider}_api_key", "")
|
|
||||||
llm_secret_key = config.app.get(
|
|
||||||
f"{llm_provider}_secret_key", ""
|
|
||||||
) # only for baidu ernie
|
|
||||||
llm_base_url = config.app.get(f"{llm_provider}_base_url", "")
|
|
||||||
llm_model_name = config.app.get(f"{llm_provider}_model_name", "")
|
|
||||||
llm_account_id = config.app.get(f"{llm_provider}_account_id", "")
|
|
||||||
|
|
||||||
tips = ""
|
|
||||||
if llm_provider == "ollama":
|
|
||||||
if not llm_model_name:
|
|
||||||
llm_model_name = "qwen:7b"
|
|
||||||
if not llm_base_url:
|
|
||||||
llm_base_url = "http://localhost:11434/v1"
|
|
||||||
|
|
||||||
with llm_helper:
|
|
||||||
tips = """
|
|
||||||
##### Ollama配置说明
|
|
||||||
- **API Key**: 随便填写,比如 123
|
|
||||||
- **Base Url**: 一般为 http://localhost:11434/v1
|
|
||||||
- 如果 `MoneyPrinterTurbo` 和 `Ollama` **不在同一台机器上**,需要填写 `Ollama` 机器的IP地址
|
|
||||||
- 如果 `MoneyPrinterTurbo` 是 `Docker` 部署,建议填写 `http://host.docker.internal:11434/v1`
|
|
||||||
- **Model Name**: 使用 `ollama list` 查看,比如 `qwen:7b`
|
|
||||||
"""
|
|
||||||
|
|
||||||
if llm_provider == "openai":
|
|
||||||
if not llm_model_name:
|
|
||||||
llm_model_name = "gpt-3.5-turbo"
|
|
||||||
with llm_helper:
|
|
||||||
tips = """
|
|
||||||
##### OpenAI 配置说明
|
|
||||||
> 需要VPN开启全局流量模式
|
|
||||||
- **API Key**: [点击到官网申请](https://platform.openai.com/api-keys)
|
|
||||||
- **Base Url**: 可以留空
|
|
||||||
- **Model Name**: 填写**有权限**的模型,[点击查看模型列表](https://platform.openai.com/settings/organization/limits)
|
|
||||||
"""
|
|
||||||
|
|
||||||
if llm_provider == "moonshot":
|
|
||||||
if not llm_model_name:
|
|
||||||
llm_model_name = "moonshot-v1-8k"
|
|
||||||
with llm_helper:
|
|
||||||
tips = """
|
|
||||||
##### Moonshot 配置说明
|
|
||||||
- **API Key**: [点击到官网申请](https://platform.moonshot.cn/console/api-keys)
|
|
||||||
- **Base Url**: 固定为 https://api.moonshot.cn/v1
|
|
||||||
- **Model Name**: 比如 moonshot-v1-8k,[点击查看模型列表](https://platform.moonshot.cn/docs/intro#%E6%A8%A1%E5%9E%8B%E5%88%97%E8%A1%A8)
|
|
||||||
"""
|
|
||||||
if llm_provider == "oneapi":
|
|
||||||
if not llm_model_name:
|
|
||||||
llm_model_name = (
|
|
||||||
"claude-3-5-sonnet-20240620" # 默认模型,可以根据需要调整
|
|
||||||
)
|
|
||||||
with llm_helper:
|
|
||||||
tips = """
|
|
||||||
##### OneAPI 配置说明
|
|
||||||
- **API Key**: 填写您的 OneAPI 密钥
|
|
||||||
- **Base Url**: 填写 OneAPI 的基础 URL
|
|
||||||
- **Model Name**: 填写您要使用的模型名称,例如 claude-3-5-sonnet-20240620
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if llm_provider == "qwen":
|
if llm_provider == "openai":
|
||||||
if not llm_model_name:
|
if not llm_model_name:
|
||||||
llm_model_name = "qwen-max"
|
llm_model_name = "gpt-3.5-turbo"
|
||||||
with llm_helper:
|
with llm_helper:
|
||||||
tips = """
|
tips = """
|
||||||
##### 通义千问Qwen 配置说明
|
##### OpenAI 配置说明
|
||||||
- **API Key**: [点击到官网申请](https://dashscope.console.aliyun.com/apiKey)
|
> 需要VPN开启全局流量模式
|
||||||
- **Base Url**: 留空
|
- **API Key**: [点击到官网申请](https://platform.openai.com/api-keys)
|
||||||
- **Model Name**: 比如 qwen-max,[点击查看模型列表](https://help.aliyun.com/zh/dashscope/developer-reference/model-introduction#3ef6d0bcf91wy)
|
- **Base Url**: 可以留空
|
||||||
"""
|
- **Model Name**: 填写**有权限**的模型,[点击查看模型列表](https://platform.openai.com/settings/organization/limits)
|
||||||
|
"""
|
||||||
|
|
||||||
if llm_provider == "g4f":
|
if llm_provider == "moonshot":
|
||||||
if not llm_model_name:
|
if not llm_model_name:
|
||||||
llm_model_name = "gpt-3.5-turbo"
|
llm_model_name = "moonshot-v1-8k"
|
||||||
with llm_helper:
|
with llm_helper:
|
||||||
tips = """
|
tips = """
|
||||||
##### gpt4free 配置说明
|
##### Moonshot 配置说明
|
||||||
> [GitHub开源项目](https://github.com/xtekky/gpt4free),可以免费使用GPT模型,但是**稳定性较差**
|
- **API Key**: [点击到官网申请](https://platform.moonshot.cn/console/api-keys)
|
||||||
- **API Key**: 随便填写,比如 123
|
- **Base Url**: 固定为 https://api.moonshot.cn/v1
|
||||||
- **Base Url**: 留空
|
- **Model Name**: 比如 moonshot-v1-8k,[点击查看模型列表](https://platform.moonshot.cn/docs/intro#%E6%A8%A1%E5%9E%8B%E5%88%97%E8%A1%A8)
|
||||||
- **Model Name**: 比如 gpt-3.5-turbo,[点击查看模型列表](https://github.com/xtekky/gpt4free/blob/main/g4f/models.py#L308)
|
"""
|
||||||
"""
|
if llm_provider == "oneapi":
|
||||||
if llm_provider == "azure":
|
if not llm_model_name:
|
||||||
with llm_helper:
|
llm_model_name = (
|
||||||
tips = """
|
"claude-3-5-sonnet-20240620" # 默认模型,可以根据需要调整
|
||||||
##### Azure 配置说明
|
|
||||||
> [点击查看如何部署模型](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/how-to/create-resource)
|
|
||||||
- **API Key**: [点击到Azure后台创建](https://portal.azure.com/#view/Microsoft_Azure_ProjectOxford/CognitiveServicesHub/~/OpenAI)
|
|
||||||
- **Base Url**: 留空
|
|
||||||
- **Model Name**: 填写你实际的部署名
|
|
||||||
"""
|
|
||||||
|
|
||||||
if llm_provider == "gemini":
|
|
||||||
if not llm_model_name:
|
|
||||||
llm_model_name = "gemini-1.0-pro"
|
|
||||||
|
|
||||||
with llm_helper:
|
|
||||||
tips = """
|
|
||||||
##### Gemini 配置说明
|
|
||||||
> 需要VPN开启全局流量模式
|
|
||||||
- **API Key**: [点击到官网申请](https://ai.google.dev/)
|
|
||||||
- **Base Url**: 留空
|
|
||||||
- **Model Name**: 比如 gemini-1.0-pro
|
|
||||||
"""
|
|
||||||
|
|
||||||
if llm_provider == "deepseek":
|
|
||||||
if not llm_model_name:
|
|
||||||
llm_model_name = "deepseek-chat"
|
|
||||||
if not llm_base_url:
|
|
||||||
llm_base_url = "https://api.deepseek.com"
|
|
||||||
with llm_helper:
|
|
||||||
tips = """
|
|
||||||
##### DeepSeek 配置说明
|
|
||||||
- **API Key**: [点击到官网申请](https://platform.deepseek.com/api_keys)
|
|
||||||
- **Base Url**: 固定为 https://api.deepseek.com
|
|
||||||
- **Model Name**: 固定为 deepseek-chat
|
|
||||||
"""
|
|
||||||
|
|
||||||
if llm_provider == "ernie":
|
|
||||||
with llm_helper:
|
|
||||||
tips = """
|
|
||||||
##### 百度文心一言 配置说明
|
|
||||||
- **API Key**: [点击到官网申请](https://console.bce.baidu.com/qianfan/ais/console/applicationConsole/application)
|
|
||||||
- **Secret Key**: [点击到官网申请](https://console.bce.baidu.com/qianfan/ais/console/applicationConsole/application)
|
|
||||||
- **Base Url**: 填写 **请求地址** [点击查看文档](https://cloud.baidu.com/doc/WENXINWORKSHOP/s/jlil56u11#%E8%AF%B7%E6%B1%82%E8%AF%B4%E6%98%8E)
|
|
||||||
"""
|
|
||||||
|
|
||||||
if tips and config.ui["language"] == "zh":
|
|
||||||
st.warning(
|
|
||||||
"中国用户建议使用 **DeepSeek** 或 **Moonshot** 作为大模型提供商\n- 国内可直接访问,不需要VPN \n- 注册就送额度,基本够用"
|
|
||||||
)
|
)
|
||||||
st.info(tips)
|
with llm_helper:
|
||||||
|
tips = """
|
||||||
|
##### OneAPI 配置说明
|
||||||
|
- **API Key**: 填写您的 OneAPI 密钥
|
||||||
|
- **Base Url**: 填写 OneAPI 的基础 URL
|
||||||
|
- **Model Name**: 填写您要使用的模型名称,例如 claude-3-5-sonnet-20240620
|
||||||
|
"""
|
||||||
|
|
||||||
st_llm_api_key = st.text_input(
|
if llm_provider == "qwen":
|
||||||
tr("API Key"), value=llm_api_key, type="password"
|
if not llm_model_name:
|
||||||
|
llm_model_name = "qwen-max"
|
||||||
|
with llm_helper:
|
||||||
|
tips = """
|
||||||
|
##### 通义千问Qwen 配置说明
|
||||||
|
- **API Key**: [点击到官网申请](https://dashscope.console.aliyun.com/apiKey)
|
||||||
|
- **Base Url**: 留空
|
||||||
|
- **Model Name**: 比如 qwen-max,[点击查看模型列表](https://help.aliyun.com/zh/dashscope/developer-reference/model-introduction#3ef6d0bcf91wy)
|
||||||
|
"""
|
||||||
|
|
||||||
|
if llm_provider == "g4f":
|
||||||
|
if not llm_model_name:
|
||||||
|
llm_model_name = "gpt-3.5-turbo"
|
||||||
|
with llm_helper:
|
||||||
|
tips = """
|
||||||
|
##### gpt4free 配置说明
|
||||||
|
> [GitHub开源项目](https://github.com/xtekky/gpt4free),可以免费使用GPT模型,但是**稳定性较差**
|
||||||
|
- **API Key**: 随便填写,比如 123
|
||||||
|
- **Base Url**: 留空
|
||||||
|
- **Model Name**: 比如 gpt-3.5-turbo,[点击查看模型列表](https://github.com/xtekky/gpt4free/blob/main/g4f/models.py#L308)
|
||||||
|
"""
|
||||||
|
if llm_provider == "azure":
|
||||||
|
with llm_helper:
|
||||||
|
tips = """
|
||||||
|
##### Azure 配置说明
|
||||||
|
> [点击查看如何部署模型](https://learn.microsoft.com/zh-cn/azure/ai-services/openai/how-to/create-resource)
|
||||||
|
- **API Key**: [点击到Azure后台创建](https://portal.azure.com/#view/Microsoft_Azure_ProjectOxford/CognitiveServicesHub/~/OpenAI)
|
||||||
|
- **Base Url**: 留空
|
||||||
|
- **Model Name**: 填写你实际的部署名
|
||||||
|
"""
|
||||||
|
|
||||||
|
if llm_provider == "gemini":
|
||||||
|
if not llm_model_name:
|
||||||
|
llm_model_name = "gemini-1.0-pro"
|
||||||
|
|
||||||
|
with llm_helper:
|
||||||
|
tips = """
|
||||||
|
##### Gemini 配置说明
|
||||||
|
> 需要VPN开启全局流量模式
|
||||||
|
- **API Key**: [点击到官网申请](https://ai.google.dev/)
|
||||||
|
- **Base Url**: 留空
|
||||||
|
- **Model Name**: 比如 gemini-1.0-pro
|
||||||
|
"""
|
||||||
|
|
||||||
|
if llm_provider == "deepseek":
|
||||||
|
if not llm_model_name:
|
||||||
|
llm_model_name = "deepseek-chat"
|
||||||
|
if not llm_base_url:
|
||||||
|
llm_base_url = "https://api.deepseek.com"
|
||||||
|
with llm_helper:
|
||||||
|
tips = """
|
||||||
|
##### DeepSeek 配置说明
|
||||||
|
- **API Key**: [点击到官网申请](https://platform.deepseek.com/api_keys)
|
||||||
|
- **Base Url**: 固定为 https://api.deepseek.com
|
||||||
|
- **Model Name**: 固定为 deepseek-chat
|
||||||
|
"""
|
||||||
|
|
||||||
|
if llm_provider == "ernie":
|
||||||
|
with llm_helper:
|
||||||
|
tips = """
|
||||||
|
##### 百度文心一言 配置说明
|
||||||
|
- **API Key**: [点击到官网申请](https://console.bce.baidu.com/qianfan/ais/console/applicationConsole/application)
|
||||||
|
- **Secret Key**: [点击到官网申请](https://console.bce.baidu.com/qianfan/ais/console/applicationConsole/application)
|
||||||
|
- **Base Url**: 填写 **请求地址** [点击查看文档](https://cloud.baidu.com/doc/WENXINWORKSHOP/s/jlil56u11#%E8%AF%B7%E6%B1%82%E8%AF%B4%E6%98%8E)
|
||||||
|
"""
|
||||||
|
|
||||||
|
if tips and config.ui["language"] == "zh":
|
||||||
|
st.warning(
|
||||||
|
"中国用户建议使用 **DeepSeek** 或 **Moonshot** 作为大模型提供商\n- 国内可直接访问,不需要VPN \n- 注册就送额度,基本够用"
|
||||||
)
|
)
|
||||||
st_llm_base_url = st.text_input(tr("Base Url"), value=llm_base_url)
|
st.info(tips)
|
||||||
st_llm_model_name = ""
|
|
||||||
if llm_provider != "ernie":
|
|
||||||
st_llm_model_name = st.text_input(
|
|
||||||
tr("Model Name"),
|
|
||||||
value=llm_model_name,
|
|
||||||
key=f"{llm_provider}_model_name_input",
|
|
||||||
)
|
|
||||||
if st_llm_model_name:
|
|
||||||
config.app[f"{llm_provider}_model_name"] = st_llm_model_name
|
|
||||||
else:
|
|
||||||
st_llm_model_name = None
|
|
||||||
|
|
||||||
if st_llm_api_key:
|
st_llm_api_key = st.text_input(
|
||||||
config.app[f"{llm_provider}_api_key"] = st_llm_api_key
|
tr("API Key"), value=llm_api_key, type="password"
|
||||||
if st_llm_base_url:
|
)
|
||||||
config.app[f"{llm_provider}_base_url"] = st_llm_base_url
|
st_llm_base_url = st.text_input(tr("Base Url"), value=llm_base_url)
|
||||||
|
st_llm_model_name = ""
|
||||||
|
if llm_provider != "ernie":
|
||||||
|
st_llm_model_name = st.text_input(
|
||||||
|
tr("Model Name"),
|
||||||
|
value=llm_model_name,
|
||||||
|
key=f"{llm_provider}_model_name_input",
|
||||||
|
)
|
||||||
if st_llm_model_name:
|
if st_llm_model_name:
|
||||||
config.app[f"{llm_provider}_model_name"] = st_llm_model_name
|
config.app[f"{llm_provider}_model_name"] = st_llm_model_name
|
||||||
if llm_provider == "ernie":
|
else:
|
||||||
st_llm_secret_key = st.text_input(
|
st_llm_model_name = None
|
||||||
tr("Secret Key"), value=llm_secret_key, type="password"
|
|
||||||
)
|
|
||||||
config.app[f"{llm_provider}_secret_key"] = st_llm_secret_key
|
|
||||||
|
|
||||||
if llm_provider == "cloudflare":
|
if st_llm_api_key:
|
||||||
st_llm_account_id = st.text_input(
|
config.app[f"{llm_provider}_api_key"] = st_llm_api_key
|
||||||
tr("Account ID"), value=llm_account_id
|
if st_llm_base_url:
|
||||||
)
|
config.app[f"{llm_provider}_base_url"] = st_llm_base_url
|
||||||
if st_llm_account_id:
|
if st_llm_model_name:
|
||||||
config.app[f"{llm_provider}_account_id"] = st_llm_account_id
|
config.app[f"{llm_provider}_model_name"] = st_llm_model_name
|
||||||
|
if llm_provider == "ernie":
|
||||||
|
st_llm_secret_key = st.text_input(
|
||||||
|
tr("Secret Key"), value=llm_secret_key, type="password"
|
||||||
|
)
|
||||||
|
config.app[f"{llm_provider}_secret_key"] = st_llm_secret_key
|
||||||
|
|
||||||
# 右侧面板 - API 密钥设置
|
if llm_provider == "cloudflare":
|
||||||
with right_config_panel:
|
st_llm_account_id = st.text_input(
|
||||||
|
tr("Account ID"), value=llm_account_id
|
||||||
|
)
|
||||||
|
if st_llm_account_id:
|
||||||
|
config.app[f"{llm_provider}_account_id"] = st_llm_account_id
|
||||||
|
|
||||||
|
# 右侧面板 - API 密钥设置
|
||||||
|
with right_config_panel:
|
||||||
|
|
||||||
def get_keys_from_config(cfg_key):
|
def get_keys_from_config(cfg_key):
|
||||||
api_keys = config.app.get(cfg_key, [])
|
api_keys = config.app.get(cfg_key, [])
|
||||||
@@ -513,45 +436,21 @@ if not config.app.get("hide_config", False):
|
|||||||
if value:
|
if value:
|
||||||
config.app[cfg_key] = value.split(",")
|
config.app[cfg_key] = value.split(",")
|
||||||
|
|
||||||
st.markdown("##### " + tr("Video API Keys"))
|
st.write(tr("Video Source Settings"))
|
||||||
|
|
||||||
# Pexels API Key
|
|
||||||
pexels_api_key = get_keys_from_config("pexels_api_keys")
|
pexels_api_key = get_keys_from_config("pexels_api_keys")
|
||||||
st.markdown(
|
|
||||||
f"**Pexels API Key** ([{tr('点击获取')}](https://www.pexels.com/api/documentation/))"
|
|
||||||
)
|
|
||||||
st.markdown(
|
|
||||||
f"<span style='color:#FF4B4B'>{tr('推荐使用')}</span>",
|
|
||||||
unsafe_allow_html=True,
|
|
||||||
)
|
|
||||||
pexels_api_key = st.text_input(
|
pexels_api_key = st.text_input(
|
||||||
"Pexels API Key",
|
tr("Pexels API Key"), value=pexels_api_key, type="password"
|
||||||
value=pexels_api_key,
|
|
||||||
type="password",
|
|
||||||
key="pexels_api_key_input",
|
|
||||||
label_visibility="collapsed",
|
|
||||||
)
|
)
|
||||||
save_keys_to_config("pexels_api_keys", pexels_api_key)
|
save_keys_to_config("pexels_api_keys", pexels_api_key)
|
||||||
|
|
||||||
# Pixabay API Key
|
|
||||||
pixabay_api_key = get_keys_from_config("pixabay_api_keys")
|
pixabay_api_key = get_keys_from_config("pixabay_api_keys")
|
||||||
st.markdown(
|
|
||||||
f"**Pixabay API Key** ([{tr('点击获取')}](https://pixabay.com/api/docs/))"
|
|
||||||
)
|
|
||||||
st.markdown(
|
|
||||||
f"<span style='color:#808080'>{tr('可以不用配置,如果 Pexels 无法使用,再选择Pixabay')}</span>",
|
|
||||||
unsafe_allow_html=True,
|
|
||||||
)
|
|
||||||
pixabay_api_key = st.text_input(
|
pixabay_api_key = st.text_input(
|
||||||
"Pixabay API Key",
|
tr("Pixabay API Key"), value=pixabay_api_key, type="password"
|
||||||
value=pixabay_api_key,
|
|
||||||
type="password",
|
|
||||||
key="pixabay_api_key_input",
|
|
||||||
label_visibility="collapsed",
|
|
||||||
)
|
)
|
||||||
save_keys_to_config("pixabay_api_keys", pixabay_api_key)
|
save_keys_to_config("pixabay_api_keys", pixabay_api_key)
|
||||||
|
|
||||||
|
llm_provider = config.app.get("llm_provider", "").lower()
|
||||||
panel = st.columns(3)
|
panel = st.columns(3)
|
||||||
left_panel = panel[0]
|
left_panel = panel[0]
|
||||||
middle_panel = panel[1]
|
middle_panel = panel[1]
|
||||||
@@ -978,4 +877,4 @@ if start_button:
|
|||||||
logger.info(tr("Video Generation Completed"))
|
logger.info(tr("Video Generation Completed"))
|
||||||
scroll_to_bottom()
|
scroll_to_bottom()
|
||||||
|
|
||||||
config.save_config()
|
config.save_config()
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
"Video Concat Mode": "Videoverkettungsmodus",
|
"Video Concat Mode": "Videoverkettungsmodus",
|
||||||
"Random": "Zufällige Verkettung (empfohlen)",
|
"Random": "Zufällige Verkettung (empfohlen)",
|
||||||
"Sequential": "Sequentielle Verkettung",
|
"Sequential": "Sequentielle Verkettung",
|
||||||
"Video Transition Mode": "Video Übergangsmodus",
|
"Video Transition Mode": "Video Übergangsmodus",
|
||||||
"None": "Kein Übergang",
|
"None": "Kein Übergang",
|
||||||
"Shuffle": "Zufällige Übergänge",
|
"Shuffle": "Zufällige Übergänge",
|
||||||
"FadeIn": "FadeIn",
|
"FadeIn": "FadeIn",
|
||||||
@@ -92,8 +92,8 @@
|
|||||||
"Synthesizing Voice": "Sprachsynthese läuft, bitte warten...",
|
"Synthesizing Voice": "Sprachsynthese läuft, bitte warten...",
|
||||||
"TTS Provider": "Sprachsynthese-Anbieter auswählen",
|
"TTS Provider": "Sprachsynthese-Anbieter auswählen",
|
||||||
"Hide Log": "Protokoll ausblenden",
|
"Hide Log": "Protokoll ausblenden",
|
||||||
"点击获取": "Klicken zum Abrufen",
|
"Hide Basic Settings": "Basis-Einstellungen ausblenden\n\nWenn diese Option deaktiviert ist, wird die Basis-Einstellungen-Leiste nicht auf der Seite angezeigt.\n\nWenn Sie sie erneut anzeigen möchten, setzen Sie `hide_config = false` in `config.toml`",
|
||||||
"推荐使用": "Empfohlen",
|
"LLM Settings": "**LLM-Einstellungen**",
|
||||||
"可以不用配置,如果 Pexels 无法使用,再选择Pixabay": "Kann uneingestellt bleiben. Wenn Pexels nicht funktioniert, wählen Sie Pixabay"
|
"Video Source Settings": "**Videoquellen-Einstellungen**"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -91,6 +91,9 @@
|
|||||||
"Voice Example": "This is an example text for testing speech synthesis",
|
"Voice Example": "This is an example text for testing speech synthesis",
|
||||||
"Synthesizing Voice": "Synthesizing voice, please wait...",
|
"Synthesizing Voice": "Synthesizing voice, please wait...",
|
||||||
"TTS Provider": "Select the voice synthesis provider",
|
"TTS Provider": "Select the voice synthesis provider",
|
||||||
"Hide Log": "Hide Log"
|
"Hide Log": "Hide Log",
|
||||||
|
"Hide Basic Settings": "Hide Basic Settings\n\nHidden, the basic settings panel will not be displayed on the page.\n\nIf you need to display it again, please set `hide_config = false` in `config.toml`",
|
||||||
|
"LLM Settings": "**LLM Settings**",
|
||||||
|
"Video Source Settings": "**Video Source Settings**"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
"Video Concat Mode": "Modo de Concatenação de Vídeo",
|
"Video Concat Mode": "Modo de Concatenação de Vídeo",
|
||||||
"Random": "Concatenação Aleatória (Recomendado)",
|
"Random": "Concatenação Aleatória (Recomendado)",
|
||||||
"Sequential": "Concatenação Sequencial",
|
"Sequential": "Concatenação Sequencial",
|
||||||
"Video Transition Mode": "Modo de Transição de Vídeo",
|
"Video Transition Mode": "Modo de Transição de Vídeo",
|
||||||
"None": "Nenhuma Transição",
|
"None": "Nenhuma Transição",
|
||||||
"Shuffle": "Transição Aleatória",
|
"Shuffle": "Transição Aleatória",
|
||||||
"FadeIn": "FadeIn",
|
"FadeIn": "FadeIn",
|
||||||
@@ -92,8 +92,8 @@
|
|||||||
"Synthesizing Voice": "Sintetizando voz, por favor aguarde...",
|
"Synthesizing Voice": "Sintetizando voz, por favor aguarde...",
|
||||||
"TTS Provider": "Selecione o provedor de síntese de voz",
|
"TTS Provider": "Selecione o provedor de síntese de voz",
|
||||||
"Hide Log": "Ocultar Log",
|
"Hide Log": "Ocultar Log",
|
||||||
"点击获取": "Clique para obter",
|
"Hide Basic Settings": "Ocultar Configurações Básicas\n\nOculto, o painel de configurações básicas não será exibido na página.\n\nSe precisar exibi-lo novamente, defina `hide_config = false` em `config.toml`",
|
||||||
"推荐使用": "Recomendado",
|
"LLM Settings": "**Configurações do LLM**",
|
||||||
"可以不用配置,如果 Pexels 无法使用,再选择Pixabay": "Pode não ser configurado, se o Pexels não estiver disponível, escolha o Pixabay"
|
"Video Source Settings": "**Configurações da Fonte do Vídeo**"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
"Random": "Nối Ngẫu Nhiên (Được Khuyến Nghị)",
|
"Random": "Nối Ngẫu Nhiên (Được Khuyến Nghị)",
|
||||||
"Sequential": "Nối Theo Thứ Tự",
|
"Sequential": "Nối Theo Thứ Tự",
|
||||||
"Video Transition Mode": "Chế Độ Chuyển Đổi Video",
|
"Video Transition Mode": "Chế Độ Chuyển Đổi Video",
|
||||||
"None": "Không Có Chuyển Đổi",
|
"None": "Không Có Chuyển Đổi",
|
||||||
"Shuffle": "Chuyển Đổi Ngẫu Nhiên",
|
"Shuffle": "Chuyển Đổi Ngẫu Nhiên",
|
||||||
"FadeIn": "FadeIn",
|
"FadeIn": "FadeIn",
|
||||||
"FadeOut": "FadeOut",
|
"FadeOut": "FadeOut",
|
||||||
@@ -92,8 +92,8 @@
|
|||||||
"Synthesizing Voice": "Đang tổng hợp giọng nói, vui lòng đợi...",
|
"Synthesizing Voice": "Đang tổng hợp giọng nói, vui lòng đợi...",
|
||||||
"TTS Provider": "Chọn nhà cung cấp tổng hợp giọng nói",
|
"TTS Provider": "Chọn nhà cung cấp tổng hợp giọng nói",
|
||||||
"Hide Log": "Ẩn Nhật Ký",
|
"Hide Log": "Ẩn Nhật Ký",
|
||||||
"点击获取": "Nhấp để lấy",
|
"Hide Basic Settings": "Ẩn Cài Đặt Cơ Bản\n\nẨn, thanh cài đặt cơ bản sẽ không hiển thị trên trang web.\n\nNếu bạn muốn hiển thị lại, vui lòng đặt `hide_config = false` trong `config.toml`",
|
||||||
"推荐使用": "Được khuyến nghị",
|
"LLM Settings": "**Cài Đặt LLM**",
|
||||||
"可以不用配置,如果 Pexels 无法使用,再选择Pixabay": "Có thể không cần cấu hình, nếu Pexels không khả dụng, hãy chọn Pixabay"
|
"Video Source Settings": "**Cài Đặt Nguồn Video**"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
"Language": "简体中文",
|
"Language": "简体中文",
|
||||||
"Translation": {
|
"Translation": {
|
||||||
"Login Required": "需要登录",
|
"Login Required": "需要登录",
|
||||||
"Please login to access settings": "请登录后访问配置设置",
|
"Please login to access settings": "请登录后访问配置设置 (:gray[默认用户名: admin, 密码: admin, 您可以在 config.toml 中修改])",
|
||||||
"Username": "用户名",
|
"Username": "用户名",
|
||||||
"Password": "密码",
|
"Password": "密码",
|
||||||
"Login": "登录",
|
"Login": "登录",
|
||||||
@@ -91,6 +91,9 @@
|
|||||||
"Voice Example": "这是一段测试语音合成的示例文本",
|
"Voice Example": "这是一段测试语音合成的示例文本",
|
||||||
"Synthesizing Voice": "语音合成中,请稍候...",
|
"Synthesizing Voice": "语音合成中,请稍候...",
|
||||||
"TTS Provider": "语音合成提供商",
|
"TTS Provider": "语音合成提供商",
|
||||||
"Hide Log": "隐藏日志"
|
"Hide Log": "隐藏日志",
|
||||||
|
"Hide Basic Settings": "隐藏基础设置\n\n隐藏后,基础设置面板将不会显示在页面中。\n\n如需要再次显示,请在 `config.toml` 中设置 `hide_config = false`",
|
||||||
|
"LLM Settings": "**大模型设置**",
|
||||||
|
"Video Source Settings": "**视频源设置**"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user