Merge branch 'develop' of https://git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas into develop

apps/worker/video_processing/intro_outro_engine.py

@@ -13,6 +13,8 @@ import logging
 import subprocess
 from pathlib import Path
 
+from video_processing.ffmpeg_utils import FFMPEG_BIN, run_ffmpeg
+
 from packages.domain.intro_outro_config import (  # noqa: F401 — 向后兼容
     INTRO_OUTRO_TYPE_FOLLOW,
     INTRO_OUTRO_TYPE_NONE,
@@ -21,7 +23,6 @@ from packages.domain.intro_outro_config import (  # noqa: F401 — 向后兼容
     TRANSITION_FADE,
     IntroOutroConfig,
 )
-from video_processing.ffmpeg_utils import FFMPEG_BIN, run_ffmpeg
 
 logger = logging.getLogger(__name__)
 

apps/worker/video_processing/multi_track_mixer.py

@@ -19,20 +19,21 @@ import logging
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from video_processing.ffmpeg_utils import FFMPEG_BIN, probe_duration, run_ffmpeg
+from video_processing.path_security import PathSecurityError, is_in_allowed_dirs, safe_resolve_path
+
 from packages.domain.audio_track_config import (  # noqa: F401 — 向后兼容
     ALLOWED_AUDIO_EXTENSIONS,
     DEFAULT_VOLUMES,
     MAX_AUDIO_TRACKS,
-    AudioTrack,
-    MultiTrackMixConfig,
     TRACK_TYPE_AMBIENT,
     TRACK_TYPE_BGM,
     TRACK_TYPE_MAIN,
     TRACK_TYPE_SFX,
     TRACK_TYPE_VOICEOVER,
+    AudioTrack,
+    MultiTrackMixConfig,
 )
-from video_processing.ffmpeg_utils import FFMPEG_BIN, probe_duration, run_ffmpeg
-from video_processing.path_security import PathSecurityError, is_in_allowed_dirs, safe_resolve_path
 
 if TYPE_CHECKING:
     from video_processing.render_audio import RenderContext

apps/worker/video_processing/pip_engine.py

@@ -16,15 +16,15 @@ from __future__ import annotations
 import logging
 from pathlib import Path
 
-from packages.domain.pip_config import (  # noqa: F401 — 向后兼容：保留模块级导出
+# 向后兼容：POSITION_BOTTOM_CENTER 也从 pip_config 再导出
+from packages.domain.pip_config import POSITION_BOTTOM_CENTER  # noqa: E402, F401
+from packages.domain.pip_config import (
     ANIMATION_FADE,
     ANIMATION_SCALE,
     ANIMATION_SLIDE_BOTTOM,
     ANIMATION_SLIDE_LEFT,
     ANIMATION_SLIDE_RIGHT,
     ANIMATION_SLIDE_TOP,
-    PiPConfig,
-    PiPLayerConfig,
     POSITION_BOTTOM_LEFT,
     POSITION_BOTTOM_RIGHT,
     POSITION_CENTER,
@@ -33,12 +33,13 @@ from packages.domain.pip_config import (  # noqa: F401 — 向后兼容：保留
     POSITION_TOP_CENTER,
     POSITION_TOP_LEFT,
     POSITION_TOP_RIGHT,
-    calculate_pip_position as _calculate_pip_position_base,
-    parse_size_value as _parse_size_value_base,
+    PiPConfig,
+    PiPLayerConfig,
 )
-
-# 向后兼容：POSITION_BOTTOM_CENTER 也从 pip_config 再导出
-from packages.domain.pip_config import POSITION_BOTTOM_CENTER  # noqa: E402, F401
+from packages.domain.pip_config import (  # noqa: F401 — 向后兼容：保留模块级导出
+    calculate_pip_position as _calculate_pip_position_base,
+)
+from packages.domain.pip_config import parse_size_value as _parse_size_value_base
 
 logger = logging.getLogger(__name__)
 

apps/worker/video_processing/transition_engine.py

@@ -13,6 +13,8 @@ from __future__ import annotations
 
 import logging
 
+from video_processing.ffmpeg_utils import build_xfade_filter_chain
+
 from packages.domain.transition_config import (  # noqa: F401 — 向后兼容
     CUT_TRANSITION,
     DEFAULT_TRANSITION_DURATION,
@@ -21,7 +23,6 @@ from packages.domain.transition_config import (  # noqa: F401 — 向后兼容
     TransitionConfig,
     TransitionType,
 )
-from video_processing.ffmpeg_utils import build_xfade_filter_chain
 
 logger = logging.getLogger(__name__)
 

tests/unit/test_audio_track_config.py

@@ -8,13 +8,13 @@ from packages.domain.audio_track_config import (
     ALLOWED_AUDIO_EXTENSIONS,
     DEFAULT_VOLUMES,
     MAX_AUDIO_TRACKS,
-    AudioTrack,
-    MultiTrackMixConfig,
     TRACK_TYPE_AMBIENT,
     TRACK_TYPE_BGM,
     TRACK_TYPE_MAIN,
     TRACK_TYPE_SFX,
     TRACK_TYPE_VOICEOVER,
+    AudioTrack,
+    MultiTrackMixConfig,
     clamp_volume,
     is_valid_audio_extension,
 )