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

aidol/api/lead.py

@@ -0,0 +1,123 @@
+"""
+Lead API router
+
+Public endpoints for collecting leads (emails).
+"""
+
+from typing import Annotated
+
+from aioia_core.fastapi import BaseCrudRouter
+from aioia_core.settings import JWTSettings
+from fastapi import APIRouter, Depends, Header, status
+from pydantic import BaseModel
+from sqlalchemy.orm import Session, sessionmaker
+
+from aidol.protocols import (
+    AIdolLeadRepositoryFactoryProtocol,
+    AIdolLeadRepositoryProtocol,
+    AIdolRepositoryFactoryProtocol,
+    NoUpdate,
+)
+from aidol.schemas import AIdolLead, AIdolLeadCreate, AIdolUpdate
+
+
+class LeadResponse(BaseModel):
+    """Response for lead creation."""
+
+    email: str
+
+
+class LeadRouter(
+    BaseCrudRouter[AIdolLead, AIdolLeadCreate, NoUpdate, AIdolLeadRepositoryProtocol]
+):
+    """
+    Lead router.
+
+    Handles email collection.
+    """
+
+    def __init__(
+        self,
+        aidol_repository_factory: AIdolRepositoryFactoryProtocol,
+        **kwargs,
+    ):
+        super().__init__(**kwargs)
+        self.aidol_repository_factory = aidol_repository_factory
+
+    def _register_routes(self) -> None:
+        """Register routes."""
+        self._register_create_lead_route()
+
+    def _register_create_lead_route(self) -> None:
+        """POST /leads - Collect email"""
+
+        @self.router.post(
+            f"/{self.resource_name}",
+            response_model=LeadResponse,
+            status_code=status.HTTP_201_CREATED,
+            summary="Collect Lead",
+            description="Collect email. Associates with AIdol if ClaimToken is valid.",
+        )
+        async def create_lead(
+            request: AIdolLeadCreate,
+            claim_token: Annotated[str | None, Header(alias="ClaimToken")] = None,
+            db_session: Session = Depends(self.get_db_dep),
+            lead_repository: AIdolLeadRepositoryProtocol = Depends(
+                self.get_repository_dep
+            ),
+        ):
+            """Collect email."""
+            email_saved = False
+
+            # 1. Try to associate with AIdol if token is present
+            if claim_token:
+                # Reuse session from dependency
+                aidol_repo = self.aidol_repository_factory.create_repository(db_session)
+
+                # Find AIdol by claim_token
+                # Assuming get_all supports filters
+                items, _ = aidol_repo.get_all(
+                    filters=[
+                        {
+                            "field": "claim_token",
+                            "operator": "eq",
+                            "value": claim_token,
+                        }
+                    ]
+                )
+
+                if items:
+                    aidol = items[0]
+                    # Update AIdol email
+                    aidol_repo.update(aidol.id, AIdolUpdate(email=request.email))
+                    email_saved = True
+
+            # 2. If not saved as AIdol email, create Lead
+            if not email_saved:
+                lead_repository.create(request)
+
+            return LeadResponse(email=request.email)
+
+
+def create_lead_router(
+    db_session_factory: sessionmaker,
+    aidol_repository_factory: AIdolRepositoryFactoryProtocol,
+    lead_repository_factory: AIdolLeadRepositoryFactoryProtocol,
+    jwt_settings: JWTSettings | None = None,
+    resource_name: str = "leads",
+    tags: list[str] | None = None,
+) -> APIRouter:
+    """Create Lead router."""
+    router = LeadRouter(
+        model_class=AIdolLead,
+        create_schema=AIdolLeadCreate,
+        update_schema=NoUpdate,  # Update not supported
+        db_session_factory=db_session_factory,
+        repository_factory=lead_repository_factory,
+        aidol_repository_factory=aidol_repository_factory,
+        user_info_provider=None,  # No auth required for lead collection
+        jwt_secret_key=jwt_settings.secret_key if jwt_settings else None,
+        resource_name=resource_name,
+        tags=tags or ["Lead"],
+    )
+    return router.get_router()

