revert html experiments

app.py

@@ -88,7 +88,6 @@ def flag(query, language, num_results, issue_description):
 
 
 def format_result(result, highlight_terms, exact_search, datasets_filter=None):
-    # print("result", result)
     text, url, docid = result
     if datasets_filter is not None:
         datasets_filter = set(datasets_filter)
@@ -134,7 +133,8 @@ def format_result(result, highlight_terms, exact_search, datasets_filter=None):
     language = "FIXME"
     result_html = """{}
         <span style='font-size:14px; font-family: Arial; color:#7978FF; text-align: left;'>Document ID: {}</span>
-        <button type="button" onclick="alert('Hello world!')">Flag result</button><br>
+        <a href="https://forms.gle/AdBLLwRApqcLkHYA8" target="_blank"><button>🏴‍☠️ Flag result 🏴‍☠️</button></a><br>
+
         <!--  <span style='font-size:12px; font-family: Arial; color:MediumAquaMarine'>Language: {}</span><br> -->
         <span style='font-family: Arial;'>{}</span><br>
         <br>
@@ -144,6 +144,58 @@ def format_result(result, highlight_terms, exact_search, datasets_filter=None):
     return "<p>" + result_html + "</p>"
 
 
+def format_result_page_old(
+    language, results, highlight_terms, num_results, exact_search, datasets_filter=None
+) -> gr.HTML:
+
+    filtered_num_results = 0
+    header_html = ""
+
+    if language == "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(
+            list(results.keys())[0]
+        )
+
+    results_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'>
+                    No results found.</div>"""
+            else:
+                results_html += """<div style='font-family: Arial; color:Silver; text-align: left; line-height: 3em'>
+                    No results for language: <b>{}</b></div>""".format(
+                    lang
+                )
+            continue
+        results_for_lang_html = ""
+        for result in results_for_lang:
+            result_html = format_result(
+                result, highlight_terms, exact_search, datasets_filter
+            )
+            if result_html != "":
+                filtered_num_results += 1
+            results_for_lang_html += result_html
+        if language == "all" and not exact_search:
+            results_for_lang_html = f"""
+                <details>
+                    <summary style='font-family: Arial; color:MediumAquaMarine; text-align: left; line-height: 3em'>
+                        Results for language: <b>{lang}</b>
+                    </summary>
+                    {results_for_lang_html}
+                </details>"""
+        results_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'>
+            Total number of matches: <b style='color:MediumAquaMarine'>{}</b></div>""".format(
+            num_results
+        )
+
+    return header_html + results_html
+
+
 def format_result_page(
     results, highlight_terms, num_results, exact_search, datasets_filter=None
 ):
@@ -160,34 +212,32 @@ def format_result_page(
 def extract_results_from_payload(query, language, payload, exact_search):
     results = payload["results"]
 
-    processed_results = list()
+    processed_results = dict()
     datasets = set()
     highlight_terms = None
     num_results = None
-
     if exact_search:
         highlight_terms = query
         num_results = payload["num_results"]
+        results = {"dummy": results}
     else:
         highlight_terms = payload["highlight_terms"]
-        results = []
-        for lang, res_for_lang in payload["results"].items():
-            for result in res_for_lang:
-                results.append(result)
 
-    for result in results:
-        text = result["text"]
-        url = (
-            result["meta"]["url"]
-            if "meta" in result
-            and result["meta"] is not None
-            and "url" in result["meta"]
-            else None
-        )
-        docid = result["docid"]
-        _, dataset, _ = docid.split("/")
-        datasets.add(dataset)
-        processed_results.append((text, url, docid))
+    for lang, results_for_lang in results.items():
+        processed_results[lang] = list()
+        for result in results_for_lang:
+            text = result["text"]
+            url = (
+                result["meta"]["url"]
+                if "meta" in result
+                and result["meta"] is not None
+                and "url" in result["meta"]
+                else None
+            )
+            docid = result["docid"]
+            _, dataset, _ = docid.split("/")
+            datasets.add(dataset)
+            processed_results[lang].append((text, url, docid))
 
     return processed_results, highlight_terms, num_results, list(datasets)
 
@@ -277,6 +327,7 @@ if __name__ == "__main__":
                     "vi",
                     "zh",
                     "detect_language",
+                    "all",
                 ],
                 value="en",
                 label="Language",
@@ -293,10 +344,8 @@ if __name__ == "__main__":
                 multiselect=True,
             )
         with gr.Row():
-            header_html = gr.HTML(label="Header", value="hello")
-        results_html = []
-        for i in range(100):
-            results_html.append(gr.HTML(label="Results"))
+            results_html = gr.HTML(label="Results")
+
         with gr.Row(visible=False) as pagination:
             next_page_btn = gr.Button("Next Page")
 
@@ -344,8 +393,8 @@ if __name__ == "__main__":
                     num_results
                 )
             # print("processed_results", processed_results)
-            results_html = format_result_page(
-                processed_results, highlight_terms, num_results, exact_search
+            results_html = format_result_page_old(
+                lang, processed_results, highlight_terms, num_results, exact_search
             )
             return (
                 processed_results,
@@ -366,20 +415,17 @@ if __name__ == "__main__":
                 datasets,
             ) = run_query(query, lang, k, dropdown_input, max_page_size, 0)
             has_more_results = exact_search and (num_results > max_page_size)
-            return (
-                [
-                    processed_results,
-                    highlight_terms,
-                    num_results,
-                    exact_search,
-                    gr.update(visible=True),
-                    gr.Dropdown.update(choices=datasets, value=datasets),
-                    gr.update(visible=has_more_results),
-                    len(processed_results),
-                ]
-                + results_html
-                + [gr.update(visible=False)] * (100 - len(results_html))
-            )
+            return [
+                processed_results,
+                highlight_terms,
+                num_results,
+                exact_search,
+                gr.update(visible=True),
+                gr.Dropdown.update(choices=datasets, value=datasets),
+                gr.update(visible=has_more_results),
+                len(processed_results),
+                results_html,
+            ]
 
         def next_page(
             query,
@@ -405,23 +451,19 @@ if __name__ == "__main__":
             print("num_processed_results", num_processed_results)
             print("has_more_results", has_more_results)
             print("received_results", received_results)
-            return (
-                [
-                    processed_results,
-                    highlight_terms,
-                    num_results,
-                    exact_search,
-                    gr.update(visible=True),
-                    gr.Dropdown.update(choices=datasets, value=datasets),
-                    gr.update(
-                        visible=num_processed_results >= max_page_size
-                        and has_more_results
-                    ),
-                    received_results + num_processed_results,
-                ]
-                + results_html
-                + [gr.update(visible=False)] * (100 - len(results_html))
-            )
+            return [
+                processed_results,
+                highlight_terms,
+                num_results,
+                exact_search,
+                gr.update(visible=True),
+                gr.Dropdown.update(choices=datasets, value=datasets),
+                gr.update(
+                    visible=num_processed_results >= max_page_size and has_more_results
+                ),
+                received_results + num_processed_results,
+                results_html,
+            ]
 
         def filter_datasets(
             lang,
@@ -431,14 +473,14 @@ if __name__ == "__main__":
             exact_search,
             datasets_filter,
         ):
-            results_html = format_result_page(
+            results_html = format_result_page_old(
                 processed_results,
                 highlight_terms,
                 num_results,
                 exact_search,
                 datasets_filter,
             )
-            return results_html + [gr.update(visible=False)] * (100 - len(results_html))
+            return results_html
 
         query.submit(
             fn=submit,
@@ -452,8 +494,8 @@ if __name__ == "__main__":
                 available_datasets,
                 pagination,
                 received_results_state,
-            ]
-            + results_html,
+                results_html,
+            ],
         )
         submit_btn.click(
             submit,
@@ -467,8 +509,8 @@ if __name__ == "__main__":
                 available_datasets,
                 pagination,
                 received_results_state,
-            ]
-            + results_html,
+                results_html,
+            ],
         )
 
         next_page_btn.click(
@@ -491,8 +533,8 @@ if __name__ == "__main__":
                 available_datasets,
                 pagination,
                 received_results_state,
-            ]
-            + results_html,
+                results_html,
+            ],
         )
 
         available_datasets.change(
@@ -507,16 +549,4 @@ if __name__ == "__main__":
             ],
             outputs=results_html,
         )
-        results_html[0].change(
-            filter_datasets,
-            inputs=[
-                lang,
-                processed_results_state,
-                highlight_terms_state,
-                num_results_state,
-                exact_search_state,
-                available_datasets,
-            ],
-            outputs=results_html,
-        )
     demo.launch(enable_queue=True, debug=True)