Merge pull request #34 from crowdresearch/develop

channel connections and task rejection

Author: shirishgoyal

.travis.yml

@@ -27,6 +27,5 @@ deploy:
     secure: E7fKfKDm9DbxoRWxNr6fDnjQpfQxNeTAAt1JFpjJQRdaYpN2a92JR8s8MAIWsekcSpAmNlFTWN/dnPXzy1yQEEOdAKscvkRqLkp9c15oDiHII+vSec56tgedHQt8H51EVEH73E056TrklLAU+O7Uxw4JD5+gxgxwQQSm+u+0ne7QgzTJk03YmnsSj7/89ab3JwCL1wQAdHYiU7B7BCcsQS/5yV1I2m60Q/hEJqE3Y79iVz9NSBu+BwXBOr07kTHQl2t/pXiB7rOhaWLW2+ypB0Gwtkqz2me1ymw84dKJgN1hqAhurkjdQ5Hj9NIFfvDdjpxKbMzZ1cQK1wItUGyiupYyu900BCPf1FGle6yNiIlCrtmjuEuZmF8EHVjgsp2mLidY6Wwl9f/LuR0GOgHkMx6G5a4D5xvuDWZaUGXeF0iaPMZ9XwPBzMeclFwMLmLybpFktJrJl/6DUlRZVP0Xgul5DK3IUfA3tKaZ1yOa7o4lUnZlJoluPNlNvby0JzJy5YW3d7+YGAtC1zplUuHN9qQwK3bKsk5YYSOOKq/UdMqDUAsOJH881KJSK7bz4zqCh/sPgFgf0gp8yh8VXP+Kby60OcZkeIAvahXbu2Yh2wBRV6F0wFRNfEE/UcjpPlhQ8N4UgtCttB/MA7+fYncpFNFHKaNHI63qpIQKu0TGZzI=
   on:
     branch: master
-    tags: true
-    distributions: "sdist bdist_wheel"
+    distributions: "bdist_wheel"
     repo: crowdresearch/daemo-api-client

daemo/client.py

@@ -667,7 +667,8 @@ def _on_batch_complete(self, batch_index, approve, completed):
                 self.store.mark_task_incomplete(
                     batch_index,
                     task_data.get("task_id"),
-                    task_data.get("task_group_id")
+                    task_data.get("task_group_id"),
+                    task_data.get("taskworker_id")
                 )
                 self.store.mark_batch_incomplete(batch_index)
 

daemo/protocol.py

@@ -11,12 +11,14 @@ class ClientProtocol(WebSocketClientProtocol):
     lost = False
 
     def connectionMade(self):
+        log.info("channel connection initiated")
+        super(ClientProtocol, self).connectionMade()
+
+    def onConnect(self, response):
         log.info("channel connected")
+        super(ClientProtocol, self).onConnect(response)
         self.factory.resetDelay()
 
-    # def onConnect(self, response):
-    #     log.info("channel connected")
-
     def onOpen(self):
         log.info("channel opened")
 

daemo/storage.py

@@ -59,25 +59,33 @@ def mark_task_completed(self, batch_index, task_id, task_group_id):
             self.batches[batch_index]["status"][task_group_id] = True
             log.debug(msg="task %d is complete" % task_group_id)
 
-    def mark_task_incomplete(self, batch_index, task_id, task_group_id):
+    def mark_task_incomplete(self, batch_index, task_id, task_group_id, taskworker_id):
         if task_group_id in self.batches[batch_index]["status"]:
-            self.batches[batch_index]["submissions"][task_group_id] = self.batches[batch_index]["submissions"][
-                task_group_id] - 1
+            self.batches[batch_index]["submissions"][task_group_id] = self.batches[batch_index]["submissions"][task_group_id] - 1
             self.batches[batch_index]["status"][task_group_id] = False
             log.debug(msg="task %d is NOT complete" % task_group_id)
 
+            data = self.batches[batch_index]["aggregated_data"]
+
+            aggregate = []
+            for taskworker in data:
+                if taskworker["data"]["taskworker_id"] != taskworker_id:
+                    aggregate.append(taskworker)
+
+            self.batches[batch_index]["aggregated_data"] = aggregate
+
     def is_batch_complete(self, batch_index):
         is_complete = all(self.batches[batch_index]["status"].values())
-        log.debug(msg="batch %d is %s complete" % (batch_index, ''if is_complete else 'NOT'))
+        log.debug(msg="batch %d is %s complete" % (batch_index + 1, '' if is_complete else 'NOT'))
         return is_complete
 
     def mark_batch_completed(self, batch_index):
-        log.debug(msg="batch %d is complete" % batch_index)
+        # log.debug(msg="batch %d is complete" % batch_index)
 
         self.batches[batch_index]["is_complete"] = True
 
     def mark_batch_incomplete(self, batch_index):
-        log.debug(msg="batch %d is NOT complete" % batch_index)
+        # log.debug(msg="batch %d is NOT complete" % batch_index)
 
         self.batches[batch_index]["is_complete"] = False
 
@@ -94,6 +102,7 @@ def all_reviews_complete(self):
 
     def aggregate(self, batch_index, task_id, task_group_id, taskworker_id, task_data):
         task_data["taskworker_id"] = taskworker_id
+
         self.batches[batch_index]["aggregated_data"].append({
             "task_id": task_id,
             "task_group_id": task_group_id,

docs/conf.py

@@ -70,7 +70,7 @@
 # The short X.Y version.
 version = u'1.0'
 # The full version, including alpha/beta/rc tags.
-release = u'1.0.10'
+release = u'1.0.11'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

samples/logging.conf

@@ -13,8 +13,8 @@ handlers:
     formatter: simple
     stream: ext://sys.stderr
     color_asctime:
-        - black
         - white
+        - black
         - True
     color_name:
         - cyan

setup.py

@@ -20,7 +20,7 @@
 
 setup(
     name='daemo-api-client',
-    version='1.0.10',
+    version='1.0.11',
     packages=find_packages(exclude=['samples']),
     package_data={'daemo': ['logging.conf']},
     install_requires=install_requires,