Merge remote-tracking branch 'origin/develop' into refactor/memory-config-management

api/app/models/end_user_model.py

@@ -1,6 +1,6 @@
 import datetime
 import uuid
-from sqlalchemy import Column, String, DateTime, ForeignKey
+from sqlalchemy import Column, String, DateTime, ForeignKey, Text, BigInteger
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import relationship
 from app.db import Base
@@ -17,6 +17,21 @@ class EndUser(Base):
     reflection_time = Column(DateTime, nullable=True)
     created_at = Column(DateTime, default=datetime.datetime.now)
     updated_at = Column(DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now)
+    
+    # 用户基本信息字段
+    name = Column(String, nullable=True, comment="姓名")
+    position = Column(String, nullable=True, comment="职位")
+    department = Column(String, nullable=True, comment="部门")
+    contact = Column(String, nullable=True, comment="联系方式")
+    phone = Column(String, nullable=True, comment="电话")
+    hire_date = Column(BigInteger, nullable=True, comment="入职日期（时间戳，毫秒）")
+    updatetime_profile = Column(BigInteger, nullable=True, comment="核心档案信息最后更新时间（时间戳，毫秒）")
+    
+    # 缓存字段 - Cache fields for pre-computed analytics
+    memory_insight = Column(Text, nullable=True, comment="缓存的记忆洞察报告")
+    user_summary = Column(Text, nullable=True, comment="缓存的用户摘要")
+    memory_insight_updated_at = Column(DateTime, nullable=True, comment="洞察报告最后更新时间")
+    user_summary_updated_at = Column(DateTime, nullable=True, comment="用户摘要最后更新时间")
 
     # 与 App 的反向关系
     app = relationship(

api/app/models/models_model.py

@@ -15,25 +15,6 @@ class ModelType(StrEnum):
     EMBEDDING = "embedding"
     RERANK = "rerank"
 
-    @classmethod
-    def from_str(cls, value: str) -> "ModelType":
-        """
-        Get a ModelType enum instance from a string value.
-
-        Args:
-            value (str): The string representation of the model type.
-
-        Returns:
-            ModelType: The corresponding ModelType enum object.
-
-        Raises:
-            ValueError: If the given value does not match any ModelType.
-        """
-        try:
-            return cls(value)
-        except ValueError:
-            raise ValueError(f"Invalid ModelType: {value}")
-
 
 class ModelProvider(StrEnum):
     """模型提供商枚举"""