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

aidol/schemas/companion.py

@@ -2,18 +2,77 @@
 Companion (member) schemas
 
 Schema hierarchy:
+- CompanionStats: Nested stats object for request/response
 - CompanionBase: Mutable fields (used in Create/Update)
 - CompanionCreate: Base + system_prompt (mutable, but sensitive)
-- CompanionUpdate: Base + system_prompt (mutable, but sensitive)
+- CompanionUpdate: All fields optional for partial updates
 - Companion: Response with all fields including system_prompt (internal use)
 - CompanionPublic: Response without sensitive fields (API use)
 """
 
 from datetime import datetime
+from enum import Enum
 
 from humps import camelize
 from pydantic import BaseModel, ConfigDict, Field
 
+# ---------------------------------------------------------------------------
+# Enums
+# ---------------------------------------------------------------------------
+
+
+class Gender(str, Enum):
+    """Gender options for companions."""
+
+    MALE = "male"
+    FEMALE = "female"
+
+
+class Grade(str, Enum):
+    """Grade levels for companions."""
+
+    A = "A"
+    B = "B"
+    C = "C"
+    F = "F"
+
+
+class Position(str, Enum):
+    """Position roles in the group."""
+
+    LEADER = "leader"
+    MAIN_VOCAL = "mainVocal"
+    SUB_VOCAL = "subVocal"
+    MAIN_DANCER = "mainDancer"
+    SUB_DANCER = "subDancer"
+    MAIN_RAPPER = "mainRapper"
+    SUB_RAPPER = "subRapper"
+    VISUAL = "visual"
+    MAKNAE = "maknae"
+
+
+# ---------------------------------------------------------------------------
+# Nested Objects
+# ---------------------------------------------------------------------------
+
+
+class CompanionStats(BaseModel):
+    """Nested stats object for API request/response."""
+
+    model_config = ConfigDict(populate_by_name=True, alias_generator=camelize)
+
+    vocal: int = Field(default=0, ge=0, le=100, description="Vocal skill")
+    dance: int = Field(default=0, ge=0, le=100, description="Dance skill")
+    rap: int = Field(default=0, ge=0, le=100, description="Rap skill")
+    visual: int = Field(default=0, ge=0, le=100, description="Visual score")
+    stamina: int = Field(default=0, ge=0, le=100, description="Stamina")
+    charm: int = Field(default=0, ge=0, le=100, description="Charm score")
+
+
+# ---------------------------------------------------------------------------
+# Request Schemas
+# ---------------------------------------------------------------------------
+
 
 class CompanionBase(BaseModel):
     """Base companion model with common mutable fields.
@@ -25,11 +84,31 @@ class CompanionBase(BaseModel):
     model_config = ConfigDict(populate_by_name=True, alias_generator=camelize)
 
     aidol_id: str | None = Field(default=None, description="AIdol group ID")
-    name: str = Field(..., description="Companion name")
+    name: str | None = Field(default=None, description="Companion name")
+    gender: Gender | None = Field(default=None, description="Gender")
+    grade: Grade | None = Field(default=None, description="Grade level")
     biography: str | None = Field(default=None, description="Companion biography")
     profile_picture_url: str | None = Field(
         default=None, description="Profile picture URL"
     )
+    position: Position | None = Field(default=None, description="Position in group")
+
+    # MBTI scores (1-10)
+    mbti_energy: int | None = Field(default=None, ge=1, le=10, description="E↔I (1-10)")
+    mbti_perception: int | None = Field(
+        default=None, ge=1, le=10, description="S↔N (1-10)"
+    )
+    mbti_judgment: int | None = Field(
+        default=None, ge=1, le=10, description="T↔F (1-10)"
+    )
+    mbti_lifestyle: int | None = Field(
+        default=None, ge=1, le=10, description="J↔P (1-10)"
+    )
+
+    # Stats (nested object)
+    stats: CompanionStats = Field(
+        default_factory=CompanionStats, description="Ability stats"
+    )
 
 
 class CompanionCreate(CompanionBase):