aidol/factories.py

@@ -7,6 +7,7 @@ Uses BaseRepositoryFactory for BaseCrudRouter compatibility.
 from aioia_core.factories import BaseRepositoryFactory
 
 from aidol.repositories.aidol import AIdolRepository
+from aidol.repositories.aidol_lead import AIdolLeadRepository
 from aidol.repositories.companion import CompanionRepository
 
 
@@ -22,3 +23,10 @@ class CompanionRepositoryFactory(BaseRepositoryFactory[CompanionRepository]):
 
     def __init__(self):
         super().__init__(repository_class=CompanionRepository)
+
+
+class AIdolLeadRepositoryFactory(BaseRepositoryFactory[AIdolLeadRepository]):
+    """Factory for creating AIdolLead repositories."""
+
+    def __init__(self):
+        super().__init__(repository_class=AIdolLeadRepository)

aidol/models/__init__.py

@@ -3,6 +3,7 @@ AIdol database models
 """
 
 from aidol.models.aidol import DBAIdol
+from aidol.models.aidol_lead import DBAIdolLead
 from aidol.models.companion import DBCompanion
 
-__all__ = ["DBAIdol", "DBCompanion"]
+__all__ = ["DBAIdol", "DBAIdolLead", "DBCompanion"]

aidol/models/aidol.py

@@ -18,7 +18,9 @@ class DBAIdol(BaseModel):
     __tablename__ = "aidols"
 
     # id, created_at, updated_at inherited from BaseModel
-    name: Mapped[str] = mapped_column(String, nullable=False)
+    name: Mapped[str | None] = mapped_column(String, nullable=True)
     concept: Mapped[str | None] = mapped_column(String, nullable=True)
-    profile_image_url: Mapped[str] = mapped_column(String, nullable=False)
+    profile_image_url: Mapped[str | None] = mapped_column(String, nullable=True)
     claim_token: Mapped[str | None] = mapped_column(String(36), nullable=True)
+    email: Mapped[str | None] = mapped_column(String, nullable=True)
+    greeting: Mapped[str | None] = mapped_column(String, nullable=True)

aidol/models/aidol_lead.py

@@ -0,0 +1,22 @@
+"""
+AIdol Leads database model
+
+Uses aioia_core.models.BaseModel which provides:
+- id: Mapped[str] (primary key, UUID default)
+- created_at: Mapped[datetime]
+- updated_at: Mapped[datetime]
+"""
+
+from aioia_core.models import BaseModel
+from sqlalchemy import String
+from sqlalchemy.orm import Mapped, mapped_column
+
+
+class DBAIdolLead(BaseModel):
+    """AIdol Lead (viewer email) database model"""
+
+    __tablename__ = "aidol_leads"
+
+    # id, created_at, updated_at inherited from BaseModel
+    aidol_id: Mapped[str] = mapped_column(String, nullable=False)
+    email: Mapped[str] = mapped_column(String, nullable=False)

aidol/models/companion.py

@@ -8,7 +8,7 @@ Uses aioia_core.models.BaseModel which provides:
 """
 
 from aioia_core.models import BaseModel
-from sqlalchemy import ForeignKey, Index, String, Text
+from sqlalchemy import ForeignKey, Index, Integer, String, Text
 from sqlalchemy.orm import Mapped, mapped_column
 
 
@@ -19,9 +19,27 @@ class DBCompanion(BaseModel):
 
     # id, created_at, updated_at inherited from BaseModel
     aidol_id: Mapped[str | None] = mapped_column(ForeignKey("aidols.id"), nullable=True)
-    name: Mapped[str] = mapped_column(String, nullable=False)
+    name: Mapped[str | None] = mapped_column(String, nullable=True)
+    gender: Mapped[str | None] = mapped_column(String, nullable=True)
+    grade: Mapped[str | None] = mapped_column(String, nullable=True)
     biography: Mapped[str | None] = mapped_column(Text, nullable=True)
     profile_picture_url: Mapped[str | None] = mapped_column(String, nullable=True)
     system_prompt: Mapped[str | None] = mapped_column(Text, nullable=True)
 
