Merge branch 'feature/pipeline-fix' into development

api/src/rehearsalhub/schemas/__init__.py

@@ -8,7 +8,7 @@ from rehearsalhub.schemas.annotation import (
 )
 from rehearsalhub.schemas.audio_version import AudioVersionCreate, AudioVersionRead
 from rehearsalhub.schemas.auth import LoginRequest, RegisterRequest, TokenResponse
-from rehearsalhub.schemas.band import BandCreate, BandRead, BandReadWithMembers, BandMemberRead
+from rehearsalhub.schemas.band import BandCreate, BandMemberRead, BandRead, BandReadWithMembers
 from rehearsalhub.schemas.member import MemberRead
 from rehearsalhub.schemas.song import SongCreate, SongRead, SongUpdate
 

api/src/rehearsalhub/schemas/comment.py

@@ -26,15 +26,15 @@ class SongCommentRead(BaseModel):
     created_at: datetime
 
     @classmethod
-    def from_model(cls, c: object) -> "SongCommentRead":
+    def from_model(cls, c: object) -> SongCommentRead:
         return cls(
-            id=getattr(c, "id"),
-            song_id=getattr(c, "song_id"),
-            body=getattr(c, "body"),
-            author_id=getattr(c, "author_id"),
-            author_name=getattr(getattr(c, "author"), "display_name"),
-            author_avatar_url=getattr(getattr(c, "author"), "avatar_url"),
-            timestamp=getattr(c, "timestamp"),
+            id=c.id,
+            song_id=c.song_id,
+            body=c.body,
+            author_id=c.author_id,
+            author_name=c.author.display_name,
+            author_avatar_url=c.author.avatar_url,
+            timestamp=c.timestamp,
             tag=getattr(c, "tag", None),
-            created_at=getattr(c, "created_at"),
+            created_at=c.created_at,
         )

api/src/rehearsalhub/schemas/member.py

@@ -1,8 +1,7 @@
 import uuid
 from datetime import datetime
-from typing import Any
 
-from pydantic import BaseModel, ConfigDict, EmailStr, model_validator
+from pydantic import BaseModel, ConfigDict, EmailStr
 
 
 class MemberBase(BaseModel):
@@ -23,7 +22,7 @@ class MemberRead(MemberBase):
     def from_model(cls, m: object) -> "MemberRead":
         obj = cls.model_validate(m)
         obj.nc_configured = bool(
-            getattr(m, "nc_url") and getattr(m, "nc_username") and getattr(m, "nc_password")
+            m.nc_url and m.nc_username and m.nc_password
         )
         return obj