🚑 修复field在pyd1下报错 (#1842)

* 🚑 修复field在pyd1下报错

* 🐛 修正字段

zhenxun/utils/_build_mat.py

@@ -1,9 +1,8 @@
-from dataclasses import field
 from io import BytesIO
 from pathlib import Path
 import random
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 from strenum import StrEnum
 
 from ._build_image import BuildImage
@@ -21,15 +20,15 @@ class MatType(StrEnum):
 class BuildMatData(BaseModel):
     mat_type: MatType
     """类型"""
-    data: list[int | float] = field(default_factory=list)
+    data: list[int | float] = Field(default_factory=list)
     """数据"""
     x_name: str | None = None
     """X轴坐标名称"""
     y_name: str | None = None
     """Y轴坐标名称"""
-    x_index: list[str] = field(default_factory=list)
+    x_index: list[str] = Field(default_factory=list)
     """显示轴坐标值"""
-    y_index: list[int | float] = field(default_factory=list)
+    y_index: list[int | float] = Field(default_factory=list)
     """数据轴坐标值"""
     space: tuple[int, int] = (20, 20)
     """坐标值间隔(X, Y)"""
@@ -49,7 +48,7 @@ class BuildMatData(BaseModel):
     """背景颜色"""
     background: Path | bytes | None = None
     """背景图片"""
-    bar_color: list[str] = field(default_factory=lambda: ["*"])
+    bar_color: list[str] = Field(default_factory=lambda: ["*"])
     """柱状图柱子颜色, 多个时随机, 使用 * 时七色随机"""
     padding: tuple[int, int] = (50, 50)
     """图表上下左右边距"""

zhenxun/utils/decorator/shop.py

@@ -1,16 +1,15 @@
 from collections.abc import Callable
-from dataclasses import field
 
 from nonebot.adapters.onebot.v11 import Message, MessageSegment
 from nonebot.plugin import require
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from zhenxun.models.goods_info import GoodsInfo
 
 
 class Goods(BaseModel):
-    before_handle: list[Callable] = field(default_factory=list)
-    after_handle: list[Callable] = field(default_factory=list)
+    before_handle: list[Callable] = Field(default_factory=list)
+    after_handle: list[Callable] = Field(default_factory=list)
     price: int
     des: str = ""
     discount: float
@@ -20,7 +19,7 @@ class Goods(BaseModel):
     is_passive: bool
     partition: str | None
     func: Callable
-    kwargs: dict[str, str] = field(default_factory=dict)
+    kwargs: dict[str, str] = Field(default_factory=dict)
     send_success_msg: bool
     max_num_limit: int
 

zhenxun/utils/github_utils/models.py

@@ -1,9 +1,8 @@
-from dataclasses import field
 from typing import Protocol
 
 from aiocache import cached
 from nonebot.compat import model_dump
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 from strenum import StrEnum
 
 from zhenxun.utils.http_utils import AsyncHttpx
@@ -100,7 +99,7 @@ class FileInfo(BaseModel):
 
     type: FileType
     name: str
-    files: list["FileInfo"] = field(default_factory=list)
+    files: list["FileInfo"] = Field(default_factory=list)
 
 
 class JsdelivrStrategy: