ecopipeline 0.9.1__tar.gz → 0.9.3__tar.gz

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

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

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

@@ -728,6 +728,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.1 → ecopipeline-0.9.3}/src/ecopipeline/transform/transform.py

@@ -396,11 +396,12 @@ def column_name_change(df : pd.DataFrame, dt : pd.Timestamp, new_column : str, o
     remove_old_column : bool
         remove old column when done
     """
-    if df.index.min() < dt:
-        mask = df.index < dt
-        df.loc[mask, new_column] = df.loc[mask, old_column]
-    if remove_old_column:
-        df = df.drop(columns=[old_column])
+    if old_column in df.columns:
+        if df.index.min() < dt:
+            mask = df.index < dt
+            df.loc[mask, new_column] = df.loc[mask, old_column]
+        if remove_old_column:
+            df = df.drop(columns=[old_column])
     return df
 
 def heat_output_calc(df: pd.DataFrame, flow_var : str, hot_temp : str, cold_temp : str, heat_out_col_name : str, return_as_kw : bool = True) -> pd.DataFrame:

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

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