@@ -50,14 +129,37 @@ class CompanionUpdate(BaseModel):
 
     aidol_id: str | None = Field(default=None, description="AIdol group ID")
     name: str | None = Field(default=None, description="Companion name")
+    gender: Gender | None = Field(default=None, description="Gender")
+    grade: Grade | None = Field(default=None, description="Grade level")
     biography: str | None = Field(default=None, description="Companion biography")
     profile_picture_url: str | None = Field(
         default=None, description="Profile picture URL"
     )
+    position: Position | None = Field(default=None, description="Position in group")
     system_prompt: str | None = Field(
         default=None, description="AI system prompt (not exposed in responses)"
     )
 
+    # MBTI scores (1-10)
+    mbti_energy: int | None = Field(default=None, ge=1, le=10, description="E↔I (1-10)")
+    mbti_perception: int | None = Field(
+        default=None, ge=1, le=10, description="S↔N (1-10)"
+    )
+    mbti_judgment: int | None = Field(
+        default=None, ge=1, le=10, description="T↔F (1-10)"
+    )
+    mbti_lifestyle: int | None = Field(
+        default=None, ge=1, le=10, description="J↔P (1-10)"
+    )
+
+    # Stats (nested object, optional for updates)
+    stats: CompanionStats | None = Field(default=None, description="Ability stats")
+
+
+# ---------------------------------------------------------------------------
+# Response Schemas
+# ---------------------------------------------------------------------------
+
 
 class Companion(CompanionBase):
     """Companion response schema with id and timestamps.
@@ -78,10 +180,12 @@ class Companion(CompanionBase):
     updated_at: datetime = Field(..., description="Last update timestamp")
 
 
-class CompanionPublic(CompanionBase):
-    """Public companion response schema without sensitive fields.
+class CompanionPublic(BaseModel):
+    """Public companion response schema for frontend.
 
-    Excludes system_prompt for API responses.
+    - Excludes system_prompt for security
+    - Uses nested stats object
+    - Includes calculated mbti string
     """
 
     model_config = ConfigDict(
@@ -89,5 +193,18 @@ class CompanionPublic(CompanionBase):
     )
 
     id: str = Field(..., description="Companion ID")
+    aidol_id: str | None = Field(default=None, description="AIdol group ID")
+    name: str | None = Field(default=None, description="Companion name")
+    gender: Gender | None = Field(default=None, description="Gender")
+    grade: Grade | None = Field(default=None, description="Grade level")
+    biography: str | None = Field(default=None, description="Companion biography")
+    profile_picture_url: str | None = Field(
+        default=None, description="Profile picture URL"
+    )
+    position: Position | None = Field(default=None, description="Position in group")
+    mbti: str | None = Field(default=None, description="Calculated MBTI (e.g., ENFP)")
+    stats: CompanionStats = Field(
+        default_factory=CompanionStats, description="Ability stats"
+    )
     created_at: datetime = Field(..., description="Creation timestamp")
     updated_at: datetime = Field(..., description="Last update timestamp")

aidol/services/companion_service.py

