🐛 version 0.12.6

fix model_validator

nonebot/adapters/satori/event.py

@@ -246,8 +246,9 @@ def get_message(self) -> Message:
 
     @model_validator(mode="before")
     def generate_message(cls, values):
-        values["_message"] = Message.from_satori_element(parse(values["message"]["content"]))
-        values["original_message"] = deepcopy(values["_message"])
+        if isinstance(values, dict):
+            values["_message"] = Message.from_satori_element(parse(values["message"]["content"]))
+            values["original_message"] = deepcopy(values["_message"])
         return values
 
     @property
@@ -405,7 +406,8 @@ def get_session_id(self) -> str:
 
     @model_validator(mode="before")
     def generate_message(cls, values):
-        values["_message"] = Message.from_satori_element(parse(values["message"]["content"]))
+        if isinstance(values, dict):
+            values["_message"] = Message.from_satori_element(parse(values["message"]["content"]))
         return values
 
     @property
@@ -526,11 +528,12 @@ def get_event_description(self) -> str:
 
     @model_validator(mode="before")
     def generate_message(cls, values):
-        cmd = values["argv"]["name"]
-        if values["argv"].get("arguments", []):
-            cmd += " ".join(values["argv"]["arguments"])
-        values["_message"] = Message(cmd)
-        values["original_message"] = deepcopy(values["_message"])
+        if isinstance(values, dict):
+            cmd = values["argv"]["name"]
+            if values["argv"].get("arguments", []):
+                cmd += " ".join(values["argv"]["arguments"])
+            values["_message"] = Message(cmd)
+            values["original_message"] = deepcopy(values["_message"])
         return values
 
     def convert(self):
@@ -576,8 +579,9 @@ class InteractionCommandMessageEvent(InteractionCommandEvent):
 
     @model_validator(mode="before")
     def generate_message(cls, values):
-        values["_message"] = Message.from_satori_element(parse(values["message"]["content"]))
-        values["original_message"] = deepcopy(values["_message"])
+        if isinstance(values, dict):
+            values["_message"] = Message.from_satori_element(parse(values["message"]["content"]))
+            values["original_message"] = deepcopy(values["_message"])
         return values
 
     @override

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-adapter-satori"
-version = "0.12.5"
+version = "0.12.6"
 description = "Satori Protocol Adapter for Nonebot2"
 authors = [
     {name = "RF-Tar-Railt",email = "rf_tar_railt@qq.com"},