Update app.py

app.py

@@ -6,112 +6,79 @@ import os
 from PIL import Image
 from deep_translator import GoogleTranslator
 
-# os.makedirs('assets', exist_ok=True) # Tidak terlalu dibutuhkan jika icon.jpg ada di root
+# os.makedirs('assets', exist_ok=True)
 if not os.path.exists('icon.jpg'):
-    print("Downloading icon.jpg...")
     os.system("wget -O icon.jpg https://i.pinimg.com/564x/64/49/88/644988c59447eb00286834c2e70fdd6b.jpg")
-    print("Icon downloaded.")
-
-API_URL_DEV = "https://lol-v2.mxflower.eu.org/api-inference.huggingface.co/models/black-forest-labs/FLUX.1-dev"
-API_URL = "https://lol-v2.mxflower.eu.org/api-inference.huggingface.co/models/black-forest-labs/FLUX.1-schnell"
+API_URL_DEV = "https://api-inference.huggingface.co/models/black-forest-labs/FLUX.1-dev"
+API_URL = "https://api-inference.huggingface.co/models/black-forest-labs/FLUX.1-schnell"
 timeout = 100
 
-def query(prompt, negative_prompt_str, steps=30, cfg_scale=7, sampler="DPM++ 2M Karras", seed=-1, strength=0.7, huggingface_api_key_ui=None, use_dev=False):
+def query(prompt, is_negative=False, steps=30, cfg_scale=7, sampler="DPM++ 2M Karras", seed=-1, strength=0.7, huggingface_api_key=None, use_dev=False):
     # Determine which API URL to use
     api_url = API_URL_DEV if use_dev else API_URL
 
-    # Determine the API token to use
-    api_token_to_use = None
-    if huggingface_api_key_ui and huggingface_api_key_ui.strip(): # Cek apakah UI key diisi dan bukan hanya spasi
-        api_token_to_use = huggingface_api_key_ui.strip()
-        print("Using API key from UI input.")
-    else:
-        env_token = os.getenv("HF_READ_TOKEN")
-        if env_token and env_token.strip(): # Cek apakah environment variable ada dan bukan hanya spasi
-            api_token_to_use = env_token.strip()
-            print("Using API key from HF_READ_TOKEN environment variable.")
-    
-    if not api_token_to_use:
-        raise gr.Error("Hugging Face API Key is required. Please provide it in the UI (Advanced Settings -> Hugging Face API Key) or set the HF_READ_TOKEN environment variable.")
+    # Check if the request is an API call by checking for the presence of the huggingface_api_key
+    is_api_call = huggingface_api_key is not None
 
-    headers = {"Authorization": f"Bearer {api_token_to_use}"}
+    if is_api_call:
+        # Use the environment variable for the API key in GUI mode
+        API_TOKEN = os.getenv("HF_READ_TOKEN")
+        headers = {"Authorization": f"Bearer {API_TOKEN}"}
+    else:
+        # Validate the API key if it's an API call
+        if huggingface_api_key == "":
+            raise gr.Error("API key is required for API calls.")
+        headers = {"Authorization": f"Bearer {huggingface_api_key}"}
 
-    if not prompt or prompt.strip() == "":
-        # Anda bisa mengembalikan gambar placeholder atau pesan error
-        # Untuk saat ini, kita kembalikan None, Gradio mungkin akan menampilkan error atau kosong
-        gr.Warning("Prompt cannot be empty.")
-        return None, seed # Atau raise gr.Error("Prompt cannot be empty.")
+    if prompt == "" or prompt is None:
+        return None
 
     key = random.randint(0, 999)
 
-    # Terjemahkan prompt
-    try:
-        translated_prompt = GoogleTranslator(source='auto', target='en').translate(prompt) # 'auto' lebih fleksibel
-    except Exception as e:
-        print(f"Error translating prompt: {e}. Using original prompt.")
-        translated_prompt = prompt # Fallback ke prompt asli jika translasi gagal
-
-    print(f'\033[1mGeneration {key} translation:\033[0m {translated_prompt}')
+    prompt = GoogleTranslator(source='ru', target='en').translate(prompt)
+    print(f'\033[1mGeneration {key} translation:\033[0m {prompt}')
 
-    # Tambahkan detail ke prompt
-    final_prompt = f"{translated_prompt} | ultra detail, ultra elaboration, ultra quality, perfect."
-    print(f'\033[1mGeneration {key}:\033[0m {final_prompt}')
+    prompt = f"{prompt} | ultra detail, ultra elaboration, ultra quality, perfect."
+    print(f'\033[1mGeneration {key}:\033[0m {prompt}')
 
-    # Jika seed adalah -1, generate seed acak
+    # If seed is -1, generate a random seed and use it
     if seed == -1:
         seed = random.randint(1, 1000000000)
 
     payload = {
-        "inputs": final_prompt,
+        "inputs": prompt,
+        "is_negative": is_negative,
         "steps": steps,
         "cfg_scale": cfg_scale,
         "seed": seed,
-        "strength": strength,
-        "sampler": sampler # Menambahkan sampler ke payload
+        "strength": strength
     }
 