@@ -0,0 +1,96 @@
+"""
+Companion service
+
+Business logic for Companion operations including grade and MBTI calculation.
+"""
+
+from aidol.schemas.companion import Companion, CompanionPublic, CompanionStats, Grade
+
+
+def calculate_grade(stats: CompanionStats) -> Grade:
+    """Calculate grade based on stats average.
+
+    - A: 80-100
+    - B: 60-79
+    - C: 40-59
+    - F: 0-39
+    """
+    avg = (
+        (stats.vocal or 0)
+        + (stats.dance or 0)
+        + (stats.rap or 0)
+        + (stats.visual or 0)
+        + (stats.stamina or 0)
+        + (stats.charm or 0)
+    ) / 6
+    if avg >= 80:
+        return Grade.A
+    if avg >= 60:
+        return Grade.B
+    if avg >= 40:
+        return Grade.C
+    return Grade.F
+
+
+def calculate_mbti(
+    energy: int | None,
+    perception: int | None,
+    judgment: int | None,
+    lifestyle: int | None,
+) -> str | None:
+    """Calculate MBTI string from 4 dimension scores.
+
+    Each score is 1-10:
+    - energy: 1-5 = E, 6-10 = I
+    - perception: 1-5 = N, 6-10 = S
+    - judgment: 1-5 = T, 6-10 = F
+    - lifestyle: 1-5 = P, 6-10 = J
+
+    Returns None if any dimension is missing.
+    """
+    if any(v is None for v in (energy, perception, judgment, lifestyle)):
+        return None
+
+    assert energy is not None
+    assert perception is not None
+    assert judgment is not None
+    assert lifestyle is not None
+
+    e_i = "E" if energy <= 5 else "I"
+    n_s = "N" if perception <= 5 else "S"
+    t_f = "T" if judgment <= 5 else "F"
+    p_j = "P" if lifestyle <= 5 else "J"
+
+    return f"{e_i}{n_s}{t_f}{p_j}"
+
+
+def to_companion_public(companion: Companion) -> CompanionPublic:
+    """Convert Companion to CompanionPublic with calculated grade and mbti."""
+    # Build stats object
+    stats = companion.stats if companion.stats else CompanionStats()
+
+    # Calculate grade from stats
+    grade = calculate_grade(stats)
+
+    # Calculate MBTI from 4 dimensions
+    mbti = calculate_mbti(
+        companion.mbti_energy,
+        companion.mbti_perception,
+        companion.mbti_judgment,
+        companion.mbti_lifestyle,
+    )
+
+    return CompanionPublic(
+        id=companion.id,
+        aidol_id=companion.aidol_id,
+        name=companion.name,
+        gender=companion.gender,
+        grade=grade,
+        biography=companion.biography,
+        profile_picture_url=companion.profile_picture_url,
+        position=companion.position,
+        mbti=mbti,
+        stats=stats,
+        created_at=companion.created_at,
+        updated_at=companion.updated_at,
+    )

aidol/services/image_generation_service.py

@@ -4,142 +4,97 @@ Image generation service for AIdol
 Generates images using OpenAI DALL-E 3 for AIdol emblems and Companion profiles.
 """
 
+from __future__ import annotations
+
 import logging
 from dataclasses import dataclass
 from io import BytesIO
 from typing import Literal
 
-import httpx
-import openai
 import PIL.Image
-from aioia_core.settings import OpenAIAPISettings
+from google import genai
+from google.genai import errors as genai_errors
 
 logger = logging.getLogger(__name__)
 
 
 @dataclass
 class ImageGenerationResponse:
-    """Structured response from the Image Generation service"""
+    """Structured response for compatibility (legacy)"""
 
-    url: str
-    revised_prompt: str | None
+    url: str | None = None
+    revised_prompt: str | None = None
 
 
 class ImageGenerationService:
-    """Service for generating images using OpenAI DALL-E 3"""
+    """Service for generating images using Google Gemini 3 (Imagen)."""
+
+    client: "genai.Client | None" = None
 
-    def __init__(self, openai_settings: OpenAIAPISettings):
+    def __init__(self, api_key: str | None = None, settings=None):
         """
-        Initialize the Image Generation service with OpenAI settings.
+        Initialize the Image Generation service.
 
         Args:
-            openai_settings: OpenAI settings containing required API key
+            api_key: Google API Key.
+            settings: Unused, kept for compatibility.
         """
-        self.settings = openai_settings
-        self.client = openai.OpenAI(api_key=self.settings.api_key)
 
-    def generate_image(
+        # 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:
+            self.client = genai.Client(api_key=settings.api_key)
+        else:
+            # Try loading from GOOGLE_API_KEY environment variable (Client handles this)
+            self.client = genai.Client()
+
+    def generate_and_download_image(
         self,
         prompt: str,
-        size: Literal[
-            "1024x1024",
-            "1792x1024",
-            "1024x1792",
-        ] = "1024x1024",
-        quality: Literal["standard", "hd"] = "standard",
-    ) -> ImageGenerationResponse | None:
+        size: Literal["1024x1024"] = "1024x1024",  # pylint: disable=unused-argument
+        quality: Literal["standard"] = "standard",  # pylint: disable=unused-argument
+    ) -> PIL.Image.Image | None:
         """
