Merge remote-tracking branch 'origin/develop' into refactor/1894-merge-title-library-into-scripts

# Conflicts:
#	alembic/versions/077_merge_title_libs.py
#	tests/unit/test_scripts_routes.py

packages/adapters/sqlalchemy_impl/models.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Any
 
 from sqlalchemy import JSON, Boolean, Column, DateTime, Float, Index, Integer, String, Text, UniqueConstraint, text
@@ -39,7 +39,12 @@ class UserModel(Base):
     phone_verified = Column(Boolean, nullable=False, default=False)
     binding_completed_at = Column(DateTime, nullable=True)
     profile_completed = Column(Boolean, nullable=False, default=True, server_default="true")
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    # 会员+积分 (#1895)
+    is_member = Column(Boolean, nullable=False, default=False)
+    member_type = Column(String(20), nullable=True)
+    member_expires_at = Column(DateTime, nullable=True)
+    points_balance = Column(Integer, nullable=False, default=0)
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class ProjectModel(Base):
@@ -57,7 +62,7 @@ class ProjectModel(Base):
     shared_users = Column(JSON, nullable=False, default=list)  # 被共享的用户 ID 列表
     is_default = Column(Boolean, nullable=False, default=False, server_default="false")
     extra_meta = Column("metadata", JSON, nullable=False, default=dict)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class AssetLibraryModel(Base):
@@ -71,8 +76,8 @@ class AssetLibraryModel(Base):
     asset_count = Column(Float, nullable=False, default=0)
     total_size = Column(Float, nullable=False, default=0)
     extra_meta = Column("metadata", JSON, nullable=False, default=dict)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class AssetModel(Base):
@@ -103,8 +108,8 @@ class AssetModel(Base):
     file_hash = Column(String(64), nullable=True, index=True)
     client_upload_id = Column(String(64), nullable=True, index=True)
     extra_meta = Column("metadata", JSON, nullable=False, default=dict)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc), index=True)
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC), index=True)
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class TagModel(Base):
@@ -115,7 +120,7 @@ class TagModel(Base):
     id = Column(String(36), primary_key=True)
     user_id = Column(String(36), nullable=False, index=True)
     name = Column(String(100), nullable=False)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
     __table_args__ = (UniqueConstraint("user_id", "name", name="uq_tags_user_name"),)
 
@@ -127,7 +132,7 @@ class AssetTagModel(Base):
 
     asset_id = Column(String(36), primary_key=True)
     tag_id = Column(String(36), primary_key=True)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class EditTemplateModel(Base):
@@ -148,8 +153,8 @@ class EditTemplateModel(Base):
     sort_weight = Column(Integer, nullable=False, default=0, index=True)
     status = Column(String(20), nullable=False, default="active", index=True)
     version = Column(Integer, nullable=False, default=1)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class EditTemplateVersionModel(Base):
@@ -169,7 +174,7 @@ class EditTemplateVersionModel(Base):
     clip_configs = Column(JSON, nullable=False, default=list)
     change_note = Column(String(500), nullable=False, default="")
     published_by = Column(String(36), nullable=False, default="")
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class EditPlanModel(Base):
@@ -189,8 +194,8 @@ class EditPlanModel(Base):
     source_edit_plan_id = Column(String(36), nullable=True, index=True)
     project_id = Column(String(36), nullable=False, default="", index=True)
     created_by_user_id = Column(String(36), nullable=False, default="", index=True)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class TemplateClipConfigModel(Base):
@@ -211,8 +216,8 @@ class TemplateClipConfigModel(Base):
     material_requirements = Column(JSON, nullable=False, default=dict)
     transition_effect = Column(String(20), nullable=False, default="cut")
     config = Column(JSON, nullable=False, default=dict)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class EditPlanClipModel(Base):
@@ -237,8 +242,8 @@ class EditPlanClipModel(Base):
     playback_speed = Column(Float, nullable=False, default=1.0)
     status = Column(String(20), nullable=False, default="pending", index=True)
     config = Column(JSON, nullable=False, default=dict)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class IngestJobModel(Base):
