Update app.py

app.py

@@ -480,14 +480,14 @@ def get_map_from_summary(summary_txt):
         for idx in tqdm(cameraimg_df.index, desc="Processing Traffic Cameras"):
             if cameraimg_df["CameraID"][idx] in list(nearest_cam_df["CameraID"]):
                 print('added nearby camera', nearest_cam_df["Description"][idx])
-                html = '<h1>{}</h1><div>{}</div>&nbsp;<img style="width:100%; height:100%;" src="data:image/jpeg;base64,{}">'.format(
-                                                                                                                nearest_cam_df["Description"][idx],
-                                                                                                                nearest_cam_df["time_retrieved"][idx],
-                                                                                                                nearest_cam_df["encoded_img"][idx]
-                                                                                                                )
-                iframe = folium.IFrame(html, width=632+20, height=500+20)
-
-                popup = folium.Popup(iframe, max_width=2650)
+                html = '<h3 style="display:inline;">{}</h3><div>{}</div><img style="width:320; height:240;" src="data:image/jpeg;base64,{}">'.format(
+                                                                                                nearest_cam_df["Description"][idx],
+                                                                                                nearest_cam_df["time_retrieved"][idx],
+                                                                                                nearest_cam_df["encoded_img"][idx]
+                                                                                                )
+                iframe = folium.IFrame(html, width=320+40, height=240+60)
+        
+                popup = folium.Popup(iframe, max_height=350)
 
                 folium.Marker(location=[nearest_cam_df["Latitude"][idx], nearest_cam_df["Longitude"][idx]],
                                        icon=folium.Icon(color='blue'),
@@ -537,14 +537,14 @@ async def a_get_map_from_summary(summary_txt, get_num_cameras=3):
         for idx in tqdm(cameraimg_df.index, desc="Processing Traffic Cameras"):
             if cameraimg_df["CameraID"][idx] in list(nearest_cam_df["CameraID"]):
                 print('added nearby camera', nearest_cam_df["Description"][idx])
-                html = '<h1>{}</h1><div>{}</div>&nbsp;<img style="width:100%; height:100%;" src="data:image/jpeg;base64,{}">'.format(
-                                                                                                                nearest_cam_df["Description"][idx],
-                                                                                                                nearest_cam_df["time_retrieved"][idx],
-                                                                                                                nearest_cam_df["encoded_img"][idx]
-                                                                                                                )
-                iframe = folium.IFrame(html, width=632+20, height=500+20)
-
-                popup = folium.Popup(iframe, max_width=2650)
+                html = '<h3 style="display:inline;">{}</h3><div>{}</div><img style="width:320; height:240;" src="data:image/jpeg;base64,{}">'.format(
+                                                                                                nearest_cam_df["Description"][idx],
+                                                                                                nearest_cam_df["time_retrieved"][idx],
+                                                                                                nearest_cam_df["encoded_img"][idx]
+                                                                                                )
+                iframe = folium.IFrame(html, width=320+40, height=240+60)
+        
+                popup = folium.Popup(iframe, max_height=350)
 
                 folium.Marker(location=[nearest_cam_df["Latitude"][idx], nearest_cam_df["Longitude"][idx]],
                                        icon=folium.Icon(color='blue'),
@@ -848,7 +848,8 @@ function refresh() {
 }
 '''
 
-trans_textbox = gr.Textbox('Transcript',lines=10,max_lines=19, autoscroll = False, label = 'Edit road names as required (e.g. Lawney --> Lornie)', interactive = True)
+#trans_textbox = gr.Textbox('Transcript',lines=10,max_lines=19, autoscroll = False, label = 'Edit road names as required (e.g. Lawney --> Lornie)', interactive = True)
+trans_textbox = gr.Textbox('Transcript',lines=10,max_lines=19, autoscroll = False, interactive = False)
 summ_textbox = gr.Textbox('Summary',lines=10,max_lines=19, autoscroll = False)
 # recc_textbox1 = gr.Textbox(label="SCDF", max_lines=8, show_copy_button=True)
 # recc_textbox2 = gr.Textbox(label="LTA", max_lines=8, show_copy_button=True)
@@ -859,8 +860,17 @@ with gr.Blocks(js=js) as demo:
     # summ_textbox = gr.Textbox('Summary')
     gr.Markdown("Emergency Responder Copilot Demonstrator")
     isOpen = False
-    
-    with gr.Tab("Transcript Generator from Audio"):
+
+    outs_textbox = gr.Textbox("Recommendations outputs will appear here once summary is generated from audio transcript.",lines=1,max_lines=1, autoscroll = False, show_label= False)
+    with gr.Accordion("Recommendations output and Locations on Map", open=True, visible = isOpen) as img:
+        with gr.Row():
+            recc_textbox1 = gr.Textbox(label="SCDF", max_lines=10, show_copy_button=True, autoscroll = False)
+            recc_textbox2 = gr.Textbox(label="LTA", max_lines=10, show_copy_button=True, autoscroll = False)
+            recc_textbox3 = gr.Textbox(label="Traffic Police", max_lines=10, show_copy_button=True, autoscroll = False)
+        # gr.Markdown(loc)
+        map_gr = Folium(value=folium.Map(location=[1.2879, 103.8517], zoom_start=12), height=400)
+        
+    with gr.Tab("Transcript from Audio"):
         input_audio = gr.Audio(
             sources=["microphone"],
             type = 'filepath',
@@ -878,11 +888,11 @@ with gr.Blocks(js=js) as demo:
             examples=[\
             # ],
                       # "audio/call_711.mp3", \
-                      "audio/ex1.m4a", "audio/ex2.m4a", "audio/ex3.m4a", "audio/ex4.m4a", "audio/ex5.m4a"],
+                      "audio/example1.m4a", "audio/example2.m4a"],
             cache_examples=True,
             allow_flagging = 'never'
         )
-    with gr.Tab("Summarisation from Audio") as tab2:
+    with gr.Tab("Summarisation from Transcript") as tab2:
         trans2summary = gr.Interface(
             fn=get_summary_from_transcript,
             inputs=trans_textbox,
@@ -890,15 +900,6 @@ with gr.Blocks(js=js) as demo:
             allow_flagging = 'never'
         )
     # trans_textbox.change(lambda x: gr.Tab("Summarisation from Audio"), inputs=[trans_textbox], outputs=[tab2], scroll_to_output = True)
-    
-    outs_textbox = gr.Textbox("Recommendations outputs will appear here once summary is generated from audio transcript.",lines=1,max_lines=1, autoscroll = False, show_label= False)
-    with gr.Accordion("Recommendations output and Locations on Map", open=True, visible = isOpen) as img:
-        with gr.Row():
-            recc_textbox1 = gr.Textbox(label="SCDF", max_lines=8, show_copy_button=True, autoscroll = False)
-            recc_textbox2 = gr.Textbox(label="LTA", max_lines=8, show_copy_button=True, autoscroll = False)
-            recc_textbox3 = gr.Textbox(label="Traffic Police", max_lines=8, show_copy_button=True, autoscroll = False)
-        # gr.Markdown(loc)
-        map_gr = Folium(value=folium.Map(location=[1.2879, 103.8517], zoom_start=12), height=400)