Update app.py

app.py

@@ -2,11 +2,17 @@ import gradio as gr
 import cadquery as cq
 from cadquery import exporters
 import tempfile
-import trimesh
+import json
+import os
 
 # Generate APDL Script
-def generate_apdl_script(file, press_force, material):
+def generate_apdl_script(file, press_force, material_json):
     try:
+        # Parse material properties from JSON
+        material = json.loads(material_json)
+        elastic_modulus = material.get("elastic_modulus", 2e11)
+        poisson = material.get("poisson", 0.3)
+
         # Save uploaded STEP file temporarily
         with tempfile.NamedTemporaryFile(delete=False, suffix=".step") as temp_file:
             temp_file.write(file.read())
@@ -16,25 +22,17 @@ def generate_apdl_script(file, press_force, material):
         model = cq.importers.importStep(step_file_path)
 
         # Export as STL for meshing
-        stl_file = "temp_model.stl"
+        stl_file = step_file_path.replace(".step", ".stl")
         exporters.export(model, stl_file)
 
-        # Load STL with trimesh
-        mesh = trimesh.load(stl_file)
-        volume = mesh.volume
-        surface_area = mesh.area
-
-        # Placeholder stress calculation
-        stress = press_force / surface_area if surface_area > 0 else "Undefined (Area is zero)"
-
         # Generate APDL script
         apdl_script = f"""\
 /PREP7
 ! Importing Geometry
 /import, '{step_file_path}', geom, STEP
 ! Material Properties
-MP, EX, 1, {material['elastic_modulus']}
-MP, PRXY, 1, {material['poisson']}
+MP, EX, 1, {elastic_modulus}
+MP, PRXY, 1, {poisson}
 ! Load and Boundary Conditions
 F, NODE, ALL, FX, {press_force}
 ! Solve
@@ -45,10 +43,11 @@ SOLVE
 /EXIT, SAVE
 """
         # Save APDL script to file
-        apdl_file_path = "simulation_script.inp"
+        apdl_file_path = step_file_path.replace(".step", ".inp")
         with open(apdl_file_path, "w") as apdl_file:
             apdl_file.write(apdl_script)
 
+        # Return script content and file path for download
         return apdl_script, apdl_file_path
     except Exception as e:
         return f"Error: {str(e)}", None
@@ -58,6 +57,7 @@ def main():
     with gr.Blocks() as app:
         gr.Markdown("# APDL Script Generator for Press Tool Design")
 
+        # Input Row
         with gr.Row():
             step_input = gr.File(label="Upload STEP File")
             force_input = gr.Number(label="Press Force (N)", value=1000)
@@ -65,9 +65,16 @@ def main():
                 label="Material Properties (JSON)",
                 value='{"elastic_modulus": 2e11, "poisson": 0.3}'
             )
-            script_output = gr.Textbox(label="Generated APDL Script")
+
+        # Output Row
+        with gr.Row():
+            script_output = gr.Textbox(label="Generated APDL Script", interactive=False)
             download_button = gr.File(label="Download Script")
+
+        # Button Row
+        with gr.Row():
             generate_button = gr.Button("Generate APDL Script")
+            submit_button = gr.Button("Submit")
 
         # Events
         generate_button.click(
@@ -75,6 +82,12 @@ def main():
             inputs=[step_input, force_input, material_input],
             outputs=[script_output, download_button],
         )
+        
+        submit_button.click(
+            fn=lambda: "Submission successful!", 
+            inputs=None, 
+            outputs=gr.Textbox(label="Submission Status")
+        )
 
     app.launch()