py-aidol 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

aidol/api/aidol.py

@@ -21,6 +21,7 @@ from aidol.protocols import (
     ImageStorageProtocol,
 )
 from aidol.schemas import AIdol, AIdolCreate, AIdolPublic, AIdolUpdate
+from aidol.settings import GoogleGenAISettings
 
 
 class AIdolCreateResponse(BaseModel):
@@ -41,11 +42,11 @@ class AIdolRouter(
 
     def __init__(
         self,
-        google_api_key: str | None,
+        google_settings: GoogleGenAISettings | None,
         image_storage: ImageStorageProtocol,
         **kwargs,
     ):
-        self.google_api_key = google_api_key
+        self.google_settings = google_settings
         self.image_storage = image_storage
         super().__init__(**kwargs)
 
@@ -55,7 +56,7 @@ class AIdolRouter(
         register_image_generation_route(
             router=self.router,
             resource_name=self.resource_name,
-            google_api_key=self.google_api_key,
+            google_settings=self.google_settings,
             image_storage=self.image_storage,
         )
 
@@ -142,7 +143,7 @@ class AIdolRouter(
 
 
 def create_aidol_router(
-    google_api_key: str | None,
+    google_settings: GoogleGenAISettings | None,
     db_session_factory: sessionmaker,
     repository_factory: AIdolRepositoryFactoryProtocol,
     image_storage: ImageStorageProtocol,
@@ -155,7 +156,7 @@ def create_aidol_router(
     Create AIdol router with dependency injection.
 
     Args:
-        google_api_key: Google API Key for image generation
+        google_settings: Google API settings (uses ADC if api_key is None)
         db_session_factory: Database session factory
         repository_factory: Factory implementing AIdolRepositoryFactoryProtocol
         image_storage: Image storage for permanent URLs
@@ -168,7 +169,7 @@ def create_aidol_router(
         FastAPI APIRouter instance
     """
     router = AIdolRouter(
-        google_api_key=google_api_key,
+        google_settings=google_settings,
         image_storage=image_storage,
         model_class=AIdol,
         create_schema=AIdolCreate,

aidol/api/common.py

@@ -14,12 +14,13 @@ from aidol.schemas import (
     ImageGenerationResponse,
 )
 from aidol.services import ImageGenerationService
+from aidol.settings import GoogleGenAISettings
 
 
 def register_image_generation_route(
     router: APIRouter,
     resource_name: str,
-    google_api_key: str | None,
+    google_settings: GoogleGenAISettings | None,
     image_storage: ImageStorageProtocol,
 ) -> None:
     """
@@ -28,7 +29,7 @@ def register_image_generation_route(
     Args:
         router: FastAPI APIRouter instance
         resource_name: Resource name for the route path
-        google_api_key: Google API Key
+        google_settings: Google API settings (API Key or Vertex AI with ADC)
         image_storage: Image Storage instance
     """
 
@@ -45,7 +46,7 @@ def register_image_generation_route(
     async def generate_image(request: ImageGenerationRequest):
         """Generate image from prompt."""
         # Generate and download image
-        service = ImageGenerationService(api_key=google_api_key)
+        service = ImageGenerationService(settings=google_settings)
         image = service.generate_and_download_image(
             prompt=request.prompt,
             size="1024x1024",

aidol/api/companion.py

@@ -28,6 +28,7 @@ from aidol.schemas import (
     Gender,
 )
 from aidol.services.companion_service import to_companion_public
+from aidol.settings import GoogleGenAISettings
 
 
 class CompanionPaginatedResponse(BaseModel):
@@ -51,11 +52,11 @@ class CompanionRouter(
 
     def __init__(
         self,
-        google_api_key: str | None,
+        google_settings: GoogleGenAISettings | None,
         image_storage: ImageStorageProtocol,
         **kwargs,
     ):
-        self.google_api_key = google_api_key
+        self.google_settings = google_settings
         self.image_storage = image_storage
         super().__init__(**kwargs)
 
@@ -65,7 +66,7 @@ class CompanionRouter(
         register_image_generation_route(
             router=self.router,
             resource_name=self.resource_name,
-            google_api_key=self.google_api_key,
+            google_settings=self.google_settings,
             image_storage=self.image_storage,
         )
 
@@ -244,7 +245,7 @@ class CompanionRouter(
 
 
 def create_companion_router(
-    google_api_key: str | None,
+    google_settings: GoogleGenAISettings | None,
     db_session_factory: sessionmaker,
     repository_factory: CompanionRepositoryFactoryProtocol,
     image_storage: ImageStorageProtocol,
@@ -257,7 +258,7 @@ def create_companion_router(
     Create Companion router with dependency injection.
 
     Args:
-        google_api_key: Google API Key for image generation
+        google_settings: Google API settings (uses ADC if api_key is None)
         db_session_factory: Database session factory
         repository_factory: Factory implementing CompanionRepositoryFactoryProtocol
         image_storage: Image storage for permanent URLs
@@ -270,7 +271,7 @@ def create_companion_router(
         FastAPI APIRouter instance
     """
     router = CompanionRouter(
-        google_api_key=google_api_key,
+        google_settings=google_settings,
         image_storage=image_storage,
         model_class=Companion,
         create_schema=CompanionCreate,

aidol/services/image_generation_service.py

@@ -1,7 +1,7 @@
 """
-Image generation service for AIdol
+Image generation service for AIdol.
 
-Generates images using OpenAI DALL-E 3 for AIdol emblems and Companion profiles.
+Generates images using Google Gemini for AIdol emblems and Companion profiles.
 """
 
 from __future__ import annotations
@@ -15,6 +15,8 @@ import PIL.Image
 from google import genai
 from google.genai import errors as genai_errors
 
+from aidol.settings import GoogleGenAISettings
+
 logger = logging.getLogger(__name__)
 
 
@@ -31,23 +33,33 @@ class ImageGenerationService:
 
     client: "genai.Client | None" = None
 
-    def __init__(self, api_key: str | None = None, settings=None):
+    def __init__(self, settings: GoogleGenAISettings | None = None):
         """
         Initialize the Image Generation service.
 
+        Supports two authentication methods:
+        1. Google AI API: settings.api_key
+        2. Vertex AI API (ADC): settings.cloud_project (location=global hardcoded)
+
         Args:
-            api_key: Google API Key.
-            settings: Unused, kept for compatibility.
+            settings: GoogleGenAISettings for configuration.
         """
-
-        # Use explicitly provided api_key, otherwise fallback to settings or env
-        if api_key:
-            self.client = genai.Client(api_key=api_key)
-        elif settings and hasattr(settings, "api_key") and settings.api_key:
+        # Priority 1: Settings with api_key (Google AI API)
+        if settings and settings.api_key:
             self.client = genai.Client(api_key=settings.api_key)
+        # Priority 2: Settings with cloud_project (Vertex AI, location=global)
+        elif settings and settings.cloud_project:
+            self.client = genai.Client(
+                vertexai=True,
+                project=settings.cloud_project,
+                location="global",
+            )
         else:
-            # Try loading from GOOGLE_API_KEY environment variable (Client handles this)
-            self.client = genai.Client()
+            logger.error(
+                "No authentication configured. "
+                "Set GOOGLE_API_KEY or GOOGLE_CLOUD_PROJECT"
+            )
+            self.client = None
 
     def generate_and_download_image(
         self,

aidol/settings.py

@@ -0,0 +1,37 @@
+"""
+Environment settings for aidol module.
+
+Provides GoogleGenAISettings for image generation with Google Gemini.
+"""
+
+from pydantic_settings import BaseSettings
+
+
+class GoogleGenAISettings(BaseSettings):
+    """
+    Google Gen AI SDK settings for Gemini image generation.
+
+    Supports two authentication methods:
+    1. Google AI API: GOOGLE_API_KEY
+    2. Vertex AI API (ADC): GOOGLE_CLOUD_PROJECT
+
+    For Google AI API:
+        export GOOGLE_API_KEY=your-api-key
+
+    For Vertex AI with ADC:
+        export GOOGLE_CLOUD_PROJECT=your-project-id
+        gcloud auth application-default login
+
+    Note: Vertex AI uses location="global" (hardcoded) because
+    Gemini image generation models only support the global endpoint.
+
+    Environment variables:
+        GOOGLE_API_KEY: Google API key (optional)
+        GOOGLE_CLOUD_PROJECT: GCP project ID for Vertex AI (optional)
+    """
+
+    api_key: str | None = None
+    cloud_project: str | None = None
+
+    class Config:
+        env_prefix = "GOOGLE_"

{py_aidol-0.3.0.dist-info → py_aidol-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-aidol
-Version: 0.3.0
+Version: 0.4.0
 Summary: Create and chat with your own AI idol group
 License: Apache-2.0
 Keywords: kpop,idol,aidol,ai-companion,chatbot,image-generation
@@ -34,7 +34,7 @@ AI 아이돌 그룹 생성 및 채팅 Python 패키지
 ## 주요 기능
 
 - AI 아이돌 그룹/멤버 CRUD
-- DALL-E 3 이미지 생성 (엠블럼, 프로필)
+- Google Gemini 이미지 생성 (엠블럼, 프로필)
 - 텍스트 채팅 (페르소나 기반 응답)
 - Buppy 통합 Adapter 패턴
 
@@ -62,7 +62,7 @@ from aidol.factories import AIdolRepositoryFactory, CompanionRepositoryFactory
 # AIdol 라우터
 aidol_router = AIdolRouter(
     repository_factory=AIdolRepositoryFactory(),
-    openai_settings=openai_settings,
+    google_settings=google_settings,
     image_storage=image_storage,
 )
 
@@ -87,11 +87,27 @@ make format
 
 ## 환경 변수
 
-### 필수 (이미지 생성 시)
+### 이미지 생성 인증 (선택, ADC 지원)
 
 | 변수 | 설명 |
 |------|------|
-| `OPENAI_API_KEY` | OpenAI API 키 |
+| `GOOGLE_API_KEY` | Google API 키 (Google AI API) |
+| `GOOGLE_CLOUD_PROJECT` | GCP 프로젝트 ID (Vertex AI) |
+
+**인증 방법:**
+
+**Option 1: Google AI API (API Key)**
+```bash
+export GOOGLE_API_KEY=your-api-key
+```
+
+**Option 2: Vertex AI (ADC)**
+```bash
+export GOOGLE_CLOUD_PROJECT=your-project-id
+gcloud auth application-default login  # 로컬 개발
+```
+
+> **참고**: Vertex AI 사용 시 `location=global`이 하드코딩되어 있습니다 (Gemini 이미지 생성 모델 요구사항).
 
 ### 선택
 
@@ -106,7 +122,8 @@ make format
 
 - aioia-core (공통 인프라)
 - FastAPI, SQLAlchemy, Pydantic
-- OpenAI (이미지 생성, 채팅)
+- Google Generative AI (이미지 생성)
+- OpenAI (채팅)
 - Pillow (이미지 처리)
 
 ## 라이선스

{py_aidol-0.3.0.dist-info → py_aidol-0.4.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 aidol/__init__.py,sha256=iMN-aij1k6vElJt0sZQT4QYJjvoD27Q9vtZkQA0TY9c,141
 aidol/api/__init__.py,sha256=skD_w82nT0v1hdKK9BBOycNERexIr8F1BmSmSono4Jk,276
-aidol/api/aidol.py,sha256=8fRkYq6-pEVKpQWbamv45IT2-b9FIgilSoPWg3itiK0,6486
-aidol/api/common.py,sha256=R_2RjV_XjAI5TuTSXNbYEjE-wY3wC_hP2Bww0z2g5ZA,2094
-aidol/api/companion.py,sha256=XVZum54ueskJgcaAA2Z_Z6xa3Zpy0CGrl3MIQIga-kY,10738
+aidol/api/aidol.py,sha256=AIpDMTTOxht1eEVk4YITvmJzvklpYlDTpQVrIuSjeUw,6588
+aidol/api/common.py,sha256=w8ERo96t9tat4HPs1qw9JhyoJ8cj5crHCe92Hp3Usug,2198
+aidol/api/companion.py,sha256=Nlx4QHqoi0y_CMczEh75n8C4xJTWp8eV1BqHjEzkOFw,10840
 aidol/api/lead.py,sha256=RSf3GcIUVJu752rU9HG7Wy22UmnrRZnN_NGWkpTRDfE,3921
 aidol/factories.py,sha256=5VhEbUVQEo-WruOdDauOi9xGgMxrgT339glocC1ua4o,983
 aidol/models/__init__.py,sha256=AljQMgSE9vHx203NFQZMknKpzHIfyFLLcOMnFpMOLAs,218
@@ -21,7 +21,8 @@ aidol/schemas/aidol_lead.py,sha256=JS8U-ep0Ga6x0PdwXhJfTrcOCKgG0wfFW8pN5X35GUM,1
 aidol/schemas/companion.py,sha256=I4hi4LT-S9AC7lqt1jyYfd0vSqYmxYNm2k9EsZdyNyM,7584
 aidol/services/__init__.py,sha256=3vdT_CtUfeDWbsPn7Xnp41sajovcl2nCvpZ8KNFPHYM,144
 aidol/services/companion_service.py,sha256=tNNWiIFmJQ-I3UBW06baOANXhBx5oTKoT6nkqfnDisA,2490
-aidol/services/image_generation_service.py,sha256=fq4ua1sO4xT4BK0b-Db2u_G0lbXElbO63MFZfstOlWY,3456
-py_aidol-0.3.0.dist-info/METADATA,sha256=xuQO_y10IvUUZe4Z-VcQkOnQ9ICHjVtSY5iVE5A0oTE,2926
-py_aidol-0.3.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-py_aidol-0.3.0.dist-info/RECORD,,
+aidol/services/image_generation_service.py,sha256=zDs9HP_JckHFJJZUIo2ADSsHGppat-8V-ttu8DlN-BU,3862
+aidol/settings.py,sha256=7oI3Vn1iGXvLRRahJ1ygD6qIu-BvZmlVvvMQxnsq1kc,1003
+py_aidol-0.4.0.dist-info/METADATA,sha256=FI4-Xdaxi36hwykQQGgmttCOlsFOlSh_NzCluamZIvA,3431
+py_aidol-0.4.0.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+py_aidol-0.4.0.dist-info/RECORD,,

{py_aidol-0.3.0.dist-info → py_aidol-0.4.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.3.0
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any