loone-data-prep 1.2.0__tar.gz → 1.2.2__tar.gz

{loone_data_prep-1.2.0 → loone_data_prep-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: loone_data_prep
-Version: 1.2.0
+Version: 1.2.2
 Summary: Prepare data to run the LOONE model.
 Author-email: Osama Tarabih <osamatarabih@usf.edu>
 Maintainer-email: Michael Souffront <msouffront@aquaveo.com>, James Dolinar <jdolinar@aquaveo.com>
@@ -24,10 +24,11 @@ Requires-Dist: numpy<2
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: geoglows>=2.0.0
-Requires-Dist: herbie-data[extras]
+Requires-Dist: herbie-data[extras]==2025.5.0
 Requires-Dist: openmeteo_requests
 Requires-Dist: requests_cache
 Requires-Dist: retry-requests
+Requires-Dist: eccodes==2.42.0
 Dynamic: license-file
 
 LOONE_DATA_PREP

{loone_data_prep-1.2.0 → loone_data_prep-1.2.2}/loone_data_prep/LOONE_DATA_PREP.py

@@ -386,8 +386,17 @@ def main(input_dir: str, output_dir: str) -> None:
 
     # RFVol acft
     # Create File (RF_Volume)
-    RFVol = pd.DataFrame(RF_data['date'], columns=['date'])
-    RFVol['RFVol_acft'] = (RF_data['average_rainfall'].values/12) * LO_Stg_Sto_SA_df['SA_acres'].values
+    # Merge the DataFrames on date to ensure matching rows
+    RF_data_copy = RF_data.copy()
+    LO_Stg_Sto_SA_df_copy = LO_Stg_Sto_SA_df.copy()
+    RF_data_copy['date'] = pd.to_datetime(RF_data_copy['date'])
+    LO_Stg_Sto_SA_df_copy['date'] = pd.to_datetime(LO_Stg_Sto_SA_df_copy['date'])
+    merged_rf_sa = pd.merge(RF_data_copy[['date', 'average_rainfall']], 
+                            LO_Stg_Sto_SA_df_copy[['date', 'SA_acres']], 
+                            on='date', how='inner')
+    
+    RFVol = pd.DataFrame(merged_rf_sa['date'], columns=['date'])
+    RFVol['RFVol_acft'] = (merged_rf_sa['average_rainfall'].values/12) * merged_rf_sa['SA_acres'].values
     date_reference = RFVol['date'].iloc[0]
     date_inserts = [date_reference - datetime.timedelta(days=2), date_reference - datetime.timedelta(days=1)]
     df_insert = pd.DataFrame(data={'date': date_inserts, 'RFVol_acft': [0.0, 0.0]})
@@ -396,8 +405,17 @@ def main(input_dir: str, output_dir: str) -> None:
 
     # ETVol acft
     # Create File (ETVol)
-    ETVol = pd.DataFrame(ET_data['date'], columns=['date'])
-    ETVol['ETVol_acft'] = (ET_data['average_ETPI'].values/12) * LO_Stg_Sto_SA_df['SA_acres'].values
+    # Merge the DataFrames on date to ensure matching rows
+    ET_data_copy = ET_data.copy()
+    LO_Stg_Sto_SA_df_copy = LO_Stg_Sto_SA_df.copy()
+    ET_data_copy['date'] = pd.to_datetime(ET_data_copy['date'])
+    LO_Stg_Sto_SA_df_copy['date'] = pd.to_datetime(LO_Stg_Sto_SA_df_copy['date'])
+    merged_et_sa = pd.merge(ET_data_copy[['date', 'average_ETPI']],
+                            LO_Stg_Sto_SA_df_copy[['date', 'SA_acres']], 
+                            on='date', how='inner')
+
+    ETVol = pd.DataFrame(merged_et_sa['date'], columns=['date'])
+    ETVol['ETVol_acft'] = (merged_et_sa['average_ETPI'].values/12) * merged_et_sa['SA_acres'].values
     date_reference = ETVol['date'].iloc[0]
     date_inserts = [date_reference - datetime.timedelta(days=2), date_reference - datetime.timedelta(days=1)]
     df_insert = pd.DataFrame(data={'date': date_inserts, 'ETVol_acft': [0.0, 0.0]})

{loone_data_prep-1.2.0 → loone_data_prep-1.2.2}/loone_data_prep.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: loone_data_prep
-Version: 1.2.0
+Version: 1.2.2
 Summary: Prepare data to run the LOONE model.
 Author-email: Osama Tarabih <osamatarabih@usf.edu>
 Maintainer-email: Michael Souffront <msouffront@aquaveo.com>, James Dolinar <jdolinar@aquaveo.com>
@@ -24,10 +24,11 @@ Requires-Dist: numpy<2
 Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: geoglows>=2.0.0
-Requires-Dist: herbie-data[extras]
+Requires-Dist: herbie-data[extras]==2025.5.0
 Requires-Dist: openmeteo_requests
 Requires-Dist: requests_cache
 Requires-Dist: retry-requests
+Requires-Dist: eccodes==2.42.0
 Dynamic: license-file
 
 LOONE_DATA_PREP

{loone_data_prep-1.2.0 → loone_data_prep-1.2.2}/loone_data_prep.egg-info/requires.txt

@@ -4,7 +4,8 @@ numpy<2
 pandas
 scipy
 geoglows>=2.0.0
-herbie-data[extras]
+herbie-data[extras]==2025.5.0
 openmeteo_requests
 requests_cache
 retry-requests
+eccodes==2.42.0

{loone_data_prep-1.2.0 → loone_data_prep-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "loone_data_prep"
-version = "1.2.0"
+version = "1.2.2"
 description = "Prepare data to run the LOONE model."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -20,8 +20,9 @@ dependencies = [
     "pandas",
     "scipy",
     "geoglows>=2.0.0",
-    "herbie-data[extras]",
+    "herbie-data[extras]==2025.5.0",
     "openmeteo_requests",
     "requests_cache",
-    "retry-requests"
+    "retry-requests",
+    "eccodes==2.42.0"
 ]