🐛 修复对 Pydantic V1 的适配

This commit is contained in:
2024-04-30 02:27:08 +08:00
parent 5cb428ed71
commit 93b169fa40
2 changed files with 4 additions and 3 deletions

View File

@@ -3,6 +3,7 @@ from datetime import datetime
from typing import Any
from nonebot.adapters import Message
from nonebot.compat import type_validate_json
from nonebot_plugin_orm import Model
from pydantic import BaseModel, ValidationError
from sqlalchemy import JSON, DateTime, Dialect, PickleType, String, TypeDecorator
@@ -30,7 +31,7 @@ class PydanticType(TypeDecorator):
if isinstance(value, str | bytes):
for i in self.get_model():
try:
return i.model_validate_json(value)
return type_validate_json(i, value)
except ValidationError: # noqa: PERF203
...
raise TypeError

View File

@@ -155,8 +155,8 @@ class Processor(ProcessorMeta):
failover_code=[502],
failover_exc=(TimeoutException,),
)
self.processed_data.user_profile[params] = UserProfile.model_validate_json(
self.raw_response.user_profile[params]
self.processed_data.user_profile[params] = type_validate_json(
UserProfile, self.raw_response.user_profile[params]
)
return self.processed_data.user_profile[params]