Update pages/_common.py

pages/_common.py

@@ -1,108 +1,52 @@
-# ============================================================
-# _common.py — Hugging Face SAFE Earth Engine integration
-# ============================================================
-
 import os
 import json
 import ee
 import geemap
 import solara
-import google.oauth2.credentials
-from typing import Optional, Tuple
-
-# ============================================================
-# 1. Global flags & placeholders (SAFE at import time)
-# ============================================================
-
-PROJECT_ID = "scenic-sunspot-485920-j6"
-
-_EE_INITIALIZED = False
-_EE_INIT_ERROR: Optional[str] = None
-
-M_AREA = None
-IUCN_RANGE = None
-OCCURRENCES = None
-
+from google.oauth2 import service_account
 
 # ============================================================
-# 2. Earth Engine initialization (STRICT, LAZY)
+# 1. Initialization & Assets
 # ============================================================
 
-def ee_initialize(token_name="EARTHENGINE_TOKEN"):
-    """
-    Initialize Earth Engine using a service account JSON stored
-    in a Hugging Face secret. Never runs at import time.
-    """
-    global _EE_INITIALIZED, _EE_INIT_ERROR
-
-    if _EE_INITIALIZED:
-        return
-
-    ee_token = os.environ.get(token_name)
-    if not ee_token:
-        _EE_INIT_ERROR = f"Missing Hugging Face secret: {token_name}"
-        return
-
-    try:
-        stored = json.loads(ee_token)
-    except Exception as e:
-        _EE_INIT_ERROR = "EARTHENGINE_TOKEN is not valid JSON"
-        return
+def get_env_var(key: str):
+    return os.environ.get(key)
 
-    if stored.get("type") != "service_account":
-        _EE_INIT_ERROR = "EARTHENGINE_TOKEN must be a service account JSON"
-        return
-
-    try:
-        credentials = ee.ServiceAccountCredentials(
-            stored["client_email"],
-            key_data=ee_token,
-        )
-        ee.Initialize(
-            credentials=credentials,
-            project=stored["project_id"],
-        )
-        _EE_INITIALIZED = True
-    except Exception as e:
-        _EE_INIT_ERROR = str(e)
-
-
-# ============================================================
-# 3. Lazy asset loader
-# ============================================================
-
-def ensure_assets_loaded():
-    """
-    Loads Earth Engine assets on first use.
-    Safe to call multiple times.
-    """
-    global M_AREA, IUCN_RANGE, OCCURRENCES
-
-    if M_AREA is not None:
-        return
-
-    ee_initialize()
-    if not _EE_INITIALIZED:
+def ee_initialize(token_name="EARTHENGINE_TOKEN", project=None, **kwargs):
+    # Skip if already initialized
+    if ee.data._get_state().credentials is not None:
         return
 
+    ee_token = get_env_var(token_name)
+    if ee_token is not None:
+        try:
+            # Parse the Service Account JSON key from the environment variable
+            sa_info = json.loads(ee_token)
+            
+            # Generate credentials from the service account dictionary
+            credentials = service_account.Credentials.from_service_account_info(
+                sa_info,
+                scopes=['https://www.googleapis.com/auth/earthengine']
+            )
+            
+            # Initialize Earth Engine with the new credentials
+            ee.Initialize(credentials=credentials, project=project, **kwargs)
+            print("Earth Engine initialized successfully using Service Account.")
+            return
+        except Exception as e:
+            print(f"Failed to initialize with Service Account: {e}")
+            pass
+            
+    # Fallback to default initialization
     try:
