update:更新自定义写作风格模块

backend/app/api/chapters.py

@@ -1,10 +1,11 @@
 """章节管理API"""
-from fastapi import APIRouter, Depends, HTTPException, Request
+from fastapi import APIRouter, Depends, HTTPException, Request, Query
 from fastapi.responses import StreamingResponse
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, func
 import json
 import asyncio
+from typing import Optional
 
 from app.database import get_db
 from app.models.chapter import Chapter
@@ -12,11 +13,13 @@ from app.models.project import Project
 from app.models.outline import Outline
 from app.models.character import Character
 from app.models.generation_history import GenerationHistory
+from app.models.writing_style import WritingStyle
 from app.schemas.chapter import (
     ChapterCreate,
     ChapterUpdate,
     ChapterResponse,
-    ChapterListResponse
+    ChapterListResponse,
+    ChapterGenerateRequest
 )
 from app.services.ai_service import AIService
 from app.services.prompt_service import prompt_service
@@ -245,183 +248,24 @@ async def check_can_generate(
     }
 
 
-@router.post("/{chapter_id}/generate", summary="AI创作章节内容")
-async def generate_chapter_content(
-    chapter_id: str,
-    db: AsyncSession = Depends(get_db),
-    user_ai_service: AIService = Depends(get_user_ai_service)
-):
-    """
-    根据大纲、前置章节内容和项目信息AI创作章节完整内容
-    要求：必须按顺序生成，确保前置章节都已完成
-    """
-    # 获取章节
-    result = await db.execute(
-        select(Chapter).where(Chapter.id == chapter_id)
-    )
-    chapter = result.scalar_one_or_none()
-    if not chapter:
-        raise HTTPException(status_code=404, detail="章节不存在")
-    
-    # 检查前置条件
-    can_generate, error_msg, previous_chapters = await check_prerequisites(db, chapter)
-    if not can_generate:
-        raise HTTPException(status_code=400, detail=error_msg)
-    
-    try:
-        # 获取项目信息
-        project_result = await db.execute(
-            select(Project).where(Project.id == chapter.project_id)
-        )
-        project = project_result.scalar_one_or_none()
-        if not project:
-            raise HTTPException(status_code=404, detail="项目不存在")
-        
-        # 获取对应的大纲（使用新的查询确保获取最新数据）
-        outline_result = await db.execute(
-            select(Outline)
-            .where(Outline.project_id == chapter.project_id)
-            .where(Outline.order_index == chapter.chapter_number)
-            .execution_options(populate_existing=True)
-        )
-        outline = outline_result.scalar_one_or_none()
-        
-        # 获取所有大纲用于上下文（使用新的查询确保获取最新数据）
-        all_outlines_result = await db.execute(
-            select(Outline)
-            .where(Outline.project_id == chapter.project_id)
-            .order_by(Outline.order_index)
-            .execution_options(populate_existing=True)
-        )
-        all_outlines = all_outlines_result.scalars().all()
-        outlines_context = "\n".join([
-            f"第{o.order_index}章 {o.title}: {o.content[:100]}..."
-            for o in all_outlines
-        ])
-        
-        # 获取角色信息
-        characters_result = await db.execute(
-            select(Character).where(Character.project_id == chapter.project_id)
-        )
-        characters = characters_result.scalars().all()
-        characters_info = "\n".join([
-            f"- {c.name}({'组织' if c.is_organization else '角色'}, {c.role_type}): {c.personality[:100] if c.personality else ''}"
-            for c in characters
-        ])
-        
-        # 构建前置章节内容上下文（如果有前置章节）
-        previous_content = ""
-        if previous_chapters:
-            # Token控制：保留最近3章的完整内容，早期章节使用摘要
-            recent_chapters = previous_chapters[-3:] if len(previous_chapters) > 3 else previous_chapters
-            early_chapters = previous_chapters[:-3] if len(previous_chapters) > 3 else []
-            
-            # 早期章节摘要
-            if early_chapters:
-                early_summary = "【前期剧情概要】\n" + "\n".join([
-                    f"第{ch.chapter_number}章《{ch.title}》：{ch.content[:200] if ch.content else ''}..."
-                    for ch in early_chapters
-                ])
-                previous_content += early_summary + "\n\n"
-            
-            # 最近章节完整内容
-            if recent_chapters:
-                recent_content = "【最近章节完整内容】\n" + "\n\n".join([
-                    f"=== 第{ch.chapter_number}章：{ch.title} ===\n{ch.content}"
-                    for ch in recent_chapters
-                ])
-                previous_content += recent_content
-            
-            logger.info(f"构建前置上下文：{len(early_chapters)}章摘要 + {len(recent_chapters)}章完整内容")
-        
-        # 根据是否有前置内容选择不同的提示词
-        if previous_content:
-            # 使用带上下文的提示词
-            prompt = prompt_service.get_chapter_generation_with_context_prompt(
-                title=project.title,
-                theme=project.theme or '',
-                genre=project.genre or '',
-                narrative_perspective=project.narrative_perspective or '第三人称',
-                time_period=project.world_time_period or '未设定',
-                location=project.world_location or '未设定',
-                atmosphere=project.world_atmosphere or '未设定',
-                rules=project.world_rules or '未设定',
-                characters_info=characters_info or '暂无角色信息',
-                outlines_context=outlines_context,
-                previous_content=previous_content,
-                chapter_number=chapter.chapter_number,
-                chapter_title=chapter.title,
-                chapter_outline=outline.content if outline else chapter.summary or '暂无大纲'
-            )
-        else:
-            # 第一章，使用原有提示词
-            prompt = prompt_service.get_chapter_generation_prompt(
-                title=project.title,
-                theme=project.theme or '',
-                genre=project.genre or '',
-                narrative_perspective=project.narrative_perspective or '第三人称',
-                time_period=project.world_time_period or '未设定',
-                location=project.world_location or '未设定',
-                atmosphere=project.world_atmosphere or '未设定',
-                rules=project.world_rules or '未设定',
-                characters_info=characters_info or '暂无角色信息',
-                outlines_context=outlines_context,
-                chapter_number=chapter.chapter_number,
-                chapter_title=chapter.title,
-                chapter_outline=outline.content if outline else chapter.summary or '暂无大纲'
-            )
-        
-        logger.info(f"开始AI创作章节 {chapter_id}")
-        
-        # 调用AI生成
-        ai_content = await user_ai_service.generate_text(
-            prompt=prompt
-        )
-        
-        # 更新章节内容
-        old_word_count = chapter.word_count or 0
-        chapter.content = ai_content
-        new_word_count = len(ai_content)
-        chapter.word_count = new_word_count
-        chapter.status = "completed"
-        
-        # 更新项目字数
-        project.current_words = project.current_words - old_word_count + new_word_count
-        
-        # 记录生成历史
-        history = GenerationHistory(
-            project_id=chapter.project_id,
-            chapter_id=chapter.id,
-            prompt=f"创作章节: 第{chapter.chapter_number}章 {chapter.title}",
-            generated_content=ai_content[:500] if len(ai_content) > 500 else ai_content,
-            model="default"
-        )
-        db.add(history)
-        
-        await db.commit()
-        await db.refresh(chapter)
-        
-        logger.info(f"成功创作章节 {chapter_id}，共 {new_word_count} 字")
-        
-        return {"content": ai_content}
-        
-    except Exception as e:
-        logger.error(f"创作章节失败: {str(e)}")
-        raise HTTPException(status_code=500, detail=f"创作章节失败: {str(e)}")
-
 @router.post("/{chapter_id}/generate-stream", summary="AI创作章节内容（流式）")
 async def generate_chapter_content_stream(
     chapter_id: str,
     request: Request,
+    generate_request: ChapterGenerateRequest = ChapterGenerateRequest(),
     user_ai_service: AIService = Depends(get_user_ai_service)
 ):
     """
     根据大纲、前置章节内容和项目信息AI创作章节完整内容（流式返回）
     要求：必须按顺序生成，确保前置章节都已完成
     
+    请求体参数：
+    - style_id: 可选，指定使用的写作风格ID。不提供则不使用任何风格
+    
     注意：此函数不使用依赖注入的db，而是在生成器内部创建独立的数据库会话
     以避免流式响应期间的连接泄漏问题
     """
