ecopipeline 0.9.3__tar.gz → 0.9.4__tar.gz

{ecopipeline-0.9.3/src/ecopipeline.egg-info → ecopipeline-0.9.4}/PKG-INFO

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

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

@@ -50,6 +50,8 @@ def flag_boundary_alarms(df: pd.DataFrame, config : ConfigManager, default_fault
             raise Exception(f"{required_column} is not present in Variable_Names.csv")
     if not 'pretty_name' in bounds_df.columns:
         bounds_df['pretty_name'] = bounds_df['variable_name']
+    else:
+        bounds_df['pretty_name'] = bounds_df['pretty_name'].fillna(bounds_df['variable_name'])
     if not 'fault_time' in bounds_df.columns:
         bounds_df['fault_time'] = default_fault_time
 

{ecopipeline-0.9.3 → ecopipeline-0.9.4}/src/ecopipeline/extract/extract.py

@@ -686,15 +686,16 @@ def fm_api_to_df(config: ConfigManager, startTime: datetime = None, endTime: dat
     device_id = config.get_fm_device_id()
     url = f"https://www.fieldpop.io/rest/method/fieldpop-api/deviceDataLog?happn_token={api_token}&deviceID={device_id}"
     if not startTime is None:
-        url = f"{url}&startUTCsec={startTime.timestamp()}"
+        url = f"{url}&startUTCsec={int(startTime.timestamp())}"
     else:
         startTime = datetime(2000, 1, 1, 0, 0, 0)  # Jan 1, 2000
     if not endTime is None:
-        url = f"{url}&endUTCsec={endTime.timestamp()}"
+        url = f"{url}&endUTCsec={int(endTime.timestamp())}"
     else:
         endTime = datetime.now()
 
     try:
+        print(url)
         response = requests.get(url)
         if response.status_code == 200:
             df = pd.DataFrame()

{ecopipeline-0.9.3 → ecopipeline-0.9.4/src/ecopipeline.egg-info}/PKG-INFO

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