upgraded to python3.12, uv and latest package versions

.gitignore

@@ -1,4 +1,6 @@
 .env
+/output/*
+!/output/.gitkeep
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

README.md

@@ -5,13 +5,11 @@
 To run the app you will need a (free) GFM account. To get one register at https://portal.gfm.eodc.eu/login . Once you have an account create a file `.env` with the content of `.env_template` where you will need to fill out your GFM username and password. The `.env` file will be gitignored.
 
 ### Python
-For now kept on python 3.10 like original Mapaction app. Create and activate your python3.10 venv in your preferred way, then:
+Project is using python 3.12. Install requirements from `pyproject.toml` in your preferred way. We suggest using `uv`, see [here](https://docs.astral.sh/uv/getting-started/installation/) for installation instructions. Once installed your can run `uv sync` to create a `.venv` folder. Activate the `.venv` and then run the line below to run the app:
+
 ```
-pip install -r requirements.txt
 streamlit run app/Home.py
 ```
-For now its kept on python 3.10 like original Mapaction app and packages have not yet been updated.
-Just create venv and pip install requirements. Then `streamlit run app/Home.py`
 
 ## Project
 TODO: Add more complete documentation. 

app/Home.py

@@ -2,21 +2,20 @@
 
 import streamlit as st
 from src.config_parameters import params
+
+# Page configuration
+st.set_page_config(layout="wide", page_title=params["browser_title"])
+
 from src.utils import (
     add_about,
-    add_logo,
     set_home_page_style,
     toggle_menu_button,
 )
 
-# Page configuration
-st.set_page_config(layout="wide", page_title=params["browser_title"])
-
 # If app is deployed hide menu button
 toggle_menu_button()
 
 # Create sidebar
-add_logo("app/img/MA-logo.png")
 add_about()
 
 # Set page style

app/pages/1_🌍_Flood_extent_analysis.py

@@ -7,7 +7,6 @@ from src.config_parameters import params
 from src.gfm import download_stuff, visualise_stuff
 from src.utils import (
     add_about,
-    add_logo,
     set_tool_page_style,
     toggle_menu_button,
 )
@@ -20,7 +19,6 @@ st.set_page_config(layout="wide", page_title=params["browser_title"])
 toggle_menu_button()
 
 # Create sidebar
-add_logo("app/img/MA-logo.png")
 add_about()
 
 # Page title
@@ -55,7 +53,6 @@ with col1:
             location=[52.205276, 0.119167],
             zoom_start=3,
             control_scale=True,
-            # crs='EPSG4326'
         )
         # Add drawing tools to map
         Draw(
@@ -74,7 +71,7 @@ with col1:
         # Add minimap to map
         MiniMap().add_to(Map)
         # Export map to Streamlit
-        output = st_folium(Map, width=800, height=600)
+        input_map = st_folium(Map, width=800, height=600)
 with col2:
     # Add collapsable container for image dates
     with st.expander("Choose Image Dates"):
@@ -97,7 +94,9 @@ with col2:
     # Introduce date validation
     check_dates = start_date <= end_date
     # Introduce drawing validation (a polygon needs to exist)
-    check_drawing = output["all_drawings"] != [] and output["all_drawings"] is not None
+    check_drawing = (
+        input_map["all_drawings"] != [] and input_map["all_drawings"] is not None
+    )
 # What happens when button is clicked on?
 if submitted:
     with col2:
@@ -111,7 +110,7 @@ if submitted:
             # Add output for computation
             with st.spinner("Computing... Please wait..."):
                 # Extract coordinates from drawn polygon
-                coords = output["all_drawings"][-1]["geometry"]["coordinates"][0]
+                coords = input_map["all_drawings"][-1]["geometry"]["coordinates"][0]
                 print(f"Coords: {coords}")
                 # Create geometry from coordinates
                 download_stuff(coords)

app/pages/2_📖_Documentation.py

@@ -1,11 +1,9 @@
 """Documentation page for Streamlit app."""
 
 import streamlit as st
-from PIL import Image
 from src.config_parameters import params
 from src.utils import (
     add_about,
-    add_logo,
     set_doc_page_style,
     toggle_menu_button,
 )
@@ -17,7 +15,6 @@ st.set_page_config(layout="wide", page_title=params["browser_title"])
 toggle_menu_button()
 
 # Create sidebar
-add_logo("app/img/MA-logo.png")
 add_about()
 
 # Set page style

app/src/config_parameters.py

@@ -21,8 +21,6 @@ params = {
     ),
     # Layout and styles
     ## Sidebar
-    "MA_logo_width": "60%",
-    "MA_logo_background_position": "35% 10%",
     "sidebar_header": "Flood Mapping Tool",
     "sidebar_header_fontsize": "30px",
     "sidebar_header_fontweight": "bold",

app/src/gfm.py

@@ -66,8 +66,8 @@ def download_stuff(coordinates):
     for f in Path("./output").glob("*"):
         f.unlink()
     r = requests.get(download_link)
-    z = zipfile.ZipFile(io.BytesIO(r.content))
-    z.extractall("./output")
+    with zipfile.ZipFile(io.BytesIO(r.content)) as z:
+        z.extractall(str(Path("./output")))
 
 
 def visualise_stuff():

app/src/utils.py

@@ -94,88 +94,6 @@ def set_tool_page_style():
 
 
 # Sidebar
-@st.cache(allow_output_mutation=True)
-def get_base64_of_bin_file(png_file):
-    """
-    Get base64 from image file.
-
-    Inputs:
-        png_file (str): image filename
-
-    Returns:
-        str: encoded ASCII file
-    """
-    with open(png_file, "rb") as f:
-        data = f.read()
-    return base64.b64encode(data).decode()
-
-
-def build_markup_for_logo(
-    png_file,
-):
-    """
-    Create full string for navigation bar, including logo and title.
-
-    Inputs:
-        png_file (str): image filename
-        background_position (str): position logo
-        image_width (str): width logo
-        image_height (str): height logo
-
-    Returns
-        str: full string with logo and title for sidebar
-    """
-    binary_string = get_base64_of_bin_file(png_file)
-    return """
-            <style>
-                [data-testid="stSidebarNav"] {
-                    background-image: url("data:image/png;base64,%s");
-                    background-repeat: no-repeat;
-                    padding-top: 50px;
-                    padding-bottom: 10px;
-                    background-position: %s;
-                    background-size: %s %s;
-                }
-                [data-testid="stSidebarNav"]::before {
-                    content: "%s";
-                    margin-left: 20px;
-                    margin-top: 20px;
-                    margin-bottom: 20px;
-                    font-size: %s;
-                    font-weight: %s;
-                    position: relative;
-                    text-align: center;
-                    top: 85px;
-                }
-            </style>
-            """ % (
-        binary_string,
-        params["MA_logo_background_position"],
-        params["MA_logo_width"],
-        "",
-        params["sidebar_header"],
-        params["sidebar_header_fontsize"],
-        params["sidebar_header_fontweight"],
-    )
-
-
-def add_logo(png_file):
-    """
-    Add logo to sidebar.
-
-    Inputs:
-        png_file (str): image filename
-    Returns:
-        None
-    """
-    logo_markup = build_markup_for_logo(png_file)
-    # st.sidebar.title("ciao")
-    st.markdown(
-        logo_markup,
-        unsafe_allow_html=True,
-    )
-
-
 def add_about():
     """
     Add about and contacts to sidebar.

pyproject.toml

@@ -1,6 +1,14 @@
-[tool.black]
-line-length = 79
-
-[tool.isort]
-profile = "black"
-line_length = 79
+[project]
+name = "flood-mapping-gfm"
+version = "0.1.0"
+description = "A streamlit app to map gfm flood forecasts"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "requests>=2.32.3",
+    "geopandas>=1.0.1",
+    "folium>=0.19.4",
+    "python-dotenv==1.0.1",
+    "streamlit>=1.41.1",
+    "streamlit-folium>=0.24.0",
+]

requirements.txt

@@ -1,9 +0,0 @@
-earthengine-api==0.1.331
-folium==0.13.0
-geemap==0.17.2
-streamlit==1.14.1
-streamlit_ext==0.1.4
-streamlit-folium==0.7.0
-pre-commit==2.18.1
-altair<5
-python-dotenv==1.0.1

setup.cfg

@@ -1,15 +0,0 @@
-[flake8]
-max-pos-args = 3
-ignore =
-    # Allow f-strings
-    SFS301,
-    # Allow print statements
-    T001,
-    # Allow implictly concatenated string literals in one line
-    ISC001,
-    # Allow percent operator in string
-    SFS101,
-    # Allow more than one # for comments
-    E266,
-    # Allow line break before binary operator
-    W503