Update app.py

app.py

@@ -23,9 +23,9 @@ def answer_questions(image_tuples, prompt_text):
     result = ""
     Q_and_A = ""
     prompts = [p.strip() for p in prompt_text.split(',')]  # Splitting and cleaning prompts
-    print(f"prompts: {prompts}\n")
     image_embeds = [img[0] for img in image_tuples if img[0] is not None]  # Extracting images from tuples, ignoring None
 
+    print(f"\nprompts: {prompts}\n\n")
     answers = []
     for prompt in prompts:
         image_answers = moondream.batch_answer(
@@ -34,19 +34,16 @@ def answer_questions(image_tuples, prompt_text):
             tokenizer=tokenizer,
         )
         answers.append(image_answers)
-            
-    data = []
-    for i in range(len(image_tuples)):
-        image_name = f"image{i+1}"
-        image_answers = [answer[i] for answer in answers]
-        print(f"image{i+1}_answers \n {image_answers} \n")
-        data.append([image_name] + image_answers)
-        
-    for question, answer in zip(prompts, answers):
-        Q_and_A += (f"Q: {question}\nA: {answer}\n\n")
-    print(f"\n\n{Q_and_A}\n\n")
     
-    result = {'headers': prompts, 'data': data}
+    for i, prompt in enumerate(prompts):
+        Q_and_A += f"Q: {prompt}\n\n"
+        for j, image_tuple in enumerate(image_tuples):
+            image_name = f"image{j+1}"
+            answer_text = answers[i][j]  # Retrieve the answer for the i-th prompt for the j-th image
+            Q_and_A += f"{image_name} A:\n{answer_text}\n\n"
+
+    result = {'headers': prompts, 'data': answers}  # Updated result handling
+    print(f"result\n{result}\n\nQ_and_A\n{Q_and_A}\n\n")
     return Q_and_A, result
 
 with gr.Blocks() as demo:
@@ -63,6 +60,6 @@ with gr.Blocks() as demo:
         submit = gr.Button("Submit")
     output = gr.TextArea(label="Questions and Answers", lines=30)
     output2 = gr.Dataframe(label="Structured Dataframe", type="array",wrap=True)
-    submit.click(answer_questions, [img, prompt], output, output2)
+    submit.click(answer_questions, [img, prompt], [output, output2])
 
 demo.queue().launch()