corebridge 0.3.2__tar.gz → 0.3.4__tar.gz

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

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

corebridge-0.3.4/corebridge/__init__.py

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

{corebridge-0.3.2 → corebridge-0.3.4}/corebridge/_modidx.py

@@ -87,4 +87,6 @@ d = { 'settings': { 'branch': 'main',
                                     'corebridge.rscript.run_rscript_nowait': ( 'rscriptbridge.html#run_rscript_nowait',
                                                                                'corebridge/rscript.py'),
                                     'corebridge.rscript.run_rscript_wait': ('rscriptbridge.html#run_rscript_wait', 'corebridge/rscript.py'),
+                                    'corebridge.rscript.snake_case_to_camel_case': ( 'rscriptbridge.html#snake_case_to_camel_case',
+                                                                                     'corebridge/rscript.py'),
                                     'corebridge.rscript.unpack_assets': ('rscriptbridge.html#unpack_assets', 'corebridge/rscript.py')}}}

{corebridge-0.3.2 → corebridge-0.3.4}/corebridge/aicorebridge.py

@@ -89,6 +89,7 @@ def __init__(self:AICoreModule,
              *args, **kwargs):
     
     self.init_time = datetime.datetime.now(datetime.UTC)
+    self.aicorebridge_version = __version__
     self._init_processor(processor)
 
     self.init_args = args
@@ -128,6 +129,7 @@ def infer(self:AICoreModule, data:dict, *_, **kwargs):
 
         msg=[
             f"Startup time: {self.init_time.isoformat()}",
+            f"Corebridge version: {self.aicorebridge_version}",
             f"{self.processor.__name__}({self.processor_signature})",             
             f"init_args: {self.init_args}, init_kwargs: {self.init_kwargs}",
         ]

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

@@ -6,7 +6,7 @@ __all__ = ['syslog', 'read_chunk_size', 'RScriptProcess', 'get_asset_path', 'get
            'calc_hash_from_flowobject', 'calc_hash_from_files', 'calc_hash_from_input_files',
            'calc_hash_from_data_files', 'check_script_inputs', 'check_script_output', 'generate_checksum_file',
            'run_rscript_wait', 'run_rscript_nowait', 'release_script_lock', 'AICoreRScriptModule',
-           'recursive_flatten_nested_data']
+           'snake_case_to_camel_case', 'recursive_flatten_nested_data']
 
 # %% ../nbs/02_rscriptbridge.ipynb 4
 import os, logging, json, hashlib
@@ -19,6 +19,7 @@ from functools import reduce
 from collections import namedtuple
 from fastcore.basics import patch_to, patch
 
+import corebridge
 from .core import *
 
 
@@ -412,6 +413,8 @@ class AICoreRScriptModule(AICoreModuleBase):
                 *args, **kwargs):
         
         super().__init__(save_dir, assets_dir, *args, **kwargs)
+    
+        self.corebridge_version = corebridge.__version__
 
         self.flow_mapping = flow_mapping
         self.cran_repo = cran_repo
@@ -500,9 +503,14 @@ def update_flow(self:AICoreRScriptModule):
 
 
 # %% ../nbs/02_rscriptbridge.ipynb 125
+def snake_case_to_camel_case(snake_case:str) -> str:
+    splittext = snake_case.split('_')
+    return ''.join([x.capitalize() if n > 0 else x for x,n in zip(splittext, range(len(splittext)))])
+
 def recursive_flatten_nested_data(
         data:dict, 
-        column_prefix:str='') -> dict:
+        column_prefix:str='',
+        camel_case=False) -> dict:
     
     if isinstance(data, np.ndarray):
         return {column_prefix:data}
