Update app.py

app.py

@@ -4,38 +4,13 @@ import os
 import logging
 import json
 from datetime import datetime
-import tempfile
-import numpy as np
-from PIL import Image
 import shutil
-import httpx
-import time
-import base64
-from gradio_client import Client, handle_file
-import cv2
-from moviepy.editor import VideoFileClip
 
 # 로깅 설정
 logging.basicConfig(level=logging.INFO)
 
-# 타임아웃 설정을 30초로 늘림
-httpx_client = httpx.Client(timeout=30.0)
-
-max_retries = 3
-retry_delay = 5  # 5초 대기
-
-for attempt in range(max_retries):
-    try:
-        api_client = Client("http://211.233.58.202:7960/")
-        api_client.httpx_client = httpx_client  # httpx 클라이언트 설정
-        break  # 성공하면 루프 종료
-    except httpx.ReadTimeout:
-        if attempt < max_retries - 1:  # 마지막 시도가 아니면
-            print(f"Connection timed out. Retrying in {retry_delay} seconds...")
-            time.sleep(retry_delay)
-        else:
-            print("Failed to connect after multiple attempts.")
-            raise  # 모든 시도 실패 시 예외 발생
+# API 클라이언트 설정
+api_client = Client("http://211.233.58.202:7960/")
 
 # 갤러리 저장 디렉토리 설정
 GALLERY_DIR = "gallery"
@@ -44,16 +19,16 @@ GALLERY_JSON = "gallery.json"
 # 갤러리 디렉토리 생성
 os.makedirs(GALLERY_DIR, exist_ok=True)
 
-def save_to_gallery(video_path, prompt):
+def save_to_gallery(image_path, prompt):
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-    new_video_path = os.path.join(GALLERY_DIR, f"{timestamp}.mp4")
+    new_image_path = os.path.join(GALLERY_DIR, f"{timestamp}.png")
     
-    # 비디오 파일 복사
-    shutil.copy2(video_path, new_video_path)
+    # 이미지 파일 복사
+    shutil.copy2(image_path, new_image_path)
     
     # 갤러리 정보 저장
     gallery_info = {
-        "video": new_video_path,
+        "image": new_image_path,
         "prompt": prompt,
         "timestamp": timestamp
     }
@@ -69,55 +44,44 @@ def save_to_gallery(video_path, prompt):
     with open(GALLERY_JSON, "w") as f:
         json.dump(gallery, f, indent=2)
     
-    return new_video_path
+    return new_image_path
 
 def load_gallery():
     if os.path.exists(GALLERY_JSON):
         with open(GALLERY_JSON, "r") as f:
             gallery = json.load(f)
-        return [{"image": item["video"], "caption": item["prompt"]} for item in reversed(gallery)]
+        return [(item["image"], item["prompt"]) for item in reversed(gallery)]
     return []
 
-def update_gallery():
-    gallery_items = load_gallery()
-    return [
-        {"video": item['image'], "caption": item['caption']}
-        for item in gallery_items
-    ]
-
-def respond(image, prompt, steps, cfg_scale, eta, fs, seed, video_length):
-    logging.info(f"Received prompt: {prompt}, steps: {steps}, cfg_scale: {cfg_scale}, "
-                 f"eta: {eta}, fs: {fs}, seed: {seed}, video_length: {video_length}")
+def respond(message, seed, randomize_seed, width, height, guidance_scale, num_inference_steps):
+    logging.info(f"Received message: {message}, seed: {seed}, randomize_seed: {randomize_seed}, "
+                 f"width: {width}, height: {height}, guidance_scale: {guidance_scale}, "
+                 f"num_inference_steps: {num_inference_steps}")
     
     try:
