commit

rowers/longtask.py

@@ -1,4 +1,9 @@
 from __future__ import absolute_import
+from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
+from rowsandall_app.settings import SITE_URL
+import requests
+import threading
+import redis
 from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
@@ -7,20 +12,14 @@ from __future__ import absolute_import
 import numpy as np
 import time
 
-from redis import StrictRedis,Redis
+from redis import StrictRedis, Redis
 from celery import result as celery_result
 import json
 
 redis_connection = StrictRedis()
 
-import redis
-import threading
-import requests
 
-from rowsandall_app.settings import SITE_URL
-from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
-
-def getvalue(data): # pragma: no cover
+def getvalue(data):  # pragma: no cover
     perc = 0
     total = 1
     done = 0
@@ -36,12 +35,11 @@ def getvalue(data): # pragma: no cover
         if i[0] == 'session_key':
             session_key = i[1]
 
-    return total,done,id,session_key
+    return total, done, id, session_key
 
 
-
-def longtask(aantal,jobid=None,debug=False,
-             session_key=None): # pragma: no cover
+def longtask(aantal, jobid=None, debug=False,
+             session_key=None):  # pragma: no cover
     counter = 0
 
     channel = 'tasks'
@@ -53,20 +51,19 @@ def longtask(aantal,jobid=None,debug=False,
             if debug:
                 progress = 100.*i/aantal
                 if jobid != None:
-                    redis_connection.publish(channel,json.dumps(
+                    redis_connection.publish(channel, json.dumps(
                         {
-                            'done':i,
-                            'total':aantal,
-                            'id':jobid,
-                            'session_key':session_key,
-                            }
-                        ))
-
-
+                            'done': i,
+                            'total': aantal,
+                            'id': jobid,
+                            'session_key': session_key,
+                        }
+                    ))
 
     return 1
 
-def longtask2(aantal,jobid=None,debug=False,secret=''): # pragma: no cover
+
+def longtask2(aantal, jobid=None, debug=False, secret=''):  # pragma: no cover
     counter = 0
 
     channel = 'tasks'
@@ -85,11 +82,10 @@ def longtask2(aantal,jobid=None,debug=False,secret=''): # pragma: no cover
                     url = SITE_URL
                 url += "/rowers/record-progress/"
                 url += str(progress)+"/"+jobid
-                post_data = {"secret":secret}
+                post_data = {"secret": secret}
                 s = requests.post(url, data=post_data)
                 if debug:
                     print(url)
                     print(s)
 
-
     return 1