ecopipeline 0.4.18__py3-none-any.whl → 0.5.0__py3-none-any.whl

ecopipeline/extract/extract.py

@@ -940,7 +940,7 @@ def _download_noaa_data(stations: dict, weather_directory : str) -> List[str]:
         print("FTP ERROR")
         return
     # Download files for each station from 2010 till present year
-    for year in range(2010, year_end):
+    for year in range(2010, year_end + 1):
         # Set FTP credentials and connect
         wd = f"/pub/data/noaa/isd-lite/{year}/"
         ftp_server.cwd(wd)

ecopipeline/transform/transform.py

@@ -449,28 +449,32 @@ def add_relative_humidity(df : pd.DataFrame, temp_col : str ='airTemp_F', dew_po
     A = 6.11
     B = 7.5
     C = 237.3
+    try:
+        if degree_f:
+            df[f"{temp_col}_C"] = df[temp_col].apply(temp_f_to_c)
+            df[f"{dew_point_col}_C"] = df[dew_point_col].apply(temp_f_to_c)
+            temp_col_c = f"{temp_col}_C"
+            dew_point_col_c = f"{dew_point_col}_C"
+        else:
+            temp_col_c = temp_col
+            dew_point_col_c = dew_point_col
 
-    if degree_f:
-        df[f"{temp_col}_C"] = df[temp_col].apply(temp_f_to_c)
-        df[f"{dew_point_col}_C"] = df[dew_point_col].apply(temp_f_to_c)
-        temp_col_c = f"{temp_col}_C"
-        dew_point_col_c = f"{dew_point_col}_C"
-    else:
-        temp_col_c = temp_col
-        dew_point_col_c = dew_point_col
-
-    # Calculate saturation vapor pressure (e_s) and actual vapor pressure (e)
-    e_s = A * 10 ** ((B * df[temp_col_c]) / (df[temp_col_c] + C))
-    e = A * 10 ** ((B * df[dew_point_col_c]) / (df[dew_point_col_c] + C))
+        # Calculate saturation vapor pressure (e_s) and actual vapor pressure (e)
+        e_s = A * 10 ** ((B * df[temp_col_c]) / (df[temp_col_c] + C))
+        e = A * 10 ** ((B * df[dew_point_col_c]) / (df[dew_point_col_c] + C))
 
-    # Calculate relative humidity
-    df['relative_humidity'] = (e / e_s) * 100.0
+        # Calculate relative humidity
+        df['relative_humidity'] = (e / e_s) * 100.0
 
-    # Handle cases where relative humidity exceeds 100% due to rounding
-    df['relative_humidity'] = np.clip(df['relative_humidity'], 0.0, 100.0)
+        # Handle cases where relative humidity exceeds 100% due to rounding
+        df['relative_humidity'] = np.clip(df['relative_humidity'], 0.0, 100.0)
 
-    if degree_f:
-        df.drop(columns=[temp_col_c, dew_point_col_c])
+        if degree_f:
+            df.drop(columns=[temp_col_c, dew_point_col_c])
+    except:
+       
+        df['relative_humidity'] = None
+        print("Unable to calculate relative humidity data for timeframe")
 
     return df
 

{ecopipeline-0.4.18.dist-info → ecopipeline-0.5.0.dist-info}/METADATA

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

{ecopipeline-0.4.18.dist-info → ecopipeline-0.5.0.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=Ldlc3dUEyW8SfIU7KI7rmCYaIXofHm3-vfxB2igpIRE,43365
+ecopipeline/extract/extract.py,sha256=ryorqnu1RgyNK7joZRcbMmTajlTlB5hwaYzzpo8Z8Ho,43369
 ecopipeline/load/__init__.py,sha256=7ipv7GJfZ5382lcrdNm4MyM-WiCEVuRWTqxyzDSZhqg,197
 ecopipeline/load/load.py,sha256=RbGZSsigkChZpX1SZzYvZuS6-DS0k-d2IYUsJvZDvmk,17485
 ecopipeline/transform/__init__.py,sha256=DcIJfkRs4OmZzDeEfW_OiOIXNqN6CUl1_lW0SS7-eN8,2280
 ecopipeline/transform/bayview.py,sha256=TP24dnTsUD95X-f6732egPZKjepFLJgDm9ImGr-fppY,17899
 ecopipeline/transform/lbnl.py,sha256=EQ54G4rJXaZ7pwVusKcdK2KBehSdCsNo2ybphtMGs7o,33400
-ecopipeline/transform/transform.py,sha256=9jVIFPGa_xVqcIg--2Wj2Fu8WGp3_C6tWGDvBYmt_Jc,43181
+ecopipeline/transform/transform.py,sha256=uyBIXKCXUCT6zVnZyQohripGAzmY1yV9T1GxsXOtS-s,43390
 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.4.18.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ecopipeline-0.4.18.dist-info/METADATA,sha256=8lh7Wpk6OSMqe-I9v6EXr9E2giiqsskXUTK9xtmjH1Q,2308
-ecopipeline-0.4.18.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ecopipeline-0.4.18.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
-ecopipeline-0.4.18.dist-info/RECORD,,
+ecopipeline-0.5.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ecopipeline-0.5.0.dist-info/METADATA,sha256=gb550ta4s3kOYQCt52JECXo_HaSEeXKkWGeIF3mTVr8,2307
+ecopipeline-0.5.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ecopipeline-0.5.0.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
+ecopipeline-0.5.0.dist-info/RECORD,,