-        Generate an image from a text prompt using OpenAI DALL-E 3.
+        Generate an image using Gemini 3 and return as PIL Image.
 
         Args:
-            prompt: Text description of the image to generate
-            size: Image size (default: "1024x1024")
-            quality: Image quality "standard" or "hd" (default: "standard")
+            prompt: Text description.
+            size: Ignored (Gemini specific).
+            quality: Ignored (Gemini specific).
 
         Returns:
-            An ImageGenerationResponse object containing the image URL and revised prompt,
-            or None if generation fails.
-
-        Raises:
-            openai.OpenAIError: If OpenAI API call fails.
+            PIL Image object, or None if generation fails.
         """
-        try:
-            logger.info("Generating image with OpenAI DALL-E 3...")
-            response = self.client.images.generate(
-                model="dall-e-3",
-                prompt=prompt,
-                size=size,
-                quality=quality,
-                n=1,
-            )
-
-            if not response.data or len(response.data) == 0:
-                logger.error("No image data returned from OpenAI")
-                return None
-
-            image_data = response.data[0]
-            url = image_data.url
-
-            if not url:
-                logger.error("No URL found in image response")
-                return None
+        if not self.client:
+            logger.error("Gemini client not initialized")
+            return None
 
-            revised_prompt = image_data.revised_prompt
+        try:
+            logger.info("Generating image with Gemini 3 (prompt: %s)...", prompt[:50])
 
-            logger.info("Successfully generated image: %s", url[:100])
-            return ImageGenerationResponse(
-                url=url,
-                revised_prompt=revised_prompt,
+            response = self.client.models.generate_content(
+                model="gemini-3-pro-image-preview",
+                contents=[prompt],  # type: ignore[arg-type]
             )
 
-        except openai.OpenAIError as e:
-            logger.error("OpenAI API error: %s", e)
-            raise
+            # Iterate parts to find the image
+            if response.parts:
+                for part in response.parts:
+                    if part.inline_data and part.inline_data.data:
+                        logger.info("Successfully generated image via Gemini.")
+                        # Manually convert bytes to PIL Image to ensure it's a standard PIL object
+                        # compatible with main.py's save(format="PNG") call.
+                        return PIL.Image.open(BytesIO(part.inline_data.data))
 
-    def _download_image(self, url: str) -> PIL.Image.Image:
-        """Download image from URL and return as PIL Image.
-
-        Args:
-            url: URL of the image to download.
-
-        Raises:
-            httpx.HTTPError: If download fails.
-        """
-        with httpx.Client(timeout=30.0) as client:
-            response = client.get(url)
-            response.raise_for_status()
-            return PIL.Image.open(BytesIO(response.content))
-
-    def generate_and_download_image(
-        self,
-        prompt: str,
-        size: Literal[
-            "1024x1024",
-            "1792x1024",
-            "1024x1792",
-        ] = "1024x1024",
-        quality: Literal["standard", "hd"] = "standard",
-    ) -> PIL.Image.Image | None:
-        """Generate an image and download as PIL Image.
-
-        DALL-E returns temporary URLs that expire in 1-2 hours.
-        Use this method to download the image immediately after generation.
-
-        Args:
-            prompt: Text description of the image to generate.
-            size: Image size (default: "1024x1024").
-            quality: Image quality "standard" or "hd" (default: "standard").
-
-        Returns:
-            PIL Image object, or None if generation fails.
+            logger.warning("No image data found in Gemini response.")
+            return None
 
