ecopipeline 0.7.0__tar.gz → 0.7.2__tar.gz

{ecopipeline-0.7.0/src/ecopipeline.egg-info → ecopipeline-0.7.2}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [metadata]
 name = ecopipeline
-version = 0.7.0
+version = 0.7.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.7.0 → ecopipeline-0.7.2}/src/ecopipeline/load/load.py

@@ -315,7 +315,7 @@ def load_event_table(config : ConfigManager, event_df: pd.DataFrame, site_name :
         site_name = config.get_site_name()
     column_names = f"start_time_pt,site_name"
     column_types = ["datetime","varchar(25)","datetime",
-                    "ENUM('HW_OUTAGE', 'HW_LOSS','PIPELINE_STATUS', 'MISC_EVENT', 'PIPELINE_UPLOAD', 'DATA_LOSS', 'DATA_LOSS_COP', 'SITE_VISIT', 'COMMISIONING', 'SYSTEM_MAINTENENCE', 'POWER_OUTAGE', 'EQUIPMENT_MALFUNCTION','PARTIAL_OCCUPANCY','INSTALLATION_ERROR','SETPOINT_ADJUSTMENT')",
+                    "ENUM('MISC_EVENT','DATA_LOSS','DATA_LOSS_COP','SITE_VISIT','SYSTEM_MAINTENANCE','EQUIPMENT_MALFUNCTION','PARTIAL_OCCUPANCY','INSTALLATION_ERROR','ALARM','MV_COMMISSIONED','PLANT_COMMISSIONED','INSTALLATION_ERROR_COP','SOO_PERIOD','SOO_PERIOD_COP','SYSTEM_TESTING')",
                     "varchar(200)"]
     column_list = ['end_time_pt','event_type', 'event_detail']
     if not set(column_list).issubset(event_df.columns):
@@ -460,7 +460,7 @@ def report_data_loss(config : ConfigManager, site_name : str = None):
     cursor.close()
     return True
 
-def load_data_statistics(config : ConfigManager, daily_stats_df : pd.DataFrame, config_daily_indicator : str = "day"):
+def load_data_statistics(config : ConfigManager, daily_stats_df : pd.DataFrame, config_daily_indicator : str = "day", custom_table_name : str = None):
     """
     Logs data statistics for the site in a table with name "{daily table name}_stats"
 
@@ -472,13 +472,18 @@ def load_data_statistics(config : ConfigManager, daily_stats_df : pd.DataFrame,
         dataframe created by the create_data_statistics_df() function in ecopipeline.transform
     config_daily_indicator : str
         the indicator of the daily_table name in the config.ini file of the data pipeline
+    custom_table_name : str
+        custom table name for data statistics. Overwrites the name "{daily table name}_stats" to your custom name. 
+        In this sense config_daily_indicator's pointer is no longer used. 
 
     Returns
     ------- 
     bool: 
         A boolean value indicating if the data was successfully written to the database. 
     """
-    table_name = f"{config.get_table_name(config_daily_indicator)}_stats"
+    table_name = custom_table_name
+    if table_name is None:
+        table_name = f"{config.get_table_name(config_daily_indicator)}_stats"
     return load_overwrite_database(config, daily_stats_df, config.get_db_table_info([]), config_daily_indicator, table_name=table_name)
 
 def _generate_mysql_update_event_table(row, id):

{ecopipeline-0.7.0 → ecopipeline-0.7.2}/src/ecopipeline/transform/transform.py

@@ -717,7 +717,7 @@ def flag_dhw_outage(df: pd.DataFrame, daily_df : pd.DataFrame, dhw_outlet_column
     Returns
     -------
     event_df : pd.DataFrame
-        Dataframe with 'HW_OUTAGE' events on the days in which there was a DHW Outage.
+        Dataframe with 'ALARM' events on the days in which there was a DHW Outage.
     """
     # TODO edge case for outage that spans over a day
     events = {
@@ -739,7 +739,7 @@ def flag_dhw_outage(df: pd.DataFrame, daily_df : pd.DataFrame, dhw_outlet_column
             adjusted_time = first_true_index - pd.Timedelta(minutes=consecutive_minutes-1)
             events['start_time_pt'].append(day)
             events['end_time_pt'].append(next_day - pd.Timedelta(minutes=1))
-            events['event_type'].append("HW_OUTAGE")
+            events['event_type'].append("ALARM")
             events['event_detail'].append(f"Hot Water Outage Occured (first one starting at {adjusted_time.strftime('%H:%M')})")
     event_df = pd.DataFrame(events)
     event_df.set_index('start_time_pt', inplace=True)

{ecopipeline-0.7.0 → ecopipeline-0.7.2/src/ecopipeline.egg-info}/PKG-INFO

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