diff --git a/api/app/services/conversation_service.py b/api/app/services/conversation_service.py index 3bb51858..122d0d87 100644 --- a/api/app/services/conversation_service.py +++ b/api/app/services/conversation_service.py @@ -1,22 +1,17 @@ """会话服务""" import uuid -from typing import Optional, List, Tuple, Annotated - -from fastapi import Depends -from sqlalchemy.orm import Session -from sqlalchemy import select, desc - -from app.db import get_db -from app.models import Conversation, Message -from app.core.exceptions import ResourceNotFoundException, BusinessException -from app.core.error_codes import BizCode +from typing import Annotated from typing import Optional, List, Tuple +from fastapi import Depends from sqlalchemy import select, desc from sqlalchemy.orm import Session +from app.core.error_codes import BizCode +from app.core.exceptions import BusinessException from app.core.exceptions import ResourceNotFoundException from app.core.logging_config import get_business_logger +from app.db import get_db from app.models import Conversation, Message logger = get_business_logger() diff --git a/api/app/services/workspace_service.py b/api/app/services/workspace_service.py index c6b22cc9..34ce0610 100644 --- a/api/app/services/workspace_service.py +++ b/api/app/services/workspace_service.py @@ -5,39 +5,16 @@ import uuid from os import getenv from typing import List, Optional -from sqlalchemy.orm import Session - from app.core.config import settings from app.core.error_codes import BizCode from app.core.exceptions import BusinessException, PermissionDeniedException from app.core.logging_config import get_business_logger from app.models.user_model import User -# 获取业务逻辑专用日志器 -business_logger = get_business_logger() -from app.models.workspace_model import ( - InviteStatus, - Workspace, - WorkspaceMember, - WorkspaceRole, -) -from app.repositories import workspace_repository -from app.repositories.workspace_invite_repository import WorkspaceInviteRepository from app.schemas.workspace_schema import ( - InviteAcceptRequest, - InviteValidateResponse, - WorkspaceCreate, - WorkspaceInviteCreate, - WorkspaceInviteResponse, - WorkspaceMemberUpdate, WorkspaceModelsUpdate, - WorkspaceUpdate, ) -from dotenv import load_dotenv from sqlalchemy.orm import Session - -# 获取业务逻辑专用日志器 -business_logger = get_business_logger() from app.models.workspace_model import Workspace, WorkspaceRole, InviteStatus, WorkspaceMember from app.repositories import workspace_repository from app.repositories.workspace_invite_repository import WorkspaceInviteRepository @@ -347,7 +324,6 @@ def _check_workspace_admin_permission(db: Session, workspace_id: uuid.UUID, user ) # 使用统一权限服务检查管理权限 - from app.core.permissions import Action, Resource, Subject, permission_service from app.core.permissions import permission_service, Subject, Resource, Action # 获取用户的工作空间成员关系