geocif 0.2.47__tar.gz → 0.2.49__tar.gz

{geocif-0.2.47/geocif.egg-info → geocif-0.2.49}/PKG-INFO

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

{geocif-0.2.47 → geocif-0.2.49}/geocif/geocif.py

@@ -844,8 +844,6 @@ class Geocif:
             # Some models cannot handle any NaN values, so gapfill them
             if self.model_name in ["gam", "linear"]:
                 for col in self.X_train.columns:
-                    if self.X_train[col].isnull().any():
-                        breakpoint()
                         median = self.X_train[col].median()
                         self.X_train[col].fillna(median, inplace=True)
 

{geocif-0.2.47 → geocif-0.2.49}/geocif/indices_runner.py

@@ -165,7 +165,7 @@ class cei_runner(base.BaseGeo):
         combinations = [
             i
             for i in combinations
-            if "ethiopia" in i[3]
+            # if "ethiopia" in i[3]
             # or "lesotho_maize" in i[3] or
             # #   "namibia_" in i[2] or
             # "united_republic_of_tanzania_maize" in i[3]
@@ -174,8 +174,8 @@ class cei_runner(base.BaseGeo):
             # or "south_africa_maize" in i[3]
             # or "mozambique_maize" in i[3]
             # or "united_states_of_america" in i[3]
-            #or "russian_federation" in i[3]
-            # or "ukraine" in i[3]
+            if "russian_federation" in i[3]
+            or "ukraine" in i[3]
         ]
         #                 "malawi" in i[2]]
 

{geocif-0.2.47 → geocif-0.2.49}/geocif/ml/stats.py

@@ -203,9 +203,9 @@ def add_statistics(
         fn = "illinois.csv"
     elif country == "Ethiopia":
         # HACK
-        fn = "adm_crop_production.csv"
+        fn = "hvstat_africa_data_v1.0.csv"
     else:
-        fn = "adm_crop_production.csv"
+        fn = "hvstat_africa_data_v1.0.csv"
     df_fewsnet = pd.read_csv(dir_stats / fn, low_memory=False)
     # HACK
     if country == "Afghanistan":
@@ -220,6 +220,10 @@ def add_statistics(
     # Check if country and crop exist in the fewsnet database
     mask = (df_fewsnet["country"] == country) & (df_fewsnet["product"] == crop)
 
+    # If qc_flag column exists, filter out rows with qc_flag != 0
+    if "qc_flag" in df_fewsnet.columns:
+        df_fewsnet = df_fewsnet[df_fewsnet["qc_flag"] == 0]
+
     if mask.sum() == 0:
         df = add_GEOGLAM_statistics(dir_stats, df, stats, method, admin_zone)
     else:
@@ -241,6 +245,7 @@ def add_statistics(
                         "All (PS)",
                         "irrigated",
                         "rainfed",
+                        "Rainfed (PS)"
                     ]
                 )
                 & (df_fewsnet["harvest_year"] == harvest_year)
@@ -256,20 +261,14 @@ def add_statistics(
                         "Winter",
                     ]
                 )
-                & (df_fewsnet["indicator"].isin(["yield", "area", "production"]))
             )
 
-            # Fetching values for each indicator
-            yield_value = df_fewsnet.loc[
-                mask_yield & mask_region & (df_fewsnet["indicator"] == "yield"), "value"
-            ]
-            area_value = df_fewsnet.loc[
-                mask_yield & mask_region & (df_fewsnet["indicator"] == "area"), "value"
-            ]
-            prod_value = df_fewsnet.loc[
-                mask_yield & mask_region & (df_fewsnet["indicator"] == "production"),
-                "value",
-            ]
+            # Fetching values for each statistic
+            mask_combined = mask_yield & mask_region
+
+            yield_value = df_fewsnet.loc[mask_combined, "yield"]
+            area_value = df_fewsnet.loc[mask_combined, "area"]
+            prod_value = df_fewsnet.loc[mask_combined, "production"]
 
             # Replace any inf or 0 values by NaN
             yield_value = yield_value.replace([0, np.inf, -np.inf], np.nan)

{geocif-0.2.47 → geocif-0.2.49}/geocif/playground/aa.py