+    style_id = generate_request.style_id
     # 预先验证章节存在性（使用临时会话）
     async for temp_db in get_db(request):
         try:
@@ -508,6 +352,27 @@ async def generate_chapter_content_stream(
                     for c in characters
                 ])
                 
+                # 获取写作风格
+                style_content = ""
+                if style_id:
+                    # 使用指定的风格
+                    style_result = await db_session.execute(
+                        select(WritingStyle).where(WritingStyle.id == style_id)
+                    )
+                    style = style_result.scalar_one_or_none()
+                    if style:
+                        # 验证风格是否可用：全局预设风格（project_id为NULL）或者当前项目的自定义风格
+                        if style.project_id is None or style.project_id == current_chapter.project_id:
+                            style_content = style.prompt_content or ""
+                            style_type = "全局预设" if style.project_id is None else "项目自定义"
+                            logger.info(f"使用指定风格: {style.name} ({style_type})")
+                        else:
+                            logger.warning(f"风格 {style_id} 不属于当前项目，无法使用")
+                    else:
+                        logger.warning(f"未找到风格 {style_id}")
+                else:
+                    logger.info("未指定写作风格，使用原始提示词")
+                
                 # 构建前置章节内容上下文（使用之前保存的数据）
                 previous_content = ""
                 if previous_chapters_data:
@@ -533,7 +398,7 @@ async def generate_chapter_content_stream(
                 # 发送开始事件
                 yield f"data: {json.dumps({'type': 'start', 'message': '开始AI创作...'}, ensure_ascii=False)}\n\n"
                 
-                # 根据是否有前置内容选择不同的提示词
+                # 根据是否有前置内容选择不同的提示词，并应用写作风格
                 if previous_content:
                     prompt = prompt_service.get_chapter_generation_with_context_prompt(
                         title=project.title,
@@ -549,7 +414,8 @@ async def generate_chapter_content_stream(
                         previous_content=previous_content,
                         chapter_number=current_chapter.chapter_number,
                         chapter_title=current_chapter.title,
-                        chapter_outline=outline.content if outline else current_chapter.summary or '暂无大纲'
+                        chapter_outline=outline.content if outline else current_chapter.summary or '暂无大纲',
+                        style_content=style_content
                     )
                 else:
                     prompt = prompt_service.get_chapter_generation_prompt(
@@ -565,7 +431,8 @@ async def generate_chapter_content_stream(
                         outlines_context=outlines_context,
                         chapter_number=current_chapter.chapter_number,
                         chapter_title=current_chapter.title,
-                        chapter_outline=outline.content if outline else current_chapter.summary or '暂无大纲'
+                        chapter_outline=outline.content if outline else current_chapter.summary or '暂无大纲',
+                        style_content=style_content
                     )
                 
                 logger.info(f"开始AI流式创作章节 {chapter_id}")