fix(pydantic): model_validate_json causing code break when using pydantic v1

Add model_validate_json methods which works with both pydantic v1 and v2

Author: silentworks

postgrest/_async/request_builder.py

@@ -20,7 +20,7 @@
 )
 from ..exceptions import APIError, APIErrorFromJSON, generate_default_error_message
 from ..types import ReturnMethod
-from ..utils import get_origin_and_cast
+from ..utils import get_origin_and_cast, model_validate_json
 
 _ReturnT = TypeVar("_ReturnT")
 
@@ -74,7 +74,7 @@ async def execute(self) -> APIResponse[_ReturnT]:
                             return body
                 return APIResponse[_ReturnT].from_http_request_response(r)
             else:
-                json_obj = APIErrorFromJSON.model_validate_json(r.content)
+                json_obj = model_validate_json(APIErrorFromJSON, r.content)
                 raise APIError(dict(json_obj))
         except ValidationError as e:
             raise APIError(generate_default_error_message(r))
@@ -122,7 +122,7 @@ async def execute(self) -> SingleAPIResponse[_ReturnT]:
             ):  # Response.ok from JS (https://developer.mozilla.org/en-US/docs/Web/API/Response/ok)
                 return SingleAPIResponse[_ReturnT].from_http_request_response(r)
             else:
-                json_obj = APIErrorFromJSON.model_validate_json(r.content)
+                json_obj = model_validate_json(APIErrorFromJSON, r.content)
                 raise APIError(dict(json_obj))
         except ValidationError as e:
             raise APIError(generate_default_error_message(r))

postgrest/_sync/request_builder.py

@@ -20,7 +20,7 @@
 )
 from ..exceptions import APIError, APIErrorFromJSON, generate_default_error_message
 from ..types import ReturnMethod
-from ..utils import get_origin_and_cast
+from ..utils import get_origin_and_cast, model_validate_json
 
 _ReturnT = TypeVar("_ReturnT")
 
@@ -74,7 +74,7 @@ def execute(self) -> APIResponse[_ReturnT]:
                             return body
                 return APIResponse[_ReturnT].from_http_request_response(r)
             else:
-                json_obj = APIErrorFromJSON.model_validate_json(r.content)
+                json_obj = model_validate_json(APIErrorFromJSON, r.content)
                 raise APIError(dict(json_obj))
         except ValidationError as e:
             raise APIError(generate_default_error_message(r))
@@ -122,7 +122,7 @@ def execute(self) -> SingleAPIResponse[_ReturnT]:
             ):  # Response.ok from JS (https://developer.mozilla.org/en-US/docs/Web/API/Response/ok)
                 return SingleAPIResponse[_ReturnT].from_http_request_response(r)
             else:
-                json_obj = APIErrorFromJSON.model_validate_json(r.content)
+                json_obj = model_validate_json(APIErrorFromJSON, r.content)
                 raise APIError(dict(json_obj))
         except ValidationError as e:
             raise APIError(generate_default_error_message(r))

postgrest/utils.py

@@ -7,6 +7,7 @@
 from deprecation import deprecated
 from httpx import AsyncClient  # noqa: F401
 from httpx import Client as BaseClient  # noqa: F401
+from pydantic import BaseModel
 
 from .version import __version__
 
@@ -81,3 +82,17 @@ def is_valid_jwt(value: str) -> bool:
             return False
 
     return True
+
+
+TBaseModel = TypeVar("TBaseModel", bound=BaseModel)
+
+
+def model_validate_json(model: Type[TBaseModel], contents) -> TBaseModel:
+    """Compatibility layer between pydantic 1 and 2 for parsing an instance
+    of a BaseModel from varied"""
+    try:
+        # pydantic > 2
+        return model.model_validate_json(contents)
+    except AttributeError:
+        # pydantic < 2
+        return model.parse_raw(contents)