@@ -6,6 +6,96 @@ from pathlib import Path
 
 import pandas as pd
 
+import pandas as pd
+
+# Build mapping dict: ISO3 -> region
+region_map = {}
+
+# Helper to add many iso codes to same region
+def add(codes, region):
+    for code in codes:
+        region_map[code] = region
+
+# Region lists --------------------------------------------------
+add(["USA", "CAN", "GRL"], "North America")
+
+add([
+    "MEX","BLZ","GTM","HND","SLV","NIC","CRI","PAN",
+    "CUB","DOM","HTI","BHS","BRB","TTO","GRD","KNA",
+    "LCA","VCT","ATG","DMA","JAM"
+], "Central America and the Caribbean")
+
+add([
+    "ARG","BOL","BRA","CHL","COL","ECU","GUY","PRY",
+    "PER","SUR","URY","VEN"
+], "South America")
+
+add([
+    "ALB","AND","AUT","BEL","BIH","BLR","BGR","HRV","CYP","CZE",
+    "DNK","EST","FIN","FRA","DEU","GRC","HUN","ISL","IRL","ITA",
+    "LVA","LIE","LTU","LUX","MLT","MDA","MCO","MNE","NLD","MKD",
+    "NOR","POL","PRT","ROU","RUS","SRB","SVK","SVN","ESP","SWE",
+    "CHE","UKR","GBR","VAT","SMR","KOS"  # KOS = Kosovo (XKX)
+], "Europe (Including all of Russia)")
+
+add([
+    "DZA","EGY","LBY","MAR","TUN","ESH",          # North Africa incl. W. Sahara
+    "ARE","BHR","IRN","IRQ","ISR","JOR","KWT",
+    "LBN","OMN","QAT","SAU","SYR","TUR","YEM","PSE"
+], "Middle East and North Africa")
+
+# Sub-Saharan Africa = all AFR codes minus the five NA ones above; list explicitly
+add([
+    "AGO","BEN","BWA","BFA","BDI","CMR","CPV","CAF","TCD",
+    "COM","COG","COD","CIV","DJI","GNQ","ERI","SWZ","ETH","GAB",
+    "GMB","GHA","GIN","GNB","KEN","LSO","LBR","MDG","MWI","MLI",
+    "MRT","MUS","MOZ","NAM","NER","NGA","RWA","STP","SEN","SYC",
+    "SLE","SOM","ZAF","SSD","SDN","TZA","TGO","UGA","ZMB","ZWE"
+], "Sub-Saharan Africa")
+
+add(["KAZ","KGZ","TJK","TKM","UZB"], "Central Asia")
+
+add(["AFG","BGD","BTN","IND","LKA","MDV","NPL","PAK"], "South Asia")
+
+add(["CHN","JPN","PRK","KOR","MNG","TWN","HKG","MAC"], "East Asia")
+
+add([
+    "BRN","KHM","IDN","LAO","MYS","MMR","PHL","SGP","THA","TLS","VNM"
+], "Southeast Asia")
+
+add([
+    "AUS","NZL","PNG","FJI","SLB","VUT","WSM","TON","KIR","NRU",
+    "PLW","MHL","FSM","TUV"
+], "Oceania")
+
+# Convert to DataFrame
+df = pd.DataFrame(list(region_map.items()), columns=["iso3", "Region"]).sort_values("iso3")
+
+# Save to CSV
+csv_path = r"C:\Users\ritvik\Downloads\region_key_iso3.csv"
+df.to_csv(csv_path, index=False)
+
+breakpoint()
+
+dg = gpd.read_file(r"C:\Users\ritvik\Downloads\Maize_1 (1).gpkg")
+#df = pd.read_csv(r"C:\Users\ritvik\Downloads\Maize_1_Gauss5_2000-2020_modDFvar (1).csv", dtype={'UID': str})
+df1 = pd.read_csv(r"C:\Users\ritvik\Downloads\crRiskIndicator_Maize_1_Gauss5_2000-2020 (1).csv", dtype={'UID': str})
+
+# Assuming 'geometry' is the column containing the geometry in the GeoDataFrame dg
+merged_df = dg.merge(df1[['UID', 'Cntry_Code', 'mnRsk',	'vrRsk','brRsk','corRsk','yvrRsk','risk','clim_risk','climCh_risk']], on=['UID', 'Cntry_Code'], how='left')
+# Keep only the varRatio column and the geometry column from the merged GeoDataFrame
+final_gdf = merged_df[['UID', 'Cntry_Code', 'mnRsk','vrRsk','brRsk','corRsk','yvrRsk','risk','clim_risk','climCh_risk', 'geometry']]
+
+# drop rows where 'varRatio' is NaN
+final_gdf = final_gdf.dropna(subset=['mnRsk','vrRsk','brRsk','corRsk','risk','yvrRsk', 'clim_risk','climCh_risk'])
+# Save the final GeoDataFrame to a new GeoPackage
+final_gdf.to_file(r"C:\Users\ritvik\Downloads\output_risk.shp")
+
+# Output top 10 rows as a csv with geometry
+#final_gdf.head(10).to_csv(r"C:\Users\ritvik\Downloads\output_top10.csv", index=False)
+
+breakpoint()
+#######################
 DATA_DIR = Path(r"C:\Users\ritvik\Downloads\exported_all_db")
 
 # Grab all maize CSV files (skip 'models.csv')

