fix: all usage of session_state.files explicitly a list now

- init was to a dict, then overwritten by a list,
- all access was treating as a list

src/apptest/demo_elements.py

@@ -1,5 +1,6 @@
 # a small library of elements used in testing, presenting some 
 # processed data in simple ways that are easily testable via AppTest
+from typing import List
 import streamlit as st
 from input.input_handling import (
     get_image_datetime, get_image_latlon
@@ -14,7 +15,7 @@ def show_uploaded_file_info():
 
     st.write("the buffered files:")
     
-    uploaded_files = st.session_state.file_uploader_data
+    uploaded_files:List = st.session_state.file_uploader_data
     for ix, file in enumerate(uploaded_files):
         image_datetime_raw = get_image_datetime(file)
         latitude0, longitude0 = get_image_latlon(file)

src/apptest/demo_multifile_upload.py

@@ -1,5 +1,5 @@
 # a minimal snippet for validating the upload sequence, for testing purposes (with AppTest)
-
+from typing import List
 import streamlit as st
 
 # to run streamlit from this subdir, we need the the src dir on the path
@@ -26,7 +26,7 @@ from input.input_handling import (
 
 def buffer_uploaded_files():
     st.write("buffering files! ")
-    uploaded_files = st.session_state.file_uploader_data
+    uploaded_files:List = st.session_state.file_uploader_data
     for ix, file in enumerate(uploaded_files):
         image_datetime_raw = get_image_datetime(file)
         latitude0, longitude0 = get_image_latlon(file)

src/input/input_handling.py

@@ -116,7 +116,7 @@ def buffer_uploaded_files():
     
 
     # get files from state 
-    uploaded_files = st.session_state.file_uploader_data
+    uploaded_files:List = st.session_state.file_uploader_data
     
     filenames = []
     images = {}
@@ -261,7 +261,7 @@ def _setup_dynamic_inputs() -> None:
     # - and these go into session state
     
     # load the files from the session state
-    uploaded_files = st.session_state.files
+    uploaded_files:List = st.session_state.files
     hashes = st.session_state.image_hashes
     #images = st.session_state.images
     observations = {}
@@ -368,7 +368,7 @@ def init_input_data_session_states() -> None:
         st.session_state.images = {}
 
     if "files" not in st.session_state:
-        st.session_state.files = {}
+        st.session_state.files = []
 
     if "public_observations" not in st.session_state:
         st.session_state.public_observations = {}

tests/test_demo_input_sidebar.py

@@ -58,7 +58,6 @@ def _cprint(msg:str, color:str=OKCYAN):
 
 TIMEOUT = 10
 #SCRIPT_UNDER_TEST = "src/main.py"
-#SCRIPT_UNDER_TEST = "src/apptest/demo_input_phase.py"
 SCRIPT_UNDER_TEST = "src/apptest/demo_input_sidebar.py"
 
 def verify_initial_session_state(at:AppTest):
@@ -68,12 +67,12 @@ def verify_initial_session_state(at:AppTest):
     # - observations {}
     # - image_hashes []
     # - images {}
-    # - files {}
+    # - files []
     # - public_observations {}
     assert at.session_state.observations == {}
     assert at.session_state.image_hashes == []
     assert at.session_state.images == {}
-    assert at.session_state.files == {}
+    assert at.session_state.files == []
     assert at.session_state.public_observations == {}
     assert "container_file_uploader" in at.session_state
     assert "container_metadata_inputs" in at.session_state
@@ -87,27 +86,8 @@ def test_no_input_no_interaction():
     #   -> not much on the main tab.
 
     at = AppTest.from_file(SCRIPT_UNDER_TEST, default_timeout=10).run()
-    if 1:
-        verify_initial_session_state(at)
-    else:
-        # the initialised states we expect 
-        # - container_file_uploader exists
-        # - container_metadata_inputs exists
-        # - observations {}
-        # - image_hashes []
-        # - image_filenames []
-        # - images {}
-        # - files {}
-        # - public_observations {}
-        assert at.session_state.observations == {}
-        assert at.session_state.image_filenames == []
-        assert at.session_state.image_hashes == []
-        assert at.session_state.images == {}
-        assert at.session_state.files == {}
-        assert at.session_state.public_observations == {}
-        assert "container_file_uploader" in at.session_state
-        assert "container_metadata_inputs" in at.session_state
-    
+    verify_initial_session_state(at)
+
     assert at.session_state.input_author_email == spoof_metadata.get("author_email")
 
     # print (f"[I] whole tree: {at._tree}")
@@ -120,6 +100,8 @@ def test_no_input_no_interaction():
     # in the sidebar, we have the progress indicator, then the fileuploader and metadata inputs
     # - annoyingly we can't use keys for markdown. 
     # - so we are sensitive to the order. 
+    # - we could grab all the text, and just be content with presence of the target strings 
+    #   anywhere in the sidebar? that would be more robust at least.
     assert "Progress: 0/5" in at.sidebar.markdown[0].value
     assert "st-key-container_file_uploader_id" in at.sidebar.markdown[1].value
     assert "st-key-container_metadata_inputs_id" in at.sidebar.markdown[2].value
@@ -157,7 +139,6 @@ def test_two_input_files_realdata(mock_file_rv: MagicMock, mock_uploadedFile_Lis
     
     # Set the return value of the mocked file_uploader to the list of mock files
     mock_file_rv.return_value = mock_files
-    #mock_file_rv.side_effect = wrapped_buffer_uploaded_files # not yet!... 
 
     # Run the Streamlit app
     at = AppTest.from_file(SCRIPT_UNDER_TEST, default_timeout=TIMEOUT).run()
@@ -180,7 +161,7 @@ def test_two_input_files_realdata(mock_file_rv: MagicMock, mock_uploadedFile_Lis
         # - observations 2 elements, keys -> some hashes. values: InputObservation objects
         # - image_hashes 2 elements, hashes (str) | 
         # - images {} 2 elements, keys -> hashes, values -> np.ndarray. 
-        # - files {} now a LIST! check how it is read. Anyway, a list of MockUploadedFile objects
+        # - files [] a list of 2 MockUploadedFile objects
         # x public_observations {}
     # I think just verify the sizes and types, we could do a data integrity 
     # check on the hashes matching everywhere, but that is far from visual.