ecopipeline 0.8.2__py3-none-any.whl → 0.8.3__py3-none-any.whl

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.
Files changed (7) hide show
  1. ecopipeline/extract/extract.py +1 -1
  2. ecopipeline/load/load.py +2 -1
  3. {ecopipeline-0.8.2.dist-info → ecopipeline-0.8.3.dist-info}/METADATA +1 -1
  4. {ecopipeline-0.8.2.dist-info → ecopipeline-0.8.3.dist-info}/RECORD +7 -7
  5. {ecopipeline-0.8.2.dist-info → ecopipeline-0.8.3.dist-info}/WHEEL +0 -0
  6. {ecopipeline-0.8.2.dist-info → ecopipeline-0.8.3.dist-info}/licenses/LICENSE +0 -0
  7. {ecopipeline-0.8.2.dist-info → ecopipeline-0.8.3.dist-info}/top_level.txt +0 -0
ecopipeline/extract/extract.py CHANGED
@@ -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=4) > startTime:
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
ecopipeline/load/load.py CHANGED
@@ -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
{ecopipeline-0.8.2.dist-info → ecopipeline-0.8.3.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ecopipeline
3
- Version: 0.8.2
3
+ Version: 0.8.3
4
4
  Summary: Contains functions for use in Ecotope Datapipelines
5
5
  Classifier: Programming Language :: Python :: 3
6
6
  Classifier: License :: OSI Approved :: GNU General Public License (GPL)
{ecopipeline-0.8.2.dist-info → ecopipeline-0.8.3.dist-info}/RECORD RENAMED
@@ -2,9 +2,9 @@ ecopipeline/__init__.py,sha256=d48mO5La6OrQDkRe_qqoY6lUx7x-e8krOH388jmWjwU,218
2
2
  ecopipeline/event_tracking/__init__.py,sha256=q49j46fXMUjNUPzL4FvXEppB93i3lUni-QUZpp61tt0,64
3
3
  ecopipeline/event_tracking/event_tracking.py,sha256=PHy4xYv71u79UZqFuXnMU7KRwbzOCIc-NNqArcmG9FM,12311
4
4
  ecopipeline/extract/__init__.py,sha256=gQ3sak6NJ63Gpo-hZXrtZfeKOTHLRyAVXfTgxxRpqPo,675
5
- ecopipeline/extract/extract.py,sha256=ITXr8XuadQ81kYA006hygvIYgmkpQXTL6KN4QTpNOvE,46707
5
+ ecopipeline/extract/extract.py,sha256=Fch2IvqGxMClKGniiJiKqyJhcFDwkckaeiGQRVnUGUg,46708
6
6
  ecopipeline/load/__init__.py,sha256=NLa_efQJZ8aP-J0Y5xx9DP7mtfRH9jY6Jz1ZMZN_BAA,292
7
- ecopipeline/load/load.py,sha256=0p9uCDN0JHEDGS8gW1uyLMH0YLedqJvVjZTUYipuSx0,23744
7
+ ecopipeline/load/load.py,sha256=Ptxr0MOjns_HeVSmZsLLApHJGB-z6XOB2m8LNiVaD7E,23860
8
8
  ecopipeline/transform/__init__.py,sha256=hYb4F64fXdXtjBSYCqv6gLFBwKZjjnl0z7s291pFE98,2505
9
9
  ecopipeline/transform/bayview.py,sha256=TP24dnTsUD95X-f6732egPZKjepFLJgDm9ImGr-fppY,17899
10
10
  ecopipeline/transform/lbnl.py,sha256=EQ54G4rJXaZ7pwVusKcdK2KBehSdCsNo2ybphtMGs7o,33400
@@ -12,8 +12,8 @@ ecopipeline/transform/transform.py,sha256=DBQD4WqKmdXnGQMAj6tg75HtXiSemIc7c6nZxz
12
12
  ecopipeline/utils/ConfigManager.py,sha256=-g1wtExdvhYO5Y6Q3cRbywa__DxRMFruLrB4YanwaPY,12168
13
13
  ecopipeline/utils/__init__.py,sha256=ccWUR0m7gD9DfcgsxBCLOfi4lho6RdYuB2Ugy_g6ZdQ,28
14
14
  ecopipeline/utils/unit_convert.py,sha256=VFh1we2Y8KV3u21BeWb-U3TlZJXo83q5vdxxkpgcuME,3064
15
- ecopipeline-0.8.2.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
16
- ecopipeline-0.8.2.dist-info/METADATA,sha256=WJrjohUVWYfCqlmpuhjcbt7VMSg5U7B5DpyJWUUOIfQ,2329
17
- ecopipeline-0.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
18
- ecopipeline-0.8.2.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
19
- ecopipeline-0.8.2.dist-info/RECORD,,
15
+ ecopipeline-0.8.3.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
16
+ ecopipeline-0.8.3.dist-info/METADATA,sha256=N0ZTWUbmVtj99GIrkWfZ8gSdwHiQSla0TOJ9nMDiBCU,2329
17
+ ecopipeline-0.8.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
18
+ ecopipeline-0.8.3.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
19
+ ecopipeline-0.8.3.dist-info/RECORD,,