Build update

api/src/rehearsalhub/db/models.py

@@ -228,23 +228,14 @@ class AudioVersion(Base):
     version_number: Mapped[int] = mapped_column(Integer, nullable=False)
     label: Mapped[str | None] = mapped_column(String(255))
     nc_file_path: Mapped[str] = mapped_column(Text, nullable=False)
-<<<<<<< HEAD
-    nc_file_etag: Mapped[Optional[str]] = mapped_column(String(255))
-    cdn_hls_base: Mapped[Optional[str]] = mapped_column(Text)
-    waveform_url: Mapped[Optional[str]] = mapped_column(Text)
-    waveform_peaks: Mapped[Optional[list]] = mapped_column(JSONB)
-    waveform_peaks_mini: Mapped[Optional[list]] = mapped_column(JSONB)
-    duration_ms: Mapped[Optional[int]] = mapped_column(Integer)
-    format: Mapped[Optional[str]] = mapped_column(String(10))
-    file_size_bytes: Mapped[Optional[int]] = mapped_column(BigInteger)
-=======
     nc_file_etag: Mapped[str | None] = mapped_column(String(255))
     cdn_hls_base: Mapped[str | None] = mapped_column(Text)
     waveform_url: Mapped[str | None] = mapped_column(Text)
+    waveform_peaks: Mapped[list | None] = mapped_column(JSONB)
+    waveform_peaks_mini: Mapped[list | None] = mapped_column(JSONB)
     duration_ms: Mapped[int | None] = mapped_column(Integer)
     format: Mapped[str | None] = mapped_column(String(10))
     file_size_bytes: Mapped[int | None] = mapped_column(BigInteger)
->>>>>>> feature/pipeline-fix
     analysis_status: Mapped[str] = mapped_column(String(20), nullable=False, default="pending")
     uploaded_by: Mapped[uuid.UUID | None] = mapped_column(
         UUID(as_uuid=True), ForeignKey("members.id", ondelete="SET NULL")

api/src/rehearsalhub/routers/internal.py

@@ -11,11 +11,11 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from rehearsalhub.config import get_settings
 from rehearsalhub.db.engine import get_session
 from rehearsalhub.db.models import AudioVersion, BandMember, Member
+from rehearsalhub.queue.redis_queue import RedisJobQueue
 from rehearsalhub.repositories.audio_version import AudioVersionRepository
 from rehearsalhub.repositories.band import BandRepository
 from rehearsalhub.repositories.rehearsal_session import RehearsalSessionRepository
 from rehearsalhub.repositories.song import SongRepository
-from rehearsalhub.queue.redis_queue import RedisJobQueue
 from rehearsalhub.schemas.audio_version import AudioVersionCreate
 from rehearsalhub.services.session import extract_session_folder, parse_rehearsal_date
 from rehearsalhub.services.song import SongService

api/tests/unit/test_waveform_endpoint.py

@@ -92,10 +92,9 @@ async def test_waveform_404_when_no_peaks_in_db(mock_session):
 
     with (
         patch("rehearsalhub.routers.versions._get_version_and_assert_band_membership",
-              return_value=(version, song)),
+              return_value=(version, song)),pytest.raises(HTTPException) as exc_info
     ):
-        with pytest.raises(HTTPException) as exc_info:
-            await get_waveform(version_id=version.id, session=mock_session, current_member=member)
+        await get_waveform(version_id=version.id, session=mock_session, current_member=member)
 
     assert exc_info.value.status_code == 404
 
@@ -113,8 +112,8 @@ async def test_waveform_mini_404_when_no_mini_peaks(mock_session):
     with (
         patch("rehearsalhub.routers.versions._get_version_and_assert_band_membership",
               return_value=(version, song)),
+        pytest.raises(HTTPException) as exc_info,
     ):
-        with pytest.raises(HTTPException) as exc_info:
-            await get_waveform(version_id=version.id, session=mock_session, current_member=member, resolution="mini")
+        await get_waveform(version_id=version.id, session=mock_session, current_member=member, resolution="mini")
 
     assert exc_info.value.status_code == 404