ecopipeline 0.7.1__tar.gz → 0.7.3__tar.gz

{ecopipeline-0.7.1/src/ecopipeline.egg-info → ecopipeline-0.7.3}/PKG-INFO

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

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

@@ -162,7 +162,8 @@ def create_new_columns(cursor : mysql.connector.cursor.MySQLCursor, table_name:
     return True
 
 def load_overwrite_database(config : ConfigManager, dataframe: pd.DataFrame, config_info: dict, data_type: str, 
-                            primary_key: str = "time_pt", table_name: str = None, auto_log_data_loss : bool = False):
+                            primary_key: str = "time_pt", table_name: str = None, auto_log_data_loss : bool = False,
+                            config_key : str = "minute"):
     """
     Loads given pandas DataFrame into a MySQL table overwriting any conflicting data. Uses an UPSERT strategy to ensure any gaps in data are filled.
     Note: will not overwrite values with NULL. Must have a new value to overwrite existing values in database
@@ -184,6 +185,9 @@ def load_overwrite_database(config : ConfigManager, dataframe: pd.DataFrame, con
     auto_log_data_loss : bool
         if set to True, a data loss event will be reported if no data exits in the dataframe 
         for the last two days from the current date OR if an error occurs
+    config_key : str 
+        The key in the config.ini file that points to the minute table data for the site. The name of this table is also the site name.
+        
 
     Returns
     ------- 
@@ -208,7 +212,7 @@ def load_overwrite_database(config : ConfigManager, dataframe: pd.DataFrame, con
 
             print(f"Attempting to write data for {dataframe.index[0]} to {dataframe.index[-1]} into {table_name}")
             if auto_log_data_loss and dataframe.index[-1] < datetime.now() - timedelta(days=3):
-                report_data_loss(config)
+                report_data_loss(config, config.get_site_name(config_key))
             
             # Get string of all column names for sql insert
             sensor_names = primary_key
@@ -271,7 +275,7 @@ def load_overwrite_database(config : ConfigManager, dataframe: pd.DataFrame, con
     except Exception as e:
         print(f"Unable to load data into database. Exception: {e}")
         if auto_log_data_loss:
-            report_data_loss(config)
+            report_data_loss(config, config.get_site_name(config_key))
         ret_value = False
 
     db_connection.close()
@@ -460,7 +464,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 +476,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.1 → ecopipeline-0.7.3}/src/ecopipeline/transform/transform.py

@@ -1029,7 +1029,7 @@ def join_to_daily(daily_data: pd.DataFrame, cop_data: pd.DataFrame) -> pd.DataFr
 
 def apply_equipment_cop_derate(df: pd.DataFrame, equip_cop_col: str, r_val : int = 16) -> pd.DataFrame:
     """
-    Function derates equipment COP based on R value
+    Function derates equipment method system COP based on R value
     R12 - R16 : 12 %
     R16 - R20 : 10%
     R20 - R24 : 8%

{ecopipeline-0.7.1 → ecopipeline-0.7.3}/src/ecopipeline/utils/ConfigManager.py

@@ -156,15 +156,20 @@ class ConfigManager:
         """
         return self.db_connection_info['database']
     
-    def get_site_name(self):
+    def get_site_name(self, config_key : str = "minute"):
         """
         returns name of site
+
+        Parameters
+        ---------- 
+        config_key : str 
+            The key in the config.ini file that points to the minute table data for the site. The name of this table is also the site name.
         """
         # TODO needs an update
         configure = configparser.ConfigParser()
         configure.read(self.config_directory)
 
-        return configure.get("minute", 'table_name')
+        return configure.get(config_key, 'table_name')
     
     def connect_db(self) -> (mysql.connector.MySQLConnection, mysql.connector.cursor.MySQLCursor):
         """

{ecopipeline-0.7.1 → ecopipeline-0.7.3/src/ecopipeline.egg-info}/PKG-INFO

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