ecopipeline 0.11.5__tar.gz → 0.11.7__tar.gz

{ecopipeline-0.11.5/src/ecopipeline.egg-info → ecopipeline-0.11.7}/PKG-INFO

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

{ecopipeline-0.11.5 → ecopipeline-0.11.7}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ecopipeline
-version = 0.11.5
+version = 0.11.7
 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.11.5 → ecopipeline-0.11.7}/src/ecopipeline/event_tracking/event_tracking.py

@@ -78,7 +78,7 @@ def flag_abnormal_COP(daily_data: pd.DataFrame, config : ConfigManager, system:
         for bound_var, bounds in bounds_df.iterrows():
             if bound_var in cop_columns:
                 for day, day_values in daily_data.iterrows():
-                    if day_values[bound_var] > bounds['high_alarm'] or day_values[bound_var] < bounds['low_alarm']:
+                    if not day_values[bound_var] is None and (day_values[bound_var] > bounds['high_alarm'] or day_values[bound_var] < bounds['low_alarm']):
                         alarm_str = f"Unexpected COP Value detected: {bounds['pretty_name']} = {round(day_values[bound_var],2)}"
                         if day in alarms_dict:
                             alarms_dict[day].append([bound_var, alarm_str])
@@ -135,6 +135,9 @@ def flag_boundary_alarms(df: pd.DataFrame, config : ConfigManager, default_fault
     pd.DataFrame:
         Pandas dataframe with alarm events
     """
+    if df.empty:
+        print("cannot flag boundary alarms. Dataframe is empty")
+        return pd.DataFrame()
     variable_names_path = config.get_var_names_path()
     try:
         bounds_df = pd.read_csv(variable_names_path)

{ecopipeline-0.11.5 → ecopipeline-0.11.7}/src/ecopipeline/transform/__init__.py

@@ -2,7 +2,7 @@ from .transform import rename_sensors, avg_duplicate_times, remove_outliers, ffi
     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, create_data_statistics_df, delete_erroneous_from_time_pt,column_name_change, \
-    process_ls_signal
+    process_ls_signal, convert_temp_resistance_type
 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, \
@@ -14,4 +14,4 @@ __all__ = ["rename_sensors", "avg_duplicate_times", "remove_outliers", "ffill_mi
            "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","apply_equipment_cop_derate","create_data_statistics_df",
-           "delete_erroneous_from_time_pt","column_name_change","process_ls_signal"]
+           "delete_erroneous_from_time_pt","column_name_change","process_ls_signal", "convert_temp_resistance_type"]

{ecopipeline-0.11.5 → ecopipeline-0.11.7}/src/ecopipeline/transform/transform.py

@@ -1,7 +1,7 @@
 import pandas as pd
 import numpy as np
 import datetime as dt
-import csv
+import pickle
 import os
 from ecopipeline.utils.unit_convert import temp_c_to_f_non_noaa, volume_l_to_g, power_btuhr_to_kw, temp_f_to_c
 from ecopipeline import ConfigManager
@@ -305,6 +305,41 @@ def ffill_missing(original_df: pd.DataFrame, config : ConfigManager, previous_fi
     df.apply(_ffill, args=(ffill_df,previous_fill))
     return df
 
+def convert_temp_resistance_type(df : pd.DataFrame, column_name : str, sensor_model = 'veris') -> pd.DataFrame:
+    """
+    Convert temperature in Fahrenheit to resistance in Ohms for 10k Type 2 thermistor.
+    
+    Parameters:
+    -----------
+    temp_F : float or array-like
+        Temperature in Fahrenheit
+    model_path : str, optional
+        Path to a pickle file containing a saved interpolation model.
+        If provided, loads and uses that model instead of the global interp_model.
+        If None, uses the global interp_model.
+    
+    Returns:
+    --------
+    float or ndarray
+        Resistance in Ohms
+    """
+    model_path_t_to_r = '../utils/pkls/'
+    model_path_r_to_t = '../utils/pkls/'
+    if sensor_model == 'veris':
+        model_path_t_to_r = model_path_t_to_r + 'veris_temp_to_resistance_2.pkl'
+        model_path_r_to_t = model_path_r_to_t + 'veris_resistance_to_temp_3.pkl'
+    else:
+        raise Exception("unsupported sensor model")
+    
+    with open(os.path.join(os.path.dirname(__file__),model_path_t_to_r), 'rb') as f:
+        model = pickle.load(f)
+    df['resistance'] = df[column_name].apply(model)
+    with open(os.path.join(os.path.dirname(__file__),model_path_r_to_t), 'rb') as f:
+        model = pickle.load(f)
+    df[column_name] = df['resistance'].apply(model)
+    df.drop(columns='resistance')
+    return df
+
 def process_ls_signal(df: pd.DataFrame, hourly_df: pd.DataFrame, daily_df: pd.DataFrame, load_dict: dict = {1: "normal", 2: "loadUp", 3 : "shed"}, ls_column: str = 'ls',
                       drop_ls_from_df : bool = False):
     """

{ecopipeline-0.11.5 → ecopipeline-0.11.7/src/ecopipeline.egg-info}/PKG-INFO

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

{ecopipeline-0.11.5 → ecopipeline-0.11.7}/src/ecopipeline.egg-info/SOURCES.txt

@@ -22,4 +22,5 @@ src/ecopipeline/transform/transform.py
 src/ecopipeline/utils/ConfigManager.py
 src/ecopipeline/utils/NOAADataDownloader.py
 src/ecopipeline/utils/__init__.py
-src/ecopipeline/utils/unit_convert.py
+src/ecopipeline/utils/unit_convert.py
+src/ecopipeline/utils/pkls/__init__.py