+    # MBTI scores (1-10 scale)
+    mbti_energy: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    mbti_perception: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    mbti_judgment: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    mbti_lifestyle: Mapped[int | None] = mapped_column(Integer, nullable=True)
+
+    # Stats (0-100 scale)
+    vocal: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    dance: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    rap: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    visual: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    stamina: Mapped[int | None] = mapped_column(Integer, nullable=True)
+    charm: Mapped[int | None] = mapped_column(Integer, nullable=True)
+
+    position: Mapped[str | None] = mapped_column(String, nullable=True)
+
     __table_args__ = (Index("ix_companions_aidol_id", "aidol_id"),)

aidol/protocols.py

@@ -11,11 +11,14 @@ from typing import Protocol
 
 import PIL.Image
 from aioia_core import CrudRepositoryProtocol
+from pydantic import BaseModel
 from sqlalchemy.orm import Session
 
 from aidol.schemas import (
     AIdol,
     AIdolCreate,
+    AIdolLead,
+    AIdolLeadCreate,
     AIdolUpdate,
     Companion,
     CompanionCreate,
@@ -23,6 +26,10 @@ from aidol.schemas import (
 )
 
 
+class NoUpdate(BaseModel):
+    """Placeholder for repositories without update support."""
+
+
 class AIdolRepositoryProtocol(
     CrudRepositoryProtocol[AIdol, AIdolCreate, AIdolUpdate], Protocol
 ):
@@ -98,3 +105,22 @@ class ImageStorageProtocol(Protocol):
             image: PIL Image object to upload.
         """
         ...
+
+
+class AIdolLeadRepositoryProtocol(
+    CrudRepositoryProtocol[AIdolLead, AIdolLeadCreate, NoUpdate], Protocol
+):
+    """Protocol defining AIdolLead repository expectations.
+
+    Inherits CRUD operations from CrudRepositoryProtocol.
+    """
+
+
+class AIdolLeadRepositoryFactoryProtocol(Protocol):
+    """Protocol for factory that creates AIdolLeadRepositoryProtocol instances."""
+
+    def create_repository(
+        self, db_session: Session | None = None
+    ) -> AIdolLeadRepositoryProtocol:
+        """Create a repository instance."""
+        ...

aidol/repositories/__init__.py

@@ -3,9 +3,11 @@ AIdol repositories
 """
 
 from aidol.repositories.aidol import AIdolRepository
+from aidol.repositories.aidol_lead import AIdolLeadRepository
 from aidol.repositories.companion import CompanionRepository
 
 __all__ = [
     "AIdolRepository",
+    "AIdolLeadRepository",
     "CompanionRepository",
 ]

aidol/repositories/aidol.py

@@ -25,6 +25,8 @@ def _convert_db_aidol_to_model(db_aidol: DBAIdol) -> AIdol:
     return AIdol(
         id=db_aidol.id,
         name=db_aidol.name,
+        email=db_aidol.email,
+        greeting=db_aidol.greeting,
         concept=db_aidol.concept,
         profile_image_url=db_aidol.profile_image_url,
         claim_token=db_aidol.claim_token,

aidol/repositories/aidol_lead.py

@@ -0,0 +1,49 @@
+"""
+AIdol Lead repository
+
+Implements BaseRepository pattern for BaseCrudRouter compatibility.
+"""
+
+from datetime import timezone
+
+from aioia_core.repositories import BaseRepository
+from sqlalchemy.orm import Session
+
+from aidol.models import DBAIdolLead
+from aidol.protocols import AIdolLeadRepositoryProtocol, NoUpdate
+from aidol.schemas import AIdolLead, AIdolLeadCreate
+
+
+def _convert_db_aidol_lead_to_model(db_lead: DBAIdolLead) -> AIdolLead:
+    """Convert DB AIdolLead to Pydantic model."""
+    return AIdolLead(
+        id=db_lead.id,
+        aidol_id=db_lead.aidol_id,
+        email=db_lead.email,
+        created_at=db_lead.created_at.replace(tzinfo=timezone.utc),
+        updated_at=db_lead.updated_at.replace(tzinfo=timezone.utc),
+    )
+
+
+def _convert_aidol_lead_create_to_db(schema: AIdolLeadCreate) -> dict:
+    """Convert AIdolLeadCreate schema to DB model data dict."""
+    return schema.model_dump(exclude_unset=True)
+
+
+class AIdolLeadRepository(
+    BaseRepository[AIdolLead, DBAIdolLead, AIdolLeadCreate, NoUpdate],
+    AIdolLeadRepositoryProtocol,
+):
+    """
+    Database-backed AIdolLead repository.
+
+    Extends BaseRepository for CRUD operations compatible with BaseCrudRouter.
+    """
+
+    def __init__(self, db_session: Session):
+        super().__init__(
+            db_session=db_session,
+            db_model=DBAIdolLead,
+            convert_to_model=_convert_db_aidol_lead_to_model,
+            convert_to_db_model=_convert_aidol_lead_create_to_db,
+        )

aidol/repositories/companion.py

@@ -10,7 +10,15 @@ from aioia_core.repositories import BaseRepository
 from sqlalchemy.orm import Session
 
 from aidol.models import DBCompanion
-from aidol.schemas import Companion, CompanionCreate, CompanionUpdate
+from aidol.schemas import (
+    Companion,
+    CompanionCreate,
+    CompanionStats,
+    CompanionUpdate,
+    Gender,
+    Grade,
+    Position,
+)
 
 
 def _convert_db_companion_to_model(db_companion: DBCompanion) -> Companion:
@@ -23,20 +31,45 @@ def _convert_db_companion_to_model(db_companion: DBCompanion) -> Companion:
         id=db_companion.id,
         aidol_id=db_companion.aidol_id,
         name=db_companion.name,
+        gender=Gender(db_companion.gender) if db_companion.gender else None,
+        grade=Grade(db_companion.grade) if db_companion.grade else None,
         biography=db_companion.biography,
         profile_picture_url=db_companion.profile_picture_url,
+        position=Position(db_companion.position) if db_companion.position else None,
         system_prompt=db_companion.system_prompt,
+        mbti_energy=db_companion.mbti_energy,
+        mbti_perception=db_companion.mbti_perception,
+        mbti_judgment=db_companion.mbti_judgment,
+        mbti_lifestyle=db_companion.mbti_lifestyle,
+        stats=CompanionStats(
+            vocal=db_companion.vocal or 0,
+            dance=db_companion.dance or 0,
+            rap=db_companion.rap or 0,
+            visual=db_companion.visual or 0,
+            stamina=db_companion.stamina or 0,
+            charm=db_companion.charm or 0,
+        ),
         created_at=db_companion.created_at.replace(tzinfo=timezone.utc),
         updated_at=db_companion.updated_at.replace(tzinfo=timezone.utc),
     )
 
 
-def _convert_companion_create_to_db(schema: CompanionCreate) -> dict:
-    """Convert CompanionCreate schema to DB model data dict.
+def _convert_companion_schema_to_db(
+    schema: CompanionCreate | CompanionUpdate,
+) -> dict:
+    """Convert CompanionCreate/Update schema to DB model data dict.
 
+    Decomposes nested stats object into individual DB columns.
     Includes system_prompt for AI configuration.
     """
-    return schema.model_dump(exclude_unset=True)
+    data = schema.model_dump(exclude_unset=True, exclude={"stats"})
+
+    # Decompose stats into individual columns
+    if schema.stats is not None:
+        stats_dict = schema.stats.model_dump()
+        data.update(stats_dict)
+
+    return data
 
 
 class CompanionRepository(
@@ -53,5 +86,5 @@ class CompanionRepository(
             db_session=db_session,
             db_model=DBCompanion,
             convert_to_model=_convert_db_companion_to_model,
-            convert_to_db_model=_convert_companion_create_to_db,
+            convert_to_db_model=_convert_companion_schema_to_db,
         )

aidol/schemas/__init__.py

@@ -12,12 +12,17 @@ from aidol.schemas.aidol import (
     ImageGenerationRequest,
     ImageGenerationResponse,
 )
+from aidol.schemas.aidol_lead import AIdolLead, AIdolLeadBase, AIdolLeadCreate
 from aidol.schemas.companion import (
     Companion,
     CompanionBase,
     CompanionCreate,
     CompanionPublic,
+    CompanionStats,
     CompanionUpdate,
+    Gender,
+    Grade,
+    Position,
 )
 
 __all__ = [
@@ -29,9 +34,16 @@ __all__ = [
     "ImageGenerationData",
     "ImageGenerationRequest",
     "ImageGenerationResponse",
+    "AIdolLead",
+    "AIdolLeadBase",
+    "AIdolLeadCreate",
     "Companion",
     "CompanionBase",
     "CompanionCreate",
     "CompanionPublic",
+    "CompanionStats",
     "CompanionUpdate",
+    "Gender",
+    "Grade",
+    "Position",
 ]

aidol/schemas/aidol.py

@@ -24,20 +24,22 @@ class AIdolBase(BaseModel):
 
     model_config = ConfigDict(populate_by_name=True, alias_generator=camelize)
 
-    name: str = Field(..., description="AIdol group name")
+    name: str | None = Field(default=None, description="AIdol group name")
+    email: str | None = Field(default=None, description="Creator email")
+    greeting: str | None = Field(default=None, description="Greeting message")
     concept: str | None = Field(default=None, description="Group concept or theme")
-    profile_image_url: str = Field(..., description="Profile image URL")
+    profile_image_url: str | None = Field(default=None, description="Profile image URL")
 
 
 class AIdolCreate(AIdolBase):
     """Schema for creating an AIdol group (no id).
 
-    claim_token is optional for anonymous ownership verification.
+    claim_token is required for ownership verification.
     """
 
-    claim_token: str | None = Field(
-        default=None,
-        description="Optional client-generated UUID for ownership verification",
+    claim_token: str = Field(
+        ...,
+        description="Client-generated UUID for ownership verification",
     )
 
 
@@ -47,6 +49,8 @@ class AIdolUpdate(BaseModel):
     model_config = ConfigDict(populate_by_name=True, alias_generator=camelize)
 
     name: str | None = Field(default=None, description="AIdol group name")
+    email: str | None = Field(default=None, description="Creator email")
+    greeting: str | None = Field(default=None, description="Greeting message")
     concept: str | None = Field(default=None, description="Group concept or theme")
     profile_image_url: str | None = Field(default=None, description="Profile image URL")
 

aidol/schemas/aidol_lead.py

@@ -0,0 +1,38 @@
+"""
+AIdol Lead (viewer email) schemas
+
+Schema hierarchy:
+- AIdolLeadBase: Common fields
+- AIdolLeadCreate: For creating a lead (no id)
+- AIdolLead: Response with all fields
+"""
+
+from datetime import datetime
+
+from humps import camelize
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class AIdolLeadBase(BaseModel):
+    """Base AIdol Lead model with common fields."""
+
+    model_config = ConfigDict(populate_by_name=True, alias_generator=camelize)
+
+    aidol_id: str = Field(..., description="AIdol group ID")
+    email: str = Field(..., description="Viewer email")
+
+
+class AIdolLeadCreate(AIdolLeadBase):
+    """Schema for creating an AIdol lead (no id)."""
+
+
+class AIdolLead(AIdolLeadBase):
+    """AIdol Lead response schema with id and timestamps."""
+
+    model_config = ConfigDict(
+        populate_by_name=True, from_attributes=True, alias_generator=camelize
+    )
+
+    id: str = Field(..., description="Lead ID")
+    created_at: datetime = Field(..., description="Creation timestamp")
+    updated_at: datetime = Field(..., description="Last update timestamp")