Upload app.py

app.py

@@ -111,27 +111,55 @@ def generate_image_with_gemini(prompt: str, gemini_api_key: str, model: str = "g
 
         logger.info(f"Generating image with {model}: {enhanced_prompt[:100]}...")
 
-        # 新SDK: GenerateContentConfigを使用
-        size_map = {
-            (512, 512): "1K",
-            (768, 768): "1K",
-            (1024, 1024): "1K",
-            (1024, 768): "1K",
-            (768, 1024): "1K",
-            (1536, 1536): "2K",
-            (2048, 2048): "2K",
+        # 新SDK: ImageConfigを使用
+        # アスペクト比のマッピング（全モデル共通）
+        aspect_ratio_map = {
+            (512, 512): "1:1",
+            (768, 768): "1:1",
+            (1024, 1024): "1:1",
+            (1024, 768): "4:3",
+            (768, 1024): "3:4",
+            (1536, 1536): "1:1",
+            (2048, 2048): "1:1",
         }
-        size_str = size_map.get((width, height), "1K")
-
-        config = types.GenerateContentConfig(
-            temperature=1.0,
-            response_modalities=["TEXT", "IMAGE"],  # 必須！
-            image_generation_config=types.ImageGenerationConfig(
-                size=size_str,
-                allow_people_generation=True,
-                image_output_format="png"
+        aspect_ratio = aspect_ratio_map.get((width, height), "1:1")
+
+        # ✅ モデル別のImageConfig設定
+        if model == "gemini-3-pro-image-preview":
+            # Gemini 3 Pro: image_sizeパラメータをサポート
+            size_map = {
+                (512, 512): "1K",
+                (768, 768): "1K",
+                (1024, 1024): "1K",
+                (1024, 768): "1K",
+                (768, 1024): "1K",
+                (1536, 1536): "2K",
+                (2048, 2048): "4K",
+            }
+            image_size = size_map.get((width, height), "1K")
+
+            logger.info(f"Using Gemini 3 Pro with image_size={image_size}, aspect_ratio={aspect_ratio}")
+
+            config = types.GenerateContentConfig(
+                temperature=1.0,
+                response_modalities=[types.Modality.TEXT, types.Modality.IMAGE],
+                image_config=types.ImageConfig(
+                    aspect_ratio=aspect_ratio,
+                    image_size=image_size,  # ✅ Gemini 3 Proでのみ指定
+                )
+            )
+        else:
+            # Gemini 2.5 Flash: aspect_ratioのみサポート、image_sizeは指定しない
+            logger.info(f"Using Gemini 2.5 Flash with aspect_ratio={aspect_ratio} (1024px固定)")
+
+            config = types.GenerateContentConfig(
+                temperature=1.0,
+                response_modalities=[types.Modality.TEXT, types.Modality.IMAGE],
+                image_config=types.ImageConfig(
+                    aspect_ratio=aspect_ratio,
+                    # image_sizeは指定しない（デフォルト1024px）
+                )
             )
-        )
 
         # 新SDK: generate_contentの呼び出し
         response = client.models.generate_content(