-        Raises:
-            openai.OpenAIError: If OpenAI API call fails.
-            httpx.HTTPError: If image download fails.
-        """
-        result = self.generate_image(prompt, size, quality)
-        if result is None:
+        except genai_errors.APIError as e:
+            logger.error("Gemini API error: code=%s, message=%s", e.code, e.message)
             return None
 
-        logger.info("Downloading image from DALL-E temporary URL...")
-        return self._download_image(result.url)
+    # Legacy methods for compatibility if needed (can be removed or shimmed)
+    def generate_image(self, *args, **kwargs):  # pylint: disable=unused-argument
+        """Deprecated: Use generate_and_download_image instead."""
+        logger.warning("generate_image is deprecated for Gemini service.")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-aidol
-Version: 0.1.0
+Version: 0.3.0
 Summary: Create and chat with your own AI idol group
 License: Apache-2.0
 Keywords: kpop,idol,aidol,ai-companion,chatbot,image-generation
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 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: openai (>=1.0.0)
 Requires-Dist: pillow (>=10.0.0,<11.0.0)

py_aidol-0.3.0.dist-info/RECORD

@@ -0,0 +1,27 @@
+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,,

py_aidol-0.1.0.dist-info/RECORD

@@ -1,21 +0,0 @@
-aidol/__init__.py,sha256=iMN-aij1k6vElJt0sZQT4QYJjvoD27Q9vtZkQA0TY9c,141
-aidol/api/__init__.py,sha256=skD_w82nT0v1hdKK9BBOycNERexIr8F1BmSmSono4Jk,276
-aidol/api/aidol.py,sha256=DQzwF41bnfw8JpcrZlV3XDkvuH5AszyYCJwOmcRxTKg,6684
-aidol/api/companion.py,sha256=QBsPgSjBp1USunB6Jth6fdWLwBzsI6KIq6XQZu9OifQ,6287
-aidol/factories.py,sha256=HYkJN9qu1fZOgLW6hk3t0Ixh41mVB4tzzmOQQcso9tA,698
-aidol/models/__init__.py,sha256=nlmLezsKx1xGdJkKANkOj3QCZQVPniXkYwQBsj8Ockk,155
-aidol/models/aidol.py,sha256=0t1OJiJBnmhpRCYczmsr1aYD8pMZqE3wKaUWIQiymKM,750
-aidol/models/companion.py,sha256=F64BejN3ZWP4EyNDBiV0s63dofsAgMVZJi55JV0b5gk,954
-aidol/protocols.py,sha256=Zc9LWUcdHJlerI649v3maXbgXARiXrBiRd2cxNLnSDE,2667
-aidol/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aidol/repositories/__init__.py,sha256=hJbn-Pw0iGMMIYkUbEqLOy-gK_0LqCJLBba21pmZ0Pw,207
-aidol/repositories/aidol.py,sha256=zwgXB823EZsrYYoJn2S05VD1bcuhSlcwnlVCJoD09p0,1744
-aidol/repositories/companion.py,sha256=xzAHrdCexT4cXFPTg3yCmWoqou8edeZO0A22ozMieFg,1775
-aidol/schemas/__init__.py,sha256=dakC_xvl4akjGRSOJdFnB1k6_RbNplGnPzEwI_7wwKA,661
-aidol/schemas/aidol.py,sha256=aTS7hx4BGUvLDMgqo3CGVY_867GO0vnAeJhRFntGG1g,3834
-aidol/schemas/companion.py,sha256=SCjvNETAZII256o0myCp6q1wzp999JIO99q8cKf8Yo0,3224
-aidol/services/__init__.py,sha256=3vdT_CtUfeDWbsPn7Xnp41sajovcl2nCvpZ8KNFPHYM,144
-aidol/services/image_generation_service.py,sha256=naqOxe5jsSTs9__Nj3gwBtOQPkfWvgqVV4z6XkA6DGM,4359
-py_aidol-0.1.0.dist-info/METADATA,sha256=_c0y1xNNGOGHmKIeSfvCqWmYLPuGfDypFHg7jn8uVoM,2880
-py_aidol-0.1.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-py_aidol-0.1.0.dist-info/RECORD,,