Rclient and Rwrapper

Author: chreman

server/preprocessing/other-scripts/run_base_contentproviders.R

@@ -9,6 +9,7 @@ renv::restore(lockfile = '../renv.lock')
 Sys.setlocale(category="LC_ALL", locale = "en_US.UTF-8")
 
 library(jsonlite)
+library(rbace)
 library(logging)
 
 source('utils.R')

server/workers/base/src/base.py

@@ -1,3 +1,4 @@
+import os
 import json
 import subprocess
 import pandas as pd
@@ -53,11 +54,12 @@ def execute_search(self, params):
             raise
 
     def get_contentproviders(self):
-        cmd = [self.command, "run_base_contentproviders.R", self.wd]
+        runner = os.path.abspath(os.path.join(self.wd, "run_base_contentproviders.R"))
+        cmd = [self.command, runner, self.wd]
         try:
             proc = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                                     encoding='utf-8')
-            stdout, stderr = proc.communicate(json.dumps({}))
+            stdout, stderr = proc.communicate()
             output = [o for o in stdout.split('\n') if len(o) > 0]
             error = [o for o in stderr.split('\n') if len(o) > 0]
             raw = json.loads(output[-1])
@@ -66,7 +68,7 @@ def get_contentproviders(self):
             else:
                 contentproviders = pd.DataFrame(raw)
                 res = {}
-                res["contentproviders"] = contentproviders
+                res["contentproviders"] = contentproviders.to_json(orient='records')
             return res
         except Exception as e:
             self.logger.error(e)
@@ -93,10 +95,7 @@ def run(self):
                 try:
                     res = self.get_contentproviders()
                     res["id"] = k
-                    if res.get("status") == "error" or params.get('raw') is True:
-                        self.redis_store.set(k+"_output", json.dumps(res))
-                    else:
-                        self.redis_store.rpush("input_data", json.dumps(res).encode('utf8'))
+                    self.redis_store.set(k+"_output", json.dumps(res))
                 except Exception as e:
                     self.logger.exception("Exception during retrieval of contentproviders.")
                     self.logger.error(params)