style: Import mongoengine instead of detail fields

Author: abawchen

graphene_mongo/converter.py

@@ -111,6 +111,7 @@ def convert_field_to_list(field, registry=None):
 
 
 @convert_mongoengine_field.register(mongoengine.EmbeddedDocumentField)
+@convert_mongoengine_field.register(mongoengine.GenericReferenceField)
 @convert_mongoengine_field.register(mongoengine.ReferenceField)
 def convert_field_to_dynamic(field, registry=None):
     model = field.document_type

graphene_mongo/tests/models.py

@@ -1,21 +1,19 @@
+import mongoengine
 from datetime import datetime
-from mongoengine import (
-    connect, Document, EmbeddedDocument
-)
 from mongoengine.fields import (
     DateTimeField, EmailField, EmbeddedDocumentField,
     FloatField, EmbeddedDocumentListField, ListField, LazyReferenceField,
     MapField, MultiPolygonField, PointField, PolygonField,
     ReferenceField, StringField,
 )
 
-connect('graphene-mongo-test', host='mongomock://localhost', alias='default')
+mongoengine.connect('graphene-mongo-test', host='mongomock://localhost', alias='default')
 
 
-class Publisher(Document):
+class Publisher(mongoengine.Document):
 
     meta = {'collection': 'test_publisher'}
-    name = StringField()
+    name = mongoengine.StringField()
 
     @property
     def legal_name(self):
@@ -25,42 +23,44 @@ def bad_field(self):
         return None
 
 
-class Editor(Document):
+class Editor(mongoengine.Document):
     """
     An Editor of a publication.
     """
 
     meta = {'collection': 'test_editor'}
-    id = StringField(primary_key=True)
-    first_name = StringField(required=True, help_text="Editor's first name.", db_field='fname')
-    last_name = StringField(required=True, help_text="Editor's last name.")
-    metadata = MapField(field=StringField(), help_text="Arbitrary metadata.")
-    company = LazyReferenceField(Publisher)
+    id = mongoengine.StringField(primary_key=True)
+    first_name = mongoengine.StringField(required=True, help_text="Editor's first name.", db_field='fname')
+    last_name = mongoengine.StringField(required=True, help_text="Editor's last name.")
+    metadata = mongoengine.MapField(field=mongoengine.StringField(), help_text="Arbitrary metadata.")
+    company = mongoengine.LazyReferenceField(Publisher)
 
 
-class Article(Document):
+class Article(mongoengine.Document):
 
     meta = {'collection': 'test_article'}
-    headline = StringField(required=True, help_text="The article headline.")
-    pub_date = DateTimeField(default=datetime.now,
-                             verbose_name="publication date",
-                             help_text="The date of first press.")
-    editor = ReferenceField(Editor)
-    reporter = ReferenceField('Reporter')
+    headline = mongoengine.StringField(required=True, help_text="The article headline.")
+    pub_date = mongoengine.DateTimeField(
+        default=datetime.now,
+        verbose_name="publication date",
+        help_text="The date of first press.")
+    editor = mongoengine.ReferenceField(Editor)
+    reporter = mongoengine.ReferenceField('Reporter')
 
 
-class EmbeddedArticle(EmbeddedDocument):
+class EmbeddedArticle(mongoengine.EmbeddedDocument):
 
     meta = {'collection': 'test_embedded_article'}
-    headline = StringField(required=True)
-    pub_date = DateTimeField(default=datetime.now)
-    editor = ReferenceField(Editor)
-    reporter = ReferenceField('Reporter')
+    headline = mongoengine.StringField(required=True)
+    pub_date = mongoengine.DateTimeField(default=datetime.now)
+    editor = mongoengine.ReferenceField(Editor)
+    reporter = mongoengine.ReferenceField('Reporter')
 
 
-class Reporter(Document):
+class Reporter(mongoengine.Document):
 
     meta = {'collection': 'test_reporter'}
+<<<<<<< HEAD
     id = StringField(primary_key=True)
     first_name = StringField(required=True)
     last_name = StringField(required=True)
@@ -69,30 +69,39 @@ class Reporter(Document):
     articles = ListField(ReferenceField(Article))
     embedded_articles = ListField(EmbeddedDocumentField(EmbeddedArticle))
     embedded_list_articles = EmbeddedDocumentListField(EmbeddedArticle)
+    id = StringField(primary_key=True)
+    first_name = StringField(required=True)
+    last_name = StringField(required=True)
+    email = EmailField()
+    articles = ListField(ReferenceField(Article))
+    embedded_articles = ListField(EmbeddedDocumentField(EmbeddedArticle))
+    embedded_list_articles = EmbeddedDocumentListField(EmbeddedArticle)
+    awards = ListField(StringField())
 
 
-class Player(Document):
+class Player(mongoengine.Document):
 
     meta = {'collection': 'test_player'}
