@ -1,9 +1,8 @@
import json
from datetime import timedelta from datetime import timedelta
import flask as flask
import common import common
from common import dateutil , database import flask as flask
from common import dateutil , database , format_bustime , dt_to_bustime , bustime_to_dt , parse_bustime
from dateutil . parser import ParserError from dateutil . parser import ParserError
from flask import request , jsonify , Response , render_template from flask import request , jsonify , Response , render_template
@ -22,11 +21,6 @@ def create_seconds_timedelta(seconds):
return timedelta ( seconds = seconds )
return timedelta ( seconds = seconds )
def round_bus_time ( delta : timedelta ) :
""" Round bus time down to the second. """
return f ' { delta . days * 24 + delta . seconds / / 3600 : 02 } : { ( delta . seconds % 3600 ) / / 60 : 02 } : { delta . seconds % 60 : 02 } '
@app.route ( ' /buscribe/vtt ' ) @app.route ( ' /buscribe/vtt ' )
def get_vtt ( ) : def get_vtt ( ) :
""" Returns WebVTT subtitle file for the period between start_time and end_time.
""" Returns WebVTT subtitle file for the period between start_time and end_time.
@ -74,20 +68,32 @@ def get_json():
( https : / / www . postgresql . org / docs / 13 / functions - textsearch . html ) """
( https : / / www . postgresql . org / docs / 13 / functions - textsearch . html ) """
start_time_string = request . args . get ( ' start_time ' )
start_time_string = request . args . get ( ' start_time ' )
bus_start_time_string = request . args . get ( ' bus_start_time ' )
if start_time_string is not None :
if start_time_string is not None :
try :
try :
start_time = dateutil . parse ( start_time_string )
start_time = dateutil . parse ( start_time_string )
except ParserError :
except ParserError :
return " Invalid start time! " , 400
return " Invalid start time! " , 400
elif bus_start_time_string is not None :
try :
start_time = bustime_to_dt ( app . bustime_start , parse_bustime ( bus_start_time_string ) )
except ValueError :
return " Invalid bus end time! " , 400
else :
else :
start_time = None
start_time = None
end_time_string = request . args . get ( ' end_time ' )
end_time_string = request . args . get ( ' end_time ' )
bus_end_time_string = request . args . get ( ' bus_end_time ' )
if end_time_string is not None :
if end_time_string is not None :
try :
try :
end_time = dateutil . parse ( end_time_string )
end_time = dateutil . parse ( end_time_string )
except ParserError :
except ParserError :
return " Invalid end time! " , 400
return " Invalid end time! " , 400
elif bus_end_time_string is not None :
try :
end_time = bustime_to_dt ( app . bustime_start , parse_bustime ( bus_end_time_string ) )
except ValueError :
return " Invalid bus end time! " , 400
else :
else :
end_time = None
end_time = None
@ -103,35 +109,120 @@ def get_json():
return jsonify ( [ { " id " : row . id ,
return jsonify ( [ { " id " : row . id ,
" start_time " : row . start_time . isoformat ( ) ,
" start_time " : row . start_time . isoformat ( ) ,
" start_bus_time " : round_bus_time( row . start_time - app . bustime_start ) ,
" start_bus_time " : format_bustime( dt_to_bustime ( app . bustime_start , row . start_time ) , " second " ) ,
" end_time " : row . end_time . isoformat ( ) ,
" end_time " : row . end_time . isoformat ( ) ,
" end_bus_time " : round_bus_time( row . start_time - app . bustime_start ) ,
" end_bus_time " : format_bustime( dt_to_bustime ( app . bustime_start , row . end_time ) , " second " ) ,
" verifier " : row . verifier ,
" verifier " : row . verifier ,
" speakers " : row . names ,
" speakers " : row . names ,
" text " : row . highlighted_text if row . highlighted_text is not None else " " } for row in results ] )
" text " : row . highlighted_text if row . highlighted_text is not None else " " } for row in results ] )
def fetch_lines ( db_conn , start_time , end_time , ts_query = None , limit = None , offset = None ) : def fetch_lines ( db_conn , start_time , end_time , ts_query = None , limit = None , offset = None ) :
query = " SELECT * " + \
query = f """
WITH q AS (
SELECT convert_query ( % ( text_query ) s )
) ,
time_window AS (
SELECT id
FROM buscribe_transcriptions
WHERE start_time > = % ( start_time ) s
AND end_time < = % ( end_time ) s
) ,
relevant_lines AS (
(
(
" ,ts_headline(transcription_line, convert_query( %(text_query)s ), ' StartSel= ' ' <span class= \" highlight \" > ' ' , StopSel=</span> ' ) AS highlighted_text " if ts_query is not None else " ,transcription_line AS highlighted_text " ) + \
SELECT id
" FROM buscribe_all_transcriptions WHERE start_time >= %(start_time)s AND end_time <= %(end_time)s "
FROM buscribe_transcriptions
WHERE id IN ( SELECT id FROM time_window )
if ts_query is not None :
{ " AND to_tsvector( ' english ' , transcription_line) @@ (SELECT * FROM q) " if ts_query else " " }
query + = " AND (coalesce(transcription_line_ts, ' ' ::tsvector) || coalesce(names_ts, ' ' ::tsvector)) @@ " \
)
" convert_query( %(text_query)s ) " \
UNION
" ORDER BY ts_rank_cd(coalesce(transcription_line_ts, ' ' ::tsvector) || coalesce(names_ts, ' ' ::tsvector), convert_query( %(text_query)s )) DESC, " \
(
" start_time "
SELECT line
else :
FROM buscribe_verified_lines
query + = " ORDER BY start_time "
WHERE line IN ( SELECT id FROM time_window )
{ " AND to_tsvector( ' english ' , verified_line) @@ (SELECT * FROM q) " if ts_query else " " }
if limit is not None :
)
query + = " LIMIT %(limit)s "
UNION
(
if offset is not None :
SELECT line
query + = " OFFSET %(limit)s "
FROM buscribe_line_speakers
INNER JOIN buscribe_speakers ON buscribe_line_speakers . speaker = buscribe_speakers . id
query + = " ; "
WHERE line IN ( SELECT id FROM time_window )
{ " AND to_tsvector(name) @@ (SELECT * FROM q) " if ts_query else " " }
)
UNION
(
SELECT line
FROM buscribe_line_inferred_speakers
INNER JOIN buscribe_speakers ON buscribe_line_inferred_speakers . speaker = buscribe_speakers . id
WHERE line IN ( SELECT id FROM time_window )
{ " AND to_tsvector(name) @@ (SELECT * FROM q) " if ts_query else " " }
)
)
(
( SELECT id ,
start_time ,
end_time ,
null AS verifier ,
names ,
transcription_line ,
ts_rank_cd ( coalesce ( to_tsvector ( ' english ' , transcription_line ) , ' ' : : tsvector ) | |
coalesce ( to_tsvector ( array_to_string ( names , ' ' ) ) , ' ' : : tsvector ) , ( SELECT * FROM q ) ) AS rank ,
ts_headline ( transcription_line ,
( SELECT * FROM q ) , ' StartSel= ' ' <span class= \" highlight \" > ' ' , StopSel=</span> ' ) AS highlighted_text ,
transcription_json
FROM buscribe_transcriptions
LEFT OUTER JOIN ( SELECT line , array_agg ( name ) AS names
FROM buscribe_line_inferred_speakers
INNER JOIN buscribe_speakers
ON buscribe_line_inferred_speakers . speaker = buscribe_speakers . id
GROUP BY line ) AS inferred_speakers ON id = inferred_speakers . line
WHERE id IN ( SELECT id FROM relevant_lines )
)
UNION
(
SELECT buscribe_transcriptions . id AS id ,
start_time ,
end_time ,
cverifier AS verifier ,
names ,
coalesce ( verifications . verified_line ,
buscribe_transcriptions . transcription_line ) AS transcription_line ,
ts_rank_cd ( coalesce (
setweight ( to_tsvector ( ' english ' , verified_line ) , ' C ' ) ,
to_tsvector ( ' english ' , buscribe_transcriptions . transcription_line ) ,
' ' : : tsvector ) | |
coalesce ( setweight ( to_tsvector ( array_to_string ( names , ' ' ) ) , ' C ' ) , ' ' : : tsvector ) ,
( SELECT * FROM q ) ) AS rank ,
ts_headline ( coalesce ( verifications . verified_line , buscribe_transcriptions . transcription_line ) ,
( SELECT * FROM q ) , ' StartSel= ' ' <span class= \" highlight \" > ' ' , StopSel=</span> ' ) AS highlighted_text ,
null AS transcription_json
FROM buscribe_transcriptions
INNER JOIN (
SELECT * ,
coalesce ( relevant_verified . line , relevant_speakers . line ) AS cline ,
coalesce ( relevant_verified . verifier , relevant_speakers . verifier ) AS cverifier
FROM ( SELECT *
FROM buscribe_verified_lines
WHERE line IN ( SELECT id FROM relevant_lines ) ) AS relevant_verified
FULL OUTER JOIN
( SELECT line , verifier , array_agg ( name ) AS names
FROM buscribe_line_speakers
INNER JOIN buscribe_speakers
ON buscribe_line_speakers . speaker = buscribe_speakers . id
WHERE line IN ( SELECT id FROM relevant_lines )
GROUP BY line , verifier ) AS relevant_speakers
ON relevant_verified . line = relevant_speakers . line AND
relevant_speakers . verifier = relevant_verified . verifier ) AS verifications
ON id = verifications . cline
)
)
ORDER BY
{ " rank DESC, " if ts_query is not None else " " }
start_time
{ " OFFSET %(offset)s " if offset is not None else " " }
{ " LIMIT %(limit)s " if limit is not None else " " } ;
"""
return database . query ( db_conn , query ,
return database . query ( db_conn , query ,
start_time = start_time if start_time is not None else ' -infinity ' ,
start_time = start_time if start_time is not None else ' -infinity ' ,
Matija Rezar
HeNine