@@ -511,7 +519,7 @@ def recursive_flatten_nested_data(
         return reduce(
             lambda R, X: dict(**R, **X) if R else X,
             [
-                recursive_flatten_nested_data(value, f"{column_prefix}_{i+1}_")
+                recursive_flatten_nested_data(value, f"{column_prefix}_{i+1}_", camel_case)
                 for i, value in enumerate(data)
              
             ],
@@ -529,7 +537,9 @@ def recursive_flatten_nested_data(
                 [
                     recursive_flatten_nested_data(
                         value, 
-                        f"{column_prefix}{str(key).capitalize()}")
+                        snake_case_to_camel_case(column_prefix+'_'+str(key)) if camel_case else column_prefix+'_'+str(key),
+                        camel_case
+                    )
                     for key, value in data.items()
                 ],
                 {}
@@ -538,9 +548,12 @@ def recursive_flatten_nested_data(
         else:
             key = list(data.keys())[0]
             value = data[key]
-            column_name = f"{column_prefix}{str(key).capitalize()}" if column_prefix else str(key)
+            if column_prefix:
+                column_name = snake_case_to_camel_case(column_prefix+'_'+str(key)) if camel_case else column_prefix+'_'+str(key)
+            else:
+                column_name = snake_case_to_camel_case(str(key)) if camel_case else str(key)
             return recursive_flatten_nested_data(
-                value, column_name,
+                value, column_name, camel_case
             )
                 
 
@@ -558,15 +571,20 @@ def write_uploaded_data(
     df.reset_index().to_csv(csv_filename, index=False, date_format='%Y-%m-%d %H:%M:%S')
 
 @patch
-def read_data(self:AICoreRScriptModule, tag:str=None, **kwargs):
+def read_data(self:AICoreRScriptModule, tag:str=None, camel_case=False, **kwargs):
+    
     rdata_filename = self.get_save_path(self.data_files_map.get(tag, tag))
     converted = rdata.read_rda(rdata_filename)
 
-    flattened = recursive_flatten_nested_data(converted)
+    flattened = recursive_flatten_nested_data(converted, camel_case=camel_case)
     df = pd.DataFrame(flattened)
-    df.set_index( pd.DatetimeIndex(df['ensemble_predTime']), inplace=True)
+    syslog.debug(f"Read {df.shape[0]} rows from {rdata_filename} for {tag} (camel_case={camel_case})")
+
+    time_column = [k for k,v in df.dtypes.to_dict().items() if 'float' not in str(v)][0]
+    df.set_index( pd.DatetimeIndex(df[time_column]), inplace=True)
     df.index.name = 'time'
-    df.drop('ensemble_predTime', axis=1, inplace=True)
+    df.drop(time_column, axis=1, inplace=True)
+
     return df
                                         
 
@@ -576,10 +594,6 @@ def infer(
     self:AICoreRScriptModule, 
     data:dict, 
     *_, 
-    writeTag:str=None,
-    readTag:str=None,
-    timezone:str='UTC',
-    recordformat:str='records',
     **kwargs):
 
     """ 
@@ -590,11 +604,17 @@ def infer(
 
         msg=[
             f"Startup time: {self.init_time.isoformat()}",
+            f"Corebridge version: {self.corebridge_version}",
             f"init_args: {self.init_args}, init_kwargs: {self.init_kwargs}",
         ]
         
         msg += self.update_flow()
         # Pickup params, pop those that are not intended for the processor
+        writeTag = kwargs.pop('writeTag', None)
+        readTag = kwargs.pop('readTag', None)
+        camelCase = bool(kwargs.pop('camelCase', False))
+        msg.append(f"writeTag: {writeTag}, readTag: {readTag}, camelCase: {camelCase}")
+
         lastSeen = kwargs.pop('lastSeen', False)
         recordformat = kwargs.pop('format', "records").lower()
         timezone = kwargs.get('timezone', 'UTC')
@@ -613,7 +633,7 @@ def infer(
             self.write_uploaded_data(df, writeTag)
 
         if readTag:
-            result = self.read_data(readTag)
+            result = self.read_data(readTag, camel_case=camelCase)
 
             if reversed:
                 result = result[::-1]

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

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

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

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

corebridge-0.3.2/corebridge/__init__.py

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