-        M_AREA = ee.FeatureCollection(
-            "projects/scenic-sunspot-485920-j6/assets/LAmericaResidentReview/Acrobatornis_fonsecai_M"
-        )
-        IUCN_RANGE = ee.FeatureCollection(
-            "projects/scenic-sunspot-485920-j6/assets/LAmericaResidentReview/Acrobatornis_fonsecai_iucnrange"
-        )
-        OCCURRENCES = ee.FeatureCollection(
-            "projects/scenic-sunspot-485920-j6/assets/LAmericaResidentReview/Acrobatornis_fonsecai_occurrence"
-        )
-    except Exception as e:
-        _EE_INIT_ERROR = f"Asset load failed: {e}"
-        M_AREA = IUCN_RANGE = OCCURRENCES = None
-
+        ee.Initialize(project=project, **kwargs)
+    except Exception:
+        print("Earth Engine failed to initialize. Please check EARTHENGINE_TOKEN.")
 
-# ============================================================
-# 4. Metadata (SAFE)
-# ============================================================
+try:
+    ee_initialize(project="scenic-sunspot-485920-j6")
+except Exception as e:
+    print(f"EE Init Error: {e}")
 
 SPECIES = "Acrobatornis fonsecai"
 
@@ -113,185 +57,203 @@ THRESHOLD_IMAGES = {
     "sensit": "projects/scenic-sunspot-485920-j6/assets/LAmericaResidentReview/Acrobatornis_fonsecai_sensit",
 }
 
+THRESHOLD_TITLES = {
+    "mtp": "Minimum Training Presence",
+    "tss": "True Skill Statistic",
+    "p10": "10th Percentile",
+    "sensit": "Sensitivity-Specificity Equality"
+}
+
+# Assets
+try:
+    M_AREA = ee.FeatureCollection("projects/scenic-sunspot-485920-j6/assets/LAmericaResidentReview/Acrobatornis_fonsecai_M")
+    IUCN_RANGE = ee.FeatureCollection("projects/scenic-sunspot-485920-j6/assets/LAmericaResidentReview/Acrobatornis_fonsecai_iucnrange")
+    OCCURRENCES = ee.FeatureCollection("projects/scenic-sunspot-485920-j6/assets/LAmericaResidentReview/Acrobatornis_fonsecai_occurrence")
+except Exception:
+    M_AREA = ee.FeatureCollection([])
+    IUCN_RANGE = ee.FeatureCollection([])
+    OCCURRENCES = ee.FeatureCollection([])
 
 # ============================================================
-# 5. View computation (lazy)
+# 2. View Computation
 # ============================================================
-
-def compute_species_view(
-    fallback_center=(-15, -50),
-    fallback_zoom=4,
-) -> Tuple[Tuple[float, float], int]:
-    ensure_assets_loaded()
-
-    if M_AREA is None:
-        return fallback_center, fallback_zoom
-
+def compute_species_view(fc, fallback_center=(-15, -50), fallback_zoom=4):
     try:
-        coords = M_AREA.geometry().bounds().coordinates().getInfo()[0]
+        coords = fc.geometry().bounds().coordinates().getInfo()[0]
         lons = [p[0] for p in coords]
         lats = [p[1] for p in coords]
-
         center = (sum(lats) / len(lats), sum(lons) / len(lons))
         span = max(max(lons) - min(lons), max(lats) - min(lats))
-
-        if span > 60:
-            zoom = 3
-        elif span > 30:
-            zoom = 4
-        elif span > 15:
-            zoom = 5
-        elif span > 8:
-            zoom = 6
-        elif span > 4:
-            zoom = 7
-        else:
-            zoom = 8
-
+        
+        if span > 60: zoom = 3
+        elif span > 30: zoom = 4
+        elif span > 15: zoom = 5
+        elif span > 8: zoom = 6
+        elif span > 4: zoom = 7
+        else: zoom = 8
         return center, zoom
     except Exception:
         return fallback_center, fallback_zoom
 
+SPECIES_CENTER, SPECIES_ZOOM = compute_species_view(M_AREA)
 
 # ============================================================
-# 6. Global Solara state
+# 3. Global Shared State
 # ============================================================
 
+# --- Session / User Metadata ---
 researcher_name = solara.reactive("Guest Researcher")
-selected_threshold = solara.reactive(None)
+species_list = ["Acrobatornis fonsecai"]
+selected_species = solara.reactive("Acrobatornis fonsecai")
 