@@ -254,8 +259,8 @@ class IngestJobModel(Base):
     file_hash = Column(String(64), nullable=True, index=True)
     asset_id = Column(String(36), nullable=False, default="", index=True)
     celery_task_id = Column(String(64), nullable=False, default="", server_default="")
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class ClassificationJobModel(Base):
@@ -268,8 +273,8 @@ class ClassificationJobModel(Base):
     classification = Column(String(50), nullable=False, default="")
     confidence = Column(Float, nullable=False, default=0.0)
     error_message = Column(Text, nullable=False, default="")
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class GenerationTaskModel(Base):
@@ -315,12 +320,12 @@ class GenerationTaskModel(Base):
     bgm_config = Column(JSON, nullable=False, default=dict)
     extra_meta = Column("metadata", JSON, nullable=False, default=dict)
     logs = Column(Text, nullable=False, default="[]", server_default="[]")
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
     updated_at = Column(
         DateTime,
         nullable=False,
-        default=lambda: datetime.now(timezone.utc),
-        onupdate=lambda: datetime.now(timezone.utc),
+        default=lambda: datetime.now(UTC),
+        onupdate=lambda: datetime.now(UTC),
     )
 
 
@@ -344,8 +349,8 @@ class GeneratedVideoModel(Base):
     status = Column(String(20), nullable=False, default="completed", index=True)
     review_status = Column(String(20), nullable=False, default="pending_review", index=True)
     generation_params = Column(Text, nullable=False, default="{}")
-    generated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    generated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
     updated_at = Column(DateTime, nullable=True)
     video_fingerprint = Column(Text, nullable=True)
     is_duplicate = Column(Boolean, nullable=False, default=False)
@@ -368,8 +373,8 @@ class TitleLibraryModel(Base):
     usage_count = Column(Integer, nullable=False, default=0)
     is_active = Column(Boolean, nullable=False, default=True, index=True)
     extra_meta = Column("metadata", JSON, nullable=False, default=dict)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class VoiceCloneProfileModel(Base):
@@ -391,8 +396,8 @@ class VoiceCloneProfileModel(Base):
     retry_count = Column(Integer, nullable=False, default=0)
     max_retries = Column(Integer, nullable=False, default=3)
     metadata_ = Column("metadata", JSON, nullable=False, default=dict)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class VoiceLibraryModel(Base):
@@ -412,8 +417,8 @@ class VoiceLibraryModel(Base):
     status = Column(String(20), nullable=False, default="completed", index=True)
     tags = Column(JSON, nullable=False, default=list)
     extra_meta = Column("metadata", JSON, nullable=False, default=dict)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class DuplicationRecordModel(Base):
@@ -433,8 +438,8 @@ class DuplicationRecordModel(Base):
     match_count = Column(Integer, nullable=True)
     video_fingerprint = Column(Text, nullable=True)
     error_message = Column(Text, nullable=False, default="")
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class DuplicationSegmentModel(Base):
@@ -462,8 +467,8 @@ class RecipeModel(Base):
     generation_params = Column(JSON, nullable=False, default=dict)
     is_active = Column(Boolean, nullable=False, default=True)
     extra_meta = Column("metadata", JSON, nullable=False, default=dict)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class RecipeItemModel(Base):
@@ -491,8 +496,8 @@ class TemplateModel(Base):
     bgm_config = Column(JSON, nullable=False, default=dict)
     estimated_duration = Column(Float, nullable=False, default=0.0)
     is_active = Column(Boolean, nullable=False, default=True)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class TemplateSegmentModel(Base):
@@ -504,8 +509,8 @@ class TemplateSegmentModel(Base):
     duration_min = Column(Float, nullable=False)
     duration_max = Column(Float, nullable=False)
     material_type = Column(String(20), nullable=True)  # 仅 voice_over 模式: 人物/场景
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class TemplateCategoryModel(Base):
@@ -515,7 +520,7 @@ class TemplateCategoryModel(Base):
     user_id = Column(String(36), nullable=False, index=True)
     name = Column(String(100), nullable=False)
     sort_order = Column(Integer, nullable=False, default=0)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class JobModel(Base):
@@ -539,8 +544,8 @@ class JobModel(Base):
     created_by_user_id = Column(String(36), nullable=False, default="", index=True)
     started_at = Column(DateTime, nullable=True)
     completed_at = Column(DateTime, nullable=True)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class TTSJobModel(Base):
@@ -568,8 +573,8 @@ class TTSJobModel(Base):
     metadata_ = Column("metadata", JSON, nullable=False, default=dict)
     started_at = Column(DateTime, nullable=True)
     completed_at = Column(DateTime, nullable=True)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class BillingRecordModel(Base):
@@ -586,7 +591,7 @@ class BillingRecordModel(Base):
     payment_method = Column(String(50), nullable=True)
     payment_id = Column(String(100), nullable=True)  # 第三方支付流水号
     invoice_url = Column(String(500), nullable=True)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
     paid_at = Column(DateTime, nullable=True)
 
 
@@ -602,7 +607,7 @@ class VerificationCodeModel(Base):
     expires_at = Column(DateTime, nullable=False)
     used_at = Column(DateTime, nullable=True)
     attempts = Column(Integer, nullable=False, default=0)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class VideoShareModel(Base):
