update app.py

app.py

@@ -1,140 +1,3 @@
-# import streamlit as st
-# import json
-# import ee
-# import os
-# import pandas as pd
-# import geopandas as gpd
-# from datetime import datetime
-# import leafmap.foliumap as leafmap
-# import re
-# from shapely.geometry import base
-# from lxml import etree
-# from xml.etree import ElementTree as ET
-
-# # Set up the page layout
-# st.set_page_config(layout="wide")
-
-# # Custom button styling
-# m = st.markdown(
-#     """
-#     <style>
-#     div.stButton > button:first-child {
-#         background-color: #006400;
-#         color:#ffffff;
-#     }
-#     </style>""",
-#     unsafe_allow_html=True,
-# )
-
-# # Logo
-# st.write(
-#     f"""
-#     <div style="display: flex; justify-content: space-between; align-items: center;">
-#         <img src="https://huggingface.co/spaces/YashMK89/GEE_Calculator/resolve/main/ISRO_Logo.png" style="width: 20%; margin-right: auto;">
-#         <img src="https://huggingface.co/spaces/YashMK89/GEE_Calculator/resolve/main/SAC_Logo.png" style="width: 20%; margin-left: auto;">
-#     </div>
-#     """,
-#     unsafe_allow_html=True,
-# )
-
-# # Title
-# st.markdown(
-#     f"""
-#     <h1 style="text-align: center;">Precision Analysis for Vegetation, Water, and Air Quality</h1>
-#     """,
-#     unsafe_allow_html=True,
-# )
-# st.write("<h2><div style='text-align: center;'>User Inputs</div></h2>", unsafe_allow_html=True)
-
-# # Authenticate and initialize Earth Engine
-# earthengine_credentials = os.environ.get("EE_Authentication")
-
-# # Initialize Earth Engine with secret credentials
-# os.makedirs(os.path.expanduser("~/.config/earthengine/"), exist_ok=True)
-# with open(os.path.expanduser("~/.config/earthengine/credentials"), "w") as f:
-#     f.write(earthengine_credentials)
-
-# ee.Initialize(project='ee-yashsacisro24')
-
-# # Load the Sentinel dataset options from JSON file
-# with open("sentinel_datasets.json") as f:
-#     data = json.load(f)
-
-# # Display the title for the Streamlit app
-# st.title("Sentinel Dataset")
-
-# # Select dataset category (main selection)
-# main_selection = st.selectbox("Select Sentinel Dataset Category", list(data.keys()))
-
-# # If a category is selected, display the sub-options (specific datasets)
-# if main_selection:
-#     sub_options = data[main_selection]["sub_options"]
-#     sub_selection = st.selectbox("Select Specific Dataset ID", list(sub_options.keys()))
-
-#     # Display the selected dataset ID based on user input
-#     if sub_selection:
-#         st.write(f"You selected: {main_selection} -> {sub_options[sub_selection]}")
-#         st.write(f"Dataset ID: {sub_selection}")
-#         dataset_id = sub_selection  # Use the key directly as the dataset ID
-
-# # Earth Engine Index Calculator Section
-# st.header("Earth Engine Index Calculator")
-
-# # Load band information based on selected dataset
-# if main_selection and sub_selection:
-#     dataset_bands = data[main_selection]["bands"].get(sub_selection, [])
-#     st.write(f"Available Bands for {sub_options[sub_selection]}: {', '.join(dataset_bands)}")
-
-#     # Allow user to select 1 or 2 bands
-#     selected_bands = st.multiselect(
-#         "Select 1 or 2 Bands for Calculation",
-#         options=dataset_bands,
-#         default=[dataset_bands[0]] if dataset_bands else [],
-#         help="Select at least 1 band and up to 2 bands."
-#     )
-
-#     # Ensure minimum 1 and maximum 2 bands are selected
-#     if len(selected_bands) < 1:
-#         st.warning("Please select at least one band.")
-#         st.stop()
-#     elif len(selected_bands) > 2:
-#         st.warning("You can select a maximum of 2 bands.")
-#         st.stop()
-
-#     # Show custom formula input if bands are selected
-#     if selected_bands:
-#         default_formula = (
-#             f"{selected_bands[0]}" if len(selected_bands) == 1 
-#             else f"({selected_bands[0]} - {selected_bands[1]}) / ({selected_bands[0]} + {selected_bands[1]})"
-#         )
-#         custom_formula = st.text_input(
-#             "Enter Custom Formula (e.g., 'B3*B5/2' or '(B8 - B4) / (B8 + B4)')",
-#             value=default_formula,
-#             help=f"Use {', '.join(selected_bands)} in your formula. Example: 'B3*B5/2'"
-#         )
-
-#         # Validate the formula
-#         def validate_formula(formula, selected_bands):
-#             allowed_chars = set(" +-*/()0123456789.")
-#             terms = re.findall(r'[a-zA-Z][a-zA-Z0-9]*', formula)
-#             invalid_terms = [term for term in terms if term not in selected_bands]
-#             if invalid_terms:
-#                 return False, f"Invalid terms in formula: {', '.join(invalid_terms)}. Use only {', '.join(selected_bands)}."
-#             if not all(char in allowed_chars or char in ''.join(selected_bands) for char in formula):
-#                 return False, "Formula contains invalid characters. Use only bands, numbers, and operators (+, -, *, /, ())"
-#             return True, ""
-
-#         is_valid, error_message = validate_formula(custom_formula, selected_bands)
-#         if not is_valid:
-#             st.error(error_message)
-#             st.stop()
-#         elif not custom_formula:
-#             st.warning("Please enter a custom formula to proceed.")
-#             st.stop()
-
-#         # Display the validated formula
-#         st.write(f"Custom Formula: {custom_formula}")
-
 import streamlit as st
 import json
 import ee
