Merge pull request #634 from neuroscout/fix/coll_desc

Use json string for collection description

neuroscout/resources/predictor.py

@@ -1,5 +1,6 @@
 import webargs as wa
 import tempfile
+import json
 from sqlalchemy import func
 from flask_apispec import MethodResource, marshal_with, use_kwargs, doc
 from flask_jwt import current_identity
@@ -133,11 +134,13 @@ class PredictorCollectionResource(MethodResource):
             required=True
             ),
         "dataset_id": wa.fields.Int(required=True, description="Dataset id."),
-        "descriptions": wa.fields.Dict(description="Column descriptions")
+        "descriptions": wa.fields.Str(description="Column descriptions")
         }, locations=["files", "form"])
     @auth_required
     def post(self, collection_name, event_files, runs, dataset_id,
              descriptions=None):
+        if descriptions is not None:
+            descriptions = json.loads(descriptions)
         pc, filenames = prepare_upload(
             collection_name, event_files, runs, dataset_id)
 

neuroscout/tests/api/test_predictor.py

@@ -137,7 +137,7 @@ def test_predictor_create(session,
     assert results['status'] == 'OK'
 
     resp = auth_client.get('/api/predictors/collection',
-                           params={'id': pc.id})
+                           params={'collection_id': pc.id})
     assert resp.status_code == 200
     resp = decode_json(resp)