adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[modify] optimize import

Browse Source
This commit is contained in:
Mark
2025-12-25 14:59:20 +08:00
parent 73fa2b666b
commit 74e2a48286
5 changed files with 96 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/app/controllers/app_controller.py
View File

@@ -674,7 +674,8 @@ async def draft_run_compare(
workspace_id=workspace_id,
user=current_user
)
if storage_type is None: storage_type = 'neo4j'
if storage_type is None:
storage_type = 'neo4j'
user_rag_memory_id = ''
if workspace_id:
knowledge = knowledge_repository.get_knowledge_by_name(
@@ -682,7 +683,8 @@ async def draft_run_compare(
name="USER_RAG_MERORY",
workspace_id=workspace_id
)
if knowledge: user_rag_memory_id = str(knowledge.id)
if knowledge:
user_rag_memory_id = str(knowledge.id)
logger.info(
"多模型对比试运行",

130
api/app/controllers/public_share_controller.py
View File

@@ -1,31 +1,23 @@
from fastapi import APIRouter, Depends, Query, Request, Header
import hashlib
import uuid
from fastapi import APIRouter, Depends, Query, Request
from fastapi.responses import StreamingResponse
from sqlalchemy.orm import Session
import uuid
import hashlib
import time
import jwt
from app.services import task_service, workspace_service
from typing import Optional, Dict
from functools import wraps
from app.dependencies import get_current_superuser, get_current_user, get_current_tenant, workspace_access_guard, cur_workspace_access_guard
from app.db import get_db
from app.core.response_utils import success
from app.core.logging_config import get_business_logger
from app.core.exceptions import BusinessException
from app.core.error_codes import BizCode
from app.core.config import settings
from app.core.response_utils import success
from app.db import get_db
from app.dependencies import get_share_user_id, ShareTokenData
from app.repositories import knowledge_repository
from app.schemas import release_share_schema, conversation_schema
from app.schemas.response_schema import PageData, PageMeta
from app.services import workspace_service
from app.services.auth_service import create_access_token
from app.services.conversation_service import ConversationService
from app.services.release_share_service import ReleaseShareService
from app.services.shared_chat_service import SharedChatService
from app.services.conversation_service import ConversationService
from app.services.auth_service import create_access_token
from app.dependencies import get_share_user_id, ShareTokenData
from app.models.user_model import User
from app.repositories.app_repository import AppRepository
from app.repositories.workspace_repository import WorkspaceRepository
from app.repositories import knowledge_repository
router = APIRouter(prefix="/public/share", tags=["Public Share"])
logger = get_business_logger()
@@ -37,31 +29,31 @@ def get_base_url(request: Request) -> str:
def get_or_generate_user_id(payload_user_id: str, request: Request) -> str:
"""获取或生成用户 ID
优先级：
1. 使用前端传递的 user_id
2. 基于 IP + User-Agent 生成唯一 ID
Args:
payload_user_id: 前端传递的 user_id
request: FastAPI Request 对象
Returns:
用户 ID
"""
if payload_user_id:
return payload_user_id
# 获取客户端 IP
client_ip = request.client.host if request.client else "unknown"
# 获取 User-Agent
user_agent = request.headers.get("user-agent", "unknown")
# 生成唯一 ID：基于 IP + User-Agent 的哈希
unique_string = f"{client_ip}_{user_agent}"
hash_value = hashlib.md5(unique_string.encode()).hexdigest()[:16]
return f"guest_{hash_value}"
@@ -76,13 +68,13 @@ def get_access_token(
db: Session = Depends(get_db),
):
"""获取访问 token
- 用户通过 user_id + share_token 换取访问 token
- 后续请求需要携带此 token
"""
# 获取或生成 user_id
user_id = get_or_generate_user_id(payload.user_id, request)
# 验证分享链接（可选：验证密码）
service = ReleaseShareService(db)
try:
@@ -93,10 +85,10 @@ def get_access_token(
except Exception as e:
logger.error(f"获取分享信息失败: {str(e)}")
raise
# 生成 token
access_token = create_access_token(user_id, share_token)
logger.info(
"生成访问 token",
extra={
@@ -104,7 +96,7 @@ def get_access_token(
"user_id": user_id
}
)
return success(data={
"access_token": access_token,
"token_type": "Bearer",
@@ -123,7 +115,7 @@ def get_shared_release(
db: Session = Depends(get_db),
):
"""获取公开分享的发布版本信息
- 无需认证即可访问
- 如果设置了密码保护，需要提供正确的密码
- 如果密码错误或未提供密码，返回基本信息（不含配置详情）
@@ -133,7 +125,7 @@ def get_shared_release(
share_token=share_data.share_token,
password=password
)
return success(data=info)
@@ -147,7 +139,7 @@ def verify_password(
db: Session = Depends(get_db),
):
"""验证分享的访问密码
- 用于前端先验证密码，再获取完整信息
"""
service = ReleaseShareService(db)
@@ -155,7 +147,7 @@ def verify_password(
share_token=share_data.share_token,
password=payload.password
)
return success(data={"valid": is_valid})
@@ -163,7 +155,7 @@ def verify_password(
"/embed",
summary="获取嵌入代码"
)
def get_embed_code(
def get_embed_code(
width: str = Query("100%", description="iframe 宽度"),
height: str = Query("600px", description="iframe 高度"),
request: Request = None,
@@ -171,12 +163,12 @@ def get_embed_code(
db: Session = Depends(get_db),
):
"""获取嵌入代码
- 返回 iframe 嵌入代码
- 可以自定义宽度和高度
"""
base_url = get_base_url(request) if request else None
service = ReleaseShareService(db)
embed_code = service.get_embed_code(
share_token=share_data.share_token,
@@ -184,7 +176,7 @@ def get_embed_code(
height=height,
base_url=base_url
)
return success(data=embed_code)
@@ -203,7 +195,7 @@ def list_conversations(
db: Session = Depends(get_db),
):
"""获取分享应用的会话列表
- 可以按 user_id 筛选
- 支持分页
"""
@@ -214,7 +206,7 @@ def list_conversations(
from app.repositories.end_user_repository import EndUserRepository
end_user_repo = EndUserRepository(db)
new_end_user = end_user_repo.get_or_create_end_user(
app_id=share.app_id,
app_id=share.app_id,
other_id=other_id
)
logger.debug(new_end_user.id)
@@ -226,10 +218,10 @@ def list_conversations(
page=page,
pagesize=pagesize
)
items = [conversation_schema.Conversation.model_validate(c) for c in conversations]
meta = PageMeta(page=page, pagesize=pagesize, total=total, hasnext=(page * pagesize) < total)
return success(data=PageData(page=meta, items=items))
@@ -250,17 +242,17 @@ def get_conversation(
conversation_id=conversation_id,
password=password
)
# 获取消息
conv_service = ConversationService(db)
messages = conv_service.get_messages(conversation_id)
# 构建响应
conv_dict = conversation_schema.Conversation.model_validate(conversation).model_dump()
conv_dict["messages"] = [
conversation_schema.Message.model_validate(m) for m in messages
]
return success(data=conv_dict)
@@ -276,17 +268,17 @@ async def chat(
db: Session = Depends(get_db)
):
"""发送消息并获取回复
使用 Bearer token 认证：
- Header: Authorization: Bearer {token}
- user_id 和 share_token 从 token 中解码
- 支持多轮对话（提供 conversation_id）
- 支持流式返回（设置 stream=true）
- 如果不提供 conversation_id，会自动创建新会话
"""
service = SharedChatService(db)
# 从依赖中获取 user_id 和 share_token
user_id = share_data.user_id
share_token = share_data.share_token
@@ -299,19 +291,19 @@ async def chat(
from app.models.app_model import AppType
try:
from app.core.exceptions import BusinessException
from app.core.error_codes import BizCode
from app.core.error_codes import BizCode
from app.services.app_service import AppService
# 验证分享链接和密码
share, release = service._get_release_by_share_token(share_token, password)
# # Create end_user_id by concatenating app_id with user_id
# end_user_id = f"{share.app_id}_{user_id}"
# Store end_user_id in database with original user_id
from app.repositories.end_user_repository import EndUserRepository
end_user_repo = EndUserRepository(db)
new_end_user = end_user_repo.get_or_create_end_user(
app_id=share.app_id,
app_id=share.app_id,
other_id=other_id,
original_user_id=user_id # Save original user_id to other_id
)
@@ -319,21 +311,21 @@ async def chat(
appid=share.app_id
"""获取存储类型和工作空间的ID"""
# 直接通过 SQLAlchemy 查询 app
from app.models.app_model import App
app = db.query(App).filter(App.id == appid).first()
if not app:
raise BusinessException("应用不存在", BizCode.APP_NOT_FOUND)
workspace_id = app.workspace_id
# 直接从 workspace 获取 storage_type（公开分享场景无需权限检查）
storage_type = workspace_service.get_workspace_storage_type_without_auth(
db=db,
workspace_id=workspace_id
)
if storage_type is None:
if storage_type is None:
storage_type = 'neo4j'
user_rag_memory_id = ''
@@ -357,7 +349,7 @@ async def chat(
# 获取应用类型
app_type = release.app.type if release.app else None
# 根据应用类型验证配置
if app_type == "agent":
# Agent 类型：验证模型配置
@@ -371,7 +363,7 @@ async def chat(
raise BusinessException("多 Agent 应用未配置子 Agent", BizCode.AGENT_CONFIG_MISSING)
else:
raise BusinessException(f"不支持的应用类型: {app_type}", BizCode.APP_TYPE_NOT_SUPPORTED)
# 获取或创建会话（提前验证）
conversation = service.create_or_get_conversation(
share_token=share_data.share_token,
@@ -379,7 +371,7 @@ async def chat(
user_id=str(new_end_user.id), # 转换为字符串
password=password
)
logger.debug(
"参数验证完成",
extra={
@@ -389,12 +381,12 @@ async def chat(
"stream": payload.stream
}
)
except Exception as e:
# 验证失败，直接抛出异常（会被 FastAPI 的异常处理器捕获）
logger.error(f"参数验证失败: {str(e)}")
raise
if app_type == AppType.AGENT:
# 流式返回
if payload.stream:
@@ -412,7 +404,7 @@ async def chat(
user_rag_memory_id=user_rag_memory_id
):
yield event
return StreamingResponse(
event_generator(),
media_type="text/event-stream",
@@ -422,7 +414,7 @@ async def chat(
"X-Accel-Buffering": "no"
}
)
# 非流式返回
result = await service.chat(
share_token=share_token,
@@ -454,7 +446,7 @@ async def chat(
user_rag_memory_id=user_rag_memory_id
):
yield event
return StreamingResponse(
event_generator(),
media_type="text/event-stream",
@@ -464,7 +456,7 @@ async def chat(
"X-Accel-Buffering": "no"
}
)
# 多 Agent 非流式返回
result = await service.multi_agent_chat(
share_token=share_token,
@@ -478,7 +470,7 @@ async def chat(
storage_type=storage_type,
user_rag_memory_id=user_rag_memory_id
)
return success(data=conversation_schema.ChatResponse(**result))
else:
from app.core.exceptions import BusinessException

9
api/app/services/app_service.py
View File

@@ -9,7 +9,7 @@
"""
import datetime
import uuid
from typing import Optional, List, Dict, Any, Tuple, Type
from typing import Optional, List, Dict, Any, Tuple
from sqlalchemy import select, func, or_, and_
from sqlalchemy.orm import Session
@@ -27,6 +27,7 @@ from app.repositories.workflow_repository import WorkflowConfigRepository
from app.schemas import app_schema
from app.schemas.workflow_schema import WorkflowConfigUpdate
from app.services.agent_config_converter import AgentConfigConverter
from app.models import AppShare, Workspace
# 获取业务日志器
logger = get_business_logger()
@@ -1390,7 +1391,7 @@ class AppService:
target_workspace_ids: List[uuid.UUID],
user_id: uuid.UUID,
workspace_id: Optional[uuid.UUID] = None
) -> List["AppShare"]:
) -> AppShare:
"""分享应用到其他工作空间
Args:
@@ -1406,7 +1407,7 @@ class AppService:
ResourceNotFoundException: 当应用不存在时
BusinessException: 当应用不在指定工作空间或目标工作空间无效时
"""
from app.models import AppShare, Workspace
logger.info(
"分享应用",
@@ -1548,7 +1549,7 @@ class AppService:
*,
app_id: uuid.UUID,
workspace_id: Optional[uuid.UUID] = None
) -> List["AppShare"]:
) -> List[AppShare]:
"""列出应用的所有分享记录
Args:

7
api/app/services/conversation_service.py
View File

@@ -10,7 +10,14 @@ 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 Optional, List, Tuple
from sqlalchemy import select, desc
from sqlalchemy.orm import Session
from app.core.exceptions import ResourceNotFoundException
from app.core.logging_config import get_business_logger
from app.models import Conversation, Message
logger = get_business_logger()

19
api/app/services/workspace_service.py
View File

@@ -5,6 +5,8 @@ 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
@@ -36,6 +38,22 @@ 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
from app.schemas.workspace_schema import (
WorkspaceCreate,
WorkspaceUpdate,
WorkspaceInviteCreate,
WorkspaceInviteResponse,
InviteValidateResponse,
InviteAcceptRequest,
WorkspaceMemberUpdate
)
# 获取业务逻辑专用日志器
business_logger = get_business_logger()
from dotenv import load_dotenv
load_dotenv()
def switch_workspace(
db: Session,
@@ -330,6 +348,7 @@ 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
# 获取用户的工作空间成员关系
member = workspace_repository.get_member_in_workspace(