defrg

app.py

@@ -14,17 +14,38 @@ import json
 import subprocess
 import base64
 import io
+import zipfile
 from pathlib import Path
 from typing import Iterator
 
 # ==========================================
-# RELATIVE PATH RESOLUTION (GLOBAL) for environment 
+# RELATIVE PATH RESOLUTION & ZIP EXTRACTION
 # ==========================================
 try:
     PROJECT_ROOT = Path(__file__).resolve().parent
 except NameError:
     PROJECT_ROOT = Path(".").resolve()
 
+def extract_if_needed(folder_name: str, zip_name: str):
+    """Checks if a folder exists; if not, looks for a zip and extracts it."""
+    target_dir = PROJECT_ROOT / folder_name
+    zip_path = PROJECT_ROOT / zip_name
+    
+    # If folder doesn't exist, or it exists but is empty
+    if not target_dir.exists() or not any(target_dir.iterdir()):
+        if zip_path.exists():
+            print(f"📦 Extracting {zip_name} to {folder_name}...", flush=True)
+            with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+                zip_ref.extractall(PROJECT_ROOT)
+            print(f"✅ {zip_name} extracted successfully.", flush=True)
+        else:
+            print(f"⚠️ Warning: Neither {folder_name}/ nor {zip_name} found in {PROJECT_ROOT}!", flush=True)
+
+# 🚨 RUN EXTRACTION BEFORE ANYTHING ELSE BOOTS UP 🚨
+extract_if_needed("final_databases", "final_databases.zip")
+extract_if_needed("int8_dynamic", "int8_dynamic.zip")
+
+
 if (PROJECT_ROOT / "data" / "database").exists():
     DB_ROOT = PROJECT_ROOT / "data" / "database"
 else:
@@ -170,7 +191,7 @@ def run_query(method, sample_q, custom_q, db_id):
             if quant_engine is None:
                 return "-- ❌ ENGINE CRASH", pd.DataFrame(columns=["Error"]), "Failed to load model. Did you move the tokenizer files and add config.json to int8_dynamic/?"
         except Exception as e:
-            return f"-- ❌ ENGINE CRASH\n-- {str(e)}", pd.DataFrame(columns=["Error Status"]), f"Critical failure loading model: {e}"
+            return f"-- ❌ ENGINE CRASH\n-- {str(e)}", pd.DataFrame(columns=["Error Status"]), f"Critical failure loading model: {e}\nDid the zip file extract properly?"
 
     def _log(error_type: str, *, question: str, db_id_val: str, sql: str = "", error_msg: str = "") -> None:
         _QUERY_LOG.append({"t": time.time(), "db_id": str(db_id_val), "question": str(question), "sql": str(sql), "error_type": str(error_type), "error_msg": str(error_msg)})
@@ -566,5 +587,4 @@ if __name__ == "__main__":
                 # If it's a different OSError, raise it normally
                 raise e
     else:
-        print(f"❌ Could not find an open port between {base_port} and {base_port + max_retries - 1}.")
-    
+        print(f"❌ Could not find an open port between {base_port} and {base_port + max_retries - 1}.")