Phase 3: Schema Layer - Pydantic v2 migration, deduplication, and missing schemas

- Migrated all schemas to Pydantic v2 syntax (model_config, ConfigDict) - Fixed mutable default in ProtoMessageBase using Field(default_factory=datetime.now) - Consolidated CardCollection and Wishlist schemas in user_card_collection.py - Created game_schemas.py with GameCreate, GameResponse, GameJoinRequest, etc. - Created mtg_card_schemas.py with MtgCardResponse, MtgCardSearchRequest, etc. - Added CardImportBatchCreate, CardImportBatchResponse, UserCardImportCreate/Response schemas - Fixed duplicate UserCardImportRecord class between card_import_batch.py and user_card_import_record.py - Updated __init__.py with comprehensive schema exports - Created verify_schemas.py for schema-model matching verification
2026-08-16 05:22:17 +00:00
parent 5f324cf8a9
commit bea91db64d
20 changed files with 2733 additions and 342 deletions
@@ -1 +1,133 @@
-# Schemas package
+"""Schemas package initialization."""
+from app.schemas.schemas import (
+    LoginRequest, LoginResponse, RefreshTokenRequest, TokenResponse,
+    UserBase, UserCreate, UserUpdate, UserResponse,
+    DeckCreate, DeckUpdate, DeckResponse,
+    FolderCreate, FolderResponse,
+    GameCreate, GameResponse,
+    RoomResponse,
+    BanCreate, BanResponse,
+    ErrorResponse, ValidationErrorResponse,
+    PaginationParams, PaginatedResponse,
+    CardMirrorResponse, DeckCardLinkResponse, DeckWithCardsResponse,
+)
+from app.schemas.user_data_schemas import (
+    DeckVersionStatus, GameReplayStatus, GameOutcomeType,
+    GroupMemberRole, NetworkMemberRole, UserPreferenceTheme, ActivityType,
+    SessionResponse, SessionCleanupResponse,
+    DeckVersionCreate, DeckVersionUpdate, DeckVersionResponse, DeckVersionListResponse,
+    GameReplayCreate, GameReplayUpdate, GameReplayResponse, GameReplayListResponse,
+    GameOutcomeCreate, GameOutcomeResponse, GameOutcomeListResponse,
+    UserStatisticsResponse, StatisticsUpdateResponse,
+    CardCollectionCreate, CardCollectionUpdate, CardCollectionResponse, CardCollectionListResponse,
+    WishlistCreate, WishlistUpdate, WishlistResponse, WishlistListResponse,
+    GroupCreate, GroupUpdate, GroupMemberCreate, GroupMemberUpdate, GroupMemberRemove,
+    GroupResponse, GroupListResponse, GroupChatMessageCreate, GroupChatMessageResponse, GroupChatMessageListResponse,
+    NetworkCreate, NetworkUpdate, NetworkMemberCreate,
+    NetworkResponse, NetworkListResponse,
+    UserPreferenceUpdate, UserPreferenceResponse,
+    ActivityLogEntry, ActivityLogListResponse,
+    MessageResponse, CountResponse, ErrorDetail,
+)
+from app.schemas.user_deck_schemas import (
+    DeckStatus, DeckZone, SuggestionType,
+    UserDeckCreate, UserDeckUpdate, UserDeckResponse, UserDeckListResponse,
+    DeckCardCreate, DeckCardUpdate, DeckCardResponse, DeckCardWithDetailsResponse, DeckCardListResponse,
+    PrecedentCreate, PrecedentUpdate, PrecedentResponse, PrecedentListResponse,
+    SuggestionCreate, SuggestionResponse, SuggestionListResponse,
+    DeckFinalizeRequest, DeckFinalizeResponse, DeckDeleteResponse,
+    CardSearchRequest, CardSearchResponse,
+)
+from app.schemas.user_card_collection import (
+    CardCondition, AcquisitionMethod,
+    CollectionStatistics, CollectionSummaryResponse,
+)
+from app.schemas.card_import_schemas import (
+    CardImportRequest, CardImportResponse, CardImportStatusResponse,
+    CardMatchResult, CardImportSummary,
+    CardImportBatchCreate, CardImportBatchResponse,
+    UserCardImportCreate, UserCardImportResponse, UserCardImportRecordResponse,
+)
+from app.schemas.card_search_schemas import (
+    CardResponse, SetResponse, CardTypeResponse,
+)
+from app.schemas.proto_messages import (
+    ProtoMessageBase, SessionCommand, GameCommand, GameEvent, Response,
+    ServerInfoUser, ServerInfoDeckStorageFile, ServerInfoDeckStorageFolder,
+    ServerInfoDeckStorageTreeItem, ServerInfoCard, ServerInfoZone, ServerInfoGame,
+)
+from app.schemas.protocol_constants import (
+    SessionCommandType, GameCommandType, GameEventType, ResponseCode,
+    ZoneType, UserLevelFlag,
+)
+from app.schemas.game_schemas import (
+    GameCreate, GameResponse, GameJoinRequest, GameLeaveRequest,
+    GameListResponse, GamePlayerResponse, GameStateResponse,
+)
+from app.schemas.mtg_card_schemas import (
+    MtgCardResponse, MtgCardSearchRequest, MtgCardSearchResponse,
+    MtgSetResponse, MtgCardMirrorResponse, DeckCardLinkResponse, DeckWithCardsResponse,
+)
+
+__all__ = [
+    # Auth
+    "LoginRequest", "LoginResponse", "RefreshTokenRequest", "TokenResponse",
+    # User
+    "UserBase", "UserCreate", "UserUpdate", "UserResponse",
+    # Deck
+    "DeckCreate", "DeckUpdate", "DeckResponse",
+    "FolderCreate", "FolderResponse",
+    # Game
+    "GameCreate", "GameResponse", "RoomResponse",
+    "GameJoinRequest", "GameLeaveRequest", "GameListResponse", "GamePlayerResponse", "GameStateResponse",
+    # Ban
+    "BanCreate", "BanResponse",
+    # Error
+    "ErrorResponse", "ValidationErrorResponse",
+    # Pagination
+    "PaginationParams", "PaginatedResponse",
+    # Card Mirror
+    "CardMirrorResponse", "DeckCardLinkResponse", "DeckWithCardsResponse",
+    # User Data
+    "DeckVersionStatus", "GameReplayStatus", "GameOutcomeType",
+    "GroupMemberRole", "NetworkMemberRole", "UserPreferenceTheme", "ActivityType",
+    "SessionResponse", "SessionCleanupResponse",
+    "DeckVersionCreate", "DeckVersionUpdate", "DeckVersionResponse", "DeckVersionListResponse",
+    "GameReplayCreate", "GameReplayUpdate", "GameReplayResponse", "GameReplayListResponse",
+    "GameOutcomeCreate", "GameOutcomeResponse", "GameOutcomeListResponse",
+    "UserStatisticsResponse", "StatisticsUpdateResponse",
+    "CardCollectionCreate", "CardCollectionUpdate", "CardCollectionResponse", "CardCollectionListResponse",
+    "WishlistCreate", "WishlistUpdate", "WishlistResponse", "WishlistListResponse",
+    "GroupCreate", "GroupUpdate", "GroupMemberCreate", "GroupMemberUpdate", "GroupMemberRemove",
+    "GroupResponse", "GroupListResponse", "GroupChatMessageCreate", "GroupChatMessageResponse", "GroupChatMessageListResponse",
+    "NetworkCreate", "NetworkUpdate", "NetworkMemberCreate",
+    "NetworkResponse", "NetworkListResponse",
+    "UserPreferenceUpdate", "UserPreferenceResponse",
+    "ActivityLogEntry", "ActivityLogListResponse",
+    "MessageResponse", "CountResponse", "ErrorDetail",
+    # User Deck
+    "DeckStatus", "DeckZone", "SuggestionType",
+    "UserDeckCreate", "UserDeckUpdate", "UserDeckResponse", "UserDeckListResponse",
+    "DeckCardCreate", "DeckCardUpdate", "DeckCardResponse", "DeckCardWithDetailsResponse", "DeckCardListResponse",
+    "PrecedentCreate", "PrecedentUpdate", "PrecedentResponse", "PrecedentListResponse",
+    "SuggestionCreate", "SuggestionResponse", "SuggestionListResponse",
+    "DeckFinalizeRequest", "DeckFinalizeResponse", "DeckDeleteResponse",
+    "CardSearchRequest", "CardSearchResponse",
+    # Card Collection
+    "CardCondition", "AcquisitionMethod",
+    "CollectionStatistics", "CollectionSummaryResponse",
+    # Card Import
+    "CardImportRequest", "CardImportResponse", "CardImportStatusResponse",
+    "CardMatchResult", "CardImportSummary",
+    "CardImportBatchCreate", "CardImportBatchResponse",
+    "UserCardImportCreate", "UserCardImportResponse", "UserCardImportRecordResponse",
+    # Card Search
+    "CardResponse", "SetResponse", "CardTypeResponse",
+    # Proto Messages
+    "ProtoMessageBase", "SessionCommand", "GameCommand", "GameEvent", "Response",
+    "ServerInfoUser", "ServerInfoDeckStorageFile", "ServerInfoDeckStorageFolder",
+    "ServerInfoDeckStorageTreeItem", "ServerInfoCard", "ServerInfoZone", "ServerInfoGame",
+    # Protocol Constants
+    "SessionCommandType", "GameCommandType", "GameEventType", "ResponseCode",
+    "ZoneType", "UserLevelFlag",
+]