Update app.py

app.py

@@ -13,9 +13,13 @@ from my_model.KBVQA import KBVQA, prepare_kbvqa_model
 
 
 
-def answer_question(image, question, model):
+def answer_question(image, question, caption, detected_objects_str, model):
 
-    answer = model.generate_answer(question, image)
+    answer = model.generate_answer(question, image, caption, detected_objects_str)
+    st.image(image)
+    st.write(caption)
+    st.write("----------------")
+    st.write(detected_objects_str)
     return answer
 
 def get_caption(image):
@@ -31,14 +35,13 @@ sample_images = ["Files/sample1.jpg", "Files/sample2.jpg", "Files/sample3.jpg",
 
 
 
-def analyze_image(image, model):
-    # Placeholder for your analysis function
-    # This function should prepare captions, detect objects, etc.
-    # For example:
-    # caption = model.get_caption(image)
-    # detected_objects = model.detect_objects(image)
-    # return caption, detected_objects
-    pass
+def analyze_image(image, model, show_processed_image=False):
+    img = copy.deepcopy(image)
+    caption = model.get_caption(img)
+    image_with_boxes, detected_objects_str = model.detect_objects(img)
+    if show_processed_image:
+        st.image(image_with_boxes)
+    return caption, detected_objects
 
 def image_qa_app(kbvqa):
     # Initialize session state for storing the current image and its Q&A history
@@ -77,7 +80,7 @@ def image_qa_app(kbvqa):
     if st.session_state.get('current_image') and not st.session_state['analysis_done']:
         if st.button('Analyze Image'):
             # Perform analysis on the image
-            analyze_image(st.session_state['current_image'], kbvqa)
+            caption, detected_objects = 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'])
 
@@ -90,7 +93,7 @@ def image_qa_app(kbvqa):
         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(st.session_state['processed_image'], question, model=kbvqa)
+            answer = answer_question(st.session_state['processed_image'], question, caption, detected_objects_str, model=kbvqa)
             st.session_state['qa_history'].append((question, answer))
             
 
@@ -153,7 +156,7 @@ 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", "Object Detection"])
+    selection = st.sidebar.radio("Go to", ["Home", "Dataset Analysis", "Evaluation Results", "Run Inference", "Dissertation Report"])
 
     if selection == "Home":
         st.title("MultiModal Learning for Knowledg-Based Visual Question Answering")