-    first_name = StringField(required=True)
-    last_name = StringField(required=True)
-    opponent = ReferenceField('Player')
-    players = ListField(ReferenceField('Player'))
-    articles = ListField(ReferenceField('Article'))
-    embedded_list_articles = EmbeddedDocumentListField(EmbeddedArticle)
+    first_name = mongoengine.StringField(required=True)
+    last_name = mongoengine.StringField(required=True)
+    opponent = mongoengine.ReferenceField('Player')
+    players = mongoengine.ListField(mongoengine.ReferenceField('Player'))
+    articles = mongoengine.ListField(mongoengine.ReferenceField('Article'))
+    embedded_list_articles = mongoengine.EmbeddedDocumentListField(EmbeddedArticle)
 
 
-class Parent(Document):
+class Parent(mongoengine.Document):
 
     meta = {
         'collection': 'test_parent',
         'allow_inheritance': True
     }
-    bar = StringField()
-    loc = MultiPolygonField()
+    bar = mongoengine.StringField()
+    loc = mongoengine.MultiPolygonField()
+    # reference = GenericReferenceField()
 
 
-class CellTower(Document):
+class CellTower(mongoengine.Document):
 
     meta = {
         'collection': 'test_cell_tower',
@@ -105,49 +114,51 @@ class CellTower(Document):
 class Child(Parent):
 
     meta = {'collection': 'test_child'}
-    baz = StringField()
-    loc = PointField()
+    baz = mongoengine.StringField()
+    loc = mongoengine.PointField()
 
 
-class ProfessorMetadata(EmbeddedDocument):
+class ProfessorMetadata(mongoengine.EmbeddedDocument):
 
     meta = {'collection': 'test_professor_metadata'}
-    id = StringField(primary_key=False)
-    first_name = StringField()
-    last_name = StringField()
-    departments = ListField(StringField())
+    id = mongoengine.StringField(primary_key=False)
+    first_name = mongoengine.StringField()
+    last_name = mongoengine.StringField()
+    departments = mongoengine.ListField(mongoengine.StringField())
 
 
-class ProfessorVector(Document):
+class ProfessorVector(mongoengine.Document):
 
     meta = {'collection': 'test_professor_vector'}
-    vec = ListField(FloatField())
-    metadata = EmbeddedDocumentField(ProfessorMetadata)
+    vec = mongoengine.ListField(mongoengine.FloatField())
+    metadata = mongoengine.EmbeddedDocumentField(ProfessorMetadata)
 
 
-class ParentWithRelationship(Document):
+class ParentWithRelationship(mongoengine.Document):
 
     meta = {'collection': 'test_parent_reference'}
-    before_child = ListField(ReferenceField("ChildRegisteredBefore"))
-    after_child = ListField(ReferenceField("ChildRegisteredAfter"))
-    name = StringField()
+    before_child = mongoengine.ListField(
+        mongoengine.ReferenceField('ChildRegisteredBefore'))
+    after_child = mongoengine.ListField(
+        mongoengine.ReferenceField('ChildRegisteredAfter'))
+    name = mongoengine.StringField()
 
 
-class ChildRegisteredBefore(Document):
+class ChildRegisteredBefore(mongoengine.Document):
 
     meta = {'collection': 'test_child_before_reference'}
-    parent = ReferenceField(ParentWithRelationship)
-    name = StringField()
+    parent = mongoengine.ReferenceField(ParentWithRelationship)
+    name = mongoengine.StringField()
 
 
-class ChildRegisteredAfter(Document):
+class ChildRegisteredAfter(mongoengine.Document):
 
     meta = {'collection': 'test_child_after_reference'}
-    parent = ReferenceField(ParentWithRelationship)
-    name = StringField()
+    parent = mongoengine.ReferenceField(ParentWithRelationship)
+    name = mongoengine.StringField()
 
 
-class ErroneousModel(Document):
+class ErroneousModel(mongoengine.Document):
     meta = {'collection': 'test_colliding_objects_model'}
 
-    objects = ListField(StringField())
+    objects = mongoengine.ListField(mongoengine.StringField())

graphene_mongo/tests/test_relay_query.py

@@ -779,16 +779,16 @@ class Query(graphene.ObjectType):
 
     query = '''
     query {
-      allProfessors {
-        edges {
-            node {
-                vec,
-                metadata {
-                     firstName
+        allProfessors {
+            edges {
+                node {
+                    vec,
+                    metadata {
+                        firstName
+                    }
                 }
             }
         }
-      }
     }
     '''
     expected = {

setup.py

@@ -7,14 +7,10 @@
     description='Graphene Mongoengine integration',
     long_description=open('README.rst').read(),
     # long_description_content_type='text/markdown',
-
     url='https://github.com/graphql-python/graphene-mongo',
-
     author='Abaw Chen',
     author_email='[email protected]',
-
     license='MIT',
-
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
@@ -25,11 +21,8 @@
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
-
     keywords='api graphql protocol rest relay graphene mongo mongoengine',
-
     packages=find_packages(exclude=['tests']),
-
     install_requires=[
         'graphene>=2.1.3,<3',
         'mongoengine>=0.15.0',