geocif 0.1.80__tar.gz → 0.1.81__tar.gz

{geocif-0.1.80/geocif.egg-info → geocif-0.1.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.80
+Version: 0.1.81
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.1.80 → geocif-0.1.81}/geocif/cei/indices.py

@@ -158,9 +158,14 @@ def adjust_dataframes(df: pd.DataFrame) -> pd.DataFrame:
         earliest_year = df["time"].dt.year.min()
         desired_start_year = earliest_year + 1
         desired_start_date_dynamic = pd.Timestamp(f"{desired_start_year}-01-01")
+
+        # Calculate the difference between the earliest date in the dataset and the desired start date
         min_date_new = df["time"].min()
         date_difference_dynamic = desired_start_date_dynamic - min_date_new
+
+        # Adjust all dates in the 'time' column forward by the calculated difference
         df["time"] = df["time"] + date_difference_dynamic
+
     return df
 
 
@@ -214,8 +219,9 @@ def get_icclim_dates(
     # end_br: latest date - 2 years
     end_br = str(df_all_years_ix.index[-1][2] - relativedelta(years=2))
 
-    start_tr = np.datetime_as_string(df_harvest_year_ix.index[0][2])
-    end_tr = np.datetime_as_string(df_harvest_year_ix.index[-1][2])
+    start_tr = np.datetime_as_string(df_harvest_year_ix.index[0][2].to_datetime64())
+    end_tr = np.datetime_as_string(df_harvest_year_ix.index[-1][2].to_datetime64())
+
     return start_br, end_br, start_tr, end_tr
 
 
@@ -244,8 +250,11 @@ def compute_indices(
         df_time_period = adjust_dataframes(df_time_period)
         df_base_period = adjust_dataframes(df_base_period)
 
-    dx, vals_ix = df_to_xarray(df_base_period)
-    start_br, end_br, start_tr, end_tr = get_icclim_dates(vals_ix, df_time_period.set_index(["lat", "lon", "time"]))
+    try:
+        dx, vals_ix = df_to_xarray(df_base_period)
+        start_br, end_br, start_tr, end_tr = get_icclim_dates(vals_ix, df_time_period.set_index(["lat", "lon", "time"]))
+    except:
+        breakpoint()
 
     # For seasonal indices, slice_mode is used, but for SPI indices it fails
     slice_mode = (
@@ -277,6 +286,7 @@ def compute_indices(
             "Error computing %s for %s to %s: %s",
             index_name, start_tr, end_tr, e
         )
+        breakpoint()
 
     return ds
 
@@ -319,11 +329,11 @@ METHOD_TO_COLUMN = {
     "full_season": "crop_cal",
     "fraction_season": "fraction_season",
     "dekad": "dekad",
-    "dekad_r": "dekad",
+    "dekad_r": "dekad_r",
     "biweekly": "biweekly",
-    "biweekly_r": "biweekly",
+    "biweekly_r": "biweekly_r",
     "monthly": "monthly",
-    "monthly_r": "monthly"
+    "monthly_r": "monthly_r"
 }
 
 
@@ -636,22 +646,24 @@ class CEIs:
             )
 
             # 1) ICCLIM-based indices
-            for index_name, (index_type, index_details) in di.dict_indices.items():
-                ds = compute_indices(df_time_period, df_base_period, index_name)
-                if ds:
-                    df_out = ds.to_dataframe().reset_index()
-                    df_processed = self.process_row(
-                        df_out,
-                        df_harvest_year_region,
-                        extended_stage,
-                        key,
-                        index_name,
-                        index_type,
-                        index_details
-                    )
-                    if not df_processed.empty:
-                        frames_group.append(df_processed)
-
+            try:
+                for index_name, (index_type, index_details) in di.dict_indices.items():
+                    ds = compute_indices(df_time_period, df_base_period, index_name)
+                    if ds:
+                        df_out = ds.to_dataframe().reset_index()
+                        df_processed = self.process_row(
+                            df_out,
+                            df_harvest_year_region,
+                            extended_stage,
+                            key,
+                            index_name,
+                            index_type,
+                            index_details
+                        )
+                        if not df_processed.empty:
+                            frames_group.append(df_processed)
+            except:
+                breakpoint()
             # 2) EO indices (NDVI, ESI, GCVI, H-INDEX, etc.)
             for eo_var in ["GCVI", "NDVI", "ESI4WK", "H-INDEX"]:
                 df_eo = self.compute_eo_indices(df_time_period, df_harvest_year_region, eo_var, key, extended_stage)

{geocif-0.1.80 → geocif-0.1.81}/geocif/indices_runner.py

@@ -165,7 +165,7 @@ class cei_runner(base.BaseGeo):
         combinations = [
             i
             for i in combinations
-            if "ukraine_maize" in i[3]
+            if "ukraine" in i[3]
             # or "lesotho_maize" in i[3] or
             # #   "namibia_" in i[2] or
             # "united_republic_of_tanzania_maize" in i[3]
@@ -179,7 +179,7 @@ class cei_runner(base.BaseGeo):
         ]
         #                 "malawi" in i[2]]
 
-        if True or self.do_parallel:
+        if self.do_parallel:
             num_cpu = int(cpu_count() * 0.6)
             with Pool(num_cpu) as p:
                 for i, _ in enumerate(p.imap_unordered(indices.process, combinations)):

{geocif-0.1.80 → geocif-0.1.81/geocif.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.80
+Version: 0.1.81
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.1.80 → geocif-0.1.81}/setup.py

@@ -50,6 +50,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://ritviksahajpal.github.io/yield_forecasting/",
-    version="0.1.80",
+    version="0.1.81",
     zip_safe=False,
 )