Update app.py

app.py

@@ -9,32 +9,9 @@ import json
 import atexit
 import glob
 
-def process_cad_file(file):
-    # Check if the file exists and is not empty
-    if not os.path.exists(file.name):
-        raise ValueError("Uploaded file is missing or does not exist.")
-    if os.path.getsize(file.name) == 0:
-        raise ValueError("Uploaded file is empty.")
-    
-    # Validate file format
-    file_extension = os.path.splitext(file.name)[-1].lower()
-    if file_extension not in [".stp", ".step", ".iges", ".igs"]:
-        raise ValueError(f"Unsupported file format: {file_extension}")
-    
-    # Process the valid CAD file
-    try:
-        if file_extension in [".stp", ".step"]:
-            return cq.importers.importStep(file.name)
-        elif file_extension in [".iges", ".igs"]:
-            return cq.importers.importStep(file.name)  # Same handler for now
-        else:
-            raise ValueError("Invalid file type detected during processing.")
-    except Exception as e:
-        raise RuntimeError(f"Error processing the CAD file: {str(e)}")
-
 # Cleanup function to remove temporary files
 def cleanup_temp_files():
-    temp_files = glob.glob("/tmp/*.svg") + glob.glob("/tmp/*.obj") + glob.glob("/tmp/*.stl") + glob.glob("/tmp/*.inp")
+    temp_files = glob.glob("*.stl") + glob.glob("*.inp")
     for temp_file in temp_files:
         try:
             os.remove(temp_file)
@@ -43,84 +20,71 @@ def cleanup_temp_files():
 
 atexit.register(cleanup_temp_files)
 
-# Generate 2D View
+# Define 2D and 3D view generation functions with error handling
 def generate_2d_view(file):
     try:
-        # Process CAD file
         model = process_cad_file(file)
-        
-        # Generate 2D SVG
-        svg_content = model.toSvg()
-        svg_path = "/tmp/2d_view.svg"
-        with open(svg_path, "w") as svg_file:
-            svg_file.write(svg_content)
-        
-        print(f"2D View successfully generated: {svg_path}")
-        return svg_path
+        two_d_image = model.toSvg()
+        return two_d_image
     except Exception as e:
-        error_message = f"Error generating 2D view: {str(e)}"
-        print(error_message)  # Log error details
-        return error_message
-
+        return f"Error generating 2D view: {str(e)}"
 
-# Generate 3D View
 def generate_3d_view(file):
     try:
-        # Import CAD file
+        # Import CAD file and create a Workplane object
         model = cq.importers.importStep(file.name)
 
-        # Extract solids
-        solids = model.solids()
+        # Extract solids from the Workplane object
+        solids = model.vals() if hasattr(model, 'vals') else model.solids()
         if not solids:
             raise ValueError("No solids found in the CAD model.")
 
-        # Tessellate and generate 3D mesh
-        vertices = []
-        faces = []
+        # Convert solids into trimesh-compatible meshes
+        meshes = []
         for solid in solids:
-            for face in solid.tessellate(tolerance=0.1):  # Increase tolerance for simpler tessellation
-                vertices.extend(face[0])
-                faces.extend([[face[1][i], face[1][i + 1], face[1][i + 2]] for i in range(0, len(face[1]), 3)])
+            vertices = []
+            faces = []
+            for face in solid.tessellate():
+                vertices.extend(face[0])  # Extract vertices (x, y, z)
+                faces.extend([[face[1][i], face[1][i + 1], face[1][i + 2]] for i in range(0, len(face[1]), 3)])  # Triangular faces
+            mesh = trimesh.Trimesh(vertices=vertices, faces=faces)
+            meshes.append(mesh)
 
-        mesh = trimesh.Trimesh(vertices=vertices, faces=faces)
-        obj_path = "/tmp/3d_view.obj"
-        mesh.export(obj_path)
+        # Combine all meshes into a single trimesh object if multiple solids exist
+        combined_mesh = trimesh.util.concatenate(meshes) if len(meshes) > 1 else meshes[0]
 
-        print(f"3D View successfully generated: {obj_path}")
-        return obj_path
+        # Visualize the mesh
+        combined_mesh.show()
+
+        return "3D view generated successfully."
     except Exception as e:
-        error_message = f"Error generating 3D view: {str(e)}"
-        print(error_message)  # Log error details
-        return error_message
+        return f"Error generating 3D view: {str(e)}"
 
 
-# Wrapper to generate both 2D and 3D views
+      
+# Wrapper function to generate views
 def generate_views(file):
     try:
