From 08d4f4bd0753aca3b9ebc5666757610df9b9f4df Mon Sep 17 00:00:00 2001 From: CI Bot Date: Fri, 24 Jul 2026 00:39:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor(#780):=20=E7=BB=9F=E4=B8=80=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=B1=82=E5=BC=82=E5=B8=B8=E5=AE=9A=E4=B9=89=EF=BC=8C?= =?UTF-8?q?=E6=B6=88=E9=99=A4=E9=87=8D=E5=A4=8D=E5=BC=82=E5=B8=B8=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 packages/domain/exceptions.py：定义领域层通用异常基类 - DomainError 基类 - NotFoundError（原5个模块各定义一份，完全相同） - ValidationError（原template模块定义） - QuotaExceededError（原title_library/voice_library各定义一份） - 新增 packages/application/tts_job/exceptions.py：TTSJobNotFoundError 统一到模块公共文件 - 消除 use_cases.py 和 workflow.py 中的重复定义 - 各模块改为从统一位置 import，向后兼容完全保持 - 9个文件，+77/-54，净减23行 --- packages/application/recipe/use_cases.py | 5 +-- packages/application/template/use_cases.py | 10 +----- .../application/title_library/use_cases.py | 13 +------ packages/application/tts_job/exceptions.py | 7 ++++ packages/application/tts_job/use_cases.py | 6 +--- packages/application/tts_job/workflow.py | 7 +--- packages/application/video_share/use_cases.py | 7 +--- .../application/voice_library/use_cases.py | 13 +------ packages/domain/exceptions.py | 35 +++++++++++++++++++ 9 files changed, 49 insertions(+), 54 deletions(-) create mode 100644 packages/application/tts_job/exceptions.py create mode 100644 packages/domain/exceptions.py diff --git a/packages/application/recipe/use_cases.py b/packages/application/recipe/use_cases.py index 9c2918bfa..acdb81a32 100644 --- a/packages/application/recipe/use_cases.py +++ b/packages/application/recipe/use_cases.py @@ -12,13 +12,10 @@ from packages.application.recipe.commands import ( UpdateRecipeCommand, ) from packages.domain.recipe import Recipe, RecipeItem +from packages.domain.exceptions import NotFoundError from packages.infrastructure.feature_flags import FeatureScope, feature_flags -class NotFoundError(Exception): - pass - - class FeatureDisabledError(Exception): pass diff --git a/packages/application/template/use_cases.py b/packages/application/template/use_cases.py index 8e1ed2dec..ecb1a61b0 100755 --- a/packages/application/template/use_cases.py +++ b/packages/application/template/use_cases.py @@ -15,19 +15,11 @@ from packages.application.template.commands import ( ValidateTemplateCommand, ) from packages.domain.editing_mode import EditingMode +from packages.domain.exceptions import NotFoundError, ValidationError from packages.domain.template import Template, TemplateCategory, TemplateSegment from packages.ports.template_repository import TemplateRepositoryPort -class NotFoundError(Exception): - pass - - -class ValidationError(Exception): - """业务规则校验失败.""" - - pass - VALID_MODES = {m.value for m in EditingMode} VALID_MATERIAL_TYPES = {"人物", "场景"} diff --git a/packages/application/title_library/use_cases.py b/packages/application/title_library/use_cases.py index 1795de020..889b598ef 100755 --- a/packages/application/title_library/use_cases.py +++ b/packages/application/title_library/use_cases.py @@ -12,6 +12,7 @@ from packages.application.title_library.commands import ( PickTitleCommand, UpdateTitleLibraryCommand, ) +from packages.domain.exceptions import NotFoundError, QuotaExceededError from packages.domain.quota import QuotaDimension, quota_checker from packages.domain.title_library import TitleLibraryItem @@ -162,15 +163,3 @@ class PickTitleUseCase: # 随机选一个 return random.choice(pool) - - -class QuotaExceededError(Exception): - def __init__(self, dimension: str, limit: float, used: float) -> None: - self.dimension = dimension - self.limit = limit - self.used = used - super().__init__(f"Quota exceeded for {dimension}: {used}/{limit}") - - -class NotFoundError(Exception): - pass diff --git a/packages/application/tts_job/exceptions.py b/packages/application/tts_job/exceptions.py new file mode 100644 index 000000000..7657baf94 --- /dev/null +++ b/packages/application/tts_job/exceptions.py @@ -0,0 +1,7 @@ +"""TTS Job 模块公共异常定义。""" + + +class TTSJobNotFoundError(Exception): + """TTS 任务未找到。""" + + pass diff --git a/packages/application/tts_job/use_cases.py b/packages/application/tts_job/use_cases.py index ab943f49c..e1fae68f6 100644 --- a/packages/application/tts_job/use_cases.py +++ b/packages/application/tts_job/use_cases.py @@ -5,14 +5,10 @@ from __future__ import annotations from typing import List, Optional from packages.domain.tts_job import TTSJob +from packages.application.tts_job.exceptions import TTSJobNotFoundError from packages.ports.tts_job_repository import TTSJobRepository -class TTSJobNotFoundError(Exception): - """TTS 任务未找到。""" - - pass - class CreateTTSJobUseCase: """创建 TTS 合成任务。""" diff --git a/packages/application/tts_job/workflow.py b/packages/application/tts_job/workflow.py index 137ab4b77..58a913126 100644 --- a/packages/application/tts_job/workflow.py +++ b/packages/application/tts_job/workflow.py @@ -19,6 +19,7 @@ from typing import Optional from packages.application.cosyvoice_service import CosyVoiceAuthError, CosyVoiceError, CosyVoiceService from packages.application.tts_job.audio_merger import AudioMerger +from packages.application.tts_job.exceptions import TTSJobNotFoundError from packages.application.tts_job.text_splitter import split_text from packages.domain.tts_job import TTSJob, TTSJobStatus from packages.ports.tts_job_repository import TTSJobRepository @@ -43,12 +44,6 @@ class TTSWorkflowError(Exception): pass -class TTSJobNotFoundError(Exception): - """TTS 任务未找到。""" - - pass - - class TTSWorkflowService: """TTS 合成工作流编排服务。 diff --git a/packages/application/video_share/use_cases.py b/packages/application/video_share/use_cases.py index 2290b8a28..a4f9f8bc5 100755 --- a/packages/application/video_share/use_cases.py +++ b/packages/application/video_share/use_cases.py @@ -13,15 +13,10 @@ from packages.application.video_share.commands import ( from packages.domain.generated_video import GeneratedVideo from packages.domain.video_share import VideoShare from packages.ports.generated_video_repository import GeneratedVideoRepository +from packages.domain.exceptions import NotFoundError from packages.ports.video_share_repository import VideoShareRepositoryPort -class NotFoundError(Exception): - """分享记录不存在.""" - - pass - - class VideoNotFoundError(Exception): """视频不存在.""" diff --git a/packages/application/voice_library/use_cases.py b/packages/application/voice_library/use_cases.py index a63bc81f2..2255699f6 100644 --- a/packages/application/voice_library/use_cases.py +++ b/packages/application/voice_library/use_cases.py @@ -10,6 +10,7 @@ from packages.application.voice_library.commands import ( CreateVoiceLibraryCommand, UpdateVoiceLibraryCommand, ) +from packages.domain.exceptions import NotFoundError, QuotaExceededError from packages.domain.quota import QuotaDimension, quota_checker from packages.domain.voice_library import VoiceLibraryItem @@ -117,15 +118,3 @@ class DeleteVoiceLibraryUseCase: def execute(self, voice_id: str, user_id: str) -> bool: return self.repository.delete(voice_id, user_id) - - -class QuotaExceededError(Exception): - def __init__(self, dimension: str, limit: float, used: float) -> None: - self.dimension = dimension - self.limit = limit - self.used = used - super().__init__(f"Quota exceeded for {dimension}: {used}/{limit}") - - -class NotFoundError(Exception): - pass diff --git a/packages/domain/exceptions.py b/packages/domain/exceptions.py new file mode 100644 index 000000000..1134ab18a --- /dev/null +++ b/packages/domain/exceptions.py @@ -0,0 +1,35 @@ +""" +领域层通用异常定义。 + +所有应用层共享的通用异常在此统一定义， +消除各 use_cases 模块中重复的异常类。 +领域特定的异常仍在各模块内定义。 +""" + + +class DomainError(Exception): + """领域层异常基类。""" + + pass + + +class NotFoundError(DomainError): + """资源不存在。""" + + pass + + +class ValidationError(DomainError): + """业务规则校验失败。""" + + pass + + +class QuotaExceededError(DomainError): + """配额超限。""" + + def __init__(self, dimension: str, limit: float, used: float) -> None: + self.dimension = dimension + self.limit = limit + self.used = used + super().__init__(f"Quota exceeded for {dimension}: {used}/{limit}") -- 2.54.0