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

aidol/api/aidol.py

@@ -6,11 +6,13 @@ Public endpoints for AIdol group creation and retrieval.
 Public access pattern: no authentication required.
 """
 
+from typing import Annotated
+
 from aioia_core.auth import UserInfoProvider
 from aioia_core.errors import ErrorResponse
 from aioia_core.fastapi import BaseCrudRouter
 from aioia_core.settings import JWTSettings
-from fastapi import APIRouter, Depends, HTTPException, Response, status
+from fastapi import APIRouter, Cookie, Depends, HTTPException, status
 from pydantic import BaseModel
 from sqlalchemy.orm import sessionmaker
 
@@ -20,7 +22,13 @@ from aidol.protocols import (
     AIdolRepositoryProtocol,
     ImageStorageProtocol,
 )
-from aidol.schemas import AIdol, AIdolCreate, AIdolPublic, AIdolUpdate
+from aidol.schemas import (
+    AIdol,
+    AIdolCreate,
+    AIdolCreateWithClaim,
+    AIdolPublic,
+    AIdolUpdate,
+)
 from aidol.settings import GoogleGenAISettings
 
 
@@ -31,7 +39,7 @@ class AIdolCreateResponse(BaseModel):
 
 
 class AIdolRouter(
-    BaseCrudRouter[AIdol, AIdolCreate, AIdolUpdate, AIdolRepositoryProtocol]
+    BaseCrudRouter[AIdol, AIdolCreateWithClaim, AIdolUpdate, AIdolRepositoryProtocol]
 ):
     """
     AIdol router with public endpoints.
@@ -106,15 +114,21 @@ class AIdolRouter(
         )
         async def create_aidol(
             request: AIdolCreate,
-            response: Response,
+            claim_token: Annotated[str | None, Cookie(alias="ClaimToken")] = None,
             repository: AIdolRepositoryProtocol = Depends(self.get_repository_dep),
         ):
             """Create a new AIdol group."""
-            created = repository.create(request)
+            if not claim_token:
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail="ClaimToken cookie is required",
+                )
 
-            # Set ClaimToken header
-            if created.claim_token:
-                response.headers["ClaimToken"] = created.claim_token
+            # Convert body schema to internal schema with claim_token from Cookie
+            create_data = AIdolCreateWithClaim(
+                **request.model_dump(), claim_token=claim_token
+            )
+            created = repository.create(create_data)
 
             # Return only id
             return AIdolCreateResponse(id=created.id)

aidol/api/chatroom.py

