fix: public_observations now a dict, for multi-image handling

- renamed the session_state variable from singular to plural
- was initialised as a dict, but then overwritten each time, meaning
access was order-dependent and lossy

src/classifier/classifier_image.py

@@ -40,7 +40,7 @@ def cetacean_just_classify(cetacean_classifier):
         g_logger.info(msg)
 
         # TODO: what is the difference between public and regular; and why is this not array-ready?
-        st.session_state.public_observation = observation
+        st.session_state.public_observations[hash] = observation
         st.write(f"*[D] Observation {hash} classified as {st.session_state.whale_prediction1[hash]}*")
        
         
@@ -78,10 +78,10 @@ def cetacean_show_results_and_review():
             if selected_class != st.session_state.whale_prediction1[hash]:
                 observation['class_overriden'] = selected_class # TODO: this should be boolean!
             
-            st.session_state.public_observation = observation
+            st.session_state.public_observations[hash] = observation
             st.button(f"Upload observation {str(o)} to THE INTERNET!", on_click=push_observations)
             # TODO: the metadata only fills properly if `validate` was clicked.
-            st.markdown(metadata2md())
+            st.markdown(metadata2md(hash))
 
             msg = f"[D] full observation after inference: {observation}"
             g_logger.debug(msg)
@@ -136,7 +136,7 @@ def cetacean_show_results():
             # st.session_state.public_observation = observation
             st.button(f"Upload observation {str(o)} to THE INTERNET!", on_click=push_observations)
             # TODO: the metadata only fills properly if `validate` was clicked.
-            st.markdown(metadata2md())
+            st.markdown(metadata2md(hash))
             st.markdown(f"- **hash**: {hash}")
 
             msg = f"[D] full observation after inference: {observation}"
@@ -163,6 +163,7 @@ def cetacean_classify_show_and_review(cetacean_classifier):
     Args:
         cetacean_classifier ([type]):  saving-willy model from Saving Willy Hugging Face space
     """
+    raise DeprecationWarning("This function is deprecated. Use individual steps instead")
     images = st.session_state.images
     observations = st.session_state.observations
     hashes = st.session_state.image_hashes

src/main.py

@@ -53,8 +53,8 @@ if "handler" not in st.session_state:
     st.session_state['handler'] = setup_logging()
 
 
-if "public_observation" not in st.session_state:
-    st.session_state.public_observation = {}
+if "public_observations" not in st.session_state:
+    st.session_state.public_observations = {}
 
 if "classify_whale_done" not in st.session_state:
     st.session_state.classify_whale_done = {}

src/utils/metadata_handler.py

@@ -1,16 +1,26 @@
 import streamlit as st
 
-def metadata2md() -> str:
+def metadata2md(image_hash:str) -> str:
     """Get metadata from cache and return as markdown-formatted key-value list
 
+    Args:
+        image_hash (str): The hash of the image to get metadata for
+        
     Returns:
         str: Markdown-formatted key-value list of metadata
         
     """
     markdown_str = "\n"
-    keys_to_print = ["latitude","longitude","author_email","date","time"]
-    for key, value in st.session_state.public_observation.items():
-            if key in keys_to_print:
-                markdown_str += f"- **{key}**: {value}\n"
+    # FIXME get the right keys
+    # keys_to_print = ["latitude","longitude","author_email","date","time"]
+    keys_to_print = ["latitude","longitude","author_email","date_option","time_option"]
+
+    observation = st.session_state.public_observations.get(image_hash, {})
+    
+    #for key, value in st.session_state.public_observation.items():
+    for key, value in observation.items():
+        if key in keys_to_print:
+            markdown_str += f"- **{key}**: {value}\n"
+
     return markdown_str