Merge pull request #1 from graphql-python/master

Sync

Author: barseghyanartur

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
     - "2.7"
-    - "3.3"
     - "3.4"
     - "3.5"
     - "3.6"

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/graphql-python/graphene-mongo.svg?branch=master)](https://travis-ci.org/graphql-python/graphene-mongo) [![Coverage Status](https://coveralls.io/repos/github/graphql-python/graphene-mongo/badge.svg?branch=master)](https://coveralls.io/github/graphql-python/graphene-mongo?branch=master) [![Documentation Status](https://readthedocs.org/projects/graphene-mongo/badge/?version=latest)](http://graphene-mongo.readthedocs.io/en/latest/?badge=latest) [![PyPI version](https://badge.fury.io/py/graphene-mongo.svg)](https://badge.fury.io/py/graphene-mongo) [![PyPI pyversions](https://img.shields.io/pypi/pyversions/graphene-mongo.svg)](https://pypi.python.org/pypi/graphene-mongo/)
+[![Build Status](https://travis-ci.org/graphql-python/graphene-mongo.svg?branch=master)](https://travis-ci.org/graphql-python/graphene-mongo) [![Coverage Status](https://coveralls.io/repos/github/graphql-python/graphene-mongo/badge.svg?branch=master)](https://coveralls.io/github/graphql-python/graphene-mongo?branch=master) [![Documentation Status](https://readthedocs.org/projects/graphene-mongo/badge/?version=latest)](http://graphene-mongo.readthedocs.io/en/latest/?badge=latest) [![PyPI version](https://badge.fury.io/py/graphene-mongo.svg)](https://badge.fury.io/py/graphene-mongo) [![PyPI pyversions](https://img.shields.io/pypi/pyversions/graphene-mongo.svg)](https://pypi.python.org/pypi/graphene-mongo/) [![Downloads](https://pepy.tech/badge/graphene-mongo)](https://pepy.tech/project/graphene-mongo)
 
 # Graphene-Mongo
 

docs/fields.rst

@@ -11,11 +11,15 @@ Mongoengine Fields
 - EmailField
 - EmbeddedDocumentField
 - EmbeddedDocumentListField
+- FileField
 - FloatField
-- IntegerField
+- GenericReferenceField
+- IntField
 - ListField
 - ObjectIdField
 - ReferenceField
+- PointField
+- PolygonField
 - StringField
 - URLField
 - UUIDField

examples/flask_mongoengine/requirements.txt

@@ -1,5 +1,5 @@
 Flask==0.12.2
-Flask-GraphQL==1.4.1
+Flask-GraphQL==2.0.0
 graphene-mongo
-mongomock==3.8.0
+mongomock==3.14.0
 

graphene_mongo/advanced_types.py

@@ -0,0 +1,68 @@
+import base64
+import graphene
+
+
+class FileFieldType(graphene.ObjectType):
+
+    content_type = graphene.String()
+    md5 = graphene.String()
+    chunk_size = graphene.Int()
+    length = graphene.Int()
+    data = graphene.String()
+
+    @classmethod
+    def _resolve_fs_field(cls, field, name, default_value=None):
+        v = getattr(field.instance, field.key)
+        return getattr(v, name, default_value)
+
+    def resolve_content_type(self, info):
+        return FileFieldType._resolve_fs_field(self, 'content_type')
+
+    def resolve_md5(self, info):
+        return FileFieldType._resolve_fs_field(self, 'md5')
+
+    def resolve_chunk_size(self, info):
+        return FileFieldType._resolve_fs_field(self, 'chunk_size', 0)
+
+    def resolve_length(self, info):
+        return FileFieldType._resolve_fs_field(self, 'length', 0)
+
+    def resolve_data(self, info):
+        v = getattr(self.instance, self.key)
+        data = v.read()
+        if data is not None:
+            return base64.b64encode(data)
+        return None
+
+
+class _CoordinatesTypeField(graphene.ObjectType):
+
+    type = graphene.String()
+
+    def resolve_type(self, info):
+        return self['type']
+
+    def resolve_coordinates(self, info):
+        return self['coordinates']
+
+
+class PointFieldType(_CoordinatesTypeField):
+
+    coordinates = graphene.List(graphene.Float)
+
+
+class PolygonFieldType(_CoordinatesTypeField):
+
+    coordinates = graphene.List(
+        graphene.List(
+            graphene.List(graphene.Float))
+    )
+
+
+class MultiPolygonFieldType(_CoordinatesTypeField):
+
+    coordinates = graphene.List(
+        graphene.List(
+            graphene.List(
+                graphene.List(graphene.Float)))
+    )

graphene_mongo/converter.py

@@ -1,18 +1,37 @@
-from graphene import (ID, Boolean, Dynamic, Field, Float, Int, List,
-                      NonNull, String, is_node)
-from graphene.types.json import JSONString
-
 import mongoengine
+import uuid
+from graphene import (
+    ID,
+    Boolean,
+    DateTime,
+    Dynamic,
+    Field,
+    Float,
+    Int,
+    List,
+    NonNull,
+    String,
+    Union,
+    is_node
+)
+from graphene.types.json import JSONString
+from mongoengine.base import get_document
 
-from .fields import MongoengineConnectionField
-from .utils import import_single_dispatch
+from . import advanced_types
+from .utils import (
+    import_single_dispatch, get_field_description,
+)
 
 singledispatch = import_single_dispatch()
 
 
+class MongoEngineConversionError(Exception):
+    pass
+
+
 @singledispatch
 def convert_mongoengine_field(field, registry=None):
-    raise Exception(
+    raise MongoEngineConversionError(
         "Don't know how to convert the MongoEngine field %s (%s)" %
         (field, field.__class__))
 
@@ -21,41 +40,61 @@ def convert_mongoengine_field(field, registry=None):
 @convert_mongoengine_field.register(mongoengine.StringField)
 @convert_mongoengine_field.register(mongoengine.URLField)
 def convert_field_to_string(field, registry=None):
-    return String(description=field.db_field, required=field.required)
+    return String(description=get_field_description(field, registry), required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.UUIDField)
 @convert_mongoengine_field.register(mongoengine.ObjectIdField)
 def convert_field_to_id(field, registry=None):
-    return ID(description=field.db_field, required=field.required)
+    return ID(description=get_field_description(field, registry), required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.IntField)
 @convert_mongoengine_field.register(mongoengine.LongField)
 def convert_field_to_int(field, registry=None):
-    return Int(description=field.db_field, required=field.required)
+    return Int(description=get_field_description(field, registry), required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.BooleanField)
 def convert_field_to_boolean(field, registry=None):
-    return Boolean(description=field.db_field, required=field.required)
+    return Boolean(description=get_field_description(field, registry), required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.DecimalField)
 @convert_mongoengine_field.register(mongoengine.FloatField)
 def convert_field_to_float(field, registry=None):
-    return Float(description=field.db_field, required=field.required)
+    return Float(description=get_field_description(field, registry), required=field.required)
+
+
+@convert_mongoengine_field.register(mongoengine.DateTimeField)
+def convert_field_to_datetime(field, registry=None):
+    return DateTime(description=get_field_description(field, registry), required=field.required)
 
 
 @convert_mongoengine_field.register(mongoengine.DictField)
 @convert_mongoengine_field.register(mongoengine.MapField)
-def convert_dict_to_jsonstring(field, registry=None):
-    return JSONString(description=field.db_field, required=field.required)
+def convert_field_to_jsonstring(field, registry=None):
+    return JSONString(description=get_field_description(field, registry), required=field.required)
 
 
-@convert_mongoengine_field.register(mongoengine.DateTimeField)
-def convert_date_to_string(field, registry=None):
-    return String(description=field.db_field, required=field.required)
+@convert_mongoengine_field.register(mongoengine.PointField)
+def convert_point_to_field(field, registry=None):
+    return Field(advanced_types.PointFieldType)
+
+
+@convert_mongoengine_field.register(mongoengine.PolygonField)
+def convert_polygon_to_field(field, registry=None):
+    return Field(advanced_types.PolygonFieldType)
+
+
+@convert_mongoengine_field.register(mongoengine.MultiPolygonField)
+def convert_multipolygon_to_field(field, register=None):
+    return Field(advanced_types.MultiPolygonFieldType)
+
+
+@convert_mongoengine_field.register(mongoengine.FileField)
+def convert_file_to_field(field, registry=None):
+    return Field(advanced_types.FileFieldType)
 
 
 @convert_mongoengine_field.register(mongoengine.ListField)
@@ -69,15 +108,43 @@ def convert_field_to_list(field, registry=None):
         base_type = base_type._type
 
     if is_node(base_type):
-        return MongoengineConnectionField(base_type)
+        return base_type._meta.connection_field_class(base_type)
 
     # Non-relationship field
     relations = (mongoengine.ReferenceField, mongoengine.EmbeddedDocumentField)
     if not isinstance(base_type, (List, NonNull)) \
             and not isinstance(field.field, relations):
         base_type = type(base_type)
 
-    return List(base_type, description=field.db_field, required=field.required)
+    return List(base_type, description=get_field_description(field, registry), required=field.required)
+
+
+@convert_mongoengine_field.register(mongoengine.GenericReferenceField)
+def convert_field_to_union(field, registry=None):
+
+    _types = []
+    for choice in field.choices:
+        _field = mongoengine.ReferenceField(get_document(choice))
+        _field = convert_mongoengine_field(_field, registry)
+        _type = _field.get_type()
+        if _type:
+            _types.append(_type.type)
+        else:
+            # TODO: Register type auto-matically here.
+            pass
+
+    if len(_types) == 0:
+        return None
+
+    # XXX: Use uuid to avoid duplicate name
+    name = '{}_{}_union_{}'.format(
+        field._owner_document.__name__,
+        field.db_field,
+        str(uuid.uuid1()).replace('-', '')
+    )
+    Meta = type('Meta', (object, ), {'types': tuple(_types)})
+    _union = type(name, (Union, ), {'Meta': Meta})
+    return Field(_union)
 
 
 @convert_mongoengine_field.register(mongoengine.EmbeddedDocumentField)
@@ -89,6 +156,23 @@ def dynamic_type():
         _type = registry.get_type_for_model(model)
         if not _type:
             return None
-        return Field(_type)
+        return Field(_type, description=get_field_description(field, registry))
+
+    return Dynamic(dynamic_type)
+
+
+@convert_mongoengine_field.register(mongoengine.LazyReferenceField)
+def convert_lazy_field_to_dynamic(field, registry=None):
+    model = field.document_type
+
+    def lazy_resolver(root, *args, **kwargs):
+        if getattr(root, field.name or field.db_name):
+            return getattr(root, field.name or field.db_name).fetch()
+
+    def dynamic_type():
+        _type = registry.get_type_for_model(model)
+        if not _type:
+            return None
+        return Field(_type, resolver=lazy_resolver, description=get_field_description(field, registry))
 
     return Dynamic(dynamic_type)