From 569e5aa3dc738ef69d799659f95df528e4f4115a Mon Sep 17 00:00:00 2001 From: CI Bot Date: Tue, 8 Sep 2026 02:36:00 +0000 Subject: [PATCH] style: auto-format with black + isort + prettier [skip ci-format-check] --- packages/domain/voice_duration_planner.py | 12 +++++++++--- tests/unit/domain/test_rhythm_templates_v2.py | 11 ++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/domain/voice_duration_planner.py b/packages/domain/voice_duration_planner.py index 1b26094d1..080d3a9ba 100644 --- a/packages/domain/voice_duration_planner.py +++ b/packages/domain/voice_duration_planner.py @@ -90,6 +90,7 @@ def adapt_template_length(template: list[int], clip_count: int) -> list[int]: result.append(template[i % len(template)]) return result + def transition_overlap_seconds(transition_effect: Optional[str], transition_duration: float) -> float: """转场导致的相邻片段重叠时长。 @@ -201,8 +202,10 @@ def plan_clip_durations( result[i] = round(max_dur, 3) # 将多余时长分配给最短的未超限片段 candidates = [ - j for j in range(len(result)) - if j != i and ( + j + for j in range(len(result)) + if j != i + and ( not asset_durations or j >= len(asset_durations) or result[j] < float(asset_durations[j]) * 0.9 @@ -227,7 +230,10 @@ def plan_clip_durations( if deviation > TOTAL_DURATION_TOLERANCE: logger.warning( "#1768 时长总和误差 %.3fs 超过阈值 %.1fs(voice=%.2fs, net=%.2fs),末段补偿修正", - deviation, TOTAL_DURATION_TOLERANCE, voice, net_total, + deviation, + TOTAL_DURATION_TOLERANCE, + voice, + net_total, ) # 修正末段使净时长回归配音时长 result[-1] = round(result[-1] + (voice - net_total), 3) diff --git a/tests/unit/domain/test_rhythm_templates_v2.py b/tests/unit/domain/test_rhythm_templates_v2.py index 30710edfd..468d9b30c 100644 --- a/tests/unit/domain/test_rhythm_templates_v2.py +++ b/tests/unit/domain/test_rhythm_templates_v2.py @@ -11,6 +11,7 @@ from __future__ import annotations import math + import pytest from packages.domain.voice_duration_planner import ( @@ -23,7 +24,6 @@ from packages.domain.voice_duration_planner import ( total_output_duration, ) - # ── 模板池 ────────────────────────────────────────────────────────────────── @@ -268,9 +268,9 @@ class TestTotalDurationTolerance: adapted = adapt_template_length(tpl, 5) result = plan_clip_durations(5, 30.0, rhythm_template=adapted) net = total_output_duration(result) - assert abs(net - 30.0) <= TOTAL_DURATION_TOLERANCE, ( - f"模板 {tpl} 总时长误差 {abs(net - 30.0):.3f}s > {TOTAL_DURATION_TOLERANCE}s" - ) + assert ( + abs(net - 30.0) <= TOTAL_DURATION_TOLERANCE + ), f"模板 {tpl} 总时长误差 {abs(net - 30.0):.3f}s > {TOTAL_DURATION_TOLERANCE}s" # ── #1768 组合场景 ────────────────────────────────────────────────────────── @@ -287,7 +287,8 @@ class TestCombinedScenarios: adapted = adapt_template_length(tpl, 5) result = plan_clip_durations( - 5, voice, + 5, + voice, transition_effects=effects, transition_durations=tdurs, rhythm_template=adapted,