fix bugs

Author: clhuang

scaleapi/__init__.py

@@ -16,7 +16,7 @@
 
 
 def validate_payload(task_type, kwargs):
-    allowed_fields = DEFAULT_FIELDS + ALLOWED_FIELDS[task_type]
+    allowed_fields = DEFAULT_FIELDS | ALLOWED_FIELDS[task_type]
     for k in kwargs:
         if k not in allowed_fields:
             raise ScaleInvalidRequest('Illegal parameter %s for task_type %s'
@@ -88,7 +88,7 @@ def cancel_task(self, task_id):
 
     def tasks(self):
         """Returns a list of all your tasks."""
-        return [Task(json, self) for json in self._getrequest('tasks')]
+        return [Task(json, self) for json in self._getrequest('tasks')['docs']]
 
     def create_categorization_task(self, **kwargs):
         validate_payload('categorization', kwargs)

scaleapi/tasks.py

@@ -11,5 +11,14 @@ def __getattr__(self, name):
         raise AttributeError("'%s' object has no attribute %s"
                              % (type(self).__name__, name))
 
+    def __str__(self):
+        return 'Task(id=%s)' % self.id
+
+    def __repr__(self):
+        return 'Task(%s)' % self.param_dict
+
+    def refresh(self):
+        self.param_dict = self.client._getrequest('task/%s' % self.id)
+
     def cancel(self):
         self.client.cancel_task(self.id)