Merge pull request #19 from mapaction/develop

app/pages/1_🌍_Flood_extent_analysis.py

@@ -36,7 +36,7 @@ st.markdown("# Flood extent analysis")
 set_tool_page_style()
 
 # Initialise Google Earth Engine
-ee_initialize()
+ee_initialize(force_use_service_account=True)
 
 
 # Output_created is useful to decide whether the bottom panel with the

app/src/utils_ee.py

@@ -7,9 +7,24 @@ from src.utils import is_app_on_streamlit
 
 
 @st.experimental_memo
-def ee_initialize():
-    """Initialise Google Earth Engine."""
-    if is_app_on_streamlit():
+def ee_initialize(force_use_service_account: bool = False):
+    """Initialise Google Earth Engine.
+
+    Checks whether the app is deployed on Streamlit Cloud and, based on the
+    result, initialises Google Earth Engine in different ways: if the app is
+    run locally, the credentials are retrieved from the user's credentials
+    stored in the local system (personal Google account is used). If the app
+    is deployed on Streamlit Cloud, credentials are taken from the secrets
+    field in the cloud (a dedicated service account is used).
+    Inputs:
+        force_use_service_account (bool): If True, the dedicated Google
+            service account is used, regardless of whether the app is run
+            locally or in the cloud.
+
+    Returns:
+        None
+    """
+    if force_use_service_account or is_app_on_streamlit():
         service_account_keys = st.secrets["ee_keys"]
         credentials = service_account.Credentials.from_service_account_info(
             service_account_keys, scopes=oauth.SCOPES