From 7edee804aa0547339e097bdba4e56300a8955d59 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 6 Oct 2016 15:04:55 +0100
Subject: [PATCH] Add type annotation to schema generation

---
 rest_framework/renderers.py |  4 ++++
 rest_framework/schemas.py   | 27 +++++++++++++++++++++++++--
 tests/test_schemas.py       | 16 ++++++++--------
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 11e9fb960..5de138d96 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -276,6 +276,10 @@ class HTMLFormRenderer(BaseRenderer):
             'base_template': 'input.html',
             'input_type': 'number'
         },
+        serializers.FloatField: {
+            'base_template': 'input.html',
+            'input_type': 'number'
+        },
         serializers.DateTimeField: {
             'base_template': 'input.html',
             'input_type': 'datetime-local'
diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py
index ad311dcfd..db41539fd 100644
--- a/rest_framework/schemas.py
+++ b/rest_framework/schemas.py
@@ -15,10 +15,25 @@ from rest_framework.request import clone_request
 from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework.utils import formatting
+from rest_framework.utils.field_mapping import ClassLookupDict
 from rest_framework.views import APIView
 
+
 header_regex = re.compile('^[a-zA-Z][0-9A-Za-z_]*:')
 
+types_lookup = ClassLookupDict({
+    serializers.Field: 'string',
+    serializers.IntegerField: 'integer',
+    serializers.FloatField: 'number',
+    serializers.DecimalField: 'number',
+    serializers.BooleanField: 'boolean',
+    serializers.FileField: 'file',
+    serializers.MultipleChoiceField: 'array',
+    serializers.ManyRelatedField: 'array',
+    serializers.Serializer: 'object',
+    serializers.ListSerializer: 'array'
+})
+
 
 def as_query_fields(items):
     """
@@ -372,7 +387,14 @@ class SchemaGenerator(object):
         serializer = view.get_serializer()
 
         if isinstance(serializer, serializers.ListSerializer):
-            return [coreapi.Field(name='data', location='body', required=True)]
+            return [
+                coreapi.Field(
+                    name='data',
+                    location='body',
+                    required=True,
+                    type='array'
+                )
+            ]
 
         if not isinstance(serializer, serializers.Serializer):
             return []
@@ -388,7 +410,8 @@ class SchemaGenerator(object):
                 name=field.source,
                 location='form',
                 required=required,
-                description=description
+                description=description,
+                type=types_lookup[field]
             )
             fields.append(field)
 
diff --git a/tests/test_schemas.py b/tests/test_schemas.py
index edc602d98..c8b40fbb4 100644
--- a/tests/test_schemas.py
+++ b/tests/test_schemas.py
@@ -137,8 +137,8 @@ class TestRouterGeneratedSchema(TestCase):
                         action='post',
                         encoding='application/json',
                         fields=[
-                            coreapi.Field('a', required=True, location='form', description='A field description'),
-                            coreapi.Field('b', required=False, location='form')
+                            coreapi.Field('a', required=True, location='form', type='string', description='A field description'),
+                            coreapi.Field('b', required=False, location='form', type='string')
                         ]
                     ),
                     'retrieve': coreapi.Link(
@@ -155,8 +155,8 @@ class TestRouterGeneratedSchema(TestCase):
                         description='A description of custom action.',
                         fields=[
                             coreapi.Field('pk', required=True, location='path'),
-                            coreapi.Field('c', required=True, location='form'),
-                            coreapi.Field('d', required=False, location='form'),
+                            coreapi.Field('c', required=True, location='form', type='string'),
+                            coreapi.Field('d', required=False, location='form', type='string'),
                         ]
                     ),
                     'custom_list_action': coreapi.Link(
@@ -179,8 +179,8 @@ class TestRouterGeneratedSchema(TestCase):
                         encoding='application/json',
                         fields=[
                             coreapi.Field('pk', required=True, location='path'),
-                            coreapi.Field('a', required=True, location='form', description='A field description'),
-                            coreapi.Field('b', required=False, location='form')
+                            coreapi.Field('a', required=True, location='form', type='string', description='A field description'),
+                            coreapi.Field('b', required=False, location='form', type='string')
                         ]
                     ),
                     'partial_update': coreapi.Link(
@@ -189,8 +189,8 @@ class TestRouterGeneratedSchema(TestCase):
                         encoding='application/json',
                         fields=[
                             coreapi.Field('pk', required=True, location='path'),
-                            coreapi.Field('a', required=False, location='form', description='A field description'),
-                            coreapi.Field('b', required=False, location='form')
+                            coreapi.Field('a', required=False, location='form', type='string', description='A field description'),
+                            coreapi.Field('b', required=False, location='form', type='string')
                         ]
                     ),
                     'destroy': coreapi.Link(