@@ -4,11 +4,13 @@ Chatroom API router
 Implements BaseCrudRouter pattern for consistency with aioia-core patterns.
 """
 
+from typing import Annotated
+
 from aioia_core.auth import UserInfoProvider
 from aioia_core.errors import ErrorResponse
 from aioia_core.fastapi import BaseCrudRouter
 from aioia_core.settings import JWTSettings, OpenAIAPISettings
-from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi import APIRouter, Cookie, Depends, HTTPException, status
 from humps import camelize
 from langchain_core.messages import AIMessage, BaseMessage, HumanMessage
 from pydantic import BaseModel, ConfigDict, Field
@@ -28,6 +30,7 @@ from aidol.schemas import (
     CompanionMessageCreate,
     Message,
     MessageCreate,
+    MessageCreateWithClaim,
     ModelSettings,
     Persona,
     SenderType,
@@ -181,19 +184,32 @@ class ChatroomRouter(
         async def send_message(
             item_id: str,
             request: MessageCreate,
+            claim_token: Annotated[str | None, Cookie(alias="ClaimToken")] = None,
             repository: ChatroomRepositoryProtocol = Depends(self.get_repository_dep),
         ):
             """Send a message to a chatroom."""
+            # Guard Clause: ClaimToken cookie is required
+            if not claim_token:
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail="ClaimToken cookie is required",
+                )
+
             # Verify chatroom exists
             self._get_item_or_404(repository, item_id)
 
             # Enforce sender_type as USER to prevent spoofing
             request.sender_type = SenderType.USER
 
-            # Pass MessageCreate directly (aioia-core pattern)
+            # Convert to internal schema with claim_token from Cookie
+            message_data = MessageCreateWithClaim(
+                **request.model_dump(), claim_token=claim_token
+            )
+
+            # Pass MessageCreateWithClaim to repository
             return repository.add_message_to_chatroom(
                 chatroom_id=item_id,
-                message=request,
+                message=message_data,
             )
 
     def _register_generate_response_route(self) -> None:

aidol/api/companion.py

@@ -20,13 +20,7 @@ from aidol.protocols import (
     CompanionRepositoryProtocol,
     ImageStorageProtocol,
 )
-from aidol.schemas import (
-    Companion,
-    CompanionCreate,
-    CompanionPublic,
-    CompanionUpdate,
-    Gender,
-)
+from aidol.schemas import Companion, CompanionCreate, CompanionPublic, CompanionUpdate
 from aidol.services.companion_service import to_companion_public
 from aidol.settings import GoogleGenAISettings
 
@@ -90,45 +84,32 @@ class CompanionRouter(
             response_model=CompanionPaginatedResponse,
             status_code=status.HTTP_200_OK,
             summary="List Companions",
-            description="List all Companions with optional filtering by gender and cast status",
+            description="List all Companions with pagination, sorting, and filtering",
         )
         async def list_companions(
-            gender: Gender | None = Query(None, description="Filter by gender"),
-            is_cast: bool | None = Query(
-                None, alias="isCast", description="Filter by cast status"
+            current: int = Query(1, ge=1, description="Current page number"),
+            page_size: int = Query(
+                10, alias="pageSize", ge=1, le=100, description="Items per page"
+            ),
+            sort_param: str | None = Query(
+                None,
+                alias="sort",
+                description='Sorting criteria in JSON format. Example: [["createdAt","desc"]]',
+            ),
+            filters_param: str | None = Query(
+                None,
+                alias="filters",
+                description="Filter conditions (JSON format)",
             ),
-            aidol_id: str | None = Query(None, description="Filter by AIdol Group ID"),
             repository: CompanionRepositoryProtocol = Depends(self.get_repository_dep),
         ):
-            """List Companions with optional gender and isCast filters."""
-            filter_list: list[dict] = []
-
-            # Add filters only if provided
-            if gender is not None:
-                filter_list.append(
-                    {"field": "gender", "operator": "eq", "value": gender.value}
-                )
-
-            # Filter by aidol_id if provided
-            if aidol_id is not None:
-                filter_list.append(
-                    {"field": "aidol_id", "operator": "eq", "value": aidol_id}
-                )
-
-            # isCast is derived from aidol_id presence
-            # isCast=true → aidol_id is not null (belongs to a group)
-            # isCast=false → aidol_id is null (not in a group)
-            if is_cast is True:
-                filter_list.append(
-                    {"field": "aidol_id", "operator": "ne", "value": None}
-                )
-            elif is_cast is False:
-                filter_list.append(
-                    {"field": "aidol_id", "operator": "eq", "value": None}
-                )
-
+            """List Companions with pagination, sorting, and filtering."""
+            sort_list, filter_list = self._parse_query_params(sort_param, filters_param)
             items, total = repository.get_all(
-                filters=filter_list if filter_list else None,
+                current=current,
+                page_size=page_size,
+                sort=sort_list,
+                filters=filter_list,
             )
             # Convert to Public schema (exclude system_prompt)
             public_items = [to_companion_public(c) for c in items]

aidol/api/lead.py

@@ -8,7 +8,7 @@ from typing import Annotated
 
 from aioia_core.fastapi import BaseCrudRouter
 from aioia_core.settings import JWTSettings
-from fastapi import APIRouter, Depends, Header, status
+from fastapi import APIRouter, Cookie, Depends, status
 from pydantic import BaseModel
 from sqlalchemy.orm import Session, sessionmaker
 
@@ -60,7 +60,7 @@ class LeadRouter(
         )
         async def create_lead(
             request: AIdolLeadCreate,
-            claim_token: Annotated[str | None, Header(alias="ClaimToken")] = None,
+            claim_token: Annotated[str | None, Cookie(alias="ClaimToken")] = None,
             db_session: Session = Depends(self.get_db_dep),
             lead_repository: AIdolLeadRepositoryProtocol = Depends(
                 self.get_repository_dep

aidol/protocols.py

@@ -16,7 +16,7 @@ from sqlalchemy.orm import Session
 
 from aidol.schemas import (
     AIdol,
-    AIdolCreate,
+    AIdolCreateWithClaim,
     AIdolLead,
     AIdolLeadCreate,
     AIdolUpdate,
@@ -27,7 +27,7 @@ from aidol.schemas import (
     CompanionCreate,
     CompanionUpdate,
     Message,
-    MessageCreate,
+    MessageCreateWithClaim,
 )
 
 
@@ -64,13 +64,13 @@ class ChatroomRepositoryProtocol(
         ...
 
     def add_message_to_chatroom(
-        self, chatroom_id: str, message: MessageCreate
+        self, chatroom_id: str, message: MessageCreateWithClaim
     ) -> Message:
         """Add a message to a chatroom.
 
         Args:
             chatroom_id: Chatroom ID.
