修复Sessions和Memory存储问题，修复类型错误 (#165)

* 修复Sessions和Memory存储问题，修复类型错误

* 修复迁移

Author: JohnRichard4096

nonebot_plugin_suggarchat/handlers/chat.py

@@ -49,7 +49,7 @@
     ToolResult,
     get_memory_data,
 )
-from ..utils.models import InsightsModel
+from ..utils.models import ImageContent, ImageUrl, InsightsModel, TextContent
 from ..utils.tokenizer import hybrid_token_count
 
 command_prefix = get_driver().config.command_start or "/"
@@ -80,7 +80,9 @@ async def get_tokens(
         if isinstance(st["content"], str):
             full_string += st["content"]
         else:
-            temp_string = "".join(s["text"] for s in st["content"] if s["type"] == "text")
+            temp_string = "".join(
+                s["text"] for s in st["content"] if s["type"] == "text"
+            )
             full_string += temp_string
     it = hybrid_token_count(full_string)
     ot = hybrid_token_count(response.content)
@@ -97,8 +99,8 @@ async def enforce_token_limit(
     """
     控制 token 数量，删除超出限制的旧消息.
     """
-    train = copy.deepcopy(train)
-    memory_l = [train, *data.memory.messages]
+    train_model = Message.model_validate(train)
+    memory_l: list[Message | ToolResult] = [train_model, *data.memory.messages]
     tokens = await get_tokens(memory_l, response)
     if not config_manager.config.llm_config.enable_tokens_limit:
         return tokens
@@ -131,6 +133,7 @@ async def enforce_token_limit(
         tk_tmp = hybrid_token_count(
             full_string, config_manager.config.llm_config.tokens_count_mode
         )
+        await asyncio.sleep(0)
     return tokens
 
 
@@ -198,25 +201,22 @@ async def handle_group_message(
         if config_manager.config.parse_segments:
             text = (
                 [
-                    {
-                        "type": "text",
-                        "text": f"[{role}][{Date}][{user_name}（{user_id}）]说:{content}",
-                    },
+                    TextContent(
+                        text=f"[{role}][{Date}][{user_name}（{user_id}）]说:{content}"
+                    )
                 ]
                 + [
-                    {"type": "input_image", "url": seg.data.get("url")}
+                    ImageContent(image_url=ImageUrl(url=seg.data["url"]))
                     for seg in event.message
-                    if seg.data.get("type") == "image"
+                    if seg.data.get("type") == "image" and seg.data.get("url")
                 ]
                 if is_multimodal
                 else f"[{role}][{Date}][{user_name}（{user_id}）]说:{content}"
             )
         else:
             text = event.message.extract_plain_text()
 
-        data.memory.messages.append(
-            Message.model_validate({"role": "user", "content": text})
-        )
+        data.memory.messages.append(Message(role="user", content=text))
         if chat_manager.debug:
             logger.debug(f"当前群组提示词：\n{config_manager.group_train}")
         # 控制记忆长度和 token 限制
@@ -275,24 +275,21 @@ async def handle_private_message(
         if config_manager.config.parse_segments:
             text = (
                 [
-                    {
-                        "type": "text",
-                        "text": f"{Date}{await get_friend_name(event.user_id, bot=bot)}（{event.user_id}）： {content!s}",
-                    },
+                    TextContent(
+                        text=f"{Date}{await get_friend_name(event.user_id, bot=bot)}（{event.user_id}）： {content!s}"
+                    )
                 ]
                 + [
-                    {"type": "image_url", "image_url": {"url": seg.data.get("url")}}
+                    ImageContent(image_url=ImageUrl(url=seg.data["url"]))
                     for seg in event.message
-                    if seg.data.get("type") == "image"
+                    if seg.data.get("type") == "image" and seg.data.get("url")
                 ]
                 if is_multimodal
                 else f"{Date}{await get_friend_name(event.user_id, bot=bot)}（{event.user_id}）： {content!s}"
             )
         else:
             text = event.message.extract_plain_text()
-        data.memory.messages.append(
-            Message.model_validate({"role": "user", "content": text})
-        )
+        data.memory.messages.append(Message(role="user", content=text))
         if chat_manager.debug:
             logger.debug(f"当前私聊提示词：\n{config_manager.private_train}")
         # 控制记忆长度和 token 限制

nonebot_plugin_suggarchat/migrations/3537b7cb6a29_init.py

@@ -28,8 +28,12 @@ def upgrade(name: str = "") -> None:
         sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
         sa.Column("ins_id", sa.Integer(), nullable=False),
         sa.Column("is_group", sa.Boolean(), nullable=False),
-        sa.Column("messages_json", sa.Text(), nullable=False),
-        sa.Column("sessions_json", sa.Text(), nullable=False),
+        sa.Column(
+            "messages_json", sa.Text(), nullable=False, server_default=sa.text("'{}'")
+        ),
+        sa.Column(
+            "sessions_json", sa.Text(), nullable=False, server_default=sa.text("'[]'")
+        ),
         sa.Column("time", sa.DateTime(), nullable=False),
         sa.Column("usage_count", sa.Integer(), nullable=False),
         sa.PrimaryKeyConstraint("id", name=op.f("pk_suggarchat_memory_data")),

nonebot_plugin_suggarchat/migrations/5740c5aae763_json.py

@@ -0,0 +1,65 @@
+"""Json
+
+迁移 ID: 5740c5aae763
+父迁移: 25b14ed0ad3c
+创建时间: 2025-08-21 15:46:52.697364
+
+"""
+
+from __future__ import annotations
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "5740c5aae763"
+down_revision: str | Sequence[str] | None = "25b14ed0ad3c"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = "") -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("suggarchat_memory_data", schema=None) as batch_op:
+        batch_op.alter_column(
+            "memory_json",
+            existing_type=sa.TEXT(),
+            type_=sa.JSON(),
+            existing_nullable=False,
+            existing_server_default="'{}'",
+        )
+        batch_op.alter_column(
+            "sessions_json",
+            existing_type=sa.TEXT(),
+            type_=sa.JSON(),
+            existing_nullable=False,
+            existing_server_default="'[]'",
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = "") -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("suggarchat_memory_data", schema=None) as batch_op:
+        batch_op.alter_column(
+            "sessions_json",
+            existing_type=sa.JSON(),
+            type_=sa.TEXT(),
+            existing_nullable=False,
+            existing_server_default="'[]'",
+        )
+        batch_op.alter_column(
+            "memory_json",
+            existing_type=sa.JSON(),
+            type_=sa.TEXT(),
+            existing_nullable=False,
+            existing_server_default="'{}'",
+        )
+
+    # ### end Alembic commands ###

nonebot_plugin_suggarchat/utils/libchat.py

@@ -138,6 +138,8 @@ async def tools_caller(
             continue
     else:
         raise err or RuntimeError("所有适配器调用失败")
+
+
 async def get_chat(
     messages: list[Message | ToolResult],
 ) -> UniResponse[str, None]:

nonebot_plugin_suggarchat/utils/memory.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import json
 import time
 from datetime import datetime
 from typing import overload
@@ -96,19 +95,19 @@ async def get_memory_data(
 
         session.add(memory)
         await session.refresh(memory)
-        memory_json_text = memory.memory_json
-        sessions_json = memory.sessions_json
+        memory_data = memory.memory_json
+        sessions_data = memory.sessions_json
         messages = [
             (
                 Message.model_validate(i)
                 if i["role"] != "tool"
                 else ToolResult.model_validate(i)
             )
-            for i in (json.loads(memory_json_text))["messages"]
+            for i in (memory_data)["messages"]
         ]
         c_memory = Memory(messages=messages, time=memory.time.timestamp())
 
-        sessions = [Memory.model_validate(i) for i in json.loads(sessions_json)]
+        sessions = [Memory.model_validate(i) for i in sessions_data]
         conf = MemoryModel(
             memory=c_memory,
             sessions=sessions,
@@ -172,8 +171,8 @@ async def write_memory_data(
                     for_update=True,
                 )
             session.add(memory)
-            memory.memory_json = data.memory.model_dump_json()
-            memory.sessions_json = json.dumps([s.model_dump() for s in data.sessions])
+            memory.memory_json = data.memory.model_dump()
+            memory.sessions_json = [s.model_dump() for s in data.sessions]
             memory.time = datetime.fromtimestamp(data.timestamp)
             memory.usage_count = data.usage
             memory.input_token_usage = data.input_token_usage

nonebot_plugin_suggarchat/utils/models.py

@@ -7,6 +7,7 @@
 from pydantic import BaseModel as B_Model
 from pydantic import Field
 from sqlalchemy import (
+    JSON,
     BigInteger,
     Boolean,
     DateTime,
@@ -193,12 +194,18 @@ class Memory(Model):
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     ins_id: Mapped[int] = mapped_column(BigInteger, nullable=False)
     is_group: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
-    memory_json: Mapped[str] = mapped_column(
-        Text,
-        default=MemoryModel().model_dump_json(),
+    memory_json: Mapped[dict[str, Any]] = mapped_column(
+        JSON,
+        default=MemoryModel().model_dump(),
         nullable=False,
+        server_default=text("'{}'"),
+    )
+    sessions_json: Mapped[list[dict[str, Any]]] = mapped_column(
+        JSON,
+        default=[],
+        nullable=False,
+        server_default=text("'[]'"),
     )
-    sessions_json: Mapped[str] = mapped_column(Text, default="[]", nullable=False)
     time: Mapped[datetime] = mapped_column(
         DateTime, default=datetime.now, nullable=False
     )

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot_plugin_suggarchat"
-version = "3.4.5"
+version = "3.4.5.1"
 description = "SuggarChat chat framework"
 authors = [{ name = "LiteSuggarDEV", email = "windowserror@163.com" }]
 dependencies = [