v9

app.py

@@ -1,43 +1,42 @@
 import os
 import uuid
-import shutil
 import gradio as gr
 import numpy as np
 from PIL import Image
 from qdrant_client import QdrantClient
-from qdrant_client.models import PointStruct, Distance, VectorParams
+from qdrant_client.http.models import Distance, VectorParams, PointStruct
 from sentence_transformers import SentenceTransformer
 
-# =====================
+# =========================
 # CONFIG
-# =====================
+# =========================
 UPLOAD_DIR = "uploads"
-DB_PATH = "./qdrant_db"
-COLLECTION = "items"
-
 os.makedirs(UPLOAD_DIR, exist_ok=True)
 
-# =====================
-# INIT
-# =====================
-qclient = QdrantClient(path=DB_PATH)
-if COLLECTION not in [c.name for c in qclient.get_collections().collections]:
-    qclient.recreate_collection(
+COLLECTION = "lostfound"
+
+# Connect to Qdrant (local or remote if deployed)
+qclient = QdrantClient(":memory:")  # use ":memory:" for demo, change for persistent DB
+
+# Create collection only if missing
+if not qclient.collection_exists(COLLECTION):
+    qclient.create_collection(
         collection_name=COLLECTION,
         vectors_config=VectorParams(size=512, distance=Distance.COSINE)
     )
 
+# Load CLIP model
 model = SentenceTransformer("clip-ViT-B-32")
 
-# =====================
-# HELPERS
-# =====================
+
+# =========================
+# ENCODING FUNCTION
+# =========================
 def encode_data(text=None, image=None):
-    """Encodes either text or image into embedding."""
     if image is not None:
-        if isinstance(image, str):
+        if isinstance(image, str):  # path
             img = Image.open(image).convert("RGB")
-        else:
+        else:  # PIL.Image
             img = image.convert("RGB")
         emb = model.encode(img, convert_to_numpy=True, normalize_embeddings=True)
     elif text:
@@ -46,8 +45,11 @@ def encode_data(text=None, image=None):
         raise ValueError("Need text or image")
     return emb.astype(np.float32)
 
+
+# =========================
+# ADD ITEM
+# =========================
 def add_item(mode, text, image, name, phone):
-    """Add new lost/found item."""
     try:
         vector = encode_data(text=text if text else None, image=image if image else None)
 
@@ -57,6 +59,7 @@ def add_item(mode, text, image, name, phone):
             "has_image": image is not None,
         }
 
+        # Save image if uploaded
         if image is not None:
             if isinstance(image, str):
                 img = Image.open(image).convert("RGB")
@@ -79,10 +82,14 @@ def add_item(mode, text, image, name, phone):
     except Exception as e:
         return f"❌ Error: {e}"
 
+
+# =========================
+# SEARCH FUNCTION
+# =========================
 def search_items(text, image, max_results, min_score):
-    """Search lost/found items."""
     try:
         vector = encode_data(text=text if text else None, image=image if image else None)
+
         results = qclient.search(
             collection_name=COLLECTION,
             query_vector=vector.tolist(),
@@ -91,65 +98,42 @@ def search_items(text, image, max_results, min_score):
             with_payload=True
         )
 
-        if not results:
-            return "No matches found.", []
-
-        text_results = []
-        gallery = []
-
+        texts, imgs = [], []
         for r in results:
-            pl = r.payload
-            txt = f"🆔 {r.id} | Mode: {pl.get('mode')} | Text: {pl.get('text')}"
-            if pl.get("mode") == "found":
-                txt += f" | Found by: {pl.get('finder_name')} ({pl.get('finder_phone')})"
-            txt += f" | Score: {r.score:.3f}"
-            text_results.append(txt)
-
-            if pl.get("image_path") and os.path.exists(pl["image_path"]):
-                gallery.append((pl["image_path"], txt))
-            else:
-                gallery.append((None, txt))
-
-        return "\n\n".join(text_results), gallery
+            p = r.payload
+            desc = f"id:{r.id} | score:{r.score:.3f} | mode:{p.get('mode','')} | text:{p.get('text','')}"
+            if p.get("mode") == "found":
+                desc += f" | finder:{p.get('finder_name','')} ({p.get('finder_phone','')})"
+            texts.append(desc)
+            if p.get("has_image") and "image_path" in p:
+                imgs.append(p["image_path"])
+        return "\n".join(texts) if texts else "No matches", imgs
     except Exception as e:
         return f"❌ Error: {e}", []
 
