Spaces:

capagio
/

garment_designer

Paused

App Files Files Community

giorgio-caparvi commited on Aug 23, 2024

Commit

554a6f2

1 Parent(s): ce8fac2

added button to trigger image generation

Browse files

Files changed (3) hide show

Dockerfile +4 -3
api/app.py +30 -5
api/templates/index.html +50 -0

Dockerfile CHANGED Viewed

@@ -15,8 +15,9 @@ WORKDIR /api
 COPY --chown=user api/environment.yml ./
 RUN conda env create -f environment.yml && conda clean -a -y
-# Ensure conda is initialized and available for subsequent RUN commands
-SHELL ["conda", "run", "-n", "mgd", "/bin/bash", "-c"]
 # Copy the backend application code
 COPY --chown=user api/ .
@@ -25,4 +26,4 @@ COPY --chown=user api/ .
 EXPOSE 7860
 # Set default command to run the backend model using the specified port
-CMD ["conda", "run", "-n", "mgd", "python", "app.py", "--port", "7860"]

 COPY --chown=user api/environment.yml ./
 RUN conda env create -f environment.yml && conda clean -a -y
+# Activate the conda environment explicitly in the same RUN layer
+RUN echo "conda activate mgd" >> ~/.bashrc
+SHELL ["/bin/bash", "--login", "-c"]
 # Copy the backend application code
 COPY --chown=user api/ .
 EXPOSE 7860
 # Set default command to run the backend model using the specified port
+CMD ["bash", "-c", "source ~/.bashrc && conda activate mgd && python app.py --port 7860"]

api/app.py CHANGED Viewed

@@ -1,19 +1,31 @@
-from flask import Flask, request, jsonify
 from flask_cors import CORS
 import subprocess
 app = Flask(__name__)
 CORS(app)
-@app.route('/generate-design', methods=['GET'])
 def generate_design():
-    # Same command handling as before
     command = [
         'python', 'app/model/src/eval.py',
         '--dataset_path', './assets/data/vitonhd',
         '--batch_size', '1',
         '--mixed_precision', 'fp16',
-        '--output_dir', 'api/output',
         '--save_name', 'generato_paired',
         '--num_workers_test', '4',
         '--sketch_cond_rate', '0.2',
@@ -24,9 +36,22 @@ def generate_design():
     try:
         subprocess.run(command, check=True)
-        return jsonify({"status": "success", "message": "Command executed successfully"})
     except subprocess.CalledProcessError as e:
         return jsonify({"status": "error", "message": str(e)}), 500
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=7860)

+from flask import Flask, request, jsonify, render_template, send_from_directory
 from flask_cors import CORS
 import subprocess
+import os
 app = Flask(__name__)
 CORS(app)
+# Ensure that Flask looks for the HTML templates in the correct folder
+app.template_folder = './templates'
+# Set the directory for the output images
+output_dir = 'api/output'
+image_filename = 'generato_paired.png'
+@app.route('/')
+def index():
+    return render_template('index.html')
+@app.route('/generate-design', methods=['POST'])
 def generate_design():
+    # Command handling
     command = [
         'python', 'app/model/src/eval.py',
         '--dataset_path', './assets/data/vitonhd',
         '--batch_size', '1',
         '--mixed_precision', 'fp16',
+        '--output_dir', output_dir,
         '--save_name', 'generato_paired',
         '--num_workers_test', '4',
         '--sketch_cond_rate', '0.2',
     try:
         subprocess.run(command, check=True)
+        image_path = os.path.join(output_dir, image_filename)
+        # Check if the image was generated
+        if os.path.exists(image_path):
+            print("IMMAGINE CREATA")
+            return jsonify({"status": "success", "image_url": f"/output/{image_filename}"})
+        else:
+            print("IMMAGINE NON CREATA")
+            return jsonify({"status": "error", "message": "Image generation failed"}), 500
     except subprocess.CalledProcessError as e:
         return jsonify({"status": "error", "message": str(e)}), 500
+# Route to serve the generated image
+@app.route('/output/<filename>')
+def serve_image(filename):
+    return send_from_directory(output_dir, filename)
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=7860)

api/templates/index.html ADDED Viewed

	@@ -0,0 +1,50 @@

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Generate Design</title>
+    <script>
+        function generateDesign() {
+            // Remove the previous image, if any
+            document.getElementById("generated-image").src = "";
+            // Disable the button to prevent multiple requests
+            const button = document.getElementById("generate-button");
+            button.disabled = true;
+            button.innerText = "Processing...";
+            fetch('/generate-design', {
+                method: 'POST'
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.status === "success") {
+                    // Display the generated image
+                    const imgElement = document.getElementById("generated-image");
+                    imgElement.src = data.image_url;
+                    imgElement.style.display = "block";
+                } else {
+                    alert("Error: " + data.message);
+                }
+            })
+            .catch(error => {
+                console.error("Error:", error);
+                alert("Failed to execute the command.");
+            })
+            .finally(() => {
+                // Re-enable the button
+                button.disabled = false;
+                button.innerText = "Run Command";
+            });
+        }
+    </script>
+</head>
+<body>
+    <h1>Generate Design</h1>
+    <button id="generate-button" onclick="generateDesign()">Run Command</button>
+    <!-- Container for displaying the generated image -->
+    <img id="generated-image" style="display:none; margin-top: 20px;" alt="Generated Design" />
+</body>
+</html>