Merge pull request #55 from phenobarbital/new-version

fix when exports json schema

datamodel/base.py

@@ -549,6 +549,7 @@ def schema(cls, as_dict: bool = False) -> Any:
                     }
                 elif isinstance(_type, ModelMeta):
                     t = 'object'
+                    enum_type = None
                     ref = f"/schemas/{_type.__name__}"
                     sch = _type.schema(as_dict = True)
                     defs[name] = sch

datamodel/parsers/json.pyx

@@ -4,6 +4,8 @@
 """
 JSON Encoder, Decoder.
 """
+import uuid
+from asyncpg.pgproto import pgproto
 from dataclasses import _MISSING_TYPE, MISSING
 from typing import Any, Union
 from decimal import Decimal
@@ -26,6 +28,10 @@ cdef class JSONContent:
             return float(obj)
         elif hasattr(obj, "isoformat"):
             return obj.isoformat()
+        elif isinstance(obj, pgproto.UUID):
+            return str(obj)
+        elif isinstance(obj, uuid.UUID):
+            return obj
         elif hasattr(obj, "hex"):
             return obj.hex
         elif hasattr(obj, 'lower'): # asyncPg Range:

datamodel/version.py

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

examples/schema.py

@@ -20,7 +20,7 @@ class User(BaseModel):
     """Basic User Model for authentication."""
 
     user_id: int = Column(required=False, primary_key=True, repr=False)
-    first_name: str = Column(required=True, max=254, label="First Name")
+    first_name: str = Column(required=True, max=254, label="First Name", pattern="^\w*$")
     last_name: str = Column(required=True, max=254, label="Last Name")
     email: str = Column(required=False, max=254, label="User's Email")
     password: str = Column(required=False, max=16, secret=True, widget='/properties/password')