-def delete_item(item_id):
-    """Delete one item by ID."""
-    try:
-        qclient.delete(collection_name=COLLECTION, points_selector={"points": [item_id]})
-        return f"🗑️ Deleted item {item_id}"
-    except Exception as e:
-        return f"❌ Error: {e}"
 
-def clear_database():
-    """Clear everything."""
-    try:
-        qclient.delete_collection(COLLECTION)
-        qclient.recreate_collection(
-            collection_name=COLLECTION,
-            vectors_config=VectorParams(size=512, distance=Distance.COSINE)
-        )
-        shutil.rmtree(UPLOAD_DIR, ignore_errors=True)
-        os.makedirs(UPLOAD_DIR, exist_ok=True)
-        return "🧹 Database cleared."
-    except Exception as e:
-        return f"❌ Error: {e}"
+# =========================
+# CLEAR DATABASE
+# =========================
+def clear_all_items():
+    qclient.delete(collection_name=COLLECTION, points_selector={"filter": {}})
+    return "🗑️ All items deleted!"
+
 
-# =====================
-# UI
-# =====================
+# =========================
+# GRADIO APP
+# =========================
 with gr.Blocks() as demo:
-    gr.Markdown("# 🔍 Lost & Found System")
+    gr.Markdown("# 🔍 Lost & Found Search with Images + Text")
 
-    with gr.Tab("➕ Add Lost/Found"):
+    with gr.Tab("➕ Add Item"):
         mode = gr.Radio(["lost", "found"], label="Mode", value="lost")
-        text = gr.Textbox(label="Description (optional)")
+        text = gr.Textbox(label="Description")
         image = gr.Image(type="pil", label="Upload Image")
-        name = gr.Textbox(label="Finder Name (for Found only)")
-        phone = gr.Textbox(label="Finder Phone (for Found only)")
+        name = gr.Textbox(label="Finder Name (only if found)")
+        phone = gr.Textbox(label="Finder Phone (only if found)")
         add_btn = gr.Button("Add Item")
-        add_output = gr.Textbox(label="Status")
+        add_output = gr.Textbox(label="Add result")
         add_btn.click(add_item, [mode, text, image, name, phone], add_output)
 
     with gr.Tab("🔎 Search"):
@@ -159,17 +143,15 @@ with gr.Blocks() as demo:
         min_score = gr.Slider(0.5, 1.0, value=0.9, step=0.01, label="Min similarity threshold")
         search_btn = gr.Button("Search")
         search_text = gr.Textbox(label="Search results (text)")
-        search_gallery = gr.Gallery(label="Search Results").style(grid=[2], height="auto")
+        search_gallery = gr.Gallery(label="Search Results", columns=2, height="auto")
         search_btn.click(search_items, [s_text, s_image, max_results, min_score], [search_text, search_gallery])
 
-    with gr.Tab("⚙️ Admin"):
-        del_id = gr.Textbox(label="Delete Item by ID")
-        del_btn = gr.Button("Delete Item")
-        del_output = gr.Textbox(label="Delete Status")
-        del_btn.click(delete_item, del_id, del_output)
+    with gr.Tab("🗑️ Admin"):
+        clear_btn = gr.Button("Clear ALL items")
+        clear_out = gr.Textbox(label="Status")
+        clear_btn.click(clear_all_items, outputs=clear_out)
 
-        clear_btn = gr.Button("Clear All Database")
-        clear_output = gr.Textbox(label="Clear Status")
-        clear_btn.click(clear_database, outputs=clear_output)
 
-demo.launch()
+# Launch
+if __name__ == "__main__":
+    demo.launch()