Merge branch 'pydantic-v2'

README.md

@@ -54,19 +54,15 @@ class Student(cherry.Model):
     birthday: date = cherry.Field(default_factory=date.today)
     school: cherry.ForeignKey[Optional["School"]] = None
 
-    class Meta:
-        database = db
-        tablename = "student"
+    cherry_config = cherry.CherryConfig(tablename="student", database=db)
 
 
 class School(cherry.Model):
     id: cherry.PrimaryKey[int]
     name: str = cherry.Field(unique=True, index=True)
     students: cherry.ReverseRelation[List[Student]] = []
 
-    class Meta:
-        database = db
-        tablename = "school"
+    cherry_config = cherry.CherryConfig(tablename="school", database=db)
 
 
 async def main():

README_EN.md

@@ -55,19 +55,15 @@ class Student(cherry.Model):
     birthday: date = cherry.Field(default_factory=date.today)
     school: cherry.ForeignKey[Optional["School"]] = None
 
-    class Meta:
-        database = db
-        tablename = "student"
+    cherry_config = cherry.CherryConfig(tablename="student", database=db)
 
 
 class School(cherry.Model):
     id: cherry.PrimaryKey[int]
     name: str = cherry.Field(unique=True, index=True)
     students: cherry.ReverseRelation[List[Student]] = []
 
-    class Meta:
-        database = db
-        tablename = "school"
+    cherry_config = cherry.CherryConfig(tablename="school", database=db)
 
 
 async def main():

cherry/models/models.py

@@ -95,16 +95,16 @@ def __new__(
             cls.__meta__.database = database
             if not abstract:
                 database.add_model(cls)
-        cls.__meta__.primary_key = tuple(
-            field_name
-            for field_name, field in cls.model_fields.items()
-            if isinstance(field, BaseField) and field.primary_key
-        )
+                cls.__meta__.primary_key = tuple(
+                    field_name
+                    for field_name, field in cls.model_fields.items()
+                    if isinstance(field, BaseField) and field.primary_key
+                )
 
-        if len(cls.__meta__.primary_key) == 0:
-            raise PrimaryKeyMissingError(
-                f"Model {cls} must have at least one primary key",
-            )
+                if len(cls.__meta__.primary_key) == 0:
+                    raise PrimaryKeyMissingError(
+                        f"Model {cls} must have at least one primary key",
+                    )
 
         return cls
 

cherry/typing.py

@@ -1,11 +1,7 @@
+from collections.abc import Mapping
 from typing import (
     Any,
-    Dict,
-    List,
     Literal,
-    Mapping,
-    Tuple,
-    Type,
     TYPE_CHECKING,
     TypeVar,
     Union,
@@ -36,9 +32,9 @@
 Ts = TypeVarTuple("Ts")
 T_MODEL = TypeVar("T_MODEL", bound="Model")
 
-ModelType = Type["Model"]
-DictStrAny: TypeAlias = Dict[str, Any]
-TupleAny: TypeAlias = Tuple[Any, ...]
+ModelType = type["Model"]
+DictStrAny: TypeAlias = dict[str, Any]
+TupleAny: TypeAlias = tuple[Any, ...]
 AnyMapping: TypeAlias = Mapping[Any, Any]
-ClauseListType: TypeAlias = List[Union[BinaryExpression[bool], "ModelClause"]]
+ClauseListType: TypeAlias = list[Union[BinaryExpression[bool], "ModelClause"]]
 OptionalClause: TypeAlias = Union[BooleanClauseList, BinaryExpression, None]

example/example.py

@@ -1,5 +1,5 @@
 from datetime import date
-from typing import List, Optional
+from typing import Optional
 
 import cherry
 
@@ -13,19 +13,15 @@ class Student(cherry.Model):
     birthday: date = cherry.Field(default_factory=date.today)
     school: cherry.ForeignKey[Optional["School"]] = None
 
-    class Meta:
-        database = db
-        tablename = "student"
+    cherry_config = cherry.CherryConfig(tablename="student", database=db)
 
 
 class School(cherry.Model):
     id: cherry.PrimaryKey[int]
     name: str = cherry.Field(unique=True, index=True)
-    students: cherry.ReverseRelation[List[Student]] = []
+    students: cherry.ReverseRelation[list[Student]] = []
 
-    class Meta:
-        database = db
-        tablename = "school"
+    cherry_config = cherry.CherryConfig(tablename="school", database=db)
 
 
 async def main():
@@ -53,7 +49,7 @@ async def main():
     # Django 风格
     student2: Student = await Student.filter(name="student 2").get()
 
-    students: List[Student] = await Student.filter(Student.age >= 18).all()
+    students: list[Student] = await Student.filter(Student.age >= 18).all()
 
     # 聚合查询
     student_nums: int = await Student.filter(Student.age >= 18).count()