-    # Logika untuk negative prompt:
-    # API Anda (lol-v2.mxflower.eu.org) sepertinya mengharapkan string negative prompt
-    # dikirim melalui field "is_negative" berdasarkan kode asli Anda.
-    # Jika API sebenarnya mengharapkan boolean untuk "is_negative" dan string di field lain (mis. "negative_prompt"),
-    # ini perlu disesuaikan.
-    # Untuk saat ini, saya mengikuti struktur asli dimana string negative_prompt_str dikirim sebagai "is_negative".
-    if negative_prompt_str and negative_prompt_str.strip():
-        payload["is_negative"] = negative_prompt_str.strip()
-    # Jika tidak, kita tidak mengirim field "is_negative" sama sekali jika API lebih suka begitu
-    # atau payload["is_negative"] = "" (tergantung preferensi API)
-
-    print(f"Payload to API: {payload}")
-
     response = requests.post(api_url, headers=headers, json=payload, timeout=timeout)
     if response.status_code != 200:
         print(f"Error: Failed to get image. Response status: {response.status_code}")
         print(f"Response content: {response.text}")
         if response.status_code == 503:
-            raise gr.Error(f"{response.status_code} : The model is being loaded or is unavailable. Details: {response.text[:500]}")
-        raise gr.Error(f"API Error {response.status_code}: {response.text[:500]}")
+            raise gr.Error(f"{response.status_code} : The model is being loaded")
+        raise gr.Error(f"{response.status_code}")
     
     try:
         image_bytes = response.content
         image = Image.open(io.BytesIO(image_bytes))
-        print(f'\033[1mGeneration {key} completed!\033[0m ({final_prompt})')
+        print(f'\033[1mGeneration {key} completed!\033[0m ({prompt})')
 
-        # Simpan gambar ke file dan kembalikan path file dan seed
-        # Pastikan direktori output ada jika Anda mau menyimpannya di subdirektori
-        # os.makedirs('outputs', exist_ok=True)
-        # output_path = f"./outputs/output_{key}.png"
-        output_path = f"./output_{key}.png" # Simpan di root untuk kesederhanaan
+        # Save the image to a file and return the file path and seed
+        output_path = f"./output_{key}.png"
         image.save(output_path)
         
         return output_path, seed
     except Exception as e:
-        print(f"Error when trying to open or save the image: {e}")
-        print(f"Response content that caused error: {response.content[:200]}") # Tampilkan sebagian konten jika bukan gambar
-        raise gr.Error(f"Failed to process image from API response. {e}")
+        print(f"Error when trying to open the image: {e}")
+        return None, None
 
 css = """
 #app-container {
-    max-width: 700px; /* Sedikit lebih lebar untuk kenyamanan */
+    max-width: 600px;
     margin-left: auto;
     margin-right: auto;
 }
@@ -119,76 +86,51 @@ css = """
     display: flex;
     align-items: center;
     justify-content: center;
-    margin-bottom: 15px; /* Tambah margin bawah */
 }
 #title-icon {
-    width: 40px; /* Sedikit lebih besar */
+    width: 32px; /* Adjust the width of the icon as needed */
     height: auto;
-    margin-right: 10px;
+    margin-right: 10px; /* Space between icon and title */
 }
 #title-text {
-    font-size: 28px; /* Sedikit lebih besar */
+    font-size: 24px; /* Adjust font size as needed */
     font-weight: bold;
 }
-#gen-button {
-    margin-top: 10px;
-}
 """
 
 with gr.Blocks(theme='Nymbo/Nymbo_Theme', css=css) as app:
     gr.HTML("""
-        <div id="title-container">
-            <img id="title-icon" src="file/icon.jpg" alt="Icon"> <!-- Perbaiki path jika icon.jpg di root -->
-            <h1 id="title-text">FLUX Capacitor</h1>
-        </div>
-    """) # Menggunakan </center> tidak standar, div dengan margin auto lebih baik untuk centering global
+        <center>
+            <div id="title-container">
+                <img id="title-icon" src="icon.jpg" alt="Icon">
+                <h1 id="title-text">FLUX Capacitor</h1>
+            </div>
+        </center>
+    """)
 
     with gr.Column(elem_id="app-container"):
         with gr.Row():