@@ -235,7 +98,7 @@ if main_selection and sub_selection:
         "Select 1 or 2 Bands for Calculation",
         options=dataset_bands,
         default=[dataset_bands[0]] if dataset_bands else [],
-        help="Select at least 1 band and up to 2 bands."
+        help=f"Select 1 or 2 bands from: {', '.join(dataset_bands)}"
     )
 
     # Ensure minimum 1 and maximum 2 bands are selected
@@ -248,20 +111,31 @@ if main_selection and sub_selection:
 
     # Show custom formula input if bands are selected
     if selected_bands:
-        default_formula = (
-            f"{selected_bands[0]}" if len(selected_bands) == 1 
-            else f"({selected_bands[0]} - {selected_bands[1]}) / ({selected_bands[0]} + {selected_bands[1]})"
-        )
+        # Provide a default formula based on the imagery base and selected bands
+        if imagery_base == "Sentinel":
+            default_formula = (
+                f"{selected_bands[0]}" if len(selected_bands) == 1 
+                else f"({selected_bands[0]} - {selected_bands[1]}) / ({selected_bands[0]} + {selected_bands[1]})"
+            )
+            example = f"'{selected_bands[0]} * {selected_bands[1]} / 2' or '({selected_bands[0]} - {selected_bands[1]}) / ({selected_bands[0]} + {selected_bands[1]})'"
+        else:  # Landsat
+            default_formula = (
+                f"{selected_bands[0]}" if len(selected_bands) == 1 
+                else f"({selected_bands[0]} - {selected_bands[1]}) / ({selected_bands[0]} + {selected_bands[1]})"
+            )
+            example = f"'{selected_bands[0]} * {selected_bands[1]} / 2' or '({selected_bands[0]} - {selected_bands[1]}) / ({selected_bands[0]} + {selected_bands[1]})'"
+
         custom_formula = st.text_input(
-            "Enter Custom Formula (e.g., 'B3*B5/2' or '(B8 - B4) / (B8 + B4)')",
+            "Enter Custom Formula",
             value=default_formula,
-            help=f"Use {', '.join(selected_bands)} in your formula. Example: 'B3*B5/2'"
+            help=f"Use only these bands: {', '.join(selected_bands)}. Examples: {example}"
         )
 
         # Validate the formula
         def validate_formula(formula, selected_bands):
             allowed_chars = set(" +-*/()0123456789.")
-            terms = re.findall(r'[a-zA-Z][a-zA-Z0-9]*', formula)
+            # Match alphanumeric terms including underscores (for Landsat bands like SR_B1)
+            terms = re.findall(r'[a-zA-Z][a-zA-Z0-9_]*', formula)
             invalid_terms = [term for term in terms if term not in selected_bands]
             if invalid_terms:
                 return False, f"Invalid terms in formula: {', '.join(invalid_terms)}. Use only {', '.join(selected_bands)}."
@@ -280,7 +154,7 @@ if main_selection and sub_selection:
         # Display the validated formula
         st.write(f"Custom Formula: {custom_formula}")
 
-# The rest of your code remains unchanged...
+# The rest of your code (reducer, geometry conversion, date input, aggregation, etc.) remains unchanged...
 
 # Function to get the corresponding reducer based on user input
 def get_reducer(reducer_name):