From 0caa15e762a34b6d2892fba11e3e55a49ae43ec5 Mon Sep 17 00:00:00 2001 From: linyqh Date: Thu, 5 Dec 2024 20:27:01 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E6=B7=BB=E5=8A=A0=20pysrt=20=E5=AD=97?= =?UTF-8?q?=E5=B9=95=E5=A4=84=E7=90=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ app/services/script_service.py | 4 ++-- app/utils/{vision_analyzer.py => gemini_analyzer.py} | 0 webui/components/script_settings.py | 4 ++-- webui/utils/vision_analyzer.py | 0 5 files changed, 7 insertions(+), 4 deletions(-) rename app/utils/{vision_analyzer.py => gemini_analyzer.py} (100%) create mode 100644 webui/utils/vision_analyzer.py diff --git a/README.md b/README.md index 7f44876..5a1812f 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,9 @@ NarratoAI 是一个自动化影视解说工具,基于LLM实现文案撰写、 - [x] 发布 0.3.5 整合包 - [ ] 支持阿里 Qwen2-VL 大模型理解视频 - [ ] 支持短剧解说 + - [x] 合并素材 + - [ ] 一键转录 + - [ ] 一键清理缓存 - [ ] ... ## 配置要求 📦 diff --git a/app/services/script_service.py b/app/services/script_service.py index d42a232..37644a7 100644 --- a/app/services/script_service.py +++ b/app/services/script_service.py @@ -6,7 +6,7 @@ import requests from loguru import logger from typing import List, Dict, Any, Callable -from app.utils import utils, vision_analyzer, video_processor, video_processor_v2 +from app.utils import utils, gemini_analyzer, video_processor, video_processor_v2 from app.utils.script_generator import ScriptProcessor from app.config import config @@ -149,7 +149,7 @@ class ScriptGenerator: if not vision_api_key or not vision_model: raise ValueError("未配置 Gemini API Key 或者模型") - analyzer = vision_analyzer.VisionAnalyzer( + analyzer = gemini_analyzer.VisionAnalyzer( model_name=vision_model, api_key=vision_api_key, ) diff --git a/app/utils/vision_analyzer.py b/app/utils/gemini_analyzer.py similarity index 100% rename from app/utils/vision_analyzer.py rename to app/utils/gemini_analyzer.py diff --git a/webui/components/script_settings.py b/webui/components/script_settings.py index bb2e7b1..b64979d 100644 --- a/webui/components/script_settings.py +++ b/webui/components/script_settings.py @@ -14,7 +14,7 @@ from loguru import logger from app.config import config from app.models.schema import VideoClipParams from app.utils.script_generator import ScriptProcessor -from app.utils import utils, check_script, vision_analyzer, video_processor, video_processor_v2 +from app.utils import utils, check_script, gemini_analyzer, video_processor, video_processor_v2 from webui.utils import file_utils @@ -485,7 +485,7 @@ def generate_script(tr, params): if not vision_api_key or not vision_model: raise ValueError("未配置 Gemini API Key 或者 型,请在基础设置配置") - analyzer = vision_analyzer.VisionAnalyzer( + analyzer = gemini_analyzer.VisionAnalyzer( model_name=vision_model, api_key=vision_api_key, ) diff --git a/webui/utils/vision_analyzer.py b/webui/utils/vision_analyzer.py new file mode 100644 index 0000000..e69de29