Upload folder using huggingface_hub

app.py

@@ -17,7 +17,7 @@ from model.tokenizer import SanskritSourceTokenizer, SanskritTargetTokenizer
 
 
 RESULTS_DIR = "generated_results"
-DEFAULT_ANALYSIS_OUT = "analysis/outputs"
+DEFAULT_ANALYSIS_OUT = "analysis_outputs/T4"
 os.makedirs(RESULTS_DIR, exist_ok=True)
 
 HF_DEFAULT_MODEL_REPO = os.environ.get("HF_DEFAULT_MODEL_REPO", "bhsinghgrid/DevaFlow")
@@ -296,11 +296,26 @@ def generate_from_ui(
     return output_text, status, record
 
 
+def _resolve_analysis_script() -> Path | None:
+    candidates = [
+        Path("analysis") / "run_analysis.py",
+        Path("final_folder") / "analysis" / "run_analysis.py",
+        Path("deploy_ready") / "space_repo" / "analysis" / "run_analysis.py",
+    ]
+    for p in candidates:
+        if p.exists():
+            return p
+    return None
+
+
 def _run_analysis_cmd(task, ckpt_path, output_dir, input_text="dharmo rakṣati rakṣitaḥ", phase="analyze"):
     os.makedirs(output_dir, exist_ok=True)
-    script = Path("analysis") / "run_analysis.py"
-    if not script.exists():
-        return 2, "Analysis runner missing in Space image. Falling back to bundled analysis outputs."
+    script = _resolve_analysis_script()
+    if script is None:
+        bundled = Path("analysis_outputs")
+        if bundled.exists():
+            return 0, "Analysis runner not bundled; using packaged analysis_outputs.", True
+        return 2, "Analysis runner missing and no bundled analysis_outputs found.", False
     # Space-safe Task4 fallback: if ablation models don't exist, bootstrap them
     # from currently selected checkpoint so Task4 can still execute end-to-end.
     if str(task) == "4" and phase == "analyze":
@@ -337,7 +352,7 @@ def _run_analysis_cmd(task, ckpt_path, output_dir, input_text="dharmo rakṣati
 
     proc = subprocess.run(cmd, capture_output=True, text=True, env=env)
     log = f"$ {' '.join(cmd)}\n\n{proc.stdout}\n{proc.stderr}"
-    return proc.returncode, log
+    return proc.returncode, log, False
 
 
 def _bundle_task_outputs(model_bundle, output_dir):
@@ -375,13 +390,17 @@ def _live_input_summary(model_bundle, input_text: str) -> str:
 def run_single_task(model_bundle, task, output_dir, input_text, task4_phase):
     if not model_bundle:
         raise gr.Error("Load a model first.")
-    code, log = _run_analysis_cmd(task, model_bundle["ckpt_path"], output_dir, input_text, task4_phase)
+    code, log, used_bundled = _run_analysis_cmd(task, model_bundle["ckpt_path"], output_dir, input_text, task4_phase)
     if code != 0:
         _bundle_task_outputs(model_bundle, output_dir)
         log = f"{log}\n\n--- Live input summary ---\n{_live_input_summary(model_bundle, input_text)}"
         status = f"Task {task} fallback mode: bundled reports + live input analysis."
     else:
-        status = f"Task {task} completed (exit={code})."
+        if used_bundled:
+            _bundle_task_outputs(model_bundle, output_dir)
+            status = f"Task {task} loaded from bundled analysis outputs."
+        else:
+            status = f"Task {task} completed (exit={code})."
     return status, log
 
 
@@ -390,15 +409,25 @@ def run_all_tasks(model_bundle, output_dir, input_text, task4_phase):
         raise gr.Error("Load a model first.")
     logs = []
     failures = 0
+    used_bundled_any = False
     for task in ["1", "2", "3", "4", "5"]:
-        code, log = _run_analysis_cmd(task, model_bundle["ckpt_path"], output_dir, input_text, task4_phase)
+        code, log, used_bundled = _run_analysis_cmd(
+            task, model_bundle["ckpt_path"], output_dir, input_text, task4_phase
+        )
         logs.append(f"\n\n{'='*22} TASK {task} {'='*22}\n{log}")
+        used_bundled_any = used_bundled_any or used_bundled
         if code != 0:
             failures += 1
-    if failures:
+    if failures or used_bundled_any:
         _bundle_task_outputs(model_bundle, output_dir)
+    if failures:
         logs.append(f"\n\n--- Live input summary ---\n{_live_input_summary(model_bundle, input_text)}")
-    status = f"Run-all finished with {failures} fallback task(s)." if failures else "All 5 tasks completed."
+    if failures:
+        status = f"Run-all finished with {failures} fallback task(s)."
+    elif used_bundled_any:
+        status = "Run-all loaded from bundled analysis outputs."
+    else:
+        status = "All 5 tasks completed."
     return status, "".join(logs)