ecopipeline 0.8.5__tar.gz → 0.8.7__tar.gz

{ecopipeline-0.8.5/src/ecopipeline.egg-info → ecopipeline-0.8.7}/PKG-INFO

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

{ecopipeline-0.8.5 → ecopipeline-0.8.7}/setup.cfg

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

@@ -3,7 +3,7 @@ import numpy as np
 import datetime as dt
 from ecopipeline import ConfigManager
 
-def flag_boundary_alarms(df: pd.DataFrame, config : ConfigManager, default_fault_time : int = 15, site: str = "", full_days : list = None) -> pd.DataFrame:
+def flag_boundary_alarms(df: pd.DataFrame, config : ConfigManager, default_fault_time : int = 15, system: str = "", full_days : list = None) -> pd.DataFrame:
     """
     Function will take a pandas dataframe and location of alarm information in a csv,
     and create an dataframe with applicable alarm events
@@ -22,8 +22,8 @@ def flag_boundary_alarms(df: pd.DataFrame, config : ConfigManager, default_fault
     default_fault_time : int
         Number of consecutive minutes that a sensor must be out of bounds for to trigger an alarm. Can be customized for each variable with 
         the fault_time column in Varriable_Names.csv
-    site: str
-        string of site name if processing a particular site in a Variable_Names.csv file with multiple sites. Leave as an empty string if not aplicable.
+    system: str
+        string of system name if processing a particular system in a Variable_Names.csv file with multiple systems. Leave as an empty string if not aplicable.
     full_days : list
         list of pd.Datetimes that should be considered full days here. If set to none, will take any day at all present in df
 
@@ -39,10 +39,10 @@ def flag_boundary_alarms(df: pd.DataFrame, config : ConfigManager, default_fault
         print("File Not Found: ", variable_names_path)
         return pd.DataFrame()
 
-    if (site != ""):
-        if not 'site' in bounds_df.columns:
-            raise Exception("site parameter is non null, however, site is not present in Variable_Names.csv")
-        bounds_df = bounds_df.loc[bounds_df['site'] == site]
+    if (system != ""):
+        if not 'system' in bounds_df.columns:
+            raise Exception("system parameter is non null, however, system is not present in Variable_Names.csv")
+        bounds_df = bounds_df.loc[bounds_df['system'] == system]
 
     required_columns = ["variable_name", "high_alarm", "low_alarm"]
     for required_column in required_columns:

{ecopipeline-0.8.5 → ecopipeline-0.8.7}/src/ecopipeline/extract/extract.py

@@ -753,7 +753,7 @@ def pull_egauge_data(config: ConfigManager, eGauge_ids: list, eGauge_usr : str,
 
     os.chdir(original_directory)
 
-def tb_api_to_df(config: ConfigManager, startTime: datetime = None, endTime: datetime = None):
+def tb_api_to_df(config: ConfigManager, startTime: datetime = None, endTime: datetime = None, create_csv = True):
     if endTime is None:
         endTime = datetime.now()
     if startTime is None:
@@ -770,7 +770,6 @@ def tb_api_to_df(config: ConfigManager, startTime: datetime = None, endTime: dat
         df = df.sort_index()
         df = df.groupby(df.index).mean()
         return df
-
     url = f'https://thingsboard.cloud/api/plugins/telemetry/DEVICE/{config.api_device_id}/values/timeseries'
     token = config.get_thingsboard_token()
     keys = _get_tb_keys(config, token)
@@ -808,8 +807,14 @@ def tb_api_to_df(config: ConfigManager, startTime: datetime = None, endTime: dat
             df = pd.DataFrame(data)
             df.index = pd.to_datetime(df.index, unit='ms')
             df = df.sort_index()
+            # save to file
+            if create_csv:
+                filename = f"{startTime.strftime('%Y%m%d%H%M%S')}.csv"
+                original_directory = os.getcwd()
+                os.chdir(config.data_directory)
+                df.to_csv(filename, index_label='time_pt')
+                os.chdir(original_directory)
             return df
-            
         print(f"Failed to make GET request. Status code: {response.status_code} {response.json()}")
         return pd.DataFrame()
     except Exception as e:

{ecopipeline-0.8.5 → ecopipeline-0.8.7/src/ecopipeline.egg-info}/PKG-INFO

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