Skip to content

Commit 1b04fd4

Browse files
abrichrKIRA009
andauthored
fix(get_audio_info, visualize): replace use of recording timestamp in functions with recording id (#717)
* fix(audio): Replace use of recording timestamp in functions with recording id (#727) Co-authored-by: Shohan Dutta Roy <[email protected]> * fix get_audio_info * black --------- Co-authored-by: Shohan Dutta Roy <[email protected]>
1 parent 57a3376 commit 1b04fd4

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

openadapt/app/dashboard/api/recordings.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ async def get_recording_detail(websocket: WebSocket, recording_id: int) -> None:
8383
)
8484

8585
try:
86-
# TODO: change to use recording_id once scrubbing PR is merged
87-
audio_info = crud.get_audio_info(session, recording.timestamp)[0]
86+
audio_info = crud.get_audio_info(session, recording)
8887
words_with_timestamps = json.loads(audio_info.words_with_timestamps)
8988
words_with_timestamps = [
9089
{

openadapt/db/crud.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -675,21 +675,21 @@ def insert_audio_info(
675675
session.commit()
676676

677677

678-
# TODO: change to use recording_id once scrubbing PR is merged
679678
def get_audio_info(
680679
session: SaSession,
681-
recording_timestamp: float,
682-
) -> list[AudioInfo]:
680+
recording: Recording,
681+
) -> AudioInfo:
683682
"""Get the audio info for a given recording.
684683
685684
Args:
686685
session (sa.orm.Session): The database session.
687-
recording_timestamp (float): The timestamp of the recording.
686+
recording (Recording): The recording object.
688687
689688
Returns:
690-
list[AudioInfo]: A list of audio info for the recording.
689+
AudioInfo: Audio info for the recording.
691690
"""
692-
return _get(session, AudioInfo, recording_timestamp)
691+
audio_infos = _get(session, AudioInfo, recording.id)
692+
return audio_infos[0] if audio_infos else None
693693

694694

695695
def post_process_events(session: SaSession, recording: Recording) -> None:

openadapt/utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ def row2dict(row: dict | db.BaseModel, follow: bool = True) -> dict:
9898
Returns:
9999
dict: The row object converted to a dictionary.
100100
"""
101+
if not row:
102+
return {}
101103
if isinstance(row, dict):
102104
return row
103105
try_follow = ["children"] if follow else []

openadapt/visualize.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,11 @@ def main(
186186
logger.info(f"{recording=}")
187187
logger.info(f"{diff_video=}")
188188

189-
audio_info = row2dict(crud.get_audio_info(recording))
190-
# don't display the FLAC data
191-
del audio_info["flac_data"]
189+
session = crud.get_new_session(read_only=True)
190+
audio_info = row2dict(crud.get_audio_info(session, recording))
191+
if audio_info:
192+
del audio_info["flac_data"]
193+
# TODO XXX: display audio_info
192194

193195
if diff_video:
194196
assert recording.config[

0 commit comments

Comments
 (0)