Update server.py

server.py

@@ -27,43 +27,38 @@ DB_TARGET = "orbiitt.db"
 
 def setup_environment():
     token = os.environ.get("HF_TOKEN")
-    if not os.path.exists(IMAGE_DIR):
-        os.makedirs(IMAGE_DIR)
+    # Clean old data to prevent version mismatch
+    if os.path.exists(IMAGE_DIR): shutil.rmtree(IMAGE_DIR)
+    os.makedirs(IMAGE_DIR)
 
     try:
-        logger.info(f"Syncing from {DATASET_REPO}...")
+        logger.info(f"Downloading dataset from {DATASET_REPO}...")
         snapshot_download(repo_id=DATASET_REPO, repo_type="dataset", token=token, local_dir=".")
 
-        zip_name = "orbiitt_db.zip"
-        if os.path.exists(zip_name):
-            with zipfile.ZipFile(zip_name, 'r') as z:
+        if os.path.exists("orbiitt_db.zip"):
+            with zipfile.ZipFile("orbiitt_db.zip", 'r') as z:
                 z.extractall("temp_extract")
             
             for root, _, files in os.walk("temp_extract"):
                 for f in files:
                     src = os.path.join(root, f)
-                    
-                    # 1. DATABASE FIX: Force rename to 'orbiitt.db'
-                    if f in ["orbiitt_db", "orbiitt_db.db", "orbiitt.db"] or f.endswith(".db"):
-                        if not os.path.exists(DB_TARGET):
-                            shutil.move(src, f"./{DB_TARGET}")
-                            logger.info(f"DB Found: {f}")
-                    
-                    # 2. IMAGE FIX: Remove spaces and %20 from filenames
+                    # 1. DB LOCATOR: Handles nested or renamed DB files
+                    if f.lower() in ["orbiitt_db", "orbiitt.db"] or (f.endswith(".db") and not f.startswith(".")):
+                        shutil.copy(src, f"./{DB_TARGET}")
+                    # 2. IMAGE NORMALIZER: Fixes encoding and moves to static folder
                     elif f.lower().endswith(('.png', '.jpg', '.jpeg', '.webp')):
-                        # Unquote removes %20, replace(' ', '_') removes spaces
-                        clean_name = urllib.parse.unquote(f).replace(" ", "_")
+                        clean_name = urllib.parse.unquote(f)
                         dest = os.path.join(IMAGE_DIR, clean_name)
-                        shutil.move(src, dest)
-            
+                        shutil.copy(src, dest)
             shutil.rmtree("temp_extract")
         
-        # Cleanup: Rename any files left in root that should be DB
+        # Root fallback for database
         if os.path.exists("orbiitt_db") and not os.path.exists(DB_TARGET):
             shutil.move("orbiitt_db", DB_TARGET)
 
+        logger.info(f"READY: Images={len(os.listdir(IMAGE_DIR))} DB={os.path.exists(DB_TARGET)}")
     except Exception as e:
-        logger.error(f"Setup Error: {e}")
+        logger.error(f"FATAL SETUP ERROR: {e}")
 
 setup_environment()
 
@@ -74,23 +69,18 @@ try:
     from orbiitt_engine import OrbiittEngine
     if os.path.exists(DB_TARGET):
         engine = OrbiittEngine()
-        logger.info("ENGINE ONLINE")
+        logger.info("SIGLIP ENGINE ONLINE")
 except Exception as e:
     logger.error(f"ENGINE ERROR: {e}")
 
 @app.get("/")
 def health():
     imgs = os.listdir(IMAGE_DIR) if os.path.exists(IMAGE_DIR) else []
-    return {
-        "engine": engine is not None,
-        "db": os.path.exists(DB_TARGET),
-        "img_count": len(imgs),
-        "first_img": imgs[0] if imgs else None
-    }
+    return {"engine": engine is not None, "db": os.path.exists(DB_TARGET), "img_count": len(imgs)}
 
 @app.post("/search")
 async def search(text: str = Form(None), weight: float = Form(0.5), file: UploadFile = File(None)):
-    if not engine: raise HTTPException(503, detail="Engine Offline")
+    if not engine: raise HTTPException(503, detail="AI Engine Loading")
     t_path = None
     try:
         if file:
@@ -99,10 +89,11 @@ async def search(text: str = Form(None), weight: float = Form(0.5), file: Upload
         
         results = engine.search(text_query=text, image_file=t_path, text_weight=weight)
         
-        # 3. FIX RESULT PATHS: Ensure the frontend gets the "Clean" names
+        # 3. PATH SANITIZER: Converts internal paths to public browser URLs
         for r in results:
-            if 'url' in r:
-                r['url'] = r['url'].replace(" ", "_")
+            raw_path = r.get('url') or r.get('path') or ""
+            filename = os.path.basename(raw_path)
+            r['url'] = f"Productimages/{urllib.parse.quote(filename)}"
                 
         return {"results": results}
     except Exception as e: