ecopipeline 0.8.2__tar.gz → 0.8.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {ecopipeline-0.8.2/src/ecopipeline.egg-info → ecopipeline-0.8.3}/PKG-INFO +1 -1
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/setup.cfg +1 -1
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/extract/extract.py +1 -1
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/load/load.py +2 -1
- {ecopipeline-0.8.2 → ecopipeline-0.8.3/src/ecopipeline.egg-info}/PKG-INFO +1 -1
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/LICENSE +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/README.md +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/pyproject.toml +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/setup.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/__init__.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/event_tracking/__init__.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/event_tracking/event_tracking.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/extract/__init__.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/load/__init__.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/transform/__init__.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/transform/bayview.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/transform/lbnl.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/transform/transform.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/utils/ConfigManager.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/utils/__init__.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline/utils/unit_convert.py +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline.egg-info/SOURCES.txt +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline.egg-info/dependency_links.txt +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline.egg-info/requires.txt +0 -0
- {ecopipeline-0.8.2 → ecopipeline-0.8.3}/src/ecopipeline.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[metadata]
|
|
2
2
|
name = ecopipeline
|
|
3
|
-
version = 0.8.
|
|
3
|
+
version = 0.8.3
|
|
4
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>"]
|
|
5
5
|
description = Contains functions for use in Ecotope Datapipelines
|
|
6
6
|
long_description = file: README.md
|
|
@@ -760,7 +760,7 @@ def tb_api_to_df(config: ConfigManager, startTime: datetime = None, endTime: dat
|
|
|
760
760
|
# 28 hours to ensure encapsulation of last day
|
|
761
761
|
startTime = endTime - timedelta(hours=28)
|
|
762
762
|
|
|
763
|
-
if endTime - timedelta(hours=
|
|
763
|
+
if endTime - timedelta(hours=12) > startTime:
|
|
764
764
|
time_diff = endTime - startTime
|
|
765
765
|
midpointTime = startTime + time_diff / 2
|
|
766
766
|
# recursively construct the df
|
|
@@ -385,8 +385,9 @@ def load_event_table(config : ConfigManager, event_df: pd.DataFrame, site_name :
|
|
|
385
385
|
(existing_rows['event_type'] == row['event_type'])
|
|
386
386
|
]
|
|
387
387
|
if not time_data[-1] is None and not filtered_existing_rows.empty:
|
|
388
|
+
# silent alarm only
|
|
388
389
|
filtered_existing_rows = filtered_existing_rows[(filtered_existing_rows['variable_name'] == row['variable_name']) &
|
|
389
|
-
(filtered_existing_rows['event_detail'] == row['event_detail'])]
|
|
390
|
+
(filtered_existing_rows['event_detail'].str[:20] == row['event_detail'][:20])] # the [:20] part is a bug fix for partial days for silent alarms
|
|
390
391
|
|
|
391
392
|
if not filtered_existing_rows.empty:
|
|
392
393
|
first_matching_row = filtered_existing_rows.iloc[0] # Retrieves the first row
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|