moved app.py to root

app/app.py → app.py

@@ -1,13 +1,13 @@
 import gradio as gr
 from pathlib import Path
-from process import generate_script_and_run
+from app.process import generate_script_and_run  # Correct import from nested app directory
 
 # === File Paths ===
-generated_dir = Path(__file__).parent / "generated"
+generated_dir = Path("app/generated")
 fcstd_file = generated_dir / "model.FCStd"
 obj_file = generated_dir / "model.obj"
 
-# Remove stale files
+# Remove stale files (optional cleanup)
 for file in ["generated_model.FCStd", "generated_model.obj"]:
     fpath = generated_dir / file
     if fpath.exists():
@@ -48,7 +48,7 @@ with gr.Blocks(css="""
     }
 """) as demo:
 
-    gr.Markdown("<h1 style='text-align: center;'> CADomatic - FreeCAD Script Generator</h1>")
+    gr.Markdown("<h1 style='text-align: center;'>CADomatic - FreeCAD Script Generator</h1>")
     gr.Markdown("Generate 3D models by describing them in plain English. Powered by FreeCAD and LLMs.")
 
     input_text = gr.Textbox(
@@ -73,8 +73,8 @@ with gr.Blocks(css="""
 
     gr.HTML("""
         <div class='footer-text'>
-            <strong>Note:</strong> CADomatic is still under development and still needs to be refined. For best results, run it locally. Toggle to view all in downloaded .FCStd file to see the generated part<br>
-            Please refresh and run if there is no preview<br>
+            <strong>Note:</strong> CADomatic is still under development and needs refinement. For best results, run locally. Toggle view in the .FCStd file for full geometry.<br>
+            Please refresh and run if there is no preview.<br>
             View the source on <a href="https://github.com/yas1nsyed/CADomatic" target="_blank">GitHub</a>.
         </div>
     """)

app/process.py

@@ -33,7 +33,6 @@ fcstd_path_str = str(FCSTD_PATH).replace("\\", "\\\\")
 obj_path_str = str(OBJ_PATH).replace("\\", "\\\\")
 preview_path_str = str(PREVIEW_PATH).replace("\\", "\\\\")
 
-# Updated export logic with debug logging
 EXPORT_SNIPPET = f"""
 import Mesh
 import os
@@ -79,7 +78,6 @@ def generate_script_and_run(user_input: str):
     example_code = example_prompt_path.read_text(encoding="utf-8").strip()
     app_prompt = app_prompt_path.read_text(encoding="utf-8").strip()
 
-    # Build prompt
     prompt = (
         f"{base_instruction}\n\n"
         f"{example_code}\n\n"
@@ -87,19 +85,14 @@ def generate_script_and_run(user_input: str):
         f"User request: {user_input.strip()}"
     )
 
-    # Generate LLM code
     generated_code = prompt_llm(prompt)
 
-    # Auto-inject App.newDocument if missing
     if "App.newDocument" not in generated_code:
         generated_code = "App.newDocument('Unnamed')\n" + generated_code
 
-    # Clean up markdown formatting
-    # Clean up markdown formatting
     if generated_code.startswith("```"):
         generated_code = generated_code[generated_code.find("\n") + 1:].rsplit("```", 1)[0]
 
-    # Unwrap if __name__ == "__main__" blocks (FreeCAD won't execute them)
     if "__name__" in generated_code and "def " in generated_code:
         lines = generated_code.splitlines()
         in_main = False
@@ -109,27 +102,20 @@ def generate_script_and_run(user_input: str):
                 in_main = True
                 continue
             if in_main:
-                # Remove leading indentation (usually 4 spaces)
                 unwrapped.append(line[4:] if line.startswith("    ") else line)
             else:
                 unwrapped.append(line)
         generated_code = "\n".join(unwrapped)
 
-    # Create output folder if needed
     GEN_DIR.mkdir(exist_ok=True)
 
-    # Build final script with export logic
     full_script = f"{generated_code.strip()}\n\n{EXPORT_SNIPPET}"
-
-    # Write script
     GEN_SCRIPT.write_text(full_script, encoding="utf-8")
 
-    # Delete old outputs
     for path in [FCSTD_PATH, OBJ_PATH, PREVIEW_PATH]:
         if path.exists():
             path.unlink()
 
-    # Run FreeCAD
     freecad_cmd = get_freecad_cmd()
     try:
         result = subprocess.run(
@@ -140,7 +126,6 @@ def generate_script_and_run(user_input: str):
             timeout=60
         )
 
-        # Log output
         (GEN_DIR / "run_stdout.txt").write_text(result.stdout or "", encoding="utf-8")
         (GEN_DIR / "run_stderr.txt").write_text(result.stderr or "", encoding="utf-8")