update pydantic models to match whitespace

Author: qwikster

qwave-server/src/qwave/api/albums.py

@@ -13,28 +13,28 @@
 router = APIRouter()
 
 class AlbumSummary(BaseModel):
-    id: int
-    title: str
+    id:           int
+    title:        str
     release_date: Optional[str]
     album_artist: Optional[dict]
-    track_count: int
+    track_count:  int
 
 class TrackInAlbum(BaseModel):
-    id: int
-    title: str
+    id:           int
+    title:        str
     track_number: Optional[int]
-    duration: int
-    artists: List[dict]
+    duration:     int
+    artists:      List[dict]
 
 class AlbumDetail(BaseModel):
-    id: int
-    title: str
+    id:           int
+    title:        str
     release_date: Optional[str]
     album_artist: Optional[dict]
-    tracks: List[TrackInAlbum]
+    tracks:       List[TrackInAlbum]
 
 class UpdateAlbumRequest(BaseModel):
-    title: Optional[str] = Field(None, min_length = 1, max_length = 255)
+    title:        Optional[str] = Field(None, min_length = 1, max_length = 255)
     release_date: Optional[str] = None # ISO date string
 
 @router.get("", response_model = dict)

qwave-server/src/qwave/api/artists.py

@@ -11,51 +11,43 @@
 router = APIRouter()
 
 class ArtistSummary(BaseModel):
-    id: int
-    name: str
-    track_count: int
-    album_count: int
-
-    class Config:
-        from_attributes = True
+    model_config = {"from_attributes": True}
+    id:            int
+    name:          str
+    track_count:   int
+    album_count:   int
 
 class ArtistDetail(BaseModel):
-    id: int
-    name: str
-    track_count: int
-    album_count: int
-
-    class Config:
-        from_attributes = True
+    model_config = {"from_attributes": True}
+    id:            int
+    name:          str
+    track_count:   int
+    album_count:   int
 
 class ArtistListResponse(BaseModel):
-    artists: List[ArtistSummary]
-    total: int
+    artists:       List[ArtistSummary]
+    total:         int
 
 class TrackSummary(BaseModel):
-    id: int
-    title: str
-    duration: float
-    album: Optional[dict]
-
-    class Config:
-        from_attributes = True
+    model_config = {"from_attributes": True}
+    id:            int
+    title:         str
+    duration:      float
+    album:         Optional[dict]
 
 class TracksResponse(BaseModel):
-    tracks: List[TrackSummary]
-    total: int
+    tracks:        List[TrackSummary]
+    total:         int
 
 class AlbumSummary(BaseModel):
-    id: int
-    title: str
-    release_date: Optional[str]
-    track_count: int
-
-    class Config:
-        from_attributes = True
+    model_config = {"from_attributes": True}
+    id:            int
+    title:         str
+    release_date:  Optional[str]
+    track_count:   int
 
 class AlbumsResponse(BaseModel):
-    albums: List[AlbumSummary]
+    albums:        List[AlbumSummary]
 
 @router.get("", response_model = ArtistListResponse)
 def list_artists(

qwave-server/src/qwave/api/auth.py

@@ -11,28 +11,26 @@
 # endpoints: /register /login /logout /me
 
 class RegisterRequest(BaseModel):
-    username: str = Field(..., min_length = 3, max_length = 255)
-    password: str = Field(..., min_length = 4)
+    username:      str = Field(..., min_length = 3, max_length = 255)
+    password:      str = Field(..., min_length = 4)
 
 class LoginRequest(BaseModel):
-    username: str
-    password: str
+    username:      str
+    password:      str
 
 class UserResponse(BaseModel):
-    user_id: int
-    username: str
-    created_at: str
-
-    class Config:
-        from_attributes = True
+    model_config = {"from_attributes": True}
+    user_id:       int
+    username:      str
+    created_at:    str
 
 class LoginResponse(BaseModel):
-    token: str
-    user_id: int
-    expires_at: str
+    token:         str
+    user_id:       int
+    expires_at:    str
 
 class MessageResponse(BaseModel):
-    message: str
+    message:       str
 
 
 def get_current_token(authorization: str = Header(None)) -> str:

qwave-server/src/qwave/api/genres.py

@@ -10,20 +10,18 @@
 router = APIRouter()
 
 class CreateGenreRequest(BaseModel):
-    name: str = Field(..., min_length = 1, max_length = 128)
+    name:          str = Field(..., min_length = 1, max_length = 128)
 
 class GenreSummary(BaseModel):
-    id: int
-    name: str
-    track_count: int
+    id:            int
+    name:          str
+    track_count:   int
 
 class GenreResponse(BaseModel):
-    id: int
-    name: str
+    model_config = {"from_attributes": True}
+    id:            int
+    name:          str
 
-    class Config:
-        from_attributes = True
-
 @router.get("", response_model = dict)
 def list_genres(
     user = Depends(get_current_user),

qwave-server/src/qwave/api/server.py

@@ -8,14 +8,14 @@
 # /info /config
 
 class ServerInfoResponse(BaseModel):
-    name: str
-    theme_colors: dict
-    logo_url: Optional[str]
-    background_url: Optional[str]
+    name:               str
+    theme_colors:       dict
+    logo_url:           Optional[str]
+    background_url:     Optional[str]
 
 class ServerConfigResponse(BaseModel):
-    opus_bitrate: int
-    acoustid_enabled: bool
+    opus_bitrate:       int
+    acoustid_enabled:   bool
     max_upload_size_mb: int
 
 @router.get("/info", response_model = ServerInfoResponse)

qwave-server/src/qwave/api/tracks.py

@@ -8,6 +8,39 @@
 
 router = APIRouter()
 
+# =========================== table item model thingies
 class ArtistInfo(BaseModel):
-    id: int
-    name:
+    id:             int
+    name:           str
+    is_primary:     bool
+
+class AlbumInfo(BaseModel):
+    id:             int
+    title:          str
+    release_date:   Optional[str] = None
+
+class GenreInfo(BaseModel):
+    id:             int
+    name:           str
+
+class UserInfo(BaseModel):
+    id:             int
+    username:       str
+
+# ========================== track responsesssssssssss
+class TrackSummary(BaseModel):
+    id:             int
+    title:          str
+    duration:       int
+    artists:        List[ArtistInfo]
+    album:          Optional[AlbumInfo]
+
+class abc(BaseModel):
+    abc:            int
+
+
+# ===========
+class UpdateTrackResponse(BaseModel):
+    id:             int
+    updated_fields: List[str]
+    track:          dict # maybe make this a model?