fix error on deal with UUID pgproto (asyncpg UUID)

Author: phenobarbital

datamodel/base.py

@@ -191,6 +191,7 @@ def _process_field_(
         field_category = self.__field_types__.get(name, 'complex')
         try:
             if field_category == 'primitive':
+                print('AQUI > ', _type, value, type(value))
                 # if value is not None:
                 new_val = parse_basic(_type, value, _encoder)
                 return self._validation_(name, new_val, f, _type)

datamodel/converters.pyx

@@ -13,6 +13,7 @@ from cpython cimport datetime
 import pendulum
 from pendulum.parsing.exceptions import ParserError
 from uuid import UUID
+import asyncpg.pgproto.pgproto as pgproto
 from cpython.ref cimport PyObject
 from .functions import is_dataclass, is_iterable, is_primitive
 
@@ -38,6 +39,9 @@ cdef str to_string(object obj):
 cdef object to_uuid(object obj):
     """Returns a UUID version of a str column.
     """
+    if isinstance(obj, pgproto.UUID):
+        # If it's asyncpg's UUID, convert by casting to string first
+        return UUID(str(obj))
     if isinstance(obj, UUID):
         # already an uuid
         return obj
@@ -333,6 +337,7 @@ cpdef object register_converter(object _type, object converter_func):
 cdef dict encoders = {
     str: to_string,
     UUID: to_uuid,
+    pgproto.UUID: to_uuid,
     bool: to_boolean,
     int: to_integer,
     float: to_float,
@@ -568,11 +573,12 @@ cpdef object parse_basic(object T, object data, object encoder = None):
     Parse a value to primitive types as str or int.
     --- (int, float, str, bool, bytes)
     """
+    if T == UUID or T == pgproto.UUID:
+        return to_uuid(data)
     if T == str:
         return str(data)
-    elif T == bytes:
+    if T == bytes:
         return bytes(data)
-
     # Using the encoders for basic types:
     try:
         return encoders[T](data)

datamodel/functions.pyx

@@ -5,6 +5,7 @@ from typing import get_args, get_origin, Union, Optional
 from collections.abc import Iterable
 from libcpp cimport bool as bool_t
 from uuid import UUID
+import asyncpg.pgproto.pgproto as pgproto
 from decimal import Decimal
 import datetime
 import types
@@ -26,6 +27,7 @@ cpdef bool_t is_primitive(object value):
         float,
         str,
         UUID,
+        pgproto.UUID,
         Decimal,
         bool,
         bytes,

datamodel/validation.pyx

@@ -8,8 +8,10 @@ from libcpp cimport bool as bool_t
 from enum import Enum
 import pendulum
 import datetime
+import asyncpg.pgproto.pgproto as pgproto
 from .types import uint64_min, uint64_max, Text
 from .abstract import ModelMeta
+from uuid import UUID
 from .fields import Field
 from .functions import (
     is_iterable,
@@ -122,6 +124,11 @@ cpdef list _validation(object F, str name, object value, object annotated_type,
                 errors.append(
                     _create_error(name, value, error_msg, val_type, annotated_type)
                 )
+        elif annotated_type is UUID:
+            if not isinstance(value, (UUID, pgproto.UUID)):
+                errors.append(
+                    _create_error(name, value, f'invalid type for {annotated_type}.{name}, expected {annotated_type}', val_type, annotated_type)
+                )
         elif val_type != annotated_type:
             instance = is_instanceof(value, annotated_type)
             if not instance:

datamodel/version.py

@@ -4,7 +4,7 @@
 __title__ = 'python-datamodel'
 __description__ = ('simple library based on python +3.8 to use Dataclass-syntax'
                    'for interacting with Data')
-__version__ = '0.8.1'
+__version__ = '0.8.2'
 __author__ = 'Jesus Lara'
 __author_email__ = '[email protected]'
 __license__ = 'BSD'

examples/basic.py

@@ -1,8 +1,10 @@
 import uuid
 from typing import Union, List, Optional
 from dataclasses import dataclass, fields, is_dataclass, field
+import asyncpg.pgproto.pgproto as pgproto
 import orjson
 from datamodel import Field, BaseModel, Column
+from datamodel.exceptions import ValidationError
 
 
 def auto_uid():
@@ -68,7 +70,7 @@ def valid_zipcode(field, value):
     return value == 45510
 
 class Address(BaseModel):
-    id: uuid.UUID = field(default_factory=auto_uid)
+    id: uuid.UUID = Field(default_factory=auto_uid)
     street: str = Field(required=True)
     number: str = Field(factory=default_number)
     zipcode: int = Field(required=False, default=1010, validator=valid_zipcode)
@@ -132,6 +134,7 @@ def __str__(self) -> str:
 
 
 user = {
+    "userid": pgproto.UUID('f47ac10b-58cc-4372-a567-0e02b2c3d479'),
     "name": "Jesus Lara",
     "account": [
         {
@@ -148,5 +151,8 @@ def __str__(self) -> str:
         }
     ]
 }
-user = Actor(**user)
-print(user)
+try:
+    user = Actor(**user)
+    print(user)
+except ValidationError as e:
+    print(e.payload)