Fix bugs that are not compatible with pydantic2.x

fastapi_crudrouter/core/_utils.py

@@ -2,9 +2,11 @@
 
 from fastapi import Depends, HTTPException
 from pydantic import create_model
+from pydantic import __version__ as pydantic_version
 
 from ._types import T, PAGINATION, PYDANTIC_SCHEMA
 
+PYDANTIC_MAJOR_VERSION = int(pydantic_version.split(".", maxsplit=1)[0])
 
 class AttrDict(dict): # type: ignore
  def __init__(self, *args, **kwargs) -> None: # type: ignore
@@ -14,7 +16,10 @@ def __init__(self, *args, **kwargs) -> None: # type: ignore
 
 def get_pk_type(schema: Type[PYDANTIC_SCHEMA], pk_field: str) -> Any:
  try:
- return schema.__fields__[pk_field].type_
+ if PYDANTIC_MAJOR_VERSION >= 2:
+ return schema.model_fields[pk_field].annotation
+ else:
+ return schema.__fields__[pk_field].type_
  except KeyError:
  return int
 
@@ -26,11 +31,20 @@ def schema_factory(
  Is used to create a CreateSchema which does not contain pk
  """
 
- fields = {
- f.name: (f.type_, ...)
- for f in schema_cls.__fields__.values()
- if f.name != pk_field_name
- }
+ if PYDANTIC_MAJOR_VERSION >= 2:
+ # pydantic 2.x
+ fields = {
+ fk: (fv.annotation, ...)
+ for fk, fv in schema_cls.model_fields.items()
+ if fk != pk_field_name
+ }
+ else:
+ # pydantic 1.x
+ fields = {
+ f.name: (f.type_, ...)
+ for f in schema_cls.__fields__.values()
+ if f.name != pk_field_name
+ }
 
  name = schema_cls.__name__ + name
  schema: Type[T] = create_model(__model_name=name, **fields) # type: ignore