ecopipeline 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl

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/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()
@@ -728,6 +729,10 @@ def fm_api_to_df(config: ConfigManager, startTime: datetime = None, endTime: dat
             json_message = response.json()
             string_to_match = 'The log size is too large - please try again with a smaller date range.'
             if 'error' in json_message and 'message' in json_message['error'] and json_message['error']['message'] == string_to_match:
+                if endTime - timedelta(minutes=30) < startTime:
+                    # if we can't retrieve less then 30 minutes of data, the dataframe is bust...
+                    print(f"Unable to retrieve data for {startTime} - {endTime}")
+                    return pd.DataFrame() 
                 # Calculate the midpoint between the two datetimes
                 time_diff = endTime - startTime
                 midpointTime = startTime + time_diff / 2

{ecopipeline-0.9.2.dist-info → ecopipeline-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecopipeline
-Version: 0.9.2
+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.2.dist-info → ecopipeline-0.9.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 ecopipeline/__init__.py,sha256=d48mO5La6OrQDkRe_qqoY6lUx7x-e8krOH388jmWjwU,218
 ecopipeline/event_tracking/__init__.py,sha256=hVV2IHyt3pLSIOESpINr8-sQBmK98t7CiVb1IlvE5xQ,84
-ecopipeline/event_tracking/event_tracking.py,sha256=Ti2OJ5cVuBOWEJjgsV0049vHv8941cYusV3Xci2MVuU,16983
+ecopipeline/event_tracking/event_tracking.py,sha256=0w-dgsziC-JolqCPxiyryA9PiWKETQYZ3Gbt0faVgbI,17088
 ecopipeline/extract/__init__.py,sha256=gQ3sak6NJ63Gpo-hZXrtZfeKOTHLRyAVXfTgxxRpqPo,675
-ecopipeline/extract/extract.py,sha256=i5e-mL4KiJfmWMFnKwvCW_BdPELGJiYKRk6FbvcEi1U,51106
+ecopipeline/extract/extract.py,sha256=y32feIIzgABwrwfduNQM1hICmkVOU4PYu6-M07zCLpU,51422
 ecopipeline/load/__init__.py,sha256=NLa_efQJZ8aP-J0Y5xx9DP7mtfRH9jY6Jz1ZMZN_BAA,292
 ecopipeline/load/load.py,sha256=Ptxr0MOjns_HeVSmZsLLApHJGB-z6XOB2m8LNiVaD7E,23860
 ecopipeline/transform/__init__.py,sha256=YveBLBsNhfI4qZP04doa0NrTbEKvjDAUDEKtEPdFPfU,2545
@@ -12,8 +12,8 @@ ecopipeline/transform/transform.py,sha256=wL4B00XBwLWVlf7goOLSHKgLFmIsXprQNepGLL
 ecopipeline/utils/ConfigManager.py,sha256=-g1wtExdvhYO5Y6Q3cRbywa__DxRMFruLrB4YanwaPY,12168
 ecopipeline/utils/__init__.py,sha256=ccWUR0m7gD9DfcgsxBCLOfi4lho6RdYuB2Ugy_g6ZdQ,28
 ecopipeline/utils/unit_convert.py,sha256=VFh1we2Y8KV3u21BeWb-U3TlZJXo83q5vdxxkpgcuME,3064
-ecopipeline-0.9.2.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ecopipeline-0.9.2.dist-info/METADATA,sha256=TvfyD5HUMuKdbDYtQZqr4iTg0HSNNMswtLEVXF7AZ-I,2329
-ecopipeline-0.9.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ecopipeline-0.9.2.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
-ecopipeline-0.9.2.dist-info/RECORD,,
+ecopipeline-0.9.4.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ecopipeline-0.9.4.dist-info/METADATA,sha256=W1-fbJlxCCnlkqlSV5KgSvQlKuQTLYYxFvCgtQY8XFM,2329
+ecopipeline-0.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecopipeline-0.9.4.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
+ecopipeline-0.9.4.dist-info/RECORD,,