Merge pull request #14 from upsidetravel/fix/more-compatible

Make more compatible with recent Pydantic

Author: necaris

graphene_pydantic/converters.py

@@ -7,7 +7,36 @@
 import decimal
 import enum
 
-from pydantic import BaseModel, fields
+from pydantic import BaseModel
+from pydantic.fields import Field as PydanticField
+
+try:
+    # Pydantic pre-1.0
+    from pydantic.fields import Shape
+
+    SHAPE_SINGLETON = (Shape.SINGLETON,)
+    SHAPE_SEQUENTIAL = (
+        Shape.LIST,
+        Shape.TUPLE,
+        Shape.TUPLE_ELLIPS,
+        Shape.SEQUENCE,
+        Shape.SET,
+    )
+    SHAPE_MAPPING = (Shape.MAPPING,)
+except ImportError:
+    # Pydantic 1.0+
+    from pydantic import fields
+
+    SHAPE_SINGLETON = (fields.SHAPE_SINGLETON,)
+    SHAPE_SEQUENTIAL = (
+        fields.SHAPE_LIST,
+        fields.SHAPE_TUPLE,
+        fields.SHAPE_TUPLE_ELLIPSIS,
+        fields.SHAPE_SEQUENCE,
+        fields.SHAPE_SET,
+    )
+    SHAPE_MAPPING = (fields.SHAPE_MAPPING,)
+
 
 from graphene import Field, Boolean, Enum, Float, Int, List, String, UUID, Union
 from graphene.types.base import BaseType
@@ -45,7 +74,7 @@ def _get_field(root, _info):
 
 
 def convert_pydantic_field(
-    field: fields.Field,
+    field: PydanticField,
     registry: Registry,
     parent_type: T.Type = None,
     model: T.Type[BaseModel] = None,
@@ -75,7 +104,7 @@ def convert_pydantic_field(
 
 def convert_pydantic_type(
     type_: T.Type,
-    field: fields.Field,
+    field: PydanticField,
     registry: Registry = None,
     parent_type: T.Type = None,
     model: T.Type[BaseModel] = None,
@@ -88,24 +117,18 @@ def convert_pydantic_type(
     graphene_type = find_graphene_type(
         type_, field, registry, parent_type=parent_type, model=model
     )
-    if field.shape == fields.Shape.SINGLETON:
+    if field.shape in SHAPE_SINGLETON:
         return graphene_type
-    elif field.shape in (
-        fields.Shape.LIST,
-        fields.Shape.TUPLE,
-        fields.Shape.TUPLE_ELLIPS,
-        fields.Shape.SEQUENCE,
-        fields.Shape.SET,
-    ):
+    elif field.shape in SHAPE_SEQUENTIAL:
         # TODO: _should_ Sets remain here?
         return List(graphene_type)
-    elif field.shape == fields.Shape.MAPPING:
+    elif field.shape in SHAPE_MAPPING:
         raise ConversionError(f"Don't know how to handle mappings in Graphene.")
 
 
 def find_graphene_type(
     type_: T.Type,
-    field: fields.Field,
+    field: PydanticField,
     registry: Registry = None,
     parent_type: T.Type = None,
     model: T.Type[BaseModel] = None,
@@ -178,7 +201,7 @@ def find_graphene_type(
 
 def convert_generic_python_type(
     type_: T.Type,
-    field: fields.Field,
+    field: PydanticField,
     registry: Registry = None,
     parent_type: T.Type = None,
     model: T.Type[BaseModel] = None,
@@ -231,7 +254,7 @@ def convert_generic_python_type(
 
 def convert_union_type(
     type_: T.Type,
-    field: fields.Field,
+    field: PydanticField,
     registry: Registry = None,
     parent_type: T.Type = None,
     model: T.Type[BaseModel] = None,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "graphene_pydantic"
-version = "0.0.4"
+version = "0.0.5"
 description = "Graphene Pydantic integration"
 readme = "README.md"
 repository = "https://github.com/upsidetravel/graphene-pydantic"
@@ -22,7 +22,7 @@ keywords = ["api", "graphql", "protocol", "rest", "relay", "graphene", "pydantic
 python = "^3.6"
 # To keep things simple, we only support newer versions of Graphene & Pydantic
 graphene = ">=2.1.3,<3"
-pydantic = ">=0.25,<0.30"
+pydantic = ">=0.26,<=1.1"
 
 [tool.poetry.dev-dependencies]
 pytest = "~4.6.4"

tests/test_converters.py

@@ -7,6 +7,7 @@
 import pytest
 import graphene
 import graphene.types
+import pydantic
 from pydantic import create_model, BaseModel
 
 from graphene_pydantic.converters import convert_pydantic_field, ConversionError
@@ -142,4 +143,11 @@ def test_unknown():
     with pytest.raises(ConversionError) as exc:
         _convert_field_from_spec("attr", (create_model("Model", size=int), None))
     assert "Don't know how to convert" in exc.value.args[0]
-    assert "Field(attr type=Model default=None)" in exc.value.args[0]
+    if pydantic.version.VERSION < pydantic.version.StrictVersion("1.0"):
+        assert "Field(attr type=Model default=None)" in exc.value.args[0]
+    else:
+        # this worked at least as of 1.1
+        assert (
+            "ModelField(name='attr', type=Optional[Model], required=False, default=None)"
+            in exc.value.args[0]
+        )