geocif-0.2.49/geocif/playground/aaaa.py

@@ -0,0 +1,165 @@
+import geopandas as gpd
+import holoviews as hv
+import hvplot.pandas                                # registers .hvplot accessor
+import panel as pn
+hv.extension("bokeh"); pn.extension()
+
+# ------------------------------------------------------------------
+# 1. Paths
+# ------------------------------------------------------------------
+SHAPE_PATH      = r"C:\Users\ritvik\Downloads\output.shp"
+RISK_PATH       = r"C:\Users\ritvik\Downloads\output_risk.shp"
+LOGO_IMAGE      = r"C:\Users\ritvik\Downloads\combined_logo.png"
+
+# ------------------------------------------------------------------
+# 2. Load & prep  varRatio  layer
+# ------------------------------------------------------------------
+gdf = gpd.read_file(SHAPE_PATH)
+if "varRatio" not in gdf.columns:
+    raise KeyError("'varRatio' column missing in output.shp")
+
+uid_col   = "UID" if "UID" in gdf.columns else "index"
+gdf[uid_col]     = gdf.get(uid_col, gdf.index)
+gdf["varRatio"]  = gdf["varRatio"].round(2)            # 2-decimals
+
+# ------------------------------------------------------------------
+# 3. Load & prep  risk  layer
+# ------------------------------------------------------------------
+risk_gdf = gpd.read_file(RISK_PATH)
+risk_cols = ["risk", "yvrRsk", "clim_risk", "climCh_ris"]
+missing   = [c for c in risk_cols if c not in risk_gdf.columns]
+if missing:
+    raise KeyError(f"Columns {missing} missing in output_risk.shp")
+
+uid2 = "UID" if "UID" in risk_gdf.columns else "index"
+risk_gdf[uid2] = risk_gdf.get(uid2, risk_gdf.index)
+for c in risk_cols:
+    risk_gdf[c] = risk_gdf[c].round(2)
+
+# ------------------------------------------------------------------
+# 4. Widgets
+# ------------------------------------------------------------------
+country_opts = sorted(gdf["Cntry_Code"].dropna().unique())
+default_val  = "US" if "US" in country_opts else "All"
+
+country_select = pn.widgets.Select(name="Country",
+                                   options=["All"] + country_opts,
+                                   value=default_val)
+
+crop_select    = pn.widgets.Select(name="Crop",
+                                   options=["Maize"],
+                                   value="Maize")
+
+# ------------------------------------------------------------------
+# 5. varRatio   map
+# ------------------------------------------------------------------
+def make_varratio_map(country, crop):
+    data = gdf if country == "All" else gdf[gdf["Cntry_Code"] == country]
+    if data.empty:
+        return pn.pane.Markdown(f"**No data for {country}**")
+
+    vmin, vmax = data["varRatio"].min(), data["varRatio"].max()
+    if vmin == vmax: vmin -= 1e-6; vmax += 1e-6
+
+    return data.hvplot.polygons(
+        c="varRatio", tiles="CartoLight", cmap="Viridis",
+        clim=(vmin, vmax),
+        line_width=0.1,
+        hover_tooltips=[
+            #(uid_col, f"@{uid_col}"),
+            ("varRatio", "@varRatio{0.00}")
+        ],
+        colorbar=True,
+        toolbar='above', 
+        line_color='white',
+        height=650, width=950,
+        title=f"varRatio – {country if country!='All' else 'All Countries'}",
+    ).opts(
+        hv.opts.Polygons(tools=['hover'], show_grid=False, show_frame=False, toolbar='below', 
+        line_color='white'))
+
+varratio_panel = pn.bind(make_varratio_map, country_select, crop_select)
+
+# ------------------------------------------------------------------
+# 6. Helpers to build 4-map risk grid
+# ------------------------------------------------------------------
+def _risk_layer(df, col, title):
+    vmin, vmax = df[col].min(), df[col].max()
+
+    # …then force a symmetric range around 0 so the colourbar is centred
+    abs_max = max(abs(vmin), abs(vmax))
+    vmin, vmax = -abs_max, abs_max       # 0 now sits in the middle
+
+    return df.hvplot.polygons(
+        c=col, 
+        cmap="PiYG_r", 
+        clim=(vmin, vmax),
+        tiles="CartoLight",
+        line_width=0.1,
+        hover_tooltips=[
+            #(uid2, f"@{uid2}"),
+            (col,  f"@{col}{{0.00}}")
+        ],
+        colorbar=True,
+        height=325, 
+        width=450,
+        title=title
+    ).opts(
+        hv.opts.Polygons(tools=['hover'], show_grid=False, show_frame=False, toolbar='below', 
+        line_color='white'))
+
+pn.extension(
+    raw_css=[
+        """
+        /* tighten row/column/grid gaps */
+        .tight {
+          gap: 4px !important;      /* space between children   */
+        }
+        """
+    ]
+)
+
+def make_risk_panel(country, crop):
+    data = risk_gdf if country == "All" else risk_gdf[risk_gdf["Cntry_Code"] == country]
+    if data.empty:
+        return pn.pane.Markdown(f"**No risk data for {country}**")
+
+    maps = [
+        _risk_layer(data, "risk",        "Composite Risk Indicator"),
+        _risk_layer(data, "yvrRsk",      "Historical Yield Variance Risk Indicator"),
+        _risk_layer(data, "clim_risk",   "Growing Season Climate Risk Indicator"),
+        _risk_layer(data, "climCh_ris", "Climate Change Risk Indicator"),
+    ]
+
+    return pn.GridBox(
+        *maps,
+        ncols=2,
+        sizing_mode="stretch_both",
+        css_classes=["tight"],   # ← activates the new 4-px gap rule
+        margin=0                 # (optional) remove outer margin
+    )
+
+
+risk_panel = pn.bind(make_risk_panel, country_select, crop_select)
+
+# ------------------------------------------------------------------
+# 7. Template
+# ------------------------------------------------------------------
+template = pn.template.FastListTemplate(
+    title="Climate Risk Dashboard",
+    sidebar=[
+        country_select, crop_select, pn.Spacer(height=20),
+        pn.pane.Image(LOGO_IMAGE, width=240, height=360, align="center")
+    ],
+    main=[
+        pn.Tabs(
+            ("varRatio",      varratio_panel),
+            ("Risk Indicator", risk_panel)
+        )
+    ],
+    header_background="lightblue",
+    accent_base_color="#1f77b4",
+    main_max_width="100%"
+)
+
+template.servable()

{geocif-0.2.47 → geocif-0.2.49/geocif.egg-info}/PKG-INFO

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

{geocif-0.2.47 → geocif-0.2.49}/geocif.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ geocif/ml/trend.py
 geocif/ml/xai.py
 geocif/playground/__init__.py
 geocif/playground/aa.py
+geocif/playground/aaaa.py
 geocif/playground/area.py
 geocif/playground/automl.py
 geocif/playground/download_esi.py

{geocif-0.2.47 → geocif-0.2.49}/setup.py

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