ecopipeline 0.6.6__py3-none-any.whl → 0.6.8__py3-none-any.whl

ecopipeline/extract/extract.py

@@ -141,7 +141,7 @@ def extract_new(startTime: datetime, filenames: List[str], decihex = False, time
     
     if decihex: 
         base_date = datetime(1970, 1, 1)
-        file_dates = [pd.Timestamp(base_date + timedelta(seconds = int(re.search(r'\.(.*?)_', filename).group(1), 16))) for filename in filenames] #convert decihex to dates, these are in utc
+        file_dates = [pd.Timestamp(base_date + timedelta(seconds = int(re.search(r'\.(.*?)_', filename.split("/")[-1]).group(1), 16))) for filename in filenames] #convert decihex to dates, these are in utc
         if timeZone == None:
             file_dates_local = [file_date.tz_localize('UTC').tz_localize(None) for file_date in file_dates] #convert utc 
         else:

ecopipeline/transform/__init__.py

@@ -1,4 +1,4 @@
-from .transform import rename_sensors, avg_duplicate_times, remove_outliers, ffill_missing, nullify_erroneous, sensor_adjustment, round_time, aggregate_df, join_to_hourly, concat_last_row, join_to_daily, cop_method_1, cop_method_2, create_summary_tables, remove_partial_days,convert_c_to_f,convert_l_to_g, convert_on_off_col_to_bool, flag_dhw_outage,generate_event_log_df,convert_time_zone, shift_accumulative_columns,heat_output_calc, add_relative_humidity
+from .transform import rename_sensors, avg_duplicate_times, remove_outliers, ffill_missing, nullify_erroneous, sensor_adjustment, round_time, aggregate_df, join_to_hourly, concat_last_row, join_to_daily, cop_method_1, cop_method_2, create_summary_tables, remove_partial_days,convert_c_to_f,convert_l_to_g, convert_on_off_col_to_bool, flag_dhw_outage,generate_event_log_df,convert_time_zone, shift_accumulative_columns,heat_output_calc, add_relative_humidity, apply_equipment_cop_derate
 from .lbnl import nclarity_filter_new, site_specific, condensate_calculations, gas_valve_diff, gather_outdoor_conditions, aqsuite_prep_time, nclarity_csv_to_df, _add_date, add_local_time, aqsuite_filter_new, get_refrig_charge, elev_correction, change_ID_to_HVAC, get_hvac_state, get_cop_values, get_cfm_values, replace_humidity, create_fan_curves, lbnl_temperature_conversions, lbnl_pressure_conversions, lbnl_sat_calculations, get_site_cfm_info, get_site_info, merge_indexlike_rows
 from .bayview import calculate_cop_values, aggregate_values, get_energy_by_min, verify_power_energy, get_temp_zones120, get_storage_gals120
 __all__ = ["rename_sensors", "avg_duplicate_times", "remove_outliers", "ffill_missing", "nullify_erroneous", "sensor_adjustment", "round_time", "aggregate_df", "join_to_hourly", "concat_last_row", "join_to_daily", 
@@ -6,4 +6,4 @@ __all__ = ["rename_sensors", "avg_duplicate_times", "remove_outliers", "ffill_mi
            "nclarity_csv_to_df", "_add_date", "add_local_time", "aqsuite_filter_new", "get_refrig_charge", "elev_correction", "change_ID_to_HVAC", "get_hvac_state", "get_cop_values", "get_cfm_values", "replace_humidity", 
            "create_fan_curves", "lbnl_temperature_conversions", "lbnl_pressure_conversions", "lbnl_sat_calculations", "get_site_cfm_info", "get_site_info", "merge_indexlike_rows", "calculate_cop_values", "aggregate_values", 
            "get_energy_by_min", "verify_power_energy", "get_temp_zones120", "get_storage_gals120","convert_c_to_f","convert_l_to_g", "convert_on_off_col_to_bool", "flag_dhw_outage","generate_event_log_df","convert_time_zone",
-           "shift_accumulative_columns","heat_output_calc", "add_relative_humidity"]
+           "shift_accumulative_columns","heat_output_calc", "add_relative_humidity","apply_equipment_cop_derate"]

ecopipeline/transform/transform.py

@@ -994,3 +994,47 @@ def join_to_daily(daily_data: pd.DataFrame, cop_data: pd.DataFrame) -> pd.DataFr
     """
     out_df = daily_data.join(cop_data)
     return out_df
+
+def apply_equipment_cop_derate(df: pd.DataFrame, equip_cop_col: str, r_val : int = 16):
+    """
+    Function derates equipment COP based on R value
+    R12 - R16 : 12 %
+    R16 - R20 : 10%
+    R20 - R24 : 8%
+    R24 - R28 : 6%
+    R28 - R32 : 4%
+    > R32 : 2%
+
+    Parameters
+    ---------- 
+    df : pd.DataFrame
+        dataframe
+    equip_cop_col : str
+        name of COP column to derate
+    r_val : int
+        R value, defaults to 16
+
+    Returns
+    -------
+    pd.DataFrame
+        df with equip_cop_col derated
+    """
+    derate = 1 # R12-R16
+    if r_val >= 12:
+        if r_val < 16:
+            derate = 0.88
+        elif r_val < 20:
+            derate = 0.9
+        elif r_val < 24:
+            derate = .92
+        elif r_val < 28:
+            derate = .94
+        elif r_val < 32:
+            derate = .96
+        else:
+            derate = .98
+    else:
+        raise Exception("R value for Equipment COP derate must be at least 12")
+    
+    df[equip_cop_col] =  df[equip_cop_col] * derate
+    return df

{ecopipeline-0.6.6.dist-info → ecopipeline-0.6.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: ecopipeline
-Version: 0.6.6
+Version: 0.6.8
 Summary: Contains functions for use in Ecotope Datapipelines
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
@@ -13,6 +13,7 @@ Requires-Dist: numpy>=1.24.1
 Requires-Dist: mysql-connector-python>=8.0.32
 Requires-Dist: scikit-learn>=1.2.1
 Requires-Dist: statsmodels
+Dynamic: license-file
 
 # DataPipelinePackage
 

{ecopipeline-0.6.6.dist-info → ecopipeline-0.6.8.dist-info}/RECORD

@@ -1,17 +1,17 @@
 ecopipeline/__init__.py,sha256=vCRzwd781ciCSXMP1ycM_BXAqxj3KVaNKIjsLOPcbwc,171
 ecopipeline/extract/__init__.py,sha256=3u_CUMdCguVewU3kN8x6xhVNyo1-p-gwTrhjOh7Psqg,645
-ecopipeline/extract/extract.py,sha256=ryorqnu1RgyNK7joZRcbMmTajlTlB5hwaYzzpo8Z8Ho,43369
+ecopipeline/extract/extract.py,sha256=heWcWTeRVTRITh_1sHVnkaKOOi5PwUOEVIi4k5tw2Z8,43384
 ecopipeline/load/__init__.py,sha256=oDAVF8AhK_qugqegjW7jK16p-nb9QzKhiNQOkEBniKM,235
 ecopipeline/load/load.py,sha256=X7JIakIxyjzZbLuUjJ991kcQpyK4cFEZ0Lk36eXBEfI,21506
-ecopipeline/transform/__init__.py,sha256=DcIJfkRs4OmZzDeEfW_OiOIXNqN6CUl1_lW0SS7-eN8,2280
+ecopipeline/transform/__init__.py,sha256=YIE20XukPx-WiJ575PRgSPaCTtgTCiMqmFXPoE_yR1M,2337
 ecopipeline/transform/bayview.py,sha256=TP24dnTsUD95X-f6732egPZKjepFLJgDm9ImGr-fppY,17899
 ecopipeline/transform/lbnl.py,sha256=EQ54G4rJXaZ7pwVusKcdK2KBehSdCsNo2ybphtMGs7o,33400
-ecopipeline/transform/transform.py,sha256=sRUgfJrvRh0fET-EDa1WPq_tSqxxgIKEjA73ZIil0PE,43729
+ecopipeline/transform/transform.py,sha256=UOfrZj-un6gQuDK3s7EqflHXMAcmSJ-Ba_47I4k2jC4,44754
 ecopipeline/utils/ConfigManager.py,sha256=t4sfTjGO0g5P50XBQqGVFWaXfAlW1GMDh1DLoBuFGks,9826
 ecopipeline/utils/__init__.py,sha256=ccWUR0m7gD9DfcgsxBCLOfi4lho6RdYuB2Ugy_g6ZdQ,28
 ecopipeline/utils/unit_convert.py,sha256=VFh1we2Y8KV3u21BeWb-U3TlZJXo83q5vdxxkpgcuME,3064
-ecopipeline-0.6.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ecopipeline-0.6.6.dist-info/METADATA,sha256=_UjgfGJKfffwbg62LWOMCGvVctmqh4i9vb9HLaXe5uw,2307
-ecopipeline-0.6.6.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-ecopipeline-0.6.6.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
-ecopipeline-0.6.6.dist-info/RECORD,,
+ecopipeline-0.6.8.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ecopipeline-0.6.8.dist-info/METADATA,sha256=zzSea7K1MtnertK2FGbwBOun0_fbHBmwpij_EMDigNU,2329
+ecopipeline-0.6.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ecopipeline-0.6.8.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
+ecopipeline-0.6.8.dist-info/RECORD,,

{ecopipeline-0.6.6.dist-info → ecopipeline-0.6.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any