Update app.py

app.py

@@ -41,15 +41,8 @@ def analyze_image(image, model):
     
 
 def image_qa_app(kbvqa):
-    # Initialize session state for storing the current image and its Q&A history.
-    if 'current_image' not in st.session_state:
-        st.session_state['current_image'] = None
-    if 'qa_history' not in st.session_state:
-        st.session_state['qa_history'] = []
-    if 'analysis_done' not in st.session_state:
-        st.session_state['analysis_done'] = False
-    if 'answer_in_progress' not in st.session_state:
-        st.session_state['answer_in_progress'] = False
+    if 'images_data' not in st.session_state:
+        st.session_state['images_data'] = {}
 
     # Display sample images as clickable thumbnails
     st.write("Choose from sample images:")
@@ -59,49 +52,42 @@ def image_qa_app(kbvqa):
             image = Image.open(sample_image_path)
             st.image(image, use_column_width=True)
             if st.button(f'Select Sample Image {idx + 1}', key=f'sample_{idx}'):
-                st.session_state['current_image'] = image
-                st.session_state['qa_history'] = []
-                st.session_state['analysis_done'] = False
-                st.session_state['answer_in_progress'] = False
+                process_new_image(sample_image_path, image, kbvqa)
 
     # Image uploader
     uploaded_image = st.file_uploader("Or upload an Image", type=["png", "jpg", "jpeg"])
     if uploaded_image is not None:
-        image = Image.open(uploaded_image)
-        st.session_state['current_image'] = image
-        st.session_state['qa_history'] = []
-        st.session_state['analysis_done'] = False
-        st.session_state['answer_in_progress'] = False
-
-
-
-    # Display the current image (unaltered)
-    if st.session_state.get('current_image'):
-        st.image(st.session_state['current_image'], caption='Uploaded Image.', use_column_width=True)
-
-    # Analyze Image button
-    if st.session_state.get('current_image') and not st.session_state['analysis_done']:
-        if st.button('Analyze Image'):
-            # Perform analysis on the image
-            caption, detected_objects_str = analyze_image(st.session_state['current_image'], kbvqa)
-            st.session_state['analysis_done'] = True
-            st.session_state['processed_image'] = copy.deepcopy(st.session_state['current_image'])
-
-    # Get Answer button
-    if st.session_state['analysis_done'] and not st.session_state['answer_in_progress']:
-        question = st.text_input("Ask a question about this image:")
-        if st.button('Get Answer'):
-            st.session_state['answer_in_progress'] = True
-            answer = answer_question(caption, detected_objects_str, question, model=kbvqa)
-            st.session_state['qa_history'].append((question, answer))
-
-    # Display all Q&A
-    for q, a in st.session_state['qa_history']:
-        st.text(f"Q: {q}\nA: {a}\n")
-
-    # Reset the answer_in_progress flag after displaying the answer
-    if st.session_state['answer_in_progress']:
-        st.session_state['answer_in_progress'] = False
+        process_new_image(uploaded_image.name, Image.open(uploaded_image), kbvqa)
+
+    # Display and interact with each uploaded/selected image
+    for image_key, image_data in st.session_state['images_data'].items():
+        st.image(image_data['image'], caption=f'Uploaded Image: {image_key}', use_column_width=True)
+        if not image_data['analysis_done']:
+            if st.button('Analyze Image', key=f'analyze_{image_key}'):
+                caption, detected_objects_str = analyze_image(image_data['image'], kbvqa)
+                image_data['caption'] = caption
+                image_data['detected_objects_str'] = detected_objects_str
+                image_data['analysis_done'] = True
+
+        if image_data['analysis_done']:
+            question = st.text_input(f"Ask a question about this image ({image_key}):", key=f'question_{image_key}')
+            if st.button('Get Answer', key=f'answer_{image_key}'):
+                answer = answer_question(image_data['caption'], image_data['detected_objects_str'], question, kbvqa)
+                image_data['qa_history'].append((question, answer))
+
+            for q, a in image_data['qa_history']:
+                st.text(f"Q: {q}\nA: {a}\n")
+
+def process_new_image(image_key, image, kbvqa):
+    """Process a new image and update the session state."""
+    if image_key not in st.session_state['images_data']:
+        st.session_state['images_data'][image_key] = {
+            'image': image,
+            'caption': '',
+            'detected_objects_str': '',
+            'qa_history': [],
+            'analysis_done': False
+        }
 
 def run_inference():
     st.title("Run Inference")
@@ -159,6 +145,8 @@ def run_inference():
             
 # Main function
 def main():
+
+        
     st.sidebar.title("Navigation")
     selection = st.sidebar.radio("Go to", ["Home", "Dataset Analysis", "Evaluation Results", "Run Inference", "Dissertation Report", "More Pages will follow .. "])