-center, zoom_level = compute_species_view()
-center = solara.reactive(center)
-zoom = solara.reactive(zoom_level)
+# --- Map State ---
+selected_threshold = solara.reactive(None)
+zoom = solara.reactive(SPECIES_ZOOM)
+center = solara.reactive(SPECIES_CENTER)
 
+# --- Layer Visibility ---
 show_raster = solara.reactive(True)
 show_absence = solara.reactive(False)
 show_m_area = solara.reactive(True)
 show_iucn = solara.reactive(True)
 show_occurrences = solara.reactive(True)
 
+# --- Editing State ---
 edits = solara.reactive([])
 
-
 # ============================================================
-# 7. Editing logic
+# 4. Map Factory & Logic
 # ============================================================
 
 def apply_edits_logic(img, points, range_polys, edits_list):
+    """
+    Applies a list of geometric edits to the image, points, and range polygons.
+    """
+    modified_img = img
+    modified_points = points
+    modified_range = range_polys
+    
     if not edits_list:
-        return img, points, range_polys
+        return modified_img, modified_points, modified_range
 
     for edit in edits_list:
-        geom = edit.get("geometry")
-        if not geom:
-            continue
-
-        layer = edit.get("layer")
-        op = edit.get("type")
-
-        if layer == "Predicted Presence" and img is not None:
-            mask = ee.Image.constant(1).clip(geom)
-            img = img.where(mask, 1 if op == "add" else 0)
-
-        elif layer == "Occurrences" and points is not None:
+        geom = edit.get('geometry')
+        if not geom: continue
+        
+        layer = edit.get('layer')
+        op = edit.get('type')
+        
+        if layer == "Predicted Presence":
+            # Raster editing
+            if modified_img:
+                mask = ee.Image.constant(1).clip(geom)
+                if op == "add":
+                    # Mark as 1 (Presence)
+                    modified_img = modified_img.where(mask, 1)
+                elif op == "remove":
+                    # Mark as 0 (Absence)
+                    modified_img = modified_img.where(mask, 0)
+                
+        elif layer == "Occurrences":
             if op == "remove":
-                points = points.filter(ee.Filter.bounds(geom).Not())
+                if modified_points:
+                    modified_points = modified_points.filter(ee.Filter.bounds(geom).Not())
             elif op == "add":
-                points = points.merge(
-                    ee.FeatureCollection([ee.Feature(geom)])
-                )
+                # Add new point(s)
+                if modified_points:
+                    modified_points = modified_points.merge(ee.FeatureCollection([ee.Feature(geom)]))
+                else:
+                    modified_points = ee.FeatureCollection([ee.Feature(geom)])
 
-        elif layer == "IUCN Range" and range_polys is not None:
+        elif layer == "IUCN Range":
             if op == "add":
-                range_polys = range_polys.merge(
-                    ee.FeatureCollection([ee.Feature(geom)])
-                )
-
-    return img, points, range_polys
+                # Add new range polygon
+                if modified_range:
+                     modified_range = modified_range.merge(ee.FeatureCollection([ee.Feature(geom)]))
+                else:
+                     modified_range = ee.FeatureCollection([ee.Feature(geom)])
+                
+    return modified_img, modified_points, modified_range
 
 
-# ============================================================
-# 8. Map factory
-# ============================================================
-
-def create_threshold_map(threshold, height="350px", draw_control=False):
-    ensure_assets_loaded()
-
+def create_threshold_map(threshold: str, height="350px", draw_control=False, apply_edits_list=None) -> geemap.Map:
+    # Explicitly disable optional controls to prevent OOM
     m = geemap.Map(
-        center=center.value,
-        zoom=zoom.value,
+        center=SPECIES_CENTER,
+        zoom=SPECIES_ZOOM,
         add_google_map=False,
         draw_control=draw_control,
         toolbar_control=False,
         layer_control=True,
         zoom_control=False,
-        inspector_control=False,
+        inspector_control=False, 
         search_control=False,
         scale_control=False,
         attribution_control=False,
-        height=height,
+        height=height, 
     )
 
