diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/client.py | 3 | ||||
| -rw-r--r-- | python/task_runner.py | 1 | ||||
| -rw-r--r-- | python/tasks.py | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/python/client.py b/python/client.py index f6cb250f..ca24be71 100644 --- a/python/client.py +++ b/python/client.py @@ -1,6 +1,5 @@ import logging -from json import dumps from db import dbconn from common import get_redis_queue from tasks import Rpc @@ -15,7 +14,7 @@ def run(): rpc.args += [ET] logger.info("running: {}, {}".format(rpc.fun, rpc.args)) rpc() - if rpc.fun == "build_portfolio": + if rpc.fun == "build_portfolios": q.rpush("tasks", str(Rpc("build_scenarios", rpc.args))) if rpc.fun == "build_scenarios": q.rpush("tasks", str(Rpc("generate_scenarios", rpc.args[:-1]))) diff --git a/python/task_runner.py b/python/task_runner.py index 5b62533c..44d152b3 100644 --- a/python/task_runner.py +++ b/python/task_runner.py @@ -3,7 +3,6 @@ import tasks from systemd.daemon import notify from systemd import journal -from json import loads, dumps from db import dbconn from common import get_redis_queue diff --git a/python/tasks.py b/python/tasks.py index 7577d702..7cc28c41 100644 --- a/python/tasks.py +++ b/python/tasks.py @@ -1,10 +1,11 @@ import os import subprocess +import sys from intex.intex_scenarios import generate_scenarios -from json import loads +from json import loads, dumps -def build_portfolio(workdate, dealname, reinvflag): +def build_portfolios(workdate, dealname, reinvflag): rpath = os.path.join(os.environ['CODE_DIR'], "R") logpath = os.path.join(os.environ['LOG_DIR']) args = ["Rscript", "--vanilla", os.path.join(rpath, "build_portfolios.R"), \ @@ -36,5 +37,8 @@ class Rpc(object): @classmethod def from_json(cls, s): rpc = loads(s) - instance = cls(rpc['fun'], rpc['args']) + if sys.version_info[0] < 3: + instance = cls(rpc['fun'].encode(), [arg.encode() for arg in rpc['args']]) + else: + instance = cls(rpc['fun'], rpc['args']) return instance |