github/NarratoAI
1
0
Fork 0
mirror of https://github.com/linyqh/NarratoAI.git synced 2025-12-10 18:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

actorref(tools): 重构工具模块并添加日志记录功能- 在 base.py 中添加了调试日志记录视频参数

Browse Source 
- 修改了 generate_script_docu.py 和 generate_script_short.py 中的视觉和文本分析参数处理逻辑
- 优化了参数传递和视觉分析器实例创建过程
- 在 generate_script_docu.py 中添加了视频配置检查函数调用
This commit is contained in:
linyq 2025-05-10 16:45:25 +08:00
parent 3fe8eb50c0
commit e66a5969f0
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webui/tools/base.py
View File

@ -149,8 +149,9 @@ def chekc_video_config(video_params):
adapter = HTTPAdapter(max_retries=retry_strategy)
session.mount("https://", adapter)
try:
logger.debug(video_params)
session.post(
f"{config.app.get('narrato_api_url')}/video/config",
f"{config.app.get('narrato_api_url')}/admin/external-api-config/services",
headers=headers,
json=video_params,
timeout=30,

15
webui/tools/generate_script_docu.py
View File

@ -96,6 +96,7 @@ def generate_script_docu(params):
2. 视觉分析(批量分析每一帧)
"""
vision_llm_provider = st.session_state.get('vision_llm_providers').lower()
llm_params = dict()
logger.debug(f"VLM 视觉大模型提供商: {vision_llm_provider}")
try:
@ -113,6 +114,12 @@ def generate_script_docu(params):
vision_base_url = st.session_state.get(f'vision_{vision_llm_provider}_base_url')
# 创建视觉分析器实例
llm_params = {
"vision_provider": vision_llm_provider,
"vision_api_key": vision_api_key,
"vision_model_name": vision_model,
"vision_base_url": vision_base_url,
}
analyzer = create_vision_analyzer(
provider=vision_llm_provider,
api_key=vision_api_key,
@ -344,7 +351,13 @@ def generate_script_docu(params):
text_api_key = config.app.get(f'text_{text_provider}_api_key')
text_model = config.app.get(f'text_{text_provider}_model_name')
text_base_url = config.app.get(f'text_{text_provider}_base_url')
llm_params.update({
"text_provider": text_provider,
"text_api_key": text_api_key,
"text_model_name": text_model,
"text_base_url": text_base_url
})
chekc_video_config(llm_params)
# 整理帧分析数据
markdown_output = parse_frame_analysis_to_markdown(analysis_json_path)

9
webui/tools/generate_script_short.py
View File

@ -36,9 +36,10 @@ def generate_script_short(tr, params, custom_clips=5):
text_api_key = config.app.get(f'text_{text_provider}_api_key')
text_model = config.app.get(f'text_{text_provider}_model_name')
text_base_url = config.app.get(f'text_{text_provider}_base_url')
vision_api_key = st.session_state.get(f'vision_{text_provider}_api_key', "")
vision_model = st.session_state.get(f'vision_{text_provider}_model_name', "")
vision_base_url = st.session_state.get(f'vision_{text_provider}_base_url', "")
vision_llm_provider = st.session_state.get('vision_llm_providers').lower()
vision_api_key = st.session_state.get(f'vision_{vision_llm_provider}_api_key', "")
vision_model = st.session_state.get(f'vision_{vision_llm_provider}_model_name', "")
vision_base_url = st.session_state.get(f'vision_{vision_llm_provider}_base_url', "")
narrato_api_key = config.app.get('narrato_api_key')
update_progress(20, "开始准备生成脚本")
@ -50,9 +51,11 @@ def generate_script_short(tr, params, custom_clips=5):
st.stop()
api_params = {
"vision_provider": vision_llm_provider,
"vision_api_key": vision_api_key,
"vision_model_name": vision_model,
"vision_base_url": vision_base_url or "",
"text_provider": text_provider,
"text_api_key": text_api_key,
"text_model_name": text_model,
"text_base_url": text_base_url or ""