-        two_d_view = generate_2d_view(file)  # Generate 2D View
-        three_d_view = generate_3d_view(file)  # Generate 3D View
-
-        # Check if 3D generation was successful
-        if "Error" in three_d_view:
-            return two_d_view, {"error": True, "message": three_d_view}
-        else:
-            return two_d_view, {"error": False, "message": "3D view generated successfully!"}
+        two_d_view = generate_2d_view(file)
+        three_d_view = generate_3d_view(file)
+        return two_d_view, three_d_view
     except Exception as e:
-        return f"Error: {str(e)}", f"Error: {str(e)}"
+        return f"Error: {str(e)}", None
 
-# Process CAD file for 2D/3D generation
+# Function to process different CAD file formats
 def process_cad_file(file):
     file_extension = os.path.splitext(file.name)[-1].lower()
     if file_extension in [".stp", ".step"]:
-        return cq.importers.importStep(file.name)
+        model = cq.importers.importStep(file.name)
     elif file_extension in [".iges", ".igs"]:
-        return cq.importers.importStep(file.name)
+        model = cq.importers.importStep(file.name)  # Same as STEP for cadquery
     elif file_extension == ".sldprt":
-        raise NotImplementedError("SLDPRT support is not implemented.")
+        raise NotImplementedError("SLDPRT support is not yet implemented.")
     elif file_extension == ".dwg":
-        raise NotImplementedError("DWG support is not implemented.")
+        raise NotImplementedError("DWG support is not yet implemented.")
     else:
         raise ValueError(f"Unsupported file format: {file_extension}")
+    return model
 
 # APDL script generation
 def generate_apdl_script(file, press_force, material_json):
@@ -129,14 +93,17 @@ def generate_apdl_script(file, press_force, 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 = process_cad_file(file)
-        stl_file = "/tmp/model.stl"
+
+        stl_file = step_file_path.replace(".stp", ".stl")
         exporters.export(model, stl_file)
 
         apdl_script = f"""\n
 /PREP7
 ! Importing Geometry
-/import, '{file.name}', geom, STEP
+/import, '{step_file_path}', geom, STEP
 ! Material Properties
 MP, EX, 1, {elastic_modulus}
 MP, PRXY, 1, {poisson}
@@ -149,14 +116,15 @@ SOLVE
 *GET, stress, NODE, 0, S, MAX
 /EXIT, SAVE
 """
-        apdl_file_path = "/tmp/apdl_script.inp"
+        apdl_file_path = step_file_path.replace(".stp", ".inp")
         with open(apdl_file_path, "w") as apdl_file:
             apdl_file.write(apdl_script)
+
         return apdl_script, apdl_file_path
     except Exception as e:
-        return f"Error generating APDL script: {str(e)}", None
+        return f"Error: {str(e)}", None
 
-# Find free port for Gradio app
+# Function to find a free port in a range
 def find_free_port(start_port, end_port):
     for port in range(start_port, end_port + 1):
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
@@ -164,7 +132,7 @@ def find_free_port(start_port, end_port):
                 return port
     raise OSError(f"No available ports in range {start_port}-{end_port}")
 
-# Main Gradio app
+# Gradio App
 def main():
     with gr.Blocks() as app:
         gr.Markdown("# Press Tool Design and APDL Script Generator")
@@ -176,11 +144,8 @@ def main():
             )
 
         with gr.Row():
-            # Corrected 2D View Output
-        
-            two_d_output = gr.Image(label="2D View", type="filepath")  # Use 'filepath' to display image from a file path
-
-            three_d_output = gr.Label(label="3D View Status")  # 3D as Label
+            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():
@@ -195,14 +160,19 @@ def main():
             download_button = gr.File(label="Download Script")
             generate_apdl_btn = gr.Button("Generate APDL Script")
 
-        # Visualization Events
+        # Events for Visualization
         generate_views_btn.click(
             fn=generate_views,
             inputs=step_input,
             outputs=[two_d_output, three_d_output]
         )
 
-        # APDL Script Events
+        # Events for APDL Script
+        def handle_download(apdl_script, apdl_file_path):
+            if apdl_file_path and os.path.exists(apdl_file_path):
+                return apdl_file_path
+            return None
+
         generate_apdl_btn.click(
             fn=generate_apdl_script,
             inputs=[step_input, force_input, material_input],
@@ -213,8 +183,9 @@ def main():
 if __name__ == "__main__":
     app = main()
     try:
-        port = find_free_port(7860, 7870)  # Find available port
+        # Dynamically find a free port in range 7860-7870
+        port = find_free_port(7860, 7870)
+        print(f"Launching on port: {port}")
         app.launch(server_port=port, debug=True)
     except Exception as e:
-        print(f"Failed to launch: {str(e)}")
-
+        print(f"Failed to launch: {str(e)}")