Improved error handling and deduplication of image display etc.

app.py

@@ -6,6 +6,8 @@ import os
 
 # Get VLM API base URL and API key from environment variables
 VLM_API_BASE_URL = os.getenv("VLM_API_BASE_URL")
+if not VLM_API_BASE_URL:
+    raise RuntimeError("VLM_API_BASE_URL environment variable must be set.")
 VLM_API_KEY = os.getenv("VLM_API_KEY", "")
 VLM_API_ENDPOINT = f"{VLM_API_BASE_URL}/v1/chat/completions"
 
@@ -48,7 +50,8 @@ def get_caption(image):
         # Assume caption is in data['choices'][0]['message']['content']
         caption = data["choices"][0]["message"]["content"]
     except Exception as e:
-        caption = f"Error: {e}"
+        print(f"VLM API error: {e}")  # Detailed error for admin
+        raise gr.Error("Sorry, there was a problem generating a caption.")
     return caption
 
 
@@ -58,14 +61,13 @@ PROJECT_ID = "yso-en"  # Placeholder, update as needed
 def get_subjects(caption):
     try:
         results = annif.suggest(project_id=PROJECT_ID, text=caption)
-        # Return a dict: {label: score, ...}
         label_scores = {result["label"]: result["score"] for result in results}
-        # If no results, return a string error
         if not label_scores:
-            return "No subjects found."
+            return {}
         return label_scores
     except Exception as e:
-        return f"Error: {e}"
+        print(f"Annif API error: {e}")  # Detailed error for admin
+        raise gr.Error("Sorry, there was a problem getting subject suggestions.")
 
 
 def process_image(image):
@@ -75,12 +77,11 @@ def process_image(image):
 
 
 demo = gr.Interface(
-    fn=process_image,
+    fn=lambda image: process_image(image)[1:],  # Only return caption and subjects
     inputs=gr.Image(type="pil", label="Upload or take a photo"),
     outputs=[
-        gr.Image(type="pil", label="Input Image"),
         gr.Textbox(label="Caption"),
-        gr.Label(label="Subject Suggestions"),
+        gr.Label(label="Subject Suggestions", show_heading=False),
     ],
     title="VLM Caption & Annif Subject Demo",
     description="Upload or take a photo. The app generates a caption using a Visual Language Model and suggests subjects using Annif.",