Merge pull request #21 from graphql-python/0.4.0

Ride to 0.4.0

Author: syrusakbary

README.md

@@ -8,7 +8,7 @@ Graphene is a Python library for building GraphQL schemas/types fast and easily.
 - **Django:** Automatic *Django model* mapping to Graphene Types. Check a fully working [Django](http://github.com/graphql-python/swapi-graphene) implementation
 
 
-*But, what is supported in this Python version?* **Everything**: Interfaces, ObjectTypes, Mutations and Relay (Nodes, Connections and Mutations).
+*What is supported in this Python version?* **Everything**: Interfaces, ObjectTypes, Mutations, Scalars, Unions and Relay (Nodes, Connections and Mutations).
 
 
 ## Installation
@@ -28,9 +28,9 @@ Here is one example for get you started:
 
 ```python
 class Query(graphene.ObjectType):
-    hello = graphene.StringField(description='A typical hello world')
-    ping = graphene.StringField(description='Ping someone',
-                                to=graphene.Argument(graphene.String))
+    hello = graphene.String(description='A typical hello world')
+    ping = graphene.String(description='Ping someone',
+                           to=graphene.String())
 
     def resolve_hello(self, args, info):
         return 'World'

README.rst

@@ -12,9 +12,9 @@ easily.
    `Django <http://github.com/graphql-python/swapi-graphene>`__
    implementation
 
-*But, what is supported in this Python version?* **Everything**:
-Interfaces, ObjectTypes, Mutations and Relay (Nodes, Connections and
-Mutations).
+*What is supported in this Python version?* **Everything**: Interfaces,
+ObjectTypes, Mutations, Scalars, Unions and Relay (Nodes, Connections
+and Mutations).
 
 Installation
 ------------
@@ -35,9 +35,9 @@ Here is one example for get you started:
 .. code:: python
 
     class Query(graphene.ObjectType):
-        hello = graphene.StringField(description='A typical hello world')
-        ping = graphene.StringField(description='Ping someone',
-                                    to=graphene.Argument(graphene.String))
+        hello = graphene.String(description='A typical hello world')
+        ping = graphene.String(description='Ping someone',
+                               to=graphene.String())
 
         def resolve_hello(self, args, info):
             return 'World'

bin/autolinter

@@ -1,4 +1,5 @@
 #!/bin/bash
 
-autoflake ./ -r  --remove-unused-variables --remove-all-unused-imports --in-place
+autoflake ./ -r --remove-unused-variables --remove-all-unused-imports --in-place
+autopep8 ./ -r --in-place --experimental --aggressive --max-line-length 120
 isort -rc .

examples/starwars/schema.py

@@ -1,6 +1,7 @@
+from graphql.core.type import GraphQLEnumValue
+
 import graphene
 from graphene import resolve_only_args
-from graphql.core.type import GraphQLEnumValue
 
 from .data import get_character, get_droid, get_hero, get_human
 
@@ -12,33 +13,33 @@
 
 
 class Character(graphene.Interface):
-    id = graphene.IDField()
-    name = graphene.StringField()
-    friends = graphene.ListField('self')
-    appears_in = graphene.ListField(Episode)
+    id = graphene.ID()
+    name = graphene.String()
+    friends = graphene.List('Character')
+    appears_in = graphene.List(Episode)
 
     def resolve_friends(self, args, *_):
         # The character friends is a list of strings
         return [get_character(f) for f in self.friends]
 
 
 class Human(Character):
-    home_planet = graphene.StringField()
+    home_planet = graphene.String()
 
 
 class Droid(Character):
-    primary_function = graphene.StringField()
+    primary_function = graphene.String()
 
 
 class Query(graphene.ObjectType):
     hero = graphene.Field(Character,
                           episode=graphene.Argument(Episode)
                           )
     human = graphene.Field(Human,
-                           id=graphene.Argument(graphene.String)
+                           id=graphene.String()
                            )
     droid = graphene.Field(Droid,
-                           id=graphene.Argument(graphene.String)
+                           id=graphene.String()
                            )
 
     @resolve_only_args

examples/starwars_django/schema.py

@@ -12,6 +12,7 @@
 
 
 class Ship(DjangoNode):
+
     class Meta:
         model = ShipModel
 
@@ -21,11 +22,13 @@ def get_node(cls, id):
 
 
 class Character(DjangoObjectType):
+
     class Meta:
         model = CharacterModel
 
 
 class Faction(DjangoNode):
+
     class Meta:
         model = FactionModel
 
@@ -35,9 +38,10 @@ def get_node(cls, id):
 
 
 class IntroduceShip(relay.ClientIDMutation):
+
     class Input:
-        ship_name = graphene.StringField(required=True)
-        faction_id = graphene.StringField(required=True)
+        ship_name = graphene.String(required=True)
+        faction_id = graphene.String(required=True)
 
     ship = graphene.Field(Ship)
     faction = graphene.Field(Faction)
@@ -48,7 +52,7 @@ def mutate_and_get_payload(cls, input, info):
         faction_id = input.get('faction_id')
         ship = create_ship(ship_name, faction_id)
         faction = get_faction(faction_id)
-        return IntroduceShip(ship=ship, faction=faction)
+        return IntroduceShip(ship=Ship(ship), faction=Faction(faction))
 
 
 class Query(graphene.ObjectType):

examples/starwars_relay/schema.py

@@ -8,7 +8,7 @@
 
 class Ship(relay.Node):
     '''A ship in the Star Wars saga'''
-    name = graphene.StringField(description='The name of the ship.')
+    name = graphene.String(description='The name of the ship.')
 
     @classmethod
     def get_node(cls, id):
@@ -17,7 +17,7 @@ def get_node(cls, id):
 
 class Faction(relay.Node):
     '''A faction in the Star Wars saga'''
-    name = graphene.StringField(description='The name of the faction.')
+    name = graphene.String(description='The name of the faction.')
     ships = relay.ConnectionField(
         Ship, description='The ships used by the faction.')
 
@@ -34,8 +34,8 @@ def get_node(cls, id):
 class IntroduceShip(relay.ClientIDMutation):
 
     class Input:
-        ship_name = graphene.StringField(required=True)
-        faction_id = graphene.StringField(required=True)
+        ship_name = graphene.String(required=True)
+        faction_id = graphene.String(required=True)
 
     ship = graphene.Field(Ship)
     faction = graphene.Field(Faction)

graphene/__init__.py

@@ -1,9 +1,5 @@
 from graphql.core.type import (
-    GraphQLEnumType as Enum,
-    GraphQLArgument as Argument,
-    GraphQLString as String,
-    GraphQLInt as Int,
-    GraphQLID as ID
+    GraphQLEnumType as Enum
 )
 
 from graphene import signals
@@ -14,12 +10,24 @@
 
 from graphene.core.types import (
     ObjectType,
+    InputObjectType,
     Interface,
     Mutation,
+    BaseType,
+    LazyType,
+    Argument,
+    Field,
+    InputField,
+    String,
+    Int,
+    Boolean,
+    ID,
+    Float,
+    List,
+    NonNull
 )
 
 from graphene.core.fields import (
-    Field,
     StringField,
     IntField,
     BooleanField,
@@ -29,11 +37,35 @@
     FloatField,
 )
 
-from graphene.decorators import (
+from graphene.utils import (
     resolve_only_args
 )
 
-__all__ = ['Enum', 'Argument', 'String', 'Int', 'ID', 'signals', 'Schema',
-           'ObjectType', 'Interface', 'Mutation', 'Field', 'StringField',
-           'IntField', 'BooleanField', 'IDField', 'ListField', 'NonNullField',
-           'FloatField', 'resolve_only_args']
+__all__ = [
+    'Enum',
+    'Argument',
+    'String',
+    'Int',
+    'Boolean',
+    'Float',
+    'ID',
+    'List',
+    'NonNull',
+    'signals',
+    'Schema',
+    'BaseType',
+    'LazyType',
+    'ObjectType',
+    'InputObjectType',
+    'Interface',
+    'Mutation',
+    'Field',
+    'InputField',
+    'StringField',
+    'IntField',
+    'BooleanField',
+    'IDField',
+    'ListField',
+    'NonNullField',
+    'FloatField',
+    'resolve_only_args']

graphene/contrib/django/converter.py

@@ -1,10 +1,8 @@
 from django.db import models
 from singledispatch import singledispatch
 
-from graphene.contrib.django.fields import (ConnectionOrListField,
-                                            DjangoModelField)
-from graphene.core.fields import (BooleanField, FloatField, IDField, IntField,
-                                  StringField)
+from ...core.types.scalars import ID, Boolean, Float, Int, String
+from .fields import ConnectionOrListField, DjangoModelField
 
 try:
     UUIDField = models.UUIDField
@@ -17,7 +15,8 @@ class UUIDField(object):
 @singledispatch
 def convert_django_field(field):
     raise Exception(
-        "Don't know how to convert the Django field %s (%s)" % (field, field.__class__))
+        "Don't know how to convert the Django field %s (%s)" %
+        (field, field.__class__))
 
 
 @convert_django_field.register(models.DateField)
@@ -28,12 +27,12 @@ def convert_django_field(field):
 @convert_django_field.register(models.URLField)
 @convert_django_field.register(UUIDField)
 def convert_field_to_string(field):
-    return StringField(description=field.help_text)
+    return String(description=field.help_text)
 
 
 @convert_django_field.register(models.AutoField)
 def convert_field_to_id(field):
-    return IDField(description=field.help_text)
+    return ID(description=field.help_text)
 
 
 @convert_django_field.register(models.PositiveIntegerField)
@@ -42,23 +41,23 @@ def convert_field_to_id(field):
 @convert_django_field.register(models.BigIntegerField)
 @convert_django_field.register(models.IntegerField)
 def convert_field_to_int(field):
-    return IntField(description=field.help_text)
+    return Int(description=field.help_text)
 
 
 @convert_django_field.register(models.BooleanField)
 def convert_field_to_boolean(field):
-    return BooleanField(description=field.help_text, required=True)
+    return Boolean(description=field.help_text, required=True)
 
 
 @convert_django_field.register(models.NullBooleanField)
 def convert_field_to_nullboolean(field):
-    return BooleanField(description=field.help_text)
+    return Boolean(description=field.help_text)
 
 
 @convert_django_field.register(models.DecimalField)
 @convert_django_field.register(models.FloatField)
 def convert_field_to_float(field):
-    return FloatField(description=field.help_text)
+    return Float(description=field.help_text)
 
 
 @convert_django_field.register(models.ManyToManyField)