Full Pydantic 2.0 Support + Bug Fixes

aredis_om/checks.py

@@ -1,5 +1,4 @@
 from functools import lru_cache
-from typing import List
 
 from aredis_om.connections import get_redis_connection
 

aredis_om/model/encoders.py

@@ -31,7 +31,9 @@
 from types import GeneratorType
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union
 
-from .._compat import ENCODERS_BY_TYPE, BaseModel
+from pydantic import BaseModel
+from pydantic.deprecated.json import ENCODERS_BY_TYPE
+from pydantic_core import PydanticUndefined
 
 
 SetIntStr = Set[Union[int, str]]
@@ -72,7 +74,7 @@ def jsonable_encoder(
         encoder = getattr(obj.__config__, "json_encoders", {})
         if custom_encoder:
             encoder.update(custom_encoder)
-        obj_dict = obj.dict(
+        obj_dict = obj.model_dump(
             include=include,  # type: ignore # in Pydantic
             exclude=exclude,  # type: ignore # in Pydantic
             by_alias=by_alias,
@@ -106,6 +108,7 @@ def jsonable_encoder(
                     or (not isinstance(key, str))
                     or (not key.startswith("_sa"))
                 )
+                and value is not PydanticUndefined
                 and (value is not None or not exclude_none)
                 and ((include and key in include) or not exclude or key not in exclude)
             ):

aredis_om/model/migrations/migrator.py

@@ -131,7 +131,7 @@ async def detect_migrations(self):
 
             stored_hash = await conn.get(hash_key)
             if isinstance(stored_hash, bytes):
-                stored_hash = stored_hash.decode('utf-8')
+                stored_hash = stored_hash.decode("utf-8")
 
             schema_out_of_date = current_hash != stored_hash