-            message: MessageCreate or CompanionMessageCreate schema.
+            message: MessageCreateWithClaim or CompanionMessageCreate schema (with claim_token).
         """
         ...
 
@@ -95,7 +95,7 @@ class ChatroomRepositoryFactoryProtocol(Protocol):
 
 
 class AIdolRepositoryProtocol(
-    CrudRepositoryProtocol[AIdol, AIdolCreate, AIdolUpdate], Protocol
+    CrudRepositoryProtocol[AIdol, AIdolCreateWithClaim, AIdolUpdate], Protocol
 ):
     """Protocol defining AIdol repository expectations.
 

aidol/repositories/aidol.py

@@ -13,7 +13,7 @@ from aioia_core.repositories import BaseRepository
 from sqlalchemy.orm import Session
 
 from aidol.models import DBAIdol
-from aidol.schemas import AIdol, AIdolCreate, AIdolUpdate
+from aidol.schemas import AIdol, AIdolCreateWithClaim, AIdolUpdate
 
 
 def _convert_db_aidol_to_model(db_aidol: DBAIdol) -> AIdol:
@@ -35,15 +35,14 @@ def _convert_db_aidol_to_model(db_aidol: DBAIdol) -> AIdol:
     )
 
 
-def _convert_aidol_create_to_db(schema: AIdolCreate) -> dict:
-    """Convert AIdolCreate schema to DB model data dict.
-
-    Includes claim_token for ownership verification.
-    """
+def _convert_aidol_create_to_db(schema: AIdolCreateWithClaim) -> dict:
+    """Convert AIdolCreateWithClaim schema to DB model data dict."""
     return schema.model_dump(exclude_unset=True)
 
 
-class AIdolRepository(BaseRepository[AIdol, DBAIdol, AIdolCreate, AIdolUpdate]):
+class AIdolRepository(
+    BaseRepository[AIdol, DBAIdol, AIdolCreateWithClaim, AIdolUpdate]
+):
     """
     Database-backed AIdol repository.
 

aidol/repositories/chatroom.py

@@ -17,7 +17,7 @@ from aidol.schemas import (
     ChatroomUpdate,
     CompanionMessage,
     Message,
-    MessageCreate,
+    MessageCreateWithClaim,
     SenderType,
 )
 
@@ -81,7 +81,7 @@ class ChatroomRepository(
     # ========================================
 
     def add_message_to_chatroom(
-        self, chatroom_id: str, message: MessageCreate
+        self, chatroom_id: str, message: MessageCreateWithClaim
     ) -> Message:
         """
         Add message to chatroom.
