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

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/services/response_generation_service.py

@@ -0,0 +1,63 @@
+"""Response generation service for TEXT responses.
+
+Service layer for generating LLM responses.
+Integrators can extend for AUDIO/VIDEO response types.
+"""
+
+from __future__ import annotations
+
+from langchain_core.messages import BaseMessage, SystemMessage
+
+from aidol.providers.llm import LLMProvider
+from aidol.schemas import ModelSettings
+
+
+class ResponseGenerationService:
+    """Response generation service for TEXT responses.
+
+    Basic implementation for text-only response generation.
+    Integrators can extend for additional response types (AUDIO/VIDEO).
+
+    Responsibilities:
+    - Provide response format prompts (empty for TEXT)
+    - Generate response from prepared context
+    """
+
+    def __init__(
+        self,
+        provider: LLMProvider,
+        model_settings: ModelSettings,
+    ) -> None:
+        """Initialize ResponseGenerationService.
+
+        Args:
+            provider: LLMProvider for LLM calls.
+            model_settings: Model configuration (model name, temperature, etc.)
+        """
+        self.provider = provider
+        self.model_settings = model_settings
+
+    def get_response_format_prompts(self) -> list[SystemMessage]:
+        """Get response format prompts for TEXT responses.
+
+        This method encapsulates the responsibility of creating format-specific prompts,
+        ensuring that prompt configuration remains within the service layer.
+
+        TEXT responses don't require additional format prompts.
+        Integrators can override for AUDIO/VIDEO response types.
+
+        Returns:
+            Empty list for TEXT responses.
+        """
+        return []
+
+    def generate_response(self, context: list[BaseMessage]) -> str:
+        """Generate response from prepared context.
+
+        Args:
+            context: Prepared context from ContextService.
+
+        Returns:
+            Generated text response.
+        """
+        return self.provider.completion(self.model_settings, context)

aidol/settings.py

@@ -0,0 +1,46 @@
+"""
+Environment settings for aidol module.
+
+Provides GoogleGenAISettings for image generation with Google Gemini.
+"""
+
+from pydantic_settings import BaseSettings
+
+
+class Settings(BaseSettings):
+    """Environment-based settings for aidol module."""
+
+    openai_model: str = "gpt-4o-mini"
+
+    class Config:
+        env_prefix = "AIDOL_"
+
+
+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.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-aidol
-Version: 0.3.0
+Version: 0.5.0
 Summary: Create and chat with your own AI idol group
 License: Apache-2.0
 Keywords: kpop,idol,aidol,ai-companion,chatbot,image-generation
@@ -16,6 +16,9 @@ Requires-Dist: aioia-core (>=2.2.0,<3.0.0)
 Requires-Dist: fastapi (>=0.115.12,<0.116.0)
 Requires-Dist: google-genai (>=1.60.0,<2.0.0)
 Requires-Dist: httpx (>=0.28.1,<0.29.0)
