Update app.py

app.py

@@ -1,4 +1,4 @@
-from flask import Flask, request, jsonify, send_file, render_template_string
+from flask import Flask, request, jsonify, send_file, render_template_string, make_response
 import requests
 import io
 import random
@@ -16,7 +16,7 @@ def query(prompt, negative_prompt="", steps=35, cfg_scale=7, sampler="DPM++ 2M K
         return None, "Prompt is required"
 
     key = random.randint(0, 999)
-
+    
     # Translate the prompt from Russian to English if necessary
     prompt = GoogleTranslator(source='ru', target='en').translate(prompt)
     print(f'Generation {key} translation: {prompt}')
@@ -40,6 +40,7 @@ def query(prompt, negative_prompt="", steps=35, cfg_scale=7, sampler="DPM++ 2M K
 
     for attempt in range(3):  # 最大3回の再試行
         try:
+            # Authorization header is removed
             response = requests.post(API_URL, json=payload, timeout=timeout)
             if response.status_code != 200:
                 return None, f"Error: Failed to get image. Status code: {response.status_code}, Details: {response.text}"
@@ -212,47 +213,44 @@ index_html = """
         <textarea id="prompt" name="prompt" rows="4" cols="50" placeholder="Enter your prompt" required>real, sky, blue, clouds, light blue, light blue sky, sun, 32K, many islands floating in the sky, Ghibli, many islands, many islands in the sky, islands in the clouds, old islands, fog, high quality, cool</textarea><br><br>
         
         <label for="negative_prompt">Negative Prompt:</label><br>
-        <textarea id="negative_prompt" name="negative_prompt" rows="2" cols="50" placeholder="Enter your negative prompt"></textarea><br><br>
-
-        <label for="width">Width: <span id="width-value">1024</span></label><br>
-        <input type="range" id="width-slider" name="width-slider" min="256" max="4096" value="1024" oninput="syncWidth(this.value)" onchange="updateWidthInput()"><br>
-        <input type="number" id="width" name="width" value="1024" min="256" max="4096" onchange="updateWidthInput()"><br><br>
+        <textarea id="negative_prompt" name="negative_prompt" rows="4" cols="50" placeholder="Enter negative prompt"></textarea><br><br>
 
-        <label for="height">Height: <span id="height-value">1024</span></label><br>
-        <input type="range" id="height-slider" name="height-slider" min="256" max="4096" value="1024" oninput="syncHeight(this.value)" onchange="updateHeightInput()"><br>
-        <input type="number" id="height" name="height" value="1024" min="256" max="4096" onchange="updateHeightInput()"><br><br>
+        <label for="width">Width:</label>
+        <input id="width" name="width" type="number" value="1024" onchange="syncWidth(this.value)"><br>
+        <input id="width-slider" type="range" min="256" max="2048" value="1024" oninput="updateWidthInput()"><br><br>
+        
+        <label for="height">Height:</label>
+        <input id="height" name="height" type="number" value="1024" onchange="syncHeight(this.value)"><br>
+        <input id="height-slider" type="range" min="256" max="2048" value="1024" oninput="updateHeightInput()"><br><br>
 
         <label for="steps">Steps:</label>
-        <input type="number" id="steps" name="steps" value="35" min="1"><br><br>
-
+        <input id="steps" name="steps" type="number" value="35" min="1" max="100"><br><br>
+        
         <label for="cfgs">CFG Scale:</label>
-        <input type="number" id="cfgs" name="cfgs" value="7" min="1" step="0.1"><br><br>
-
+        <input id="cfgs" name="cfgs" type="number" value="7" step="0.1"><br><br>
+        
         <label for="sampler">Sampler:</label>
         <select id="sampler" name="sampler">
             <option value="DPM++ 2M Karras">DPM++ 2M Karras</option>
-            <option value="DDIM">DDIM</option>
+            <option value="DPM++ 2S a">DPM++ 2S a</option>
             <option value="DPM++ SDE Karras">DPM++ SDE Karras</option>
-            <option value="Euler">Euler</option>
-            <option value="LMS">LMS</option>
         </select><br><br>
-
+        
         <label for="strength">Strength:</label>
-        <input type="number" id="strength" name="strength" value="0.7" min="0" step="0.1"><br><br>
-
+        <input id="strength" name="strength" type="number" value="0.7" step="0.1" min="0.0" max="1.0"><br><br>
+        
         <label for="seed">Seed:</label>
-        <input type="number" id="seed" name="seed" value="-1" step="1"><br><br>
+        <input id="seed" name="seed" type="number" value="-1" min="-1"><br><br>
 
-        <input type="submit" id="generate-button" value="Generate Image"><br>
+        <button id="generate-button" type="submit">Generate Image</button>
+        <p id="error-message" style="color: red;"></p>
     </form>
-    
-    <p id="error-message" style="color:red;"></p>
-    <input type="text" id="reqURL" style="width: 100%;" readonly><br><br>
-
-    <div id="container">
-        <canvas id="canvas" width="1024" height="1024" style="border:1px solid #000000;"></canvas>
-        <img id="generated-image" src="#" alt="Generated Image" style="display:none; max-width:100%;"><br>
+    <br>
+    <div>
+        <canvas id="canvas" width="1024" height="1024"></canvas>
     </div>
+    <img id="generated-image" src="" alt="Generated Image" style="display: none;"><br>
+    <textarea id="reqURL" readonly style="width: 100%; height: 50px;"></textarea>
 </body>
 </html>
 """
@@ -261,5 +259,27 @@ index_html = """
 def index():
     return render_template_string(index_html)
 
-if __name__ == '__main__':
-    app.run(debug=True, host='0.0.0.0', port=7860)
+@app.route('/generate', methods=['GET'])
+def generate_image():
+    prompt = request.args.get("prompt", "")
+    negative_prompt = request.args.get("negative_prompt", "")
+    steps = int(request.args.get("steps", 35))
+    cfg_scale = float(request.args.get("cfgs", 7))
+    sampler = request.args.get("sampler", "DPM++ 2M Karras")
+    strength = float(request.args.get("strength", 0.7))
+    seed = int(request.args.get("seed", -1))
+    width = int(request.args.get("width", 1024))
+    height = int(request.args.get("height", 1024))
+
+    image, error = query(prompt, negative_prompt, steps, cfg_scale, sampler, seed, strength, width, height)
+
+    if error:
+        return jsonify({"error": error}), 400
+
+    img_bytes = io.BytesIO()
+    image.save(img_bytes, format='PNG')
+    img_bytes.seek(0)
+    return send_file(img_bytes, mimetype='image/png')
+
+if __name__ == "__main__":
+    app.run(host='0.0.0.0', port=7860)