ecopipeline 0.11.3__py3-none-any.whl → 0.11.4__py3-none-any.whl

ecopipeline/extract/extract.py

@@ -295,6 +295,9 @@ def csv_to_df(csv_filenames: List[str], mb_prefix : bool = False, round_time_ind
                     continue
                 
             temp_dfs.append(data)
+    if len(temp_dfs) <= 0:
+        print("no data for timefarme.")
+        return pd.DataFrame()
     df = pd.concat(temp_dfs, ignore_index=False)
 
     if create_time_pt_idx:

ecopipeline/transform/transform.py

@@ -306,7 +306,7 @@ def ffill_missing(original_df: pd.DataFrame, config : ConfigManager, previous_fi
     return df
 
 def process_ls_signal(df: pd.DataFrame, hourly_df: pd.DataFrame, daily_df: pd.DataFrame, load_dict: dict = {1: "normal", 2: "loadUp", 3 : "shed"}, ls_column: str = 'ls',
-                      drop_ls_from_df : bool = True):
+                      drop_ls_from_df : bool = False):
     """
     Function takes aggregated dfs and adds loadshift signals to hourly df and loadshift days to daily_df
 
@@ -342,12 +342,17 @@ def process_ls_signal(df: pd.DataFrame, hourly_df: pd.DataFrame, daily_df: pd.Da
     df_copy = df.copy()
 
     if ls_column in df_copy.columns:
+        # print("1",df_copy[np.isfinite(df_copy[ls_column])])
         df_copy = df_copy[df_copy[ls_column].notna() & np.isfinite(df_copy[ls_column])]
-    
+        # print("2",df_copy[np.isfinite(df_copy[ls_column])])
+
     # Process hourly data - aggregate ls_column values by hour and map to system_state
-    if ls_column in df.columns:
+    if ls_column in df_copy.columns:
         # Group by hour and calculate mean of ls_column, then round to nearest integer
-        hourly_ls = df_copy[ls_column].resample('H').mean().round().astype(int)
+        hourly_ls = df_copy[ls_column].resample('H').mean().round()
+        
+        # Convert to int only for non-NaN values
+        hourly_ls = hourly_ls.apply(lambda x: int(x) if pd.notna(x) else x)
         
         # Map the rounded integer values to load_dict, using None for unmapped values
         hourly_df['system_state'] = hourly_ls.map(load_dict)

{ecopipeline-0.11.3.dist-info → ecopipeline-0.11.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecopipeline
-Version: 0.11.3
+Version: 0.11.4
 Summary: Contains functions for use in Ecotope Datapipelines
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)

{ecopipeline-0.11.3.dist-info → ecopipeline-0.11.4.dist-info}/RECORD

@@ -2,19 +2,19 @@ ecopipeline/__init__.py,sha256=pjC00JWsjVAhS0jUKHD-wyi4UIpTsWbIg9JaxLS1mlc,275
 ecopipeline/event_tracking/__init__.py,sha256=SV2kkvJgptjeyLQlqHWcDRpQO6-JC433_dRZ3H9-ZNU,131
 ecopipeline/event_tracking/event_tracking.py,sha256=HffWAIAkNJ8INdG3_86RnDgw2bpHwv9hhkZ5oiiugZY,29653
 ecopipeline/extract/__init__.py,sha256=gQ3sak6NJ63Gpo-hZXrtZfeKOTHLRyAVXfTgxxRpqPo,675
-ecopipeline/extract/extract.py,sha256=y32feIIzgABwrwfduNQM1hICmkVOU4PYu6-M07zCLpU,51422
+ecopipeline/extract/extract.py,sha256=5C6KrfMAGQhTxHaWc1Lgm8yV5g994Fiinwk-IEVSHbM,51519
 ecopipeline/load/__init__.py,sha256=NLa_efQJZ8aP-J0Y5xx9DP7mtfRH9jY6Jz1ZMZN_BAA,292
 ecopipeline/load/load.py,sha256=PaSGWOZI0Xg44_SWN7htn2DPIAU_s8mOtCGibXq25tM,24614
 ecopipeline/transform/__init__.py,sha256=9au1Rjw7SMtbIxpoq_5XWi6VWTxMU2CBjPksSh4LM1o,2590
 ecopipeline/transform/bayview.py,sha256=TP24dnTsUD95X-f6732egPZKjepFLJgDm9ImGr-fppY,17899
 ecopipeline/transform/lbnl.py,sha256=EQ54G4rJXaZ7pwVusKcdK2KBehSdCsNo2ybphtMGs7o,33400
-ecopipeline/transform/transform.py,sha256=REdnqimCqI86N_Hy0EF57yDwUnCvHJDeCwcXidSHuwQ,53764
+ecopipeline/transform/transform.py,sha256=UF-sNw4zoxyXv0zsJZk6AqfQxXmAVQ_fsVZtjKiu1sk,54012
 ecopipeline/utils/ConfigManager.py,sha256=-g1wtExdvhYO5Y6Q3cRbywa__DxRMFruLrB4YanwaPY,12168
 ecopipeline/utils/NOAADataDownloader.py,sha256=iC2nl_O4PS1KFrchcPXRZxshwZwUMSqXy6BQBUwnOUU,20927
 ecopipeline/utils/__init__.py,sha256=7dT3tP6SMK4uBW6NBmQ8i6LaNTTuV6fpAZToBBlJ904,62
 ecopipeline/utils/unit_convert.py,sha256=VFh1we2Y8KV3u21BeWb-U3TlZJXo83q5vdxxkpgcuME,3064
-ecopipeline-0.11.3.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ecopipeline-0.11.3.dist-info/METADATA,sha256=gKi7lXy39J0EpxToOclUdz3IClHTOMgC161oc42RRSQ,2330
-ecopipeline-0.11.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ecopipeline-0.11.3.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
-ecopipeline-0.11.3.dist-info/RECORD,,
+ecopipeline-0.11.4.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ecopipeline-0.11.4.dist-info/METADATA,sha256=hpyr7M9aTCQo1MjbxuOeYwX9eiHnyR8XFVQnY5yWjzI,2330
+ecopipeline-0.11.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecopipeline-0.11.4.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
+ecopipeline-0.11.4.dist-info/RECORD,,