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

Merge branch 'release/v0.2.2' into develop

Browse Source
This commit is contained in:
Mark
2026-01-31 15:24:20 +08:00
parent 36cb0a12ad 1b853aa893
commit b23730388d
3 changed files with 206 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/app/repositories/memory_config_repository.py
View File

@@ -32,6 +32,8 @@ db_logger = get_db_logger()
config_logger = get_config_logger()
TABLE_NAME = "memory_config"
class MemoryConfigRepository:
"""记忆配置Repository
@@ -170,6 +172,7 @@ class MemoryConfigRepository:
if not memory_config:
raise RuntimeError("reflection config not found")
return memory_config
@staticmethod
def query_reflection_config_by_workspace_id(db: Session, workspace_id: uuid.UUID) -> MemoryConfig:
"""构建查询所有配置的语句（SQLAlchemy text() 命名参数）
@@ -189,7 +192,6 @@ class MemoryConfigRepository:
raise RuntimeError("reflection config not found")
return memory_config
@staticmethod
def build_select_all(workspace_id: uuid.UUID) -> Tuple[str, Dict]:
"""构建查询所有配置的语句（SQLAlchemy text() 命名参数）
@@ -290,7 +292,6 @@ class MemoryConfigRepository:
db_logger.error(f"更新记忆配置失败: config_id={update.config_id} - {str(e)}")
raise
@staticmethod
def update_extracted(db: Session, update: ConfigUpdateExtracted) -> Optional[MemoryConfig]:
"""更新记忆萃取引擎配置
@@ -413,7 +414,7 @@ class MemoryConfigRepository:
raise
@staticmethod
def get_extracted_config(db: Session, config_id: UUID |int) -> Optional[Dict]:
def get_extracted_config(db: Session, config_id: UUID | int) -> Optional[Dict]:
"""获取萃取配置，通过主键查询某条配置
Args:
@@ -423,7 +424,7 @@ class MemoryConfigRepository:
Returns:
Optional[Dict]: 萃取配置字典，不存在则返回None
"""
config_id=resolve_config_id(config_id,db)
config_id = resolve_config_id(config_id, db)
db_logger.debug(f"查询萃取配置: config_id={config_id}")
try:
db_config = db.query(MemoryConfig).filter(MemoryConfig.config_id == config_id).first()
@@ -517,8 +518,9 @@ class MemoryConfigRepository:
except Exception as e:
db_logger.error(f"根据ID查询记忆配置失败: config_id={config_id} - {str(e)}")
raise
@staticmethod
def get_config_with_workspace(db: Session, config_id: uuid.UUID) -> Optional[tuple]:
def get_config_with_workspace(db: Session, config_id: uuid.UUID | int | str) -> Optional[tuple]:
"""Get memory config and its associated workspace information
Args:
@@ -536,6 +538,7 @@ class MemoryConfigRepository:
from app.models.workspace_model import Workspace
start_time = time.time()
config_id = resolve_config_id(config_id, db)
# Log configuration loading start
config_logger.info(
@@ -584,8 +587,10 @@ class MemoryConfigRepository:
"elapsed_ms": elapsed_ms
}
)
db_logger.error(f"Memory config {config_id} references non-existent workspace {config_only.workspace_id}")
raise ValueError(f"Workspace {config_only.workspace_id} not found for configuration {config_id}")
db_logger.error(
f"Memory config {config_id} references non-existent workspace {config_only.workspace_id}")
raise ValueError(
f"Workspace {config_only.workspace_id} not found for configuration {config_id}")
config_logger.debug(
"Configuration not found",
@@ -616,7 +621,8 @@ class MemoryConfigRepository:
}
)
db_logger.debug(f"Memory config and workspace query successful: config={config.config_name}, workspace={workspace.name}")
db_logger.debug(
f"Memory config and workspace query successful: config={config.config_name}, workspace={workspace.name}")
return (config, workspace)
except ValueError:
@@ -640,6 +646,7 @@ class MemoryConfigRepository:
db_logger.error(f"Failed to query memory config and workspace: config_id={config_id} - {str(e)}")
raise
@staticmethod
def get_all(db: Session, workspace_id: Optional[uuid.UUID] = None) -> List[MemoryConfig]:
"""获取所有配置参数

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

@@ -17,12 +17,15 @@ from app.repositories.neo4j.neo4j_connector import Neo4jConnector
from pydantic import BaseModel, Field
from sqlalchemy.orm import Session
from app.utils.config_utils import resolve_config_id
logger = get_business_logger()
class EmotionSuggestion(BaseModel):
"""情绪建议模型"""
type: str = Field(..., description="建议类型：emotion_balance/activity_recommendation/social_connection/stress_management")
type: str = Field(...,
description="建议类型：emotion_balance/activity_recommendation/social_connection/stress_management")
title: str = Field(..., description="建议标题")
content: str = Field(..., description="建议内容")
priority: str = Field(..., description="优先级：high/medium/low")
@@ -498,7 +501,7 @@ class EmotionAnalyticsService:
connected_config = get_end_user_connected_config(end_user_id, db)
config_id = connected_config.get("memory_config_id")
config_id = resolve_config_id(config_id, db)
if config_id is not None:
from app.services.memory_config_service import (
MemoryConfigService,

11
api/app/utils/config_utils.py
View File

@@ -7,7 +7,7 @@ from uuid import UUID
from sqlalchemy.orm import Session
def resolve_config_id(config_id: UUID | int, db: Session) -> UUID:
def resolve_config_id(config_id: UUID | int|str, db: Session) -> UUID:
"""
解析 config_id，如果是整数则通过 config_id_old 查找对应的 UUID
@@ -21,16 +21,17 @@ def resolve_config_id(config_id: UUID | int, db: Session) -> UUID:
Raises:
ValueError: 当找不到对应的配置时
"""
from app.models.memory_config_model import MemoryConfig
if isinstance(config_id, UUID):
return config_id
if isinstance(config_id, str) and len(config_id)<=6:
memory_config = db.query(MemoryConfig).filter(
MemoryConfig.config_id_old == config_id
MemoryConfig.config_id_old == int(config_id)
).first()
print(memory_config)
if not memory_config:
raise ValueError(f"未找到 config_id_old={config_id} 对应的配置")
raise ValueError(f"STR 未找到 config_id_old={config_id} 对应的配置")
return memory_config.config_id
if isinstance(config_id, int):
memory_config = db.query(MemoryConfig).filter(
@@ -38,7 +39,7 @@ def resolve_config_id(config_id: UUID | int, db: Session) -> UUID:
).first()
if not memory_config:
raise ValueError(f"未找到 config_id_old={config_id} 对应的配置")
raise ValueError(f"INT 未找到 config_id_old={config_id} 对应的配置")
return memory_config.config_id