@@ -619,8 +624,8 @@ class VideoShareModel(Base):
     view_count = Column(Integer, nullable=False, default=0)
     download_count = Column(Integer, nullable=False, default=0)
     is_active = Column(Boolean, nullable=False, default=True)
-    created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
 
 
 class CoverTemplateModel(Base):
@@ -634,8 +639,8 @@ class CoverTemplateModel(Base):
     thumbnail_url = Column(String(1000), nullable=False, default="")
     is_system = Column(Boolean, nullable=False, default=False, index=True)
     config = Column(JSON, nullable=False, default=dict)
-    created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
 
 
 class VideoFingerprintChunkModel(Base):
@@ -652,7 +657,7 @@ class VideoFingerprintChunkModel(Base):
     phash_binary = Column(String(16), nullable=False)
     color_histogram = Column(JSON, nullable=False)
     frame_count = Column(Integer, nullable=False, default=1)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class ScriptModel(Base):
@@ -670,8 +675,8 @@ class ScriptModel(Base):
     title_text = Column(String(500), nullable=False, default="")
     title_category = Column(String(50), nullable=False, default="")
     title_config = Column(JSON, nullable=False, default=dict)
-    created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
 
 
 class LipsyncJobModel(Base):
@@ -713,8 +718,8 @@ class LipsyncJobModel(Base):
     # 时间戳
     submitted_at = Column(DateTime, nullable=True)
     completed_at = Column(DateTime, nullable=True)
-    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
 
 
 class AiAvatarRenderJob(Base):
@@ -745,5 +750,70 @@ class AiAvatarRenderJob(Base):
     submitted_at = Column(DateTime, nullable=True)
     started_at = Column(DateTime, nullable=True)
     completed_at = Column(DateTime, nullable=True)
-    created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
-    updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc))
+    created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
+
+
+class PointsAccountModel(Base):
+    """积分账户 ORM 模型 (#1895)"""
+
+    __tablename__ = "points_accounts"
+
+    id = Column(String(36), primary_key=True)
+    user_id = Column(String(36), nullable=False, unique=True, index=True)
+    balance = Column(Integer, nullable=False, default=0)
+    total_earned = Column(Integer, nullable=False, default=0)
+    total_spent = Column(Integer, nullable=False, default=0)
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+
+
+class PointsTransactionModel(Base):
+    """积分流水 ORM 模型 (#1895)"""
+
+    __tablename__ = "points_transactions"
+
+    id = Column(String(36), primary_key=True)
+    user_id = Column(String(36), nullable=False, index=True)
+    account_id = Column(String(36), nullable=False, index=True)
+    type = Column(String(20), nullable=False, index=True)  # earn / spend / refund
+    source = Column(String(50), nullable=False, index=True)
+    amount = Column(Integer, nullable=False)
+    balance_after = Column(Integer, nullable=False)
+    description = Column(String(255), nullable=False, default="")
+    ref_id = Column(String(100), nullable=False, default="")
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+
+
+class PointsOrderModel(Base):
+    """积分/会员订单 ORM 模型 (#1895)"""
+
+    __tablename__ = "points_orders"
+
+    id = Column(String(36), primary_key=True)
+    user_id = Column(String(36), nullable=False, index=True)
+    order_type = Column(String(20), nullable=False)  # membership / points
+    product_code = Column(String(50), nullable=False)
+    amount_cents = Column(Integer, nullable=False)
+    original_amount_cents = Column(Integer, nullable=False, default=0)
+    discount = Column(Float, nullable=False, default=1.0)
+    points_amount = Column(Integer, nullable=False, default=0)
+    status = Column(String(20), nullable=False, default="pending", index=True)
+    payment_method = Column(String(50), nullable=True)
+    payment_id = Column(String(100), nullable=True)
+    paid_at = Column(DateTime, nullable=True)
+    created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))
+
+
+class DailyUsageRecordModel(Base):
+    """每日使用记录 ORM 模型 (#1895)"""
+
+    __tablename__ = "daily_usage_records"
+    __table_args__ = (UniqueConstraint("user_id", "usage_date", "usage_type", name="uq_daily_usage_user_date_type"),)
+
+    id = Column(String(36), primary_key=True)
+    user_id = Column(String(36), nullable=False, index=True)
+    usage_date = Column(DateTime, nullable=False)  # stored as DATE in SQL but DateTime for ORM compat
+    usage_type = Column(String(50), nullable=False, default="free_clip")
+    count = Column(Integer, nullable=False, default=0)
+    updated_at = Column(DateTime, nullable=False, default=lambda: datetime.now(UTC))