1 files changed, 11 insertions, 10 deletions
diff --git a/python/client.py b/python/client.py
index d4282770..87d85bf4 100644
--- a/python/client.py
+++ b/python/client.py
@@ -1,23 +1,24 @@
 import logging
-import tasks
 
-from json import loads, dumps
+from json import dumps
 from db import dbconn
 from common import get_redis_queue
+from tasks import Rpc
 
 def run():
     ET = dbconn('etdb')
     q = get_redis_queue()
     while True:
-        f, args = loads(q.blpop("tasks")[1].decode('utf-8'))
-        if f == 'generate_scenarios':
-            args += [ET]
+        rpc = Rpc.from_json(q.blpop("tasks")[1].decode('utf-8'))
+
+        if rpc.fun == 'generate_scenarios':
+            rpc.args += [ET]
         logger.info("running: {}, {}".format(f, args))
-        getattr(tasks, f)(*args)
-        if f == "build_portfolio":
-            q.rpush("tasks",  dumps(("build_scenarios", args)))
-        if f == "build_scenarios":
-            q.rpush("tasks", dumps(("generate_scenarios", args[:-1])))
+        rpc()
+        if rpc.fun == "build_portfolio":
+            q.rpush("tasks",  str(Rpc("build_scenarios", rpc.args)))
+        if rpc.fun == "build_scenarios":
+            q.rpush("tasks", str(Rpc("generate_scenarios", rpc.args[:-1])))
     ET.close()
 
 if __name__=="__main__":