corebridge 0.3.0__tar.gz → 0.3.2__tar.gz

{corebridge-0.3.0/corebridge.egg-info → corebridge-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: corebridge
-Version: 0.3.0
+Version: 0.3.2
 Summary: Bridge for Stactics AICore
 Home-page: https://github.com/fenke/corebridge
 Author: Fenke Meijer

corebridge-0.3.2/corebridge/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.2"

{corebridge-0.3.0 → corebridge-0.3.2}/corebridge/rscript.py

@@ -456,7 +456,7 @@ class AICoreRScriptModule(AICoreModuleBase):
     
     def get_flow_status(self):
         return [
-            f"process {name} for {process.flow_object['name']} is done: {process.popen.poll()}, args: {process.popen_args}"
+            f"process {name} for {process.flow_object['name']} pollstatus: {process.popen.poll()}, args: {process.popen_args}"
             for name, process in self.flow_results.items()
             if process and process.popen
         ]
@@ -481,7 +481,7 @@ def update_flow(self:AICoreRScriptModule):
                 process = self.flow_results[flow_object['name']]
                 if process.popen.poll() is None:
                     syslog.debug(f"Process is still running: {flow_object['name']}, args: {process.popen_args}")
-                    return process
+                    return self.get_flow_status()
                 else:
                     syslog.debug(f"Process finished: {flow_object['name']}, args: {process.popen_args}, returncode: {process.popen.poll()}")
                 
@@ -494,12 +494,12 @@ def update_flow(self:AICoreRScriptModule):
                 libfolder=libfolder,
                 pkg_repo=self.cran_repo
             )
-            return self.flow_results[flow_object['name']]
 
     syslog.info(f"RScriptModule flow update complete.")
+    return self.get_flow_status()
 
 
-# %% ../nbs/02_rscriptbridge.ipynb 126
+# %% ../nbs/02_rscriptbridge.ipynb 125
 def recursive_flatten_nested_data(
         data:dict, 
         column_prefix:str='') -> dict:
@@ -544,7 +544,7 @@ def recursive_flatten_nested_data(
             )
                 
 
-# %% ../nbs/02_rscriptbridge.ipynb 130
+# %% ../nbs/02_rscriptbridge.ipynb 129
 @patch
 def write_uploaded_data(
     self:AICoreRScriptModule, 
@@ -592,7 +592,8 @@ def infer(
             f"Startup time: {self.init_time.isoformat()}",
             f"init_args: {self.init_args}, init_kwargs: {self.init_kwargs}",
         ]
-        self.update_flow()
+        
+        msg += self.update_flow()
         # Pickup params, pop those that are not intended for the processor
         lastSeen = kwargs.pop('lastSeen', False)
         recordformat = kwargs.pop('format', "records").lower()
@@ -618,6 +619,7 @@ def infer(
                 result = result[::-1]
 
             syslog.debug(f"Read {result.shape[0]} rows from {readTag}")
+
             return {
                 'msg':msg,
                 'data': timeseries_dataframe_to_datadict(
@@ -626,8 +628,9 @@ def infer(
                     timezone=timezone,
                     popNaN=True)
             }
+        
         return {
-            'msg':msg,
+            'msg':msg + self.get_flow_status(),
             'data': []
         }
 

{corebridge-0.3.0 → corebridge-0.3.2/corebridge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: corebridge
-Version: 0.3.0
+Version: 0.3.2
 Summary: Bridge for Stactics AICore
 Home-page: https://github.com/fenke/corebridge
 Author: Fenke Meijer

{corebridge-0.3.0 → corebridge-0.3.2}/settings.ini

@@ -5,7 +5,7 @@
 ### Python library ###
 repo = corebridge
 lib_name = %(repo)s
-version = 0.3.0
+version = 0.3.2
 min_python = 3.10
 license = apache2
 black_formatting = False

corebridge-0.3.0/corebridge/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.0"