diff --git a/webui/tools/base.py b/webui/tools/base.py index 439e465..94aeae8 100644 --- a/webui/tools/base.py +++ b/webui/tools/base.py @@ -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, diff --git a/webui/tools/generate_script_docu.py b/webui/tools/generate_script_docu.py index 92cab5f..189d897 100644 --- a/webui/tools/generate_script_docu.py +++ b/webui/tools/generate_script_docu.py @@ -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) diff --git a/webui/tools/generate_script_short.py b/webui/tools/generate_script_short.py index f21f901..0af09c4 100644 --- a/webui/tools/generate_script_short.py +++ b/webui/tools/generate_script_short.py @@ -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 ""