feat: Skip Union type in args

Author: abawchen

graphene_mongo/converter.py

@@ -18,9 +18,9 @@
 from mongoengine.base import get_document
 
 from . import advanced_types
+from .registry import get_global_registry
 from .utils import (
     import_single_dispatch, get_field_description,
-    ClassFactory, add_method,
 )
 
 singledispatch = import_single_dispatch()
@@ -117,35 +117,21 @@ def convert_field_to_list(field, registry=None):
 
 @convert_mongoengine_field.register(mongoengine.GenericReferenceField)
 def convert_field_to_union(field, registry=None):
-    # pass
-    # print(field.__dict__)
-    # print(type(field.choices[0]))
-    # print(get_document(field.choices[0]))
-    from graphene_mongo import MongoengineObjectType
-    from .registry import Registry, get_global_registry
+
     _types = []
     for choice in field.choices:
-        model = get_document(choice)
-        # cls = ClassFactory(choice, BaseClass=MongoengineObjectType)
-        # Meta = ClassFactory('Meta', argnames={'model': model})
-        # t = add_method(type(choice + 'Type', {'Meta': Meta}, cls))
-        # print(t)
-        # Meta = type('Meta', (object, ), {'model': model})
-        # class Meta:
-        #    model = get_document(choice)
-        ## print(Meta.__dict__)
-        """
-        class Q(MongoengineObjectType):
-            class Meta:
-                model = get_document(choice)
-        """
-        # cls = ClassFactory(choice + 'Type', BaseClass=MongoengineObjectType, Meta=Meta)
-        # cls = type(choice + 'Type', (MongoengineObjectType, ), {'Meta': Meta})
-        # _types.append(cls)
         field = fields.ReferenceField(get_document(choice))
         _field = convert_mongoengine_field(field, get_global_registry())
         _type = _field.get_type()
-        _types.append(_type.type)
+        if _type:
+            _types.append(_type.type)
+        else:
+            # Can register type auto-matically here.
+            pass
+
+    if len(_types) == 0:
+        return None
+
     class U(Union):
         class Meta:
             types = tuple(_types)

graphene_mongo/fields.py

@@ -3,8 +3,8 @@
 from collections import OrderedDict
 from functools import partial, reduce
 
+import graphene
 import mongoengine
-from graphene import PageInfo
 from graphene.relay import ConnectionField
 from graphene.types.argument import to_arguments
 from graphene.types.dynamic import Dynamic
@@ -65,6 +65,13 @@ def args(self, args):
 
     def _field_args(self, items):
         def is_filterable(k):
+            """
+            Args:
+                k (str): field name.
+            Returns:
+                bool
+            """
+
             if not hasattr(self.model, k):
                 return False
             if isinstance(getattr(self.model, k), property):
@@ -75,8 +82,10 @@ def is_filterable(k):
                 return False
             if isinstance(converted, (ConnectionField, Dynamic)):
                 return False
-            if callable(getattr(converted, 'type', None)) and isinstance(converted.type(),
-                                                                         (PointFieldType, MultiPolygonFieldType)):
+            if callable(getattr(converted, 'type', None)) \
+                    and isinstance(
+                        converted.type(),
+                        (PointFieldType, MultiPolygonFieldType, graphene.Union)):
                 return False
             return True
 
@@ -158,7 +167,7 @@ def default_resolver(self, _root, info, **args):
             list_length=list_length,
             connection_type=self.type,
             edge_type=self.type.Edge,
-            pageinfo_type=PageInfo,
+            pageinfo_type=graphene.PageInfo,
         )
         connection.iterable = objs
         connection.list_length = list_length

graphene_mongo/tests/models.py

@@ -71,6 +71,9 @@ class Reporter(mongoengine.Document):
     articles = fields.ListField(fields.ReferenceField(Article))
     embedded_articles = fields.ListField(fields.EmbeddedDocumentField(EmbeddedArticle))
     embedded_list_articles = fields.EmbeddedDocumentListField(EmbeddedArticle)
+    generic_reference = fields.GenericReferenceField(
+        choices=[Article, Editor, ]
+    )
 
 
 class Player(mongoengine.Document):
@@ -92,9 +95,6 @@ class Parent(mongoengine.Document):
     }
     bar = fields.StringField()
     loc = fields.MultiPolygonField()
-    generic_reference = fields.GenericReferenceField(
-        choices=[Article, Editor, ]
-    )
 
 
 class CellTower(mongoengine.Document):

graphene_mongo/tests/setup.py

@@ -63,6 +63,7 @@ def fixtures():
     )
     reporter1.embedded_articles = [embedded_article1, embedded_article2]
     reporter1.embedded_list_articles = [embedded_article2, embedded_article1]
+    reporter1.generic_reference = article1
     reporter1.save()
 
     Player.drop_collection()

graphene_mongo/tests/test_converter.py

@@ -4,8 +4,7 @@
 
 from .models import (
     Article, Editor, EmbeddedArticle, Player, Reporter,
-    Parent, ProfessorMetadata, ProfessorVector,
-    Publisher)
+    ProfessorMetadata, ProfessorVector, Publisher)
 from .. import registry
 from ..converter import convert_mongoengine_field
 from ..fields import MongoengineConnectionField
@@ -309,16 +308,12 @@ class E(MongoengineObjectType):
         class Meta:
             model = Editor
 
-    class P(MongoengineObjectType):
+    class R(MongoengineObjectType):
 
         class Meta:
-            model = Parent
+            model = Reporter
 
     generic_reference_field = convert_mongoengine_field(
-        Parent._fields['generic_reference'], None
-    )
-    print(generic_reference_field)
-    """
-    # print(Parent._fields['generic_reference'].__dict__)
+        Reporter._fields['generic_reference'])
     assert isinstance(generic_reference_field, graphene.Field)
-    """
+    assert isinstance(generic_reference_field.type(), graphene.Union)

graphene_mongo/tests/test_relay_query.py

@@ -57,6 +57,12 @@ def resolve_reporter(self, *args, **kwargs):
                             headline
                         }
                     }
+                },
+                genericReference {
+                    __typename
+                    ... on ArticleNode {
+                        headline
+                    }
                 }
             }
         }
@@ -108,6 +114,10 @@ def resolve_reporter(self, *args, **kwargs):
                         }
                     }
                 ],
+            },
+            'genericReference': {
+                '__typename': 'ArticleNode',
+                'headline': 'Hello'
             }
         }
     }

graphene_mongo/tests/test_types.py

@@ -66,7 +66,8 @@ def test_objecttype_registered():
         'embedded_articles',
         'embedded_list_articles',
         'articles',
-        'awards'
+        'awards',
+        'generic_reference',
     ])