-        # 이미지 파일 처리
-        if image is not None:
-            image_file = handle_file(image)
-        else:
-            image_file = None
-
-        # 비디오 생성 요청
+        # 이미지 생성 요청
         result = api_client.predict(
-            image=image_file,
-            prompt=prompt,
-            steps=steps,
-            cfg_scale=cfg_scale,
-            eta=eta,
-            fs=fs,
+            prompt=message,
             seed=seed,
-            video_length=video_length,
-            api_name="/infer"
+            randomize_seed=randomize_seed,
+            width=width,
+            height=height,
+            guidance_scale=guidance_scale,
+            num_inference_steps=num_inference_steps,
+            api_name="/infer_t2i"
         )
         logging.info("API response received: %s", result)
-
-        if isinstance(result, dict) and 'video' in result:
-            saved_video_path = save_to_gallery(result['video'], prompt)
-            return saved_video_path
+        
+        # 결과 확인 및 처리
+        if isinstance(result, tuple) and len(result) >= 1:
+            image_path = result[0]
+            saved_image_path = save_to_gallery(image_path, message)
+            return saved_image_path
         else:
-            raise ValueError("예상치 못한 API 응답 형식")
+            raise ValueError("Unexpected API response format")
     except Exception as e:
-        logging.error("API 요청 중 오류 발생: %s", str(e))
-        return "오류로 인해 비디오 생성에 실패했습니다."
+        logging.error("Error during API request: %s", str(e))
+        return "Failed to generate image due to an error."
 
 css = """
 footer {
@@ -126,12 +90,20 @@ footer {
 """
 
 examples = [
-    ["A glamorous young woman with long, wavy blonde hair and smokey eye makeup, posing in a luxury hotel room. She's wearing a sparkly gold cocktail dress and holding up a white card with 'openfree.ai' written on it in elegant calligraphy. Soft, warm lighting creates a luxurious atmosphere. ", "q1.webp"],
+    ["A photograph of the front view portrait of an Man in a full body dynamic pose on a red background in the style of high fashion moment, with rich colors, dramatic light, in a fantasy art style, with surrealism, elegant details, a golden ratio composition, and detailed texture", "q21.png"],
+    ["the image show the fourth elements, each one in a part of the picture, first part is at top left and show a splashing multicolor water text with many water reflections, the text is made of water, the water word is 'WATER', the background is splashing water, the second part of the image is a top right and show a soil rounded text, the word made of soil is 'EARTH', the background is planet earth, the third part of the image is at bottom left and show a cloud multicolor rounded text, the word is 'AIR' made of colorfull cloud the background is a sunset, and the last part of the image in the bottom right show a red fire rounded text made of lava, the colorfull big word made of fire is 'FIRE', the background is the closeup ", "q22.png"], 
+    ["Dramatic news broadcast scene in a Teahupoʻo wave's where a cow surfing, mimicking pro surf rider poses. Yogis laugh and take pictures. The news banner reads: 'COW win Olympics!!'. An inset shows an anchor openfree.ai@","q23.png"],
+    ["a beautiful cute joyful and playful 29 year old woman view from bottom, red haired, dressed in a cozy sherpa jacket over a turtleneck and skinny jeans, in the street of Paris at night eiffel tower in background, detailed masterpiece most beautiful artwork in the world Ultrarealistic, Sony A7, Nostalgic lighting","q24.png"],
+    ["A man climbing a rock wall reaching for the next hold", "q25.png"],
+    ["pov of an austronaut holding a small red rock that has a portal showing the Statue of Liberty, alien landscape of a red planet in the background, surreal","q26.png"], 
+    ["a smartphone product showcase, smartphone display showing immersive wallpaper and time, blurred turquoise background","q27.png"], 
+    ["A glamorous young woman with long, wavy blonde hair and smokey eye makeup, posing in a luxury hotel room. She’s wearing a sparkly gold cocktail dress and holding up a white card with 'openfree.ai' written on it in elegant calligraphy. Soft, warm lighting creates a luxurious atmosphere. ", "q1.webp"],
     ["A fit male fitness influencer with short dark hair and stubble, standing shirtless in a modern gym. He has defined abs and arm muscles, and is holding a protein shake in one hand and a card that says 'openfree.ai' in the other. Bright, clean lighting highlights his physique.", "q2.webp"],
-    ["A bohemian-style female travel blogger with sun-kissed skin and messy beach waves, sitting on a tropical beach at sunset. She's wearing a flowy white sundress and holding up a weathered postcard with 'openfree.ai' scrawled on it. Golden hour lighting bathes the scene in warm tones. ", "q3.webp"],
-    ["A trendy male fashion influencer with perfectly styled hair and designer stubble, posing on a city street. He's wearing a tailored suit and holding up a sleek black business card with 'openfree.ai' printed in minimalist white font. The background shows blurred city lights, creating a chic urban atmosphere.", "q4.webp"],
-    ["A fresh-faced young female beauty guru with freckles and natural makeup, sitting at a vanity covered in cosmetics. She's wearing a pastel pink robe and holding up a makeup palette with 'openfree.ai' written on it in lipstick. Soft, flattering lighting enhances her radiant complexion. ", "q5.webp"],
-    ["A stylish young woman with long, wavy ombre hair and winged eyeliner, posing in front of a neon-lit city skyline at night. She's wearing a sleek black leather jacket over a sparkly crop top and holding up a holographic business card that says 'openfree.ai' in futuristic font. The card reflects the colorful neon lights, creating a cyberpunk aesthetic.", "q6.webp"],    
+    ["A bohemian-style female travel blogger with sun-kissed skin and messy beach waves, sitting on a tropical beach at sunset. She’s wearing a flowy white sundress and holding up a weathered postcard with 'openfree.ai' scrawled on it. Golden hour lighting bathes the scene in warm tones. ", "q3.webp"],
+    ["A trendy male fashion influencer with perfectly styled hair and designer stubble, posing on a city street. He’s wearing a tailored suit and holding up a sleek black business card with 'openfree.ai' printed in minimalist white font. The background shows blurred city lights, creating a chic urban atmosphere.", "q4.webp"],
+    ["A fresh-faced young female beauty guru with freckles and natural makeup, sitting at a vanity covered in cosmetics. She’s wearing a pastel pink robe and holding up a makeup palette with 'openfree.ai' written on it in lipstick. Soft, flattering lighting enhances her radiant complexion. ", "q5.webp"],
+    ["A stylish young woman with long, wavy ombre hair and winged eyeliner, posing in front of a neon-lit city skyline at night. She’s wearing a sleek black leather jacket over a sparkly crop top and holding up a holographic business card that says 'openfree.ai' in futuristic font. The card reflects the colorful neon lights, creating a cyberpunk aesthetic.", "q6.webp"],    
+    ["Create a surreal advertisement poster for a fictional time travel agency. The background should depict a swirling vortex of clock faces and historical landmarks from different eras. In the foreground, place large, bold text that reads “AI TOURS: YOUR PAST IS OUR FUTURE” in a retro-futuristic font. The text should appear to be partially disintegrating into particles that are being sucked into the time vortex. Include smaller text at the bottom with fictional pricing and the slogan “History is just a ticket away!”", "q7.webp"],
     ["Photo realistic scene inspired by LOTR: [A tiny red dragon sleeps curled up in a nest on a medieval wizard's table]. Shot with a macro lens (f/2.8, 50mm) and a Canon EOSR5, the soft focus captures [the cozy morning light filtering through a near by window]. The pastel colors and whimsical steam shapes enhance the serene atmosphere, evoking a DnD RPG setting. The image is rendered in 16K and 8K, highlighting [the intricate details and medieval charm].", "q8.webp"],
     ["썬글라스를 착용한 귀여운 강아지가 'Openfree.ai'라고 쓰여진 표지판을 들고있다.", "q9.webp"],
     ["미레적인 도시의 해지는 풍경", "q10.webp"],
@@ -147,64 +119,64 @@ examples = [
     ["A fantasy map of a fictional world, with detailed terrain and cities.", "q19.webp"]
 ]
 
-def use_prompt_and_image(prompt, image):
-    return prompt, image
-
-def show_video(evt: gr.SelectData):
-    return evt.value["video"] if isinstance(evt.value, dict) and "video" in evt.value else None
+def use_prompt(prompt):
+    return prompt
 
 with gr.Blocks(theme="Nymbo/Nymbo_Theme", css=css) as demo:
     with gr.Tab("Generate"):
         with gr.Row():
-            input_image = gr.Image(label="Upload an image", type="filepath")
-            input_text = gr.Textbox(label="Enter your prompt for video generation")
-            output_video = gr.Video(label="Generated Video")
+            input_text = gr.Textbox(label="Enter your prompt for image generation")
+            output_image = gr.Image(label="Generated Image")
         
         with gr.Row():
-            steps = gr.Slider(minimum=1, maximum=100, step=1, label="Steps", value=30)
-            cfg_scale = gr.Slider(minimum=1, maximum=15, step=0.1, label="CFG Scale", value=3.5)
-            eta = gr.Slider(minimum=0, maximum=1, step=0.1, label="ETA", value=1)
-            fs = gr.Slider(minimum=1, maximum=30, step=1, label="FPS", value=8)
             seed = gr.Slider(minimum=0, maximum=1000000, step=1, label="Seed", value=123)
-            video_length = gr.Slider(minimum=1, maximum=10, step=1, label="Video Length (seconds)", value=2)
+            randomize_seed = gr.Checkbox(label="Randomize Seed", value=False)
+        
+        with gr.Row():
+            width = gr.Slider(minimum=256, maximum=1024, step=64, label="Width", value=1024)
+            height = gr.Slider(minimum=256, maximum=1024, step=64, label="Height", value=576)
+        
+        with gr.Row():
+            guidance_scale = gr.Slider(minimum=1, maximum=20, step=0.1, label="Guidance Scale", value=5)
+            num_inference_steps = gr.Slider(minimum=1, maximum=100, step=1, label="Number of Inference Steps", value=28)
         
         with gr.Row():
             for prompt, image_file in examples:
                 with gr.Column():
                     gr.Image(image_file, label=prompt[:50] + "...")
-                    gr.Button("Use this example").click(
-                        fn=use_prompt_and_image,
+                    gr.Button("Use this prompt").click(
+                        fn=use_prompt,
                         inputs=[],
-                        outputs=[input_text, input_image],
+                        outputs=input_text,
                         api_name=False
                     ).then(
-                        lambda p=prompt, i=image_file: (p, i),
+                        lambda x=prompt: x,
                         inputs=[],
-                        outputs=[input_text, input_image]
+                        outputs=input_text
                     )
-
+    
     with gr.Tab("Gallery"):
         gallery = gr.Gallery(
-            label="Generated Videos",
+            label="Generated Images",
             show_label=False,
             elem_id="gallery",
             columns=[5],
             rows=[3],
             object_fit="contain",
-            height="auto",
-            preview=True
+            height="auto"
         )
-        selected_video = gr.Video(label="Selected Video")
         refresh_btn = gr.Button("Refresh Gallery")
 
+    def update_gallery():
+        return load_gallery()
+
     refresh_btn.click(fn=update_gallery, inputs=None, outputs=gallery)
     demo.load(fn=update_gallery, inputs=None, outputs=gallery)
-    gallery.select(show_video, None, selected_video)
 
     input_text.submit(
         fn=respond, 
-        inputs=[input_image, input_text, steps, cfg_scale, eta, fs, seed, video_length], 
-        outputs=output_video
+        inputs=[input_text, seed, randomize_seed, width, height, guidance_scale, num_inference_steps], 
+        outputs=output_image
     ).then(
         fn=update_gallery,
         inputs=None,