Upload app.py with huggingface_hub

app.py

@@ -1,36 +1,53 @@
 #!/usr/bin/env python3
-"""Hugging Face Spaces - fix backslash filenames"""
+"""Hugging Face Spaces - create proper module namespace"""
 import os
 import sys
 import importlib.util
 from pathlib import Path
+from types import ModuleType
 
 app_dir = Path("/app")
 sys.path.insert(0, str(app_dir))
 
-print(f"Starting app from {app_dir}\n")
+print("Setting up module namespace...\n")
 
-# Step 1: Preload ALL src modules with proper names (no backslashes)
-print("Loading src modules:")
-src_modules = {}
-for item in app_dir.iterdir():
+# Create fake src package
+src_package = ModuleType("src")
+src_package.__path__ = [str(app_dir / "src")]
+sys.modules["src"] = src_package
+
+print("Loading src modules into src namespace:")
+for item in sorted(app_dir.iterdir()):
     name = item.name
-    if name.startswith("src\\") and name.endswith(".py"):
+    if name.startswith("src\\") and name.endswith(".py") and not name.endswith("__pycache__"):
         # Extract module name: "src\models.py" -> "models"
         module_name = name.split("\\")[-1].replace(".py", "")
         
+        if module_name == "__init__":
+            continue
+        
         try:
-            spec = importlib.util.spec_from_file_location(module_name, str(item))
+            # Load as src.MODULE_NAME
+            full_name = f"src.{module_name}"
+            spec = importlib.util.spec_from_file_location(full_name, str(item))
             module = importlib.util.module_from_spec(spec)
+            sys.modules[full_name] = module
+            
+            # Also make it accessible as just MODULE_NAME for direct imports
             sys.modules[module_name] = module
-            src_modules[module_name] = module
+            
+            # Execute the module
             spec.loader.exec_module(module)
-            print(f"   {module_name}")
+            print(f"   {full_name}")
+            
+            # Add to src package
+            setattr(src_package, module_name, module)
+            
         except Exception as e:
-            print(f"    {module_name}: {e}")
+            print(f"    {full_name}: {str(e)[:60]}")
 
-# Step 2: Fix imports in the code
-print("\nPreparing ui/app.py code:")
+# Now load ui/app.py
+print("\nLoading ui/app.py:")
 ui_app_path = None
 for item in app_dir.iterdir():
     if item.name == "ui\\app.py":
@@ -41,29 +58,26 @@ if ui_app_path and ui_app_path.exists():
     with open(str(ui_app_path), 'r', encoding='utf-8', errors='ignore') as f:
         code = f.read()
     
-    # Fix all src imports
-    original_code = code
-    code = code.replace("from src.", "from ")
-    code = code.replace("import src.", "import ")
+    # Create execution environment with all modules
+    exec_globals = {
+        "__name__": "__main__",
+        "__file__": str(ui_app_path),
+        "src": src_package,
+    }
     
-    print(f"   Fixed imports in ui/app.py")
+    # Add all src modules to globals
+    for key in list(sys.modules.keys()):
+        if key.startswith("src."):
+            exec_globals[key.split(".")[-1]] = sys.modules[key]
     
-    # Step 3: Execute the code
-    print("\nLaunching Gradio app:")
     try:
-        exec_globals = {
-            "__name__": "__main__",
-            "__file__": str(ui_app_path),
-            "create_gradio_app": None
-        }
-        exec_locals = {}
-        
-        exec(compile(code, str(ui_app_path), "exec"), exec_globals, exec_locals)
-        
-        # Get the function from locals
-        create_gradio_app = exec_globals.get("create_gradio_app") or exec_locals.get("create_gradio_app")
+        print("  Executing ui/app.py...")
+        exec(compile(code, str(ui_app_path), "exec"), exec_globals)
         
-        if create_gradio_app:
+        # Launch the app
+        create_gradio_app = exec_globals.get("create_gradio_app")
+        if create_gradio_app and callable(create_gradio_app):
+            print("   Launching Gradio app...")
             demo = create_gradio_app()
             demo.launch(
                 server_name="0.0.0.0",
@@ -71,11 +85,11 @@ if ui_app_path and ui_app_path.exists():
                 show_error=True
             )
         else:
-            print("ERROR: create_gradio_app not found after execution")
+            print("   create_gradio_app not found")
             
     except Exception as e:
-        print(f"ERROR: {e}")
+        print(f"   Error: {e}")
         import traceback
         traceback.print_exc()
 else:
-    print(f"ERROR: ui\\app.py not found")
+    print("   ui\\app.py not found")