🐛 SerializationMeta 适配 Pydantic V2

MountainDash · Feb 13, 2024 · 30b0173 · 30b0173
1 parent 673227b
commit 30b0173
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 14 deletions.
diff --git a/nonebot_plugin_saa/registries/meta.py b/nonebot_plugin_saa/registries/meta.py
@@ -24,25 +24,40 @@ class SerializationMeta(BaseModel, ABC):
             frozen=True,
             orm_mode=True,
         )
+
+        @classmethod
+        def __pydantic_init_subclass__(cls, *args, **kwargs) -> None:
+            if cls._level == Level.MetaBase:
+                cls._level = Level.Base
+                cls._deserializer_dict = {}
+            elif cls._level == Level.Base:
+                cls._level = Level.Normal
+                cls._deserializer_dict[cls.model_fields[cls._index_key].default] = cls
+            elif cls._level == Level.Normal:
+                pass
+            else:
+                raise RuntimeError("SerializationMeta init error")
+
     else:
 
         class Config:
             frozen = True
             orm_mode = True
 
-    def __init_subclass__(cls, *args, **kwargs) -> None:
-        if cls._level == Level.MetaBase:
-            cls._level = Level.Base
-            cls._deserializer_dict = {}
-        elif cls._level == Level.Base:
-            cls._level = Level.Normal
-            cls._deserializer_dict[cls.__fields__[cls._index_key].default] = cls
-        elif cls._level == Level.Normal:
-            pass
-        else:
-            raise RuntimeError("SerializationMeta init error")
+        @classmethod
+        def __init_subclass__(cls, *args, **kwargs) -> None:
+            if cls._level == Level.MetaBase:
+                cls._level = Level.Base
+                cls._deserializer_dict = {}
+            elif cls._level == Level.Base:
+                cls._level = Level.Normal
+                cls._deserializer_dict[cls.__fields__[cls._index_key].default] = cls
+            elif cls._level == Level.Normal:
+                pass
+            else:
+                raise RuntimeError("SerializationMeta init error")
 
-        super().__init_subclass__(*args, **kwargs)
+            super().__init_subclass__(*args, **kwargs)
 
     @classmethod
     def deserialize(cls, source: Any) -> Self:

diff --git a/poetry.lock b/poetry.lock
diff --git a/tests/test_platform_target.py b/tests/test_platform_target.py
@@ -13,7 +13,11 @@ class MySendTarget(PlatformTarget):
         platform_type: Literal[SupportedPlatform.qq_group] = SupportedPlatform.qq_group
         my_field: int
 
+        def test(self):
+            return self.my_field
+
     send_target = MySendTarget(my_field=123)
+    send_target.test()
     serialized_target = send_target.json()
     deserialized_target = PlatformTarget.deserialize(serialized_target)
 

diff --git a/tests/test_send.py b/tests/test_send.py
@@ -53,6 +53,6 @@ async def test_matcher():
                         "detail_type": "private",
                         "user_id": event.user_id,
                     },
-                    result={"message_id": 12451},
+                    result={"message_id": "12451"},
                 )
                 assertion(ctx)