Update app.py

app.py

@@ -15,9 +15,9 @@ from my_model.KBVQA import KBVQA, prepare_kbvqa_model
 
 
 
-def answer_question(image, question, model):
+def answer_question(caption, detected_objects_str, question, model=kbvqa):
 
-    answer = model.generate_answer(question, image)
+    answer = model.generate_answer(question, caption, detected_objects_str)
     return answer
 
 def get_caption(image):
@@ -37,10 +37,10 @@ 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
+    caption = model.get_caption(image)
+    image_with_boxes, detected_objects_str = model.detect_objects(image)
+    return caption, detected_objects_str
+    
 
 def image_qa_app(kbvqa):
     # Initialize session state for storing the current image and its Q&A history.
@@ -85,7 +85,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_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'])
 
@@ -94,7 +94,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(caption, detected_objects_str, question, model=kbvqa)
             st.session_state['qa_history'].append((question, answer))
 
     # Display all Q&A