Update app.py

app.py

@@ -31,18 +31,19 @@ def format_results(results):
     return "\n".join([result_html(result, meta) for result,meta in zip(results[TEXT_FIELD], results[METADATA_FIELD])])
     
 def page_0(query):
+    untokenized_query = query
     query = tokenize_sentence(query)
     hits = searcher.search(query, k=NUM_PAGES*RESULTS_PER_PAGE)
     ix = [int(hit.docid) for hit in hits]
     results = ds.select(ix).shard(num_shards=NUM_PAGES, index=0, contiguous=True) # no need to shard. split ix in batches instead. (would make sense if results was cacheable)
     results = format_results(results)
-    return results, [ix], gr.update(visible=True)
+    return results, [ix], gr.update(visible=True), untokenized_query
 
-def page_i(i, ix):
+def page_i(i, ix, query):
     ix = ix[0]
     results = ds.select(ix).shard(num_shards=NUM_PAGES, index=i, contiguous=True)
     results = format_results(results)
-    return results, [ix]
+    return results, [ix], query
     
 with gr.Blocks(css="#b {min-width:15px;background:transparent;border:white;box-shadow:none;}") as demo: #
     with gr.Row():
@@ -80,18 +81,18 @@ with gr.Blocks(css="#b {min-width:15px;background:transparent;border:white;box-s
                 # right = gr.Button(value="▶", elem_id="b", visible=False).style(full_width=True)
         with gr.Column(scale=1):
             pass
-    query.submit(fn=page_0, inputs=[query], outputs=[c, result_list, pagination])
-    submit_btn.click(page_0, inputs=[query], outputs=[c, result_list, pagination])
+    query.submit(fn=page_0, inputs=[query], outputs=[c, result_list, pagination, query])
+    submit_btn.click(page_0, inputs=[query], outputs=[c, result_list, pagination, query])
     with gr.Box(visible=False):
         nums = [gr.Number(i, visible=False, precision=0) for i in range(NUM_PAGES)]
-    page_1.click(fn=page_i, inputs=[nums[0], result_list], outputs=[c, result_list])
-    page_2.click(fn=page_i, inputs=[nums[1], result_list], outputs=[c, result_list])
-    page_3.click(fn=page_i, inputs=[nums[2], result_list], outputs=[c, result_list])
-    page_4.click(fn=page_i, inputs=[nums[3], result_list], outputs=[c, result_list])
-    page_5.click(fn=page_i, inputs=[nums[4], result_list], outputs=[c, result_list])
-    page_6.click(fn=page_i, inputs=[nums[5], result_list], outputs=[c, result_list])
-    page_7.click(fn=page_i, inputs=[nums[6], result_list], outputs=[c, result_list])
-    page_8.click(fn=page_i, inputs=[nums[7], result_list], outputs=[c, result_list])
-    page_9.click(fn=page_i, inputs=[nums[8], result_list], outputs=[c, result_list])
-    page_10.click(fn=page_i, inputs=[nums[9], result_list], outputs=[c, result_list])
+    page_1.click(fn=page_i, inputs=[nums[0], result_list, query], outputs=[c, result_list, query])
+    page_2.click(fn=page_i, inputs=[nums[1], result_list, query], outputs=[c, result_list, query])
+    page_3.click(fn=page_i, inputs=[nums[2], result_list, query], outputs=[c, result_list, query])
+    page_4.click(fn=page_i, inputs=[nums[3], result_list, query], outputs=[c, result_list, query])
+    page_5.click(fn=page_i, inputs=[nums[4], result_list, query], outputs=[c, result_list, query])
+    page_6.click(fn=page_i, inputs=[nums[5], result_list, query], outputs=[c, result_list, query])
+    page_7.click(fn=page_i, inputs=[nums[6], result_list, query], outputs=[c, result_list, query])
+    page_8.click(fn=page_i, inputs=[nums[7], result_list, query], outputs=[c, result_list, query])
+    page_9.click(fn=page_i, inputs=[nums[8], result_list, query], outputs=[c, result_list, query])
+    page_10.click(fn=page_i, inputs=[nums[9], result_list, query], outputs=[c, result_list, query])
 demo.launch(enable_queue=True, debug=True)