ecopipeline 0.11.3__tar.gz → 0.11.5__tar.gz

{ecopipeline-0.11.3/src/ecopipeline.egg-info → ecopipeline-0.11.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecopipeline
-Version: 0.11.3
+Version: 0.11.5
 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 → ecopipeline-0.11.5}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ecopipeline
-version = 0.11.3
+version = 0.11.5
 authors = ["Carlos Bello, <bellocarlos@seattleu.edu>, Emil Fahrig <fahrigemil@seattleu.edu>, Casey Mang <cmang@seattleu.edu>, Julian Harris <harrisjulian@seattleu.edu>, Roger Tram <rtram@seattleu.edu>, Nolan Price <nolan@ecotope.com>"]
 description = Contains functions for use in Ecotope Datapipelines
 long_description = file: README.md

{ecopipeline-0.11.3 → ecopipeline-0.11.5}/src/ecopipeline/event_tracking/event_tracking.py

@@ -293,6 +293,9 @@ def power_ratio_alarm(daily_df: pd.DataFrame, config : ConfigManager, day_table_
     for required_column in required_columns:
         if not required_column in ratios_df.columns:
             raise Exception(f"{required_column} is not present in Variable_Names.csv")
+    if ratios_df['alarm_codes'].isna().all() or ratios_df['alarm_codes'].isnull().all():
+        print("No alarm codes in ", variable_names_path)
+        return pd.DataFrame()
     if not 'pretty_name' in ratios_df.columns:
         ratios_df['pretty_name'] = ratios_df['variable_name']
     else:

{ecopipeline-0.11.3 → ecopipeline-0.11.5}/src/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-0.11.3 → ecopipeline-0.11.5}/src/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 → ecopipeline-0.11.5/src/ecopipeline.egg-info}/PKG-INFO

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