Update app.py

app.py

@@ -3,8 +3,7 @@ import subprocess
 import os
 import tempfile
 import datetime
-import shutil
-from huggingface_hub import upload_file, hf_hub_download
+from huggingface_hub import upload_file
 
 def convert_image_to_dxf(image_file, output_folder=None, use_lines=False):
     try:
@@ -41,19 +40,13 @@ def convert_image_to_dxf(image_file, output_folder=None, use_lines=False):
             capture_output=True
         )
         
-        # Print stdout and stderr for debugging
+        # Log stdout for debugging
         print(result.stdout.decode('utf-8'))
-        if result.stderr:
-            print(result.stderr.decode('utf-8'))
         
         # Check if conversion was successful
         if not os.path.exists(output_path):
             return "Conversion failed: DXF file was not created.", None, None
         
-        # Clean up temporary folder
-        if output_folder and os.path.isdir(output_folder):
-            shutil.rmtree(output_folder)
-
         # Prepare folder structure for upload
         date_folder = f"{current_date}"
         
@@ -93,29 +86,13 @@ def convert_image_to_dxf(image_file, output_folder=None, use_lines=False):
             )
             uploaded_files.append(uploaded_debug)
 
-        # Return valid file paths for download
-        if use_lines:
-            return output_path, debug_output_path, [output_path, debug_output_path]
-        else:
-            return output_path, None, [output_path]
+        # Return files directly for download in Gradio interface
+        return output_path, debug_output_path if use_lines else None, uploaded_files
     
     except subprocess.CalledProcessError as e:
         error_msg = f"Error converting image to DXF: {e.stderr.decode('utf-8') if e.stderr else e}"
         return error_msg, None, None
 
-# Function to download the DXF file from Hugging Face
-def download_from_huggingface(file_name, folder="datasets/ArrcttacsrjksX/ImageToAutocadData"):
-    try:
-        # Path on Hugging Face Repo
-        file_path = hf_hub_download(
-            repo_id="ArrcttacsrjksX/ImageToAutocadData",
-            filename=f"{folder}/{file_name}",
-            use_auth_token=os.getenv("HF_TOKEN")  # Ensure token is available in the environment
-        )
-        return file_path
-    except Exception as e:
-        return str(e)
-
 def main():
     with gr.Blocks() as demo:
         with gr.Tabs():
@@ -133,8 +110,8 @@ def main():
                 
                 # Outputs: Debug image and DXF file download link
                 with gr.Row():
-                    debug_output = gr.File(label="Debug Output Preview")  # Change this to File to link properly
-                    dxf_output = gr.File(label="DXF File Download")  # Ensure this is File, not Image
+                    debug_output = gr.Image(type="filepath", label="Debug Output Preview")
+                    dxf_output = gr.File(label="DXF File Download")
                 
                 # Conversion button with event binding
                 convert_btn = gr.Button("Convert to DXF")
@@ -144,28 +121,9 @@ def main():
                     outputs=[dxf_output, debug_output, dxf_output]
                 )
             
-            # Download tab for downloading from Hugging Face
-            with gr.TabItem("Download DXF"):
-                gr.Markdown("# Download DXF File from Hugging Face")
-                
-                # Input for filename
-                file_name_input = gr.Textbox(label="Enter DXF file name to download", placeholder="e.g., 2024-11-12_15-10-30_output.dxf")
-                
-                # Button to trigger download
-                download_btn = gr.Button("Download DXF")
-                
-                # Output for download link
-                download_link = gr.File(label="Download DXF")
-                
-                download_btn.click(
-                    download_from_huggingface,
-                    inputs=[file_name_input],
-                    outputs=[download_link]
-                )
-
             # About tab
             with gr.TabItem("About"):
-                gr.Markdown("This Gradio app allows users to convert an image to a DXF file using the SimpleImageToDxfHavePass command-line tool and download DXF files from Hugging Face.")
+                gr.Markdown("This Gradio app allows users to convert an image to a DXF file using the SimpleImageToDxfHavePass command-line tool.")
 
     demo.launch(share=True)