+Requires-Dist: langchain-core (>=0.3.0)
+Requires-Dist: langchain-openai (>=0.3.0)
+Requires-Dist: litellm (>=1.60.0)
 Requires-Dist: openai (>=1.0.0)
 Requires-Dist: pillow (>=10.0.0,<11.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
@@ -34,7 +37,7 @@ AI 아이돌 그룹 생성 및 채팅 Python 패키지
 ## 주요 기능
 
 - AI 아이돌 그룹/멤버 CRUD
-- DALL-E 3 이미지 생성 (엠블럼, 프로필)
+- Google Gemini 이미지 생성 (엠블럼, 프로필)
 - 텍스트 채팅 (페르소나 기반 응답)
 - Buppy 통합 Adapter 패턴
 
@@ -62,7 +65,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 +90,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 +125,8 @@ make format
 
 - aioia-core (공통 인프라)
 - FastAPI, SQLAlchemy, Pydantic
-- OpenAI (이미지 생성, 채팅)
+- Google Generative AI (이미지 생성)
+- OpenAI (채팅)
 - Pillow (이미지 처리)
 
 ## 라이선스

py_aidol-0.5.0.dist-info/RECORD

@@ -0,0 +1,41 @@
+aidol/__init__.py,sha256=iMN-aij1k6vElJt0sZQT4QYJjvoD27Q9vtZkQA0TY9c,141
+aidol/api/__init__.py,sha256=JWcwxYJ32_qzD_86_FR9wUAfSQMT6G2lqDtssrPJPj4,398
+aidol/api/aidol.py,sha256=AIpDMTTOxht1eEVk4YITvmJzvklpYlDTpQVrIuSjeUw,6588
+aidol/api/chatroom.py,sha256=wQ-NhjUqR_9BkNMBzwQlwc-_jse6GhqssC3zminWL4E,12154
+aidol/api/common.py,sha256=w8ERo96t9tat4HPs1qw9JhyoJ8cj5crHCe92Hp3Usug,2198
+aidol/api/companion.py,sha256=BgOXub9-0Zncht7xMxvbLzJgOTmh-Ef23_TdU_tr5BE,11080
+aidol/api/lead.py,sha256=RSf3GcIUVJu752rU9HG7Wy22UmnrRZnN_NGWkpTRDfE,3921
+aidol/context/__init__.py,sha256=b_DP8Qlmiv2jhKVSE61XQUAcIujwbtob435pjkeVHAM,722
+aidol/context/builder.py,sha256=XLKaj-buUNTyp9ucslGDshZ8TyTQ5xK7vACjtkV7x7o,12252
+aidol/factories.py,sha256=t7g0GJYHvY57J9mZUY2vX8HSqOFclWChaPOw8Ohyw8U,1261
+aidol/models/__init__.py,sha256=Y7DOy85izcXy5dwuXlYy0xxMV1r5ZjZbDH5Tmp8Hsr0,301
+aidol/models/aidol.py,sha256=By82BqiAasLNy8ZCNON2m46BnSCfL2J_ZFLO6_MMFO0,903
+aidol/models/aidol_lead.py,sha256=xCa1AqJdBBeW2Edcj1pK-cXbX5oatxzCOkPyqEGBXVw,619
+aidol/models/chatroom.py,sha256=R_u0GFmVO_qhHYuvDIuRK47hHuPOvXopMbAF2Qn4F9k,1587
+aidol/models/companion.py,sha256=fom58GXjGvAxxndS4X4MrT1HWNw8Ps99BNEyPd5JhW0,1974
+aidol/protocols.py,sha256=ZuaRNfIEHwfgGkMcFYhPX5so8No2SQx_jBfN9kOJC9k,5286
+aidol/providers/__init__.py,sha256=BJK--YO-_t4uxUd5-l3_icd1ZbyPwKv_Ykal_tpXs8w,292
+aidol/providers/llm/__init__.py,sha256=IsgUx2tdmd481yHQI3cEmPSrVMcYPekAtBpIsqI6hC8,342
+aidol/providers/llm/base.py,sha256=qsIjyZq0ohy9nCj8_nownvK_w-d4NPnjG7mzqwboaao,5029
+aidol/providers/llm/openai.py,sha256=ZktcVpvZlBTqlifoJV9chqRY4lW2hMkZv4IM-jLnu18,3467
+aidol/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aidol/repositories/__init__.py,sha256=3I81EjKHML8TdouGCibnWjnSQOHNSYHPy7KXVcyO7zw,381
+aidol/repositories/aidol.py,sha256=-hf7WW_sDx4vE9bHzKQnzfkgu-on7sqOem9gFO8x0EE,1810
+aidol/repositories/aidol_lead.py,sha256=vmCHXdTtxDSiRpd_n7DuyecZDPLls56r0N5vyT_v9zI,1488
+aidol/repositories/chatroom.py,sha256=sKhKNn5-A9bEUvNT1qpNccRPlRTjEbOu0FZ3677sn3g,4479
+aidol/repositories/companion.py,sha256=dUkJA0me2kmxqk3B4L0w4ENcHeAQFw5ki6RvZ5eLHDg,2877
+aidol/schemas/__init__.py,sha256=L-2wyp7Kdw0qM3p1-8vdeRJnqvsDPBomaotK1_jI8wY,1663
+aidol/schemas/aidol.py,sha256=wOfHaLu4I56elLLj6A3CGriPZE4Pz4fFAyC3emtvaCE,4135
+aidol/schemas/aidol_lead.py,sha256=JS8U-ep0Ga6x0PdwXhJfTrcOCKgG0wfFW8pN5X35GUM,1070
+aidol/schemas/chatroom.py,sha256=2jD-rlHGjq5mxH4SB9K2dp_FYfKG9WlH9ON_z5D13TM,4370
+aidol/schemas/companion.py,sha256=I4hi4LT-S9AC7lqt1jyYfd0vSqYmxYNm2k9EsZdyNyM,7584
+aidol/schemas/model_settings.py,sha256=GqvBLWsWOQAUGMEE76LGQdGp_K-fPhKfPaYhXRUr2dc,1033
+aidol/schemas/persona.py,sha256=6T3Dg8QKndsNl4XzMTWxzEhEvtEmtf_F6q-33L9rUro,550
+aidol/services/__init__.py,sha256=Jar-Gzep5mS4-dPizee4uiSDZAM8Q7SCchyYPu-U2mI,258
+aidol/services/companion_service.py,sha256=tNNWiIFmJQ-I3UBW06baOANXhBx5oTKoT6nkqfnDisA,2490
+aidol/services/image_generation_service.py,sha256=zDs9HP_JckHFJJZUIo2ADSsHGppat-8V-ttu8DlN-BU,3862
+aidol/services/response_generation_service.py,sha256=S5Xt-uVbYRc-qH_xHJkb-2xhKWm96DtWvCM8lIUGmi0,1942
+aidol/settings.py,sha256=mi8JN6C88Fv0vgRsnyupJVw6Wy_aFMxEkq635yar1_I,1178
+py_aidol-0.5.0.dist-info/METADATA,sha256=Qbj7C54L-30dqnRTgEn2oL7ZyA1w2avr4q6YhT85U-4,3547
+py_aidol-0.5.0.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+py_aidol-0.5.0.dist-info/RECORD,,

{py_aidol-0.3.0.dist-info → py_aidol-0.5.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

py_aidol-0.3.0.dist-info/RECORD

@@ -1,27 +0,0 @@
-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/lead.py,sha256=RSf3GcIUVJu752rU9HG7Wy22UmnrRZnN_NGWkpTRDfE,3921
-aidol/factories.py,sha256=5VhEbUVQEo-WruOdDauOi9xGgMxrgT339glocC1ua4o,983
-aidol/models/__init__.py,sha256=AljQMgSE9vHx203NFQZMknKpzHIfyFLLcOMnFpMOLAs,218
-aidol/models/aidol.py,sha256=By82BqiAasLNy8ZCNON2m46BnSCfL2J_ZFLO6_MMFO0,903
-aidol/models/aidol_lead.py,sha256=xCa1AqJdBBeW2Edcj1pK-cXbX5oatxzCOkPyqEGBXVw,619
-aidol/models/companion.py,sha256=fom58GXjGvAxxndS4X4MrT1HWNw8Ps99BNEyPd5JhW0,1974
-aidol/protocols.py,sha256=8-7iwbtMv5vQUAYGRbbKvm6YfYZZ1VZz6dufse_DYp4,3375
-aidol/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aidol/repositories/__init__.py,sha256=4kE68a-eRhXt9z5a2XCn1_2s-p3VMpQIdL3oRDb1Ns0,296
-aidol/repositories/aidol.py,sha256=-hf7WW_sDx4vE9bHzKQnzfkgu-on7sqOem9gFO8x0EE,1810
-aidol/repositories/aidol_lead.py,sha256=vmCHXdTtxDSiRpd_n7DuyecZDPLls56r0N5vyT_v9zI,1488
-aidol/repositories/companion.py,sha256=dUkJA0me2kmxqk3B4L0w4ENcHeAQFw5ki6RvZ5eLHDg,2877
-aidol/schemas/__init__.py,sha256=sNurP-s24PgS4ZJ7xusZ7Z7wXtl1rdsnAxxdeubRXHE,923
-aidol/schemas/aidol.py,sha256=wOfHaLu4I56elLLj6A3CGriPZE4Pz4fFAyC3emtvaCE,4135
-aidol/schemas/aidol_lead.py,sha256=JS8U-ep0Ga6x0PdwXhJfTrcOCKgG0wfFW8pN5X35GUM,1070
-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,,