fixes + flagging

app.py

@@ -144,7 +144,7 @@ def format_result(result, highlight_terms, exact_search, datasets_filter=None):
     return "<p>" + result_html + "</p>"
 
 
-def format_result_page_old(
+def format_result_page(
     language, results, highlight_terms, num_results, exact_search, datasets_filter=None
 ) -> gr.HTML:
 
@@ -157,14 +157,14 @@ def format_result_page_old(
             list(results.keys())[0]
         )
 
-    results_html = ""
+    result_page_html = ""
     for lang, results_for_lang in results.items():
         if len(results_for_lang) == 0:
             if exact_search:
-                results_html += """<div style='font-family: Arial; color:Silver; text-align: left; line-height: 3em'>
+                result_page_html += """<div style='font-family: Arial; color:Silver; text-align: left; line-height: 3em'>
                     No results found.</div>"""
             else:
-                results_html += """<div style='font-family: Arial; color:Silver; text-align: left; line-height: 3em'>
+                result_page_html += """<div style='font-family: Arial; color:Silver; text-align: left; line-height: 3em'>
                     No results for language: <b>{}</b></div>""".format(
                     lang
                 )
@@ -185,7 +185,7 @@ def format_result_page_old(
                     </summary>
                     {results_for_lang_html}
                 </details>"""
-        results_html += results_for_lang_html
+        result_page_html += results_for_lang_html
 
     if num_results is not None:
         header_html += """<div style='font-family: Arial; color:MediumAquaMarine; text-align: center; line-height: 3em'>
@@ -193,20 +193,7 @@ def format_result_page_old(
             num_results
         )
 
-    return header_html + results_html
-
-
-def format_result_page(
-    results, highlight_terms, num_results, exact_search, datasets_filter=None
-):
-    results_html = []
-    for result in results:
-        result_html = format_result(
-            result, highlight_terms, exact_search, datasets_filter
-        )
-        if result_html != "":
-            results_html.append(result_html)
-    return results_html
+    return header_html + result_page_html
 
 
 def extract_results_from_payload(query, language, payload, exact_search):
@@ -344,7 +331,7 @@ if __name__ == "__main__":
                 multiselect=True,
             )
         with gr.Row():
-            results_html = gr.HTML(label="Results")
+            result_page_html = gr.HTML(label="Results")
 
         with gr.Row(visible=False) as pagination:
             next_page_btn = gr.Button("Next Page")
@@ -378,22 +365,7 @@ if __name__ == "__main__":
                 payload,
                 exact_search,
             )
-            header_html = ""
-            if lang == "detect_language" and not exact_search:
-                header_html += """<div style='font-family: Arial; color:MediumAquaMarine; text-align: center; line-height: 3em'>
-                    Detected language: <b style='color:MediumAquaMarine'>{}</b></div>""".format(
-                    "FIX ME!"
-                )
-            if len(processed_results) == 0:
-                header_html += """<div style='font-family: Arial; color:Silver; text-align: left; line-height: 3em'>
-                    No results found.</div>"""
-            elif num_results is not None:
-                header_html += """<div style='font-family: Arial; color:MediumAquaMarine; text-align: center; line-height: 3em'>
-                    Total number of matches: <b style='color:MediumAquaMarine'>{}</b></div>""".format(
-                    num_results
-                )
-            # print("processed_results", processed_results)
-            results_html = format_result_page_old(
+            result_page_html = format_result_page(
                 lang, processed_results, highlight_terms, num_results, exact_search
             )
             return (
@@ -401,7 +373,7 @@ if __name__ == "__main__":
                 highlight_terms,
                 num_results,
                 exact_search,
-                results_html,
+                result_page_html,
                 ds,
             )
 
@@ -411,7 +383,7 @@ if __name__ == "__main__":
                 highlight_terms,
                 num_results,
                 exact_search,
-                results_html,
+                result_page_html,
                 datasets,
             ) = run_query(query, lang, k, dropdown_input, max_page_size, 0)
             has_more_results = exact_search and (num_results > max_page_size)
@@ -423,8 +395,8 @@ if __name__ == "__main__":
                 gr.update(visible=True),
                 gr.Dropdown.update(choices=datasets, value=datasets),
                 gr.update(visible=has_more_results),
-                len(processed_results),
-                results_html,
+                len(next(iter(processed_results.values()))),
+                result_page_html,
             ]
 
         def next_page(
@@ -441,12 +413,12 @@ if __name__ == "__main__":
                 highlight_terms,
                 num_results,
                 exact_search,
-                results_html,
+                result_page_html,
                 datasets,
             ) = run_query(
                 query, lang, k, dropdown_input, max_page_size, received_results
             )
-            num_processed_results = len(processed_results)
+            num_processed_results = len(next(iter(processed_results.values())))
             has_more_results = exact_search and (num_results > max_page_size)
             print("num_processed_results", num_processed_results)
             print("has_more_results", has_more_results)
@@ -462,7 +434,7 @@ if __name__ == "__main__":
                     visible=num_processed_results >= max_page_size and has_more_results
                 ),
                 received_results + num_processed_results,
-                results_html,
+                result_page_html,
             ]
 
         def filter_datasets(
@@ -473,14 +445,15 @@ if __name__ == "__main__":
             exact_search,
             datasets_filter,
         ):
-            results_html = format_result_page_old(
+            result_page_html = format_result_page(
+                lang,
                 processed_results,
                 highlight_terms,
                 num_results,
                 exact_search,
                 datasets_filter,
             )
-            return results_html
+            return result_page_html
 
         query.submit(
             fn=submit,
@@ -494,7 +467,7 @@ if __name__ == "__main__":
                 available_datasets,
                 pagination,
                 received_results_state,
-                results_html,
+                result_page_html,
             ],
         )
         submit_btn.click(
@@ -509,7 +482,7 @@ if __name__ == "__main__":
                 available_datasets,
                 pagination,
                 received_results_state,
-                results_html,
+                result_page_html,
             ],
         )
 
@@ -533,7 +506,7 @@ if __name__ == "__main__":
                 available_datasets,
                 pagination,
                 received_results_state,
-                results_html,
+                result_page_html,
             ],
         )
 
@@ -547,6 +520,6 @@ if __name__ == "__main__":
                 exact_search_state,
                 available_datasets,
             ],
-            outputs=results_html,
+            outputs=result_page_html,
         )
     demo.launch(enable_queue=True, debug=True)