Update app.py

app.py

@@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
 GEMINI_API_KEY = os.environ.get("GEMINI_API_KEY", "")
 
 # Gemini API 초기화
-genai.configure(api_key=GEMINI_API_KEY)
+genai_client = genai.Client(api_key=GEMINI_API_KEY)
 
 # 배경 JSON 파일 경로 설정 - 상대 경로 사용
 BACKGROUNDS_DIR = "./background"
@@ -144,20 +144,26 @@ def generate_prompt_with_gemini(product_name, background_info, additional_info="
 8. 프롬프트 끝에 미드저니 파라미터 "--ar 1:1 --s 750 --q 2"를 추가해주세요.
 한국어 입력 내용을 영어로 적절히 번역하여 반영해주세요.
 """
-        model = genai.GenerativeModel(
-            'gemini-2.0-flash',
-            system_instruction=generate_system_instruction()
-        )
-        response = model.generate_content(
-            prompt_request,
-            generation_config=genai.types.GenerationConfig(
+        response = genai_client.models.generate_content(
+            model="gemini-2.0-flash",
+            contents=[
+                {
+                    "role": "user",
+                    "parts": [
+                        {"text": generate_system_instruction()},
+                        {"text": prompt_request}
+                    ]
+                }
+            ],
+            generation_config=types.GenerationConfig(
                 temperature=0.7,
                 top_p=0.95,
                 top_k=64,
                 max_output_tokens=1024,
             )
         )
-        response_text = response.text.strip()
+        
+        response_text = response.candidates[0].content.parts[0].text.strip()
         if "--ar 1:1" not in response_text:
             response_text = response_text.rstrip(".") + ". --ar 1:1 --s 750 --q 2"
         return response_text
@@ -171,13 +177,6 @@ def translate_prompt_to_english(prompt):
     prompt = prompt.replace("#1", "IMAGE_TAG_ONE")
     
     try:
-        api_key = os.environ.get("GEMINI_API_KEY")
-        if not api_key:
-            logger.error("Gemini API 키가 설정되지 않았습니다.")
-            prompt = prompt.replace("IMAGE_TAG_ONE", "#1")
-            return prompt
-            
-        client = genai.Client(api_key=api_key)
         translation_prompt = f"""
         Translate the following Korean text to English:
         
@@ -188,11 +187,10 @@ def translate_prompt_to_english(prompt):
         """
         
         logger.info(f"Translation prompt: {translation_prompt}")
-        response = client.models.generate_content(
+        response = genai_client.models.generate_content(
             model="gemini-2.0-flash",
             contents=[translation_prompt],
-            config=types.GenerateContentConfig(
-                response_modalities=['Text'],
+            generation_config=types.GenerationConfig(
                 temperature=0.2,
                 top_p=0.95,
                 top_k=40,
@@ -200,10 +198,7 @@ def translate_prompt_to_english(prompt):
             )
         )
         
-        translated_text = ""
-        for part in response.candidates[0].content.parts:
-            if hasattr(part, 'text') and part.text:
-                translated_text += part.text
+        translated_text = response.candidates[0].content.parts[0].text
         
         if translated_text.strip():
             translated_text = translated_text.replace("IMAGE_TAG_ONE", "#1")
@@ -218,24 +213,11 @@ def translate_prompt_to_english(prompt):
         prompt = prompt.replace("IMAGE_TAG_ONE", "#1")
         return prompt
 
-def preprocess_prompt(prompt, image1):
-    has_img1 = image1 is not None
-
-    if "#1" in prompt and not has_img1:
-        prompt = prompt.replace("#1", "첫 번째 이미지(없음)")
-    else:
-        prompt = prompt.replace("#1", "첫 번째 이미지")
-
-    prompt += " 이미지를 생성해주세요. 이미지에 텍스트나 글자를 포함하지 마세요."
-    return prompt
-
 def generate_with_images(prompt, images, variation_index=0):
     try:
-        api_key = os.environ.get("GEMINI_API_KEY")
-        if not api_key:
+        if not GEMINI_API_KEY:
             return None, "API 키가 설정되지 않았습니다. 환경변수를 확인해주세요."
 
-        client = genai.Client(api_key=api_key)
         logger.info(f"Gemini API 요청 시작 - 프롬프트: {prompt}, 변형 인덱스: {variation_index}")
 
         variation_suffixes = [
@@ -253,14 +235,14 @@ def generate_with_images(prompt, images, variation_index=0):
         contents = [prompt]
         for idx, img in enumerate(images, 1):
             if img is not None:
+                # PIL 이미지를 파트로 변환
                 contents.append(img)
                 logger.info(f"이미지 #{idx} 추가됨")
 
-        response = client.models.generate_content(
+        response = genai_client.models.generate_content(
             model="gemini-2.0-flash-exp-image-generation",
             contents=contents,
-            config=types.GenerateContentConfig(
-                response_modalities=['Text', 'Image'],
+            generation_config=types.GenerationConfig(
                 temperature=1,
                 top_p=0.95,
                 top_k=40,
@@ -273,6 +255,7 @@ def generate_with_images(prompt, images, variation_index=0):
             temp_path = tmp.name
             result_text = ""
             image_found = False
+            
             for part in response.candidates[0].content.parts:
                 if hasattr(part, 'text') and part.text:
                     result_text += part.text
@@ -281,6 +264,7 @@ def generate_with_images(prompt, images, variation_index=0):
                     save_binary_file(temp_path, part.inline_data.data)
                     image_found = True
                     logger.info("응답에서 이미지 추출 성공")
+            
             if not image_found:
                 return None, f"API에서 이미지를 생성하지 못했습니다. 응답 텍스트: {result_text}"
             
@@ -522,6 +506,7 @@ with gr.Blocks() as demo:
         outputs=[simple_dropdown, studio_dropdown, nature_dropdown, indoor_dropdown, abstract_dropdown]
     )
     
+    
     # 프롬프트 생성 함수
     def generate_output(image, bg_type, simple, studio, nature, indoor, abstract, product_text, additional_text):
         if image is None:
@@ -573,6 +558,6 @@ with gr.Blocks() as demo:
         inputs=[image1_input, prompt_output],
         outputs=[output_image1, output_image2, output_image3, output_image4, output_text, prompt_display],
     )
-
+    
 demo.queue()
 demo.launch()