Squash merge bugfix-broken-api into main

optimizerapi/optimizer.py

@@ -78,7 +78,7 @@ def disconnect_check():
         except NoSuchJobError:
             print("Creating new job")
             job = queue.enqueue(do_run_work, body, job_id=job_id, result_ttl=TTL)
-        while job.return_value is None:
+        while job.return_value() is None:
             if disconnect_check():
                 try:
                     print(f"Client disconnected, cancelling job {job.id}")
@@ -89,7 +89,7 @@ def disconnect_check():
                     pass
                 return {}
             time.sleep(0.2)
-        return job.return_value
+        return job.return_value()
     return do_run_work(body)
 
 

optimizerapi/worker.py

@@ -2,7 +2,7 @@
 Worker that will run all tasks published to redis using RQ
 """
 import os
-from rq import Connection, Queue, Worker
+from rq import Queue, Worker
 from redis import Redis
 
 
@@ -12,6 +12,6 @@
     REDIS_URL = "redis://localhost:6379"
 
 if __name__ == "__main__":
-    with Connection(Redis.from_url(REDIS_URL)):
-        queue = Queue()
-        Worker(queue).work()
+    redis = Redis.from_url(REDIS_URL)
+    queue = Queue(connection=redis)
+    Worker(queue).work()

requirements-freeze.txt

@@ -48,7 +48,7 @@ PyYAML==6.0
 redis==4.5.4
 requests==2.28.2
 requests-toolbelt==0.10.1
-rq==1.16.2
+rq==2.0.0
 rsa==4.9
 scikit-learn==1.1.2
 scipy==1.9.1

requirements.txt

@@ -8,7 +8,7 @@ json-tricks==3.15.5
 jsonschema==4.15.0
 cryptography==3.4.7
 waitress==2.1.2
-rq==1.16.2
+rq==2.0.0
 # ProcessOptimizer requirements
 numpy==1.23.3
 matplotlib==3.5.3