Merge branch 'develop' of https://github.com/SuanmoSuanyangTechnology/MemoryBear into feature/app-share-wxy

api/app/models/memory_perceptual_model.py

@@ -7,6 +7,7 @@ from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.dialects.postgresql import JSONB
 
 from app.db import Base
+from app.schemas import FileType
 
 
 class PerceptualType(IntEnum):
@@ -15,6 +16,16 @@ class PerceptualType(IntEnum):
     TEXT = 3
     CONVERSATION = 4
 
+    @staticmethod
+    def trans_from_file_type(file_type: FileType | str):
+        type_map = {
+            FileType.IMAGE: PerceptualType.VISION,
+            FileType.AUDIO: PerceptualType.AUDIO,
+            FileType.VIDEO: PerceptualType.VISION,
+            FileType.DOCUMENT: PerceptualType.TEXT
+        }
+        return type_map.get(file_type, PerceptualType.TEXT)
+
 
 class FileStorageService(IntEnum):
     LOCAL = 1

api/app/models/tenant_model.py

@@ -1,7 +1,7 @@
 import datetime
 import uuid
-from sqlalchemy import Column, String, DateTime, Boolean
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy import Column, String, DateTime, Boolean, text
+from sqlalchemy.dialects.postgresql import UUID, ARRAY
 from sqlalchemy.orm import relationship
 from app.db import Base
 
@@ -20,6 +20,10 @@ class Tenants(Base):
     external_id = Column(String(100), nullable=True, index=True)  # 外部企业ID
     external_source = Column(String(50), nullable=True)  # 来源系统
     
+    # 国际化语言配置字段
+    default_language = Column(String(10), nullable=False, default='zh', server_default='zh', index=True)  # 租户默认语言
+    supported_languages = Column(ARRAY(String(10)), nullable=False, default=lambda: ['zh', 'en'], server_default=text("'{zh,en}'"))  # 租户支持的语言列表
+    
     # Relationship to users - one tenant has many users
     users = relationship("User", back_populates="tenant")
     

api/app/models/user_model.py

@@ -1,6 +1,6 @@
 import datetime
 import uuid
-from sqlalchemy import Column, String, Boolean, DateTime, ForeignKey
+from sqlalchemy import Column, String, Boolean, DateTime, ForeignKey, text
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import relationship
 from app.db import Base
@@ -22,6 +22,9 @@ class User(Base):
     external_id = Column(String(100), nullable=True)  # 外部用户ID
     external_source = Column(String(50), nullable=True)  # 来源系统
     
+    # 用户语言偏好
+    preferred_language = Column(String(10), server_default=text("'zh'"), default='zh', nullable=False, index=True)  # 用户偏好语言，默认中文
+    
     current_workspace_id = Column(UUID(as_uuid=True), ForeignKey("workspaces.id"), nullable=True)  # 当前工作空间ID，可为空
     
     # Foreign key to tenant - each user belongs to exactly one tenant