Upload app.py with huggingface_hub

app.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Hugging Face Spaces - create proper module namespace"""
+"""Hugging Face Spaces - load all modules first, then execute"""
 import os
 import sys
 import importlib.util
@@ -11,42 +11,43 @@ sys.path.insert(0, str(app_dir))
 
 print("Setting up module namespace...\n")
 
-# Create fake src package
+# Create 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:")
+# Step 1: Register ALL modules in sys.modules first (without executing)
+print("Registering src modules:")
+modules_to_load = []
 for item in sorted(app_dir.iterdir()):
     name = item.name
     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
         
+        full_name = f"src.{module_name}"
         try:
-            # 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
-            
-            # Execute the module
-            spec.loader.exec_module(module)
-            print(f"   {full_name}")
-            
-            # Add to src package
             setattr(src_package, module_name, module)
-            
+            modules_to_load.append((full_name, spec, module))
+            print(f"   Registered {full_name}")
         except Exception as e:
-            print(f"    {full_name}: {str(e)[:60]}")
+            print(f"    {full_name}: {str(e)[:50]}")
+
+# Step 2: Now execute all modules (imports will work now)
+print("\nExecuting src modules:")
+for full_name, spec, module in modules_to_load:
+    try:
+        spec.loader.exec_module(module)
+        print(f"   Executed {full_name}")
+    except Exception as e:
+        print(f"    {full_name}: {str(e)[:60]}")
 
-# Now load ui/app.py
+# Step 3: Load ui/app.py
 print("\nLoading ui/app.py:")
 ui_app_path = None
 for item in app_dir.iterdir():
@@ -58,7 +59,6 @@ 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()
     
-    # Create execution environment with all modules
     exec_globals = {
         "__name__": "__main__",
         "__file__": str(ui_app_path),
@@ -74,10 +74,9 @@ if ui_app_path and ui_app_path.exists():
         print("  Executing ui/app.py...")
         exec(compile(code, str(ui_app_path), "exec"), exec_globals)
         
-        # 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...")
+            print("   Launching Gradio app...\n")
             demo = create_gradio_app()
             demo.launch(
                 server_name="0.0.0.0",
@@ -88,7 +87,7 @@ if ui_app_path and ui_app_path.exists():
             print("   create_gradio_app not found")
             
     except Exception as e:
-        print(f"   Error: {e}")
+        print(f"   Error: {e}\n")
         import traceback
         traceback.print_exc()
 else: