Update app.py

app.py

@@ -4,44 +4,64 @@ from cadquery import exporters
 import trimesh
 import pyvista as pv
 from io import BytesIO
-import matplotlib.pyplot as plt
 import json
 import os
+import atexit
+import glob
 
-# Define missing generate_2d_view and generate_3d_view functions
+# Cleanup function to remove temporary files
+def cleanup_temp_files():
+    temp_files = glob.glob("*.stl") + glob.glob("*.inp")
+    for temp_file in temp_files:
+        try:
+            os.remove(temp_file)
+        except OSError:
+            pass
+
+atexit.register(cleanup_temp_files)
+
+# Define 2D and 3D view generation functions with error handling
 def generate_2d_view(step_file):
-    # Example logic for 2D view generation
-    model = cq.importers.importStep(step_file.name)
-    two_d_image = model.toSvg()
-    return two_d_image
+    try:
+        model = cq.importers.importStep(step_file.name)
+        two_d_image = model.toSvg()
+        return two_d_image
+    except Exception as e:
+        return f"Error generating 2D view: {str(e)}"
 
 def generate_3d_view(step_file):
-    # Example logic for 3D view generation
-    model = cq.importers.importStep(step_file.name)
-    mesh = trimesh.Trimesh(vertices=model.val().vertices, faces=model.val().faces)
-    three_d_image = mesh.show()
-    return three_d_image
+    try:
+        model = cq.importers.importStep(step_file.name)
+        mesh = trimesh.Trimesh(vertices=model.val().vertices(), faces=model.val().faces())
+        three_d_image = mesh.show()
+        return three_d_image
+    except Exception as e:
+        return f"Error generating 3D view: {str(e)}"
 
-# Wrapper function to generate both 2D and 3D views
+# Wrapper function to generate views
 def generate_views(step_file):
-    # Call the individual functions and collect their outputs
-    two_d_view = generate_2d_view(step_file)
-    three_d_view = generate_3d_view(step_file)
-    return two_d_view, three_d_view
+    try:
+        two_d_view = generate_2d_view(step_file)
+        three_d_view = generate_3d_view(step_file)
+        return two_d_view, three_d_view
+    except Exception as e:
+        return f"Error: {str(e)}", None
 
-# APDL Script Generation
+# APDL script generation
 def generate_apdl_script(file, press_force, material_json):
     try:
         material = json.loads(material_json)
         elastic_modulus = material.get("elastic_modulus", 2e11)
         poisson = material.get("poisson", 0.3)
 
+        # Use temporary file path for processing
         step_file_path = file.name
         model = cq.importers.importStep(step_file_path)
+
         stl_file = step_file_path.replace(".stp", ".stl")
         exporters.export(model, stl_file)
 
-        apdl_script = f"""\
+        apdl_script = f"""\n
 /PREP7
 ! Importing Geometry
 /import, '{step_file_path}', geom, STEP
@@ -74,8 +94,8 @@ def main():
             step_input = gr.File(label="Upload STEP File")
 
         with gr.Row():
-            two_d_output = gr.Image(label="2D View")
-            three_d_output = gr.Image(label="3D View")
+            two_d_output = gr.Textbox(label="2D View/Error Message", interactive=False)
+            three_d_output = gr.Textbox(label="3D View/Error Message", interactive=False)
             generate_views_btn = gr.Button("Generate 2D & 3D Views")
 
         with gr.Row():
@@ -92,7 +112,7 @@ def main():
 
         # Events for Visualization
         generate_views_btn.click(
-            fn=generate_views,  # Use the wrapper function
+            fn=generate_views,
             inputs=step_input,
             outputs=[two_d_output, three_d_output]
         )
@@ -109,7 +129,7 @@ def main():
             outputs=[script_output, download_button]
         )
 
-    app.launch()
+    app.launch(server_port=7861, debug=True)
 
 if __name__ == "__main__":
     main()