Update server.py

server.py

@@ -18,9 +18,9 @@ logger = logging.getLogger(__name__)
 DATASET_REPO = "aniketkumar1106/orbit-data" 
 IMAGE_DIR = "Productimages"
 DB_TARGET = "orbiitt.db" 
-MIN_CONFIDENCE_THRESHOLD = 0.22 
+MIN_CONFIDENCE_THRESHOLD = 0.1
 
-# BOOTSTRAP: Mandatory folder creation before FastAPI initialization
+# BOOTSTRAP: Mandatory folder creation
 os.makedirs(IMAGE_DIR, exist_ok=True)
 
 app = FastAPI()
@@ -38,24 +38,22 @@ engine = None
 loading_status = "System Booting..."
 
 def normalize_filename(name):
-    """Deep normalization to match Database paths with Disk paths."""
     if not name: return ""
     name = urllib.parse.unquote(name)
     name = name.replace('’', "'").replace('‘', "'").replace('“', '"').replace('”', '"').replace('–', '-')
     return unicodedata.normalize('NFKD', name).encode('ascii', 'ignore').decode('ascii').strip()
 
-# 3. THREADED BACKGROUND INITIALIZATION
+# 3. BACKGROUND INITIALIZATION
 def background_sync():
     global engine, loading_status
     token = os.environ.get("HF_TOKEN")
     
-    # Wipe contents but keep directory for Mount
     for f in os.listdir(IMAGE_DIR):
         p = os.path.join(IMAGE_DIR, f)
         try:
             if os.path.isfile(p): os.unlink(p)
             elif os.path.isdir(p): shutil.rmtree(p)
-        except Exception: pass
+        except: pass
 
     try:
         loading_status = "Syncing Assets..."
@@ -75,6 +73,10 @@ def background_sync():
                         shutil.copy(src, f"./{DB_TARGET}")
             shutil.rmtree("temp_extract")
 
+        # LOGGING FILE COUNT FOR VALIDATION
+        final_count = len(os.listdir(IMAGE_DIR))
+        logger.info(f"DISK VALIDATION: {final_count} images ready in {IMAGE_DIR}")
+
         loading_status = "Loading AI Engine..."
         try:
             from orbiitt_engine import OrbiittEngine
@@ -88,48 +90,47 @@ def background_sync():
 
 @app.on_event("startup")
 async def startup_event():
-    # Spawns sync thread to keep health checks responsive
     thread = threading.Thread(target=background_sync, daemon=True)
     thread.start()
 
-# Mount StaticFiles
 app.mount("/Productimages", StaticFiles(directory=IMAGE_DIR), name="Productimages")
 
 @app.get("/health")
 def health():
     return {"status": loading_status, "ready": engine is not None}
 
-# 4. THREAD-SAFE SEARCH LOGIC
+# 4. FIXED SEARCH LOGIC
 @app.post("/search")
 async def search(text: str = Form(None), weight: float = Form(0.5), file: UploadFile = File(None)):
     if not engine:
         raise HTTPException(status_code=503, detail=f"Engine not ready: {loading_status}")
     
-    # Unique buffer path for concurrency
-    t_path = f"buffer_{os.getpid()}_{threading.get_ident()}.jpg" if file else None
+    t_path = f"buffer_{os.getpid()}.jpg" if file else None
     
     try:
-        # Step 1: Intelligent Modality Balancing
         actual_weight = weight
-        if not text and file: actual_weight = 0.0 # Pure Visual
-        if text and not file: actual_weight = 1.0 # Pure Text
+        if not text and file: actual_weight = 0.0
+        if text and not file: actual_weight = 1.0
 
-        # Step 2: Thread-Safe Async File Write
         if file and t_path:
             content = await file.read()
             async with await anyio.open_file(t_path, "wb") as f:
                 await f.write(content)
         
-        # Step 3: Engine Computation (Offloaded to a thread pool)
+        # THE FIX: Use lambda to ensure keyword arguments are passed correctly
         results = await anyio.to_thread.run_sync(
-            engine.search, text, t_path, actual_weight, 50
+            lambda: engine.search(
+                text_query=text, 
+                image_file=t_path, 
+                text_weight=actual_weight, 
+                top_k=50
+            )
         )
         
         all_files = os.listdir(IMAGE_DIR)
         final_list = []
         seen_ids = set()
 
-        # Step 4: Confidence & Deduplication logic
         for r in results:
             score = r.get('score', 0)
             pid = r.get('id', 'Product')
@@ -166,7 +167,7 @@ async def search(text: str = Form(None), weight: float = Form(0.5), file: Upload
     finally:
         if t_path and os.path.exists(t_path):
             try: os.remove(t_path)
-            except Exception: pass
+            except: pass
 
 if __name__ == "__main__":
     import uvicorn