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

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]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-aidol
-Version: 0.5.0
+Version: 0.5.1
 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.5.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ 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/companion.py,sha256=nFFUKdANH44hiLe5aM5W6tO1TTI9wPHVP8ssncY5oj8,10510
 aidol/api/lead.py,sha256=RSf3GcIUVJu752rU9HG7Wy22UmnrRZnN_NGWkpTRDfE,3921
 aidol/context/__init__.py,sha256=b_DP8Qlmiv2jhKVSE61XQUAcIujwbtob435pjkeVHAM,722
 aidol/context/builder.py,sha256=XLKaj-buUNTyp9ucslGDshZ8TyTQ5xK7vACjtkV7x7o,12252
@@ -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.5.1.dist-info/METADATA,sha256=73T6ab34DA8aX_-SAX0lvli8ewYb0y7C9c_H9nGuX9w,3547
+py_aidol-0.5.1.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+py_aidol-0.5.1.dist-info/RECORD,,