给Expression系统的一些准备文件

src/common/data_models/expression_data_model.py

@@ -14,7 +14,7 @@ class MaiExpression(BaseDatabaseDataModel[Expression]):
         item_id: int,
         situation: str,
         style: str,
-        context: str,
+        # context: str,
         # up_content: str,
         content: List[str],
         count: int,
@@ -31,8 +31,8 @@ class MaiExpression(BaseDatabaseDataModel[Expression]):
         """表达方式使用情景"""
         self.style = style
         """表达方式风格"""
-        self.context = context
-        """表达方式上下文"""
+        # self.context = context
+        # """表达方式上下文"""
         # self.up_content = up_content
         self.content: List[str] = content
         """内容列表"""
@@ -40,7 +40,7 @@ class MaiExpression(BaseDatabaseDataModel[Expression]):
         self.last_active_time: datetime = last_active_time or datetime.now()
         self.create_time: datetime = create_time or datetime.now()
         self.session_id: Optional[str] = session_id
-        
+
         self.checked: bool = checked
         """是否已经被检查过"""
         self.rejected: bool = rejected
@@ -58,7 +58,7 @@ class MaiExpression(BaseDatabaseDataModel[Expression]):
             item_id=db_record.id,  # type: ignore
             situation=db_record.situation,
             style=db_record.style,
-            context=db_record.context,
+            # context=db_record.context,
             content=content_list,
             count=db_record.count,
             last_active_time=db_record.last_active_time,
@@ -77,7 +77,7 @@ class MaiExpression(BaseDatabaseDataModel[Expression]):
             id=self.item_id,
             situation=self.situation,
             style=self.style,
-            context=self.context,
+            # context=self.context,
             content_list=json.dumps(self.content),
             count=self.count,
             last_active_time=self.last_active_time,

src/common/data_models/message_component_data_model.py

@@ -1,6 +1,8 @@
 from abc import ABC, abstractmethod
 from copy import deepcopy
 from maim_message import Seg, UserInfo, MessageBase, BaseMessageInfo
+from pathlib import Path
+from sqlmodel import select
 from typing import Optional, List, Union, Dict, Any
 
 import asyncio
@@ -61,8 +63,21 @@ class ImageComponent(BaseMessageComponentModel, ByteComponent):
         return "image"
 
     async def load_image_binary(self):
-        if not self.binary_data:
-            raise NotImplementedError
+        if self.binary_data:
+            return
+        from src.common.database.database import get_db_session
+        from src.common.database.database_model import Images, ImageType
+
+        try:
+            with get_db_session() as db:
+                statement = select(Images).filter_by(image_hash=self.binary_hash, image_type=ImageType.IMAGE).limit(1)
+                if image_record := db.exec(statement).first():
+                    image_path = Path(image_record.full_path)
+                else:
+                    raise ValueError(f"无法通过 image_hash 加载图片二进制数据: {self.binary_hash}")
+            self.binary_data = await asyncio.to_thread(image_path.read_bytes)
+        except Exception as e:
+            raise ValueError(f"通过 image_hash 加载图片二进制数据时发生错误: {e}") from e
 
     async def to_seg(self) -> Seg:
         if not self.binary_data:
@@ -85,18 +100,21 @@ class EmojiComponent(BaseMessageComponentModel, ByteComponent):
             ValueError: 如果 binary_data 为空且缺少 emoji_hash
             ValueError: 如果无法通过 emoji_hash 加载表情二进制数据
         """
-        if not self.binary_data:
-            from src.chat.emoji_system.emoji_manager import emoji_manager
+        if self.binary_data:
+            return
+        from src.common.database.database import get_db_session
+        from src.common.database.database_model import Images, ImageType
 
-            if not (
-                emoji := emoji_manager.get_emoji_by_hash(self.binary_hash)
-                or emoji_manager.get_emoji_by_hash_from_db(self.binary_hash)
-            ):
-                raise ValueError(f"无法通过 emoji_hash 加载表情二进制数据: {self.binary_hash}")
-            try:
-                self.binary_data = await asyncio.to_thread(emoji.full_path.read_bytes)
-            except Exception as e:
-                raise ValueError(f"通过 emoji_hash 加载表情二进制数据时发生错误: {e}") from e
+        try:
+            with get_db_session() as db:
+                statement = select(Images).filter_by(image_hash=self.binary_hash, image_type=ImageType.EMOJI).limit(1)
+                if image_record := db.exec(statement).first():
+                    image_path = Path(image_record.full_path)
+                else:
+                    raise ValueError(f"无法通过 emoji_hash 加载表情二进制数据: {self.binary_hash}")
+            self.binary_data = await asyncio.to_thread(image_path.read_bytes)
+        except Exception as e:
+            raise ValueError(f"通过 emoji_hash 加载表情二进制数据时发生错误: {e}") from e
 
     async def to_seg(self) -> Seg:
         if not self.binary_data:

src/common/database/database_model.py

@@ -170,7 +170,7 @@ class Expression(SQLModel, table=True):
     situation: str = Field(index=True, max_length=255, primary_key=True)  # 情景
     style: str = Field(index=True, max_length=255, primary_key=True)  # 风格
 
-    context: str  # 上下文
+    # context: str  # 上下文
     # up_content: str
 
     content_list: str  # 内容列表，JSON格式存储