@@ -91,7 +91,7 @@ class ChatroomRepository(
 
         Args:
             chatroom_id: Chatroom ID
-            message: MessageCreate or CompanionMessageCreate schema (no id)
+            message: MessageCreateWithClaim or CompanionMessageCreate schema (with claim_token)
 
         Returns:
             Message or CompanionMessage with id guaranteed to be set

aidol/schemas/__init__.py

@@ -6,6 +6,7 @@ from aidol.schemas.aidol import (
     AIdol,
     AIdolBase,
     AIdolCreate,
+    AIdolCreateWithClaim,
     AIdolPublic,
     AIdolUpdate,
     ImageGenerationData,
@@ -24,6 +25,7 @@ from aidol.schemas.chatroom import (
     Message,
     MessageBase,
     MessageCreate,
+    MessageCreateWithClaim,
     SenderType,
 )
 from aidol.schemas.companion import (
@@ -45,6 +47,7 @@ __all__ = [
     "AIdol",
     "AIdolBase",
     "AIdolCreate",
+    "AIdolCreateWithClaim",
     "AIdolPublic",
     "AIdolUpdate",
     "ImageGenerationData",
@@ -65,6 +68,7 @@ __all__ = [
     "Message",
     "MessageBase",
     "MessageCreate",
+    "MessageCreateWithClaim",
     "SenderType",
     # Companion
     "Companion",

aidol/schemas/aidol.py

@@ -3,7 +3,8 @@ AIdol (group) schemas
 
 Schema hierarchy:
 - AIdolBase: Mutable fields (used in Create/Update)
-- AIdolCreate: Base + optional claim_token
+- AIdolCreate: API body (claim_token excluded, read from Cookie)
+- AIdolCreateWithClaim: Internal (claim_token included, for repository)
 - AIdolUpdate: Base fields only
 - AIdol: Response with all fields including claim_token (internal use)
 - AIdolPublic: Response without sensitive fields (API use)
@@ -32,14 +33,20 @@ class AIdolBase(BaseModel):
 
 
 class AIdolCreate(AIdolBase):
-    """Schema for creating an AIdol group (no id).
+    """API body schema for creating an AIdol group.
 
-    claim_token is required for ownership verification.
+    claim_token is excluded (read from Cookie by router).
     """
 
-    claim_token: str = Field(
-        ...,
-        description="Client-generated UUID for ownership verification",
+
+class AIdolCreateWithClaim(AIdolBase):
+    """Internal schema for repository with claim_token.
+
+    Used by router to pass Cookie-based claim_token to repository.
+    """
+
+    claim_token: str | None = Field(
+        default=None, description="Ownership token from Cookie"
     )
 
 

aidol/schemas/chatroom.py

@@ -82,10 +82,16 @@ class CompanionMessage(Message):
 
 
 class MessageCreate(MessageBase):
-    """Schema for creating a message (no id, no timestamp).
+    """API body schema for creating a message (no id, no timestamp).
 
-    claim_token is used for anonymous user identification and DAU/MAU analytics.
-    It's a UUID stored in localStorage, identifying users without authentication.
+    claim_token is excluded (read from Cookie by router).
+    """
+
+
+class MessageCreateWithClaim(MessageBase):
+    """Internal schema for repository with claim_token.
+
+    Used by router to pass Cookie-based claim_token to repository.
     """
 
     claim_token: str | None = Field(
@@ -93,7 +99,7 @@ class MessageCreate(MessageBase):
     )
 
 
-class CompanionMessageCreate(MessageCreate):
+class CompanionMessageCreate(MessageCreateWithClaim):
     """Schema for creating a companion message.
 
     companion_id is optional for aidol standalone but may be required for platform integration.

{py_aidol-0.5.0.dist-info → py_aidol-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-aidol
-Version: 0.5.0
+Version: 0.6.0
 Summary: Create and chat with your own AI idol group
 License: Apache-2.0
 Keywords: kpop,idol,aidol,ai-companion,chatbot,image-generation

{py_aidol-0.5.0.dist-info → py_aidol-0.6.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 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/aidol.py,sha256=xYncbhO1CCOEtlIKNtZSqxpiCcsayDbIi16oJCN8yuI,7002
+aidol/api/chatroom.py,sha256=WTvdNOAJWNqLQB_FzhBTuU8qvIgH8mwGKI3zDse6bME,12768
 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/api/companion.py,sha256=nFFUKdANH44hiLe5aM5W6tO1TTI9wPHVP8ssncY5oj8,10510
+aidol/api/lead.py,sha256=N1tlxvQhq3jzg5jphmAI1PyyBv-Ams9XMkotxbXP-SU,3921
 aidol/context/__init__.py,sha256=b_DP8Qlmiv2jhKVSE61XQUAcIujwbtob435pjkeVHAM,722
 aidol/context/builder.py,sha256=XLKaj-buUNTyp9ucslGDshZ8TyTQ5xK7vACjtkV7x7o,12252
 aidol/factories.py,sha256=t7g0GJYHvY57J9mZUY2vX8HSqOFclWChaPOw8Ohyw8U,1261
@@ -13,21 +13,21 @@ 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/protocols.py,sha256=_FXjOcwoJ993VF-CmkYj2J_9KCn4PNm3bHbQhAB-4hk,5350
 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.py,sha256=vdAcR6QlCbrUE0_cqHAdpaJxQdDrbRObOIe0AmfitkE,1793
 aidol/repositories/aidol_lead.py,sha256=vmCHXdTtxDSiRpd_n7DuyecZDPLls56r0N5vyT_v9zI,1488
-aidol/repositories/chatroom.py,sha256=sKhKNn5-A9bEUvNT1qpNccRPlRTjEbOu0FZ3677sn3g,4479
+aidol/repositories/chatroom.py,sha256=oCypK6pUJN8vzImw2FUlYsGVg2qGgFkhS92JQN4607o,4517
 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/__init__.py,sha256=o9azQhv4Yz1Dta4nfL1AKekU_rgjttHtn50m7NiXGQw,1775
+aidol/schemas/aidol.py,sha256=IioHkijWlHflnMmD3qRthVB7u7KgBpy7dIYH4LpvEa0,4391
 aidol/schemas/aidol_lead.py,sha256=JS8U-ep0Ga6x0PdwXhJfTrcOCKgG0wfFW8pN5X35GUM,1070
-aidol/schemas/chatroom.py,sha256=2jD-rlHGjq5mxH4SB9K2dp_FYfKG9WlH9ON_z5D13TM,4370
+aidol/schemas/chatroom.py,sha256=nU61f5uIeVHBsr5Nwyu2fwRa4a8ADMhoX36CBnRy8iI,4460
 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
@@ -36,6 +36,6 @@ aidol/services/companion_service.py,sha256=tNNWiIFmJQ-I3UBW06baOANXhBx5oTKoT6nkq
 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.6.0.dist-info/METADATA,sha256=v4kAy37r8nTF92Pn9_62uLkCLtNOltYxbx_qi2eOMaM,3547
+py_aidol-0.6.0.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+py_aidol-0.6.0.dist-info/RECORD,,