ecopipeline 0.9.0__tar.gz → 0.9.2__tar.gz

{ecopipeline-0.9.0/src/ecopipeline.egg-info → ecopipeline-0.9.2}/PKG-INFO

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

{ecopipeline-0.9.0 → ecopipeline-0.9.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ecopipeline
-version = 0.9.0
+version = 0.9.2
 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.9.0 → ecopipeline-0.9.2}/src/ecopipeline/event_tracking/event_tracking.py

@@ -184,7 +184,7 @@ def _check_and_add_ratio_alarm(daily_df: pd.DataFrame, alarm_key : str, column_n
     alarm_daily_df = daily_df.loc[(daily_df[f"{column_name}_{alarm_key}"] < low_bound) | (daily_df[f"{column_name}_{alarm_key}"] > high_bound)]
     if not alarm_daily_df.empty:
         for day, values in alarm_daily_df.iterrows():
-            alarm_str = f"Power ratio alarm: {pretty_name} accounted for {round(values[f'{column_name}_{alarm_key}'], 2)}% of {alarm_key} energy use."
+            alarm_str = f"Power ratio alarm: {pretty_name} accounted for {round(values[f'{column_name}_{alarm_key}'], 2)}% of {alarm_key} energy use. {round(low_bound, 2)}-{round(high_bound, 2)}% of {alarm_key} energy use expected."
             if day in alarms_dict:
                 alarms_dict[day].append([column_name, alarm_str])
             else:

{ecopipeline-0.9.0 → ecopipeline-0.9.2}/src/ecopipeline/transform/transform.py

@@ -396,11 +396,12 @@ def column_name_change(df : pd.DataFrame, dt : pd.Timestamp, new_column : str, o
     remove_old_column : bool
         remove old column when done
     """
-    if df.index.min() < dt:
-        mask = df.index < dt
-        df.loc[mask, new_column] = df.loc[mask, old_column]
-    if remove_old_column:
-        df = df.drop(columns=[old_column])
+    if old_column in df.columns:
+        if df.index.min() < dt:
+            mask = df.index < dt
+            df.loc[mask, new_column] = df.loc[mask, old_column]
+        if remove_old_column:
+            df = df.drop(columns=[old_column])
     return df
 
 def heat_output_calc(df: pd.DataFrame, flow_var : str, hot_temp : str, cold_temp : str, heat_out_col_name : str, return_as_kw : bool = True) -> pd.DataFrame:

{ecopipeline-0.9.0 → ecopipeline-0.9.2/src/ecopipeline.egg-info}/PKG-INFO

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