Update app.py
Browse files
app.py
CHANGED
@@ -41,9 +41,25 @@ def process_images_with_prompt(image1, image2, image3, prompt):
|
|
41 |
# Gemini ํด๋ผ์ด์ธํธ ์ด๊ธฐํ
|
42 |
client = genai.Client(api_key=api_key)
|
43 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
44 |
# ํ๋กฌํํธ ์ฒ๋ฆฌ
|
45 |
if not prompt or not prompt.strip():
|
46 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
47 |
else:
|
48 |
# #1, #2, #3 ์ฐธ์กฐ ์ฒ๋ฆฌ
|
49 |
prompt = preprocess_prompt(prompt)
|
@@ -55,8 +71,7 @@ def process_images_with_prompt(image1, image2, image3, prompt):
|
|
55 |
parts.append(types.Part.from_text(text=prompt))
|
56 |
|
57 |
# ์ฌ์ฉ ๊ฐ๋ฅํ ์ด๋ฏธ์ง ์ถ๊ฐ
|
58 |
-
|
59 |
-
for idx, img in enumerate([image1, image2, image3], 1):
|
60 |
if img is not None:
|
61 |
# PIL ์ด๋ฏธ์ง๋ฅผ ๋ฐ์ดํธ๋ก ๋ณํ
|
62 |
with tempfile.NamedTemporaryFile(suffix=".png") as tmp:
|
@@ -67,12 +82,8 @@ def process_images_with_prompt(image1, image2, image3, prompt):
|
|
67 |
|
68 |
# ์ด๋ฏธ์ง๋ฅผ ํํธ๋ก ์ถ๊ฐ
|
69 |
parts.append(types.Part.from_data(data=image_bytes, mime_type="image/png"))
|
70 |
-
images_added += 1
|
71 |
logger.info(f"์ด๋ฏธ์ง #{idx} ์ถ๊ฐ๋จ")
|
72 |
|
73 |
-
if images_added == 0:
|
74 |
-
return None, "์ ์ด๋ ํ๋์ ์ด๋ฏธ์ง๋ฅผ ์
๋ก๋ํด์ฃผ์ธ์."
|
75 |
-
|
76 |
# ์์ฑ ์ค์
|
77 |
generate_content_config = types.GenerateContentConfig(
|
78 |
temperature=1,
|
@@ -119,7 +130,7 @@ with gr.Blocks() as demo:
|
|
119 |
"""
|
120 |
<div style="text-align: center; margin-bottom: 1rem;">
|
121 |
<h1>๊ฐ๋จํ ์ด๋ฏธ์ง ์์ฑ๊ธฐ</h1>
|
122 |
-
<p
|
123 |
</div>
|
124 |
"""
|
125 |
)
|
@@ -132,11 +143,11 @@ with gr.Blocks() as demo:
|
|
132 |
image2_input = gr.Image(type="pil", label="#2", image_mode="RGB")
|
133 |
image3_input = gr.Image(type="pil", label="#3", image_mode="RGB")
|
134 |
|
135 |
-
# ํ๋กฌํํธ ์
๋ ฅ
|
136 |
prompt_input = gr.Textbox(
|
137 |
lines=3,
|
138 |
-
placeholder="ํ๋กฌํํธ๋ฅผ
|
139 |
-
label="ํ๋กฌํํธ"
|
140 |
)
|
141 |
|
142 |
# ์์ ํ๋กฌํํธ ๋ฒํผ๋ค
|
@@ -152,6 +163,9 @@ with gr.Blocks() as demo:
|
|
152 |
# ๊ฒฐ๊ณผ ์ถ๋ ฅ
|
153 |
output_image = gr.Image(label="์์ฑ๋ ์ด๋ฏธ์ง")
|
154 |
output_text = gr.Textbox(label="์ํ ๋ฉ์์ง")
|
|
|
|
|
|
|
155 |
|
156 |
# ์์ ํ๋กฌํํธ ๋ฒํผ ํด๋ฆญ ์ด๋ฒคํธ
|
157 |
prompt1_btn.click(lambda: "#1๊ณผ #2๋ฅผ ์์ฐ์ค๋ฝ๊ฒ ํฉ์ฑํด ์ฃผ์ธ์", outputs=prompt_input)
|
@@ -159,10 +173,30 @@ with gr.Blocks() as demo:
|
|
159 |
prompt3_btn.click(lambda: "#3์ ์คํ์ผ๋ก #1์ ๋ณํํด ์ฃผ์ธ์", outputs=prompt_input)
|
160 |
|
161 |
# ์ด๋ฏธ์ง ์์ฑ ๋ฒํผ ํด๋ฆญ ์ด๋ฒคํธ
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
162 |
submit_btn.click(
|
163 |
-
fn=
|
164 |
inputs=[image1_input, image2_input, image3_input, prompt_input],
|
165 |
-
outputs=[output_image, output_text],
|
166 |
)
|
167 |
|
168 |
gr.HTML(
|
@@ -170,10 +204,10 @@ with gr.Blocks() as demo:
|
|
170 |
<div style="margin-top: 1rem; padding: 1rem; background-color: #f8f9fa; border-radius: 0.5rem;">
|
171 |
<h3>์ฌ์ฉ ๋ฐฉ๋ฒ:</h3>
|
172 |
<ul>
|
173 |
-
<li
|
174 |
-
<li
|
175 |
-
<li>์์
|
176 |
-
<li
|
177 |
</ul>
|
178 |
</div>
|
179 |
"""
|
|
|
41 |
# Gemini ํด๋ผ์ด์ธํธ ์ด๊ธฐํ
|
42 |
client = genai.Client(api_key=api_key)
|
43 |
|
44 |
+
# ์ด๋ฏธ์ง ๊ฐ์ ํ์ธ
|
45 |
+
images = [image1, image2, image3]
|
46 |
+
valid_images = [img for img in images if img is not None]
|
47 |
+
|
48 |
+
if not valid_images:
|
49 |
+
return None, "์ ์ด๋ ํ๋์ ์ด๋ฏธ์ง๋ฅผ ์
๋ก๋ํด์ฃผ์ธ์."
|
50 |
+
|
51 |
# ํ๋กฌํํธ ์ฒ๋ฆฌ
|
52 |
if not prompt or not prompt.strip():
|
53 |
+
# ํ๋กฌํํธ๊ฐ ์์ผ๋ฉด ์
๋ก๋๋ ์ด๋ฏธ์ง ์์ ๋ฐ๋ผ ์๋ ํฉ์ฑ ํ๋กฌํํธ ์์ฑ
|
54 |
+
if len(valid_images) == 1:
|
55 |
+
prompt = "์ด ์ด๋ฏธ์ง๋ฅผ ์ฐฝ์์ ์ผ๋ก ๋ณํํด์ฃผ์ธ์. ๋ ์์ํ๊ณ ์์ ์ ์ธ ๋ฒ์ ์ผ๋ก ๋ง๋ค์ด์ฃผ์ธ์."
|
56 |
+
logger.info("๋จ์ผ ์ด๋ฏธ์ง ํ๋กฌํํธ ์๋ ์์ฑ")
|
57 |
+
elif len(valid_images) == 2:
|
58 |
+
prompt = "์ด ๋ ์ด๋ฏธ์ง๋ฅผ ์์ฐ์ค๋ฝ๊ฒ ํฉ์ฑํด์ฃผ์ธ์. ๋ ์ด๋ฏธ์ง์ ์์๋ฅผ ์กฐํ๋กญ๊ฒ ํตํฉํ์ฌ ํ๋์ ์ด๋ฏธ์ง๋ก ๋ง๋ค์ด์ฃผ์ธ์."
|
59 |
+
logger.info("๋ ์ด๋ฏธ์ง ํฉ์ฑ ํ๋กฌํํธ ์๋ ์์ฑ")
|
60 |
+
else:
|
61 |
+
prompt = "์ด ์ธ ์ด๋ฏธ์ง๋ฅผ ์ฐฝ์์ ์ผ๋ก ํฉ์ฑํด์ฃผ์ธ์. ๋ชจ๋ ์ด๋ฏธ์ง์ ์ฃผ์ ์์๋ฅผ ํฌํจํ๋ ์์ฐ์ค๋ฝ๊ณ ์ผ๊ด๋ ํ๋์ ์ฅ๋ฉด์ผ๋ก ๋ง๋ค์ด์ฃผ์ธ์."
|
62 |
+
logger.info("์ธ ์ด๋ฏธ์ง ํฉ์ฑ ํ๋กฌํํธ ์๋ ์์ฑ")
|
63 |
else:
|
64 |
# #1, #2, #3 ์ฐธ์กฐ ์ฒ๋ฆฌ
|
65 |
prompt = preprocess_prompt(prompt)
|
|
|
71 |
parts.append(types.Part.from_text(text=prompt))
|
72 |
|
73 |
# ์ฌ์ฉ ๊ฐ๋ฅํ ์ด๋ฏธ์ง ์ถ๊ฐ
|
74 |
+
for idx, img in enumerate(images, 1):
|
|
|
75 |
if img is not None:
|
76 |
# PIL ์ด๋ฏธ์ง๋ฅผ ๋ฐ์ดํธ๋ก ๋ณํ
|
77 |
with tempfile.NamedTemporaryFile(suffix=".png") as tmp:
|
|
|
82 |
|
83 |
# ์ด๋ฏธ์ง๋ฅผ ํํธ๋ก ์ถ๊ฐ
|
84 |
parts.append(types.Part.from_data(data=image_bytes, mime_type="image/png"))
|
|
|
85 |
logger.info(f"์ด๋ฏธ์ง #{idx} ์ถ๊ฐ๋จ")
|
86 |
|
|
|
|
|
|
|
87 |
# ์์ฑ ์ค์
|
88 |
generate_content_config = types.GenerateContentConfig(
|
89 |
temperature=1,
|
|
|
130 |
"""
|
131 |
<div style="text-align: center; margin-bottom: 1rem;">
|
132 |
<h1>๊ฐ๋จํ ์ด๋ฏธ์ง ์์ฑ๊ธฐ</h1>
|
133 |
+
<p>์ด๋ฏธ์ง๋ฅผ ์
๋ก๋ํ๊ณ ๋ฐ๋ก ์คํํ๋ฉด ์๋์ผ๋ก ํฉ์ฑํฉ๋๋ค. ๋๋ #1, #2, #3์ผ๋ก ๊ฐ ์ด๋ฏธ์ง๋ฅผ ์ฐธ์กฐํ๋ ํ๋กฌํํธ๋ฅผ ์
๋ ฅํ ์ ์์ต๋๋ค.</p>
|
134 |
</div>
|
135 |
"""
|
136 |
)
|
|
|
143 |
image2_input = gr.Image(type="pil", label="#2", image_mode="RGB")
|
144 |
image3_input = gr.Image(type="pil", label="#3", image_mode="RGB")
|
145 |
|
146 |
+
# ํ๋กฌํํธ ์
๋ ฅ (์ ํ ์ฌํญ)
|
147 |
prompt_input = gr.Textbox(
|
148 |
lines=3,
|
149 |
+
placeholder="ํ๋กฌํํธ๋ฅผ ์
๋ ฅํ๊ฑฐ๋ ๋น์๋๋ฉด ์๋ ํฉ์ฑ๋ฉ๋๋ค. ์: '#1๊ณผ #2๋ฅผ ํฉ์ฑํด ์ฃผ์ธ์'",
|
150 |
+
label="ํ๋กฌํํธ (์ ํ ์ฌํญ)"
|
151 |
)
|
152 |
|
153 |
# ์์ ํ๋กฌํํธ ๋ฒํผ๋ค
|
|
|
163 |
# ๊ฒฐ๊ณผ ์ถ๋ ฅ
|
164 |
output_image = gr.Image(label="์์ฑ๋ ์ด๋ฏธ์ง")
|
165 |
output_text = gr.Textbox(label="์ํ ๋ฉ์์ง")
|
166 |
+
|
167 |
+
# ์๋ ์์ฑ๋ ํ๋กฌํํธ ํ์
|
168 |
+
prompt_display = gr.Textbox(label="์ฌ์ฉ๋ ํ๋กฌํํธ", visible=True)
|
169 |
|
170 |
# ์์ ํ๋กฌํํธ ๋ฒํผ ํด๋ฆญ ์ด๋ฒคํธ
|
171 |
prompt1_btn.click(lambda: "#1๊ณผ #2๋ฅผ ์์ฐ์ค๋ฝ๊ฒ ํฉ์ฑํด ์ฃผ์ธ์", outputs=prompt_input)
|
|
|
173 |
prompt3_btn.click(lambda: "#3์ ์คํ์ผ๋ก #1์ ๋ณํํด ์ฃผ์ธ์", outputs=prompt_input)
|
174 |
|
175 |
# ์ด๋ฏธ์ง ์์ฑ ๋ฒํผ ํด๋ฆญ ์ด๋ฒคํธ
|
176 |
+
def process_and_show_prompt(image1, image2, image3, prompt):
|
177 |
+
# ์ด๋ฏธ์ง ๊ฐ์ ํ์ธ
|
178 |
+
images = [image1, image2, image3]
|
179 |
+
valid_images = [img for img in images if img is not None]
|
180 |
+
|
181 |
+
# ์๋ ํ๋กฌํํธ ์์ฑ (ํ์์ฉ)
|
182 |
+
auto_prompt = prompt
|
183 |
+
if not prompt or not prompt.strip():
|
184 |
+
if len(valid_images) == 1:
|
185 |
+
auto_prompt = "์ด ์ด๋ฏธ์ง๋ฅผ ์ฐฝ์์ ์ผ๋ก ๋ณํํด์ฃผ์ธ์. ๋ ์์ํ๊ณ ์์ ์ ์ธ ๋ฒ์ ์ผ๋ก ๋ง๋ค์ด์ฃผ์ธ์."
|
186 |
+
elif len(valid_images) == 2:
|
187 |
+
auto_prompt = "์ด ๋ ์ด๋ฏธ์ง๋ฅผ ์์ฐ์ค๋ฝ๊ฒ ํฉ์ฑํด์ฃผ์ธ์. ๋ ์ด๋ฏธ์ง์ ์์๋ฅผ ์กฐํ๋กญ๊ฒ ํตํฉํ์ฌ ํ๋์ ์ด๋ฏธ์ง๋ก ๋ง๋ค์ด์ฃผ์ธ์."
|
188 |
+
else:
|
189 |
+
auto_prompt = "์ด ์ธ ์ด๋ฏธ์ง๋ฅผ ์ฐฝ์์ ์ผ๋ก ํฉ์ฑํด์ฃผ์ธ์. ๋ชจ๋ ์ด๋ฏธ์ง์ ์ฃผ์ ์์๋ฅผ ํฌํจํ๋ ์์ฐ์ค๋ฝ๊ณ ์ผ๊ด๋ ํ๋์ ์ฅ๋ฉด์ผ๋ก ๋ง๋ค์ด์ฃผ์ธ์."
|
190 |
+
|
191 |
+
# ์ด๋ฏธ์ง ์์ฑ ํจ์ ํธ์ถ
|
192 |
+
result_img, status = process_images_with_prompt(image1, image2, image3, prompt)
|
193 |
+
|
194 |
+
return result_img, status, auto_prompt
|
195 |
+
|
196 |
submit_btn.click(
|
197 |
+
fn=process_and_show_prompt,
|
198 |
inputs=[image1_input, image2_input, image3_input, prompt_input],
|
199 |
+
outputs=[output_image, output_text, prompt_display],
|
200 |
)
|
201 |
|
202 |
gr.HTML(
|
|
|
204 |
<div style="margin-top: 1rem; padding: 1rem; background-color: #f8f9fa; border-radius: 0.5rem;">
|
205 |
<h3>์ฌ์ฉ ๋ฐฉ๋ฒ:</h3>
|
206 |
<ul>
|
207 |
+
<li><strong>์๋ ํฉ์ฑ:</strong> ์ด๋ฏธ์ง๋ง ์
๋ก๋ํ๊ณ ํ๋กฌํํธ๋ฅผ ๋น์๋๋ฉด ์๋์ผ๋ก ํฉ์ฑ๋ฉ๋๋ค</li>
|
208 |
+
<li><strong>์ด๋ฏธ์ง ์ฐธ์กฐ:</strong> ํ๋กฌํํธ์์ #1, #2, #3์ผ๋ก ๊ฐ ์ด๋ฏธ์ง๋ฅผ ์ฐธ์กฐํ ์ ์์ต๋๋ค</li>
|
209 |
+
<li><strong>์์ ๋ฒํผ:</strong> ์์ฃผ ์ฌ์ฉํ๋ ํ๋กฌํํธ ํ
ํ๋ฆฟ์ ํด๋ฆญํ์ฌ ์ ์ฉํ ์ ์์ต๋๋ค</li>
|
210 |
+
<li><strong>ํ์ํ ์ด๋ฏธ์ง๋ง:</strong> ๋ชจ๋ ์ด๋ฏธ์ง๋ฅผ ์
๋ก๋ํ ํ์๋ ์์ผ๋ฉฐ, ํ์ํ ์ด๋ฏธ์ง๋ง ์
๋ก๋ํ์ธ์</li>
|
211 |
</ul>
|
212 |
</div>
|
213 |
"""
|