-    if not _EE_INITIALIZED:
-        m.addLayer(
-            None,
-            {},
-            f"Earth Engine error: {_EE_INIT_ERROR}",
-        )
-        return m
-
+    # Base assets
     base_img = None
-    if threshold in THRESHOLD_IMAGES:
+    if threshold and threshold in THRESHOLD_IMAGES:
         try:
             base_img = ee.Image(THRESHOLD_IMAGES[threshold])
         except Exception:
             pass
-
-    img, pts, rng = apply_edits_logic(
-        base_img,
-        OCCURRENCES,
-        IUCN_RANGE,
-        edits.value,
-    )
-
-    if img is not None:
-        m.addLayer(
-            img.updateMask(img.eq(1)),
-            {"palette": ["000000"]},
-            "Predicted Presence (1)",
-        )
-
-    if M_AREA is not None and show_m_area.value:
-        m.addLayer(
-            M_AREA.style(color="#2b8cbe", fillColor="#2b8cbe44", width=2),
-            {},
-            "Accessible Area",
-        )
-
-    if rng is not None and show_iucn.value:
-        m.addLayer(
-            rng.style(color="red", fillColor="00000000", width=2),
-            {},
-            "IUCN Range",
-        )
-
-    if pts is not None and show_occurrences.value:
-        m.addLayer(pts, {"color": "#00BFFF"}, "Occurrences")
+            
+    base_points = OCCURRENCES
+    base_range = IUCN_RANGE
+
+    # Apply Edits
+    final_img, final_points, final_range = apply_edits_logic(base_img, base_points, base_range, apply_edits_list)
+
+    # --- Layer Adding Order (Bottom to Top) ---
+    
+    # 1. Raster (Bottom)
+    if final_img:
+        # Presence (1) -> Black
+        presence_layer = final_img.updateMask(final_img.eq(1))
+        m.addLayer(presence_layer, {"palette": ["000000"]}, "Predicted Presence (1)", True, 1.0)
+        
+        # Absence (0) -> White
+        absence_layer = final_img.updateMask(final_img.eq(0))
+        m.addLayer(absence_layer, {"palette": ["ffffff"]}, "Predicted Absence (0)", False, 1.0)
+
+    # 2. Vectors
+    m.addLayer(M_AREA.style(color="#2b8cbe", fillColor="#2b8cbe44", width=2), {}, "Accessible Area")
+    
+    # IUCN (Hollow) - Modified range
+    if final_range:
+        m.addLayer(final_range.style(color="red", fillColor="00000000", width=2), {}, "IUCN Range")
+    
+    # 3. Occurrences (Top)
+    if final_points:
+        # Use bright Deep Sky Blue (#00BFFF) for visibility against black raster
+        m.addLayer(final_points, {"color": "#00BFFF"}, "Occurrences")
 
     return m
 
-
-# ============================================================
-# 9. Solara component
-# ============================================================
-
 @solara.component
 def LinkedMap(threshold, height="350px"):
     m = solara.use_memo(
-        lambda: create_threshold_map(threshold, height),
-        [threshold, edits.value],
+        lambda: create_threshold_map(threshold, height, draw_control=False, apply_edits_list=edits.value), 
+        [threshold, edits.value]
     )
 
+    def update_layers():
+        if not m: return
+        def set_visible(name, visible):
+            for layer in m.layers:
+                if name in layer.name: layer.visible = visible
+        
+        set_visible("Predicted Presence (1)", show_raster.value)
+        set_visible("Predicted Absence (0)", show_raster.value and show_absence.value)
+        set_visible("Accessible Area", show_m_area.value)
+        set_visible("IUCN Range", show_iucn.value)
+        set_visible("Occurrences", show_occurrences.value)
+
+    solara.use_effect(update_layers, [show_raster.value, show_absence.value, show_m_area.value, show_iucn.value, show_occurrences.value])
+
     solara.display(
         m,
         zoom=zoom.value,