-            text_prompt = gr.Textbox(label="Prompt", placeholder="Enter a prompt here", lines=3, elem_id="prompt-text-input")
-        
-        with gr.Accordion("Advanced Settings", open=False):
-            negative_prompt_ui = gr.Textbox(label="Negative Prompt", placeholder="What should not be in the image", value="(deformed, distorted, disfigured), poorly drawn, bad anatomy, wrong anatomy, extra limb, missing limb, floating limbs, (mutated hands and fingers), disconnected limbs, mutation, mutated, ugly, disgusting, blurry, amputation, misspellings, typos", lines=3, elem_id="negative-prompt-text-input")
-            steps_ui = gr.Slider(label="Sampling steps", value=35, minimum=1, maximum=100, step=1)
-            cfg_ui = gr.Slider(label="CFG Scale", value=7, minimum=1, maximum=20, step=1)
-            method_ui = gr.Radio(label="Sampling method", value="DPM++ 2M Karras", choices=["DPM++ 2M Karras", "DPM++ SDE Karras", "Euler", "Euler a", "Heun", "DDIM"])
-            strength_ui = gr.Slider(label="Strength (for Img2Img/SDEdit, might not apply here)", value=0.7, minimum=0, maximum=1, step=0.001)
-            seed_ui = gr.Slider(label="Seed (-1 for random)", value=-1, minimum=-1, maximum=1000000000, step=1)
-            huggingface_api_key_ui_input = gr.Textbox(
-                label="Hugging Face API Key (optional, uses HF_READ_TOKEN if empty)", 
-                placeholder="Enter your Hugging Face API Key (e.g., hf_xxxx)", 
-                type="password", 
-                elem_id="api-key"
-            )
-            use_dev_ui = gr.Checkbox(label="Use Dev API (potentially unstable)", value=False, elem_id="use-dev-checkbox")
+            with gr.Column(elem_id="prompt-container"):
+                with gr.Row():
+                    text_prompt = gr.Textbox(label="Prompt", placeholder="Enter a prompt here", lines=2, elem_id="prompt-text-input")
+                with gr.Row():
+                    with gr.Accordion("Advanced Settings", open=False):
+                        negative_prompt = gr.Textbox(label="Negative Prompt", placeholder="What should not be in the image", value="(deformed, distorted, disfigured), poorly drawn, bad anatomy, wrong anatomy, extra limb, missing limb, floating limbs, (mutated hands and fingers), disconnected limbs, mutation, mutated, ugly, disgusting, blurry, amputation, misspellings, typos", lines=3, elem_id="negative-prompt-text-input")
+                        steps = gr.Slider(label="Sampling steps", value=35, minimum=1, maximum=100, step=1)
+                        cfg = gr.Slider(label="CFG Scale", value=7, minimum=1, maximum=20, step=1)
+                        method = gr.Radio(label="Sampling method", value="DPM++ 2M Karras", choices=["DPM++ 2M Karras", "DPM++ SDE Karras", "Euler", "Euler a", "Heun", "DDIM"])
+                        strength = gr.Slider(label="Strength", value=0.7, minimum=0, maximum=1, step=0.001)
+                        seed = gr.Slider(label="Seed", value=-1, minimum=-1, maximum=1000000000, step=1)
+                        huggingface_api_key = gr.Textbox(label="Hugging Face API Key (required for API calls)", placeholder="Enter your Hugging Face API Key here", type="password", elem_id="api-key")
+                        use_dev = gr.Checkbox(label="Use Dev API", value=False, elem_id="use-dev-checkbox")
 
         with gr.Row():
-            text_button = gr.Button("Generate Image", variant='primary', elem_id="gen-button", scale=3) # scale untuk mengambil lebih banyak ruang jika diinginkan
-        
+            text_button = gr.Button("Run", variant='primary', elem_id="gen-button")
         with gr.Row():
-            image_output = gr.Image(type="filepath", label="Generated Image", elem_id="gallery") # type="filepath" lebih baik untuk output path
-            seed_output = gr.Textbox(label="Seed Used", elem_id="seed-output", interactive=False)
+            image_output = gr.Image(type="pil", label="Image Output", elem_id="gallery")
+            seed_output = gr.Textbox(label="Seed Used", elem_id="seed-output")
         
-        # Sesuaikan fungsi click untuk menyertakan input API key dan use_dev
-        # Pastikan urutan input di sini sesuai dengan urutan argumen di fungsi query
-        text_button.click(
-            query, 
-            inputs=[
-                text_prompt, 
-                negative_prompt_ui, 
-                steps_ui, 
-                cfg_ui, 
-                method_ui, 
-                seed_ui, 
-                strength_ui, 
-                huggingface_api_key_ui_input, 
-                use_dev_ui
-            ], 
-            outputs=[image_output, seed_output]
-        )
-
-# Jika Anda menjalankan di environment seperti Hugging Face Spaces, share=True biasanya diperlukan atau default.
-# TypeError: argument of type 'bool' is not iterable (dari log Anda) sering terkait dengan show_api=True 
-# pada versi Gradio tertentu. Memperbarui Gradio atau menyetel show_api=False dapat membantu.
-# Untuk tujuan demo ini, show_api=False bisa lebih stabil jika Anda masih menghadapi error tersebut.
-app.launch(show_api=False, share=True) # show_api=False untuk menghindari potensi error schema, share=True untuk aksesibilitas
+        # Adjust the click function to include the API key and use_dev as inputs
+        text_button.click(query, inputs=[text_prompt, negative_prompt, steps, cfg, method, seed, strength, huggingface_api_key, use_dev], outputs=[image_output, seed_output])
+
+app.launch(show_api=True, share=False)