Skip to content

Commit

Permalink
updated versions and improved multithreading
Browse files Browse the repository at this point in the history
  • Loading branch information
SamyAteia committed Dec 17, 2024
1 parent 24cc9cc commit c8af890
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 17 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,4 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
local-run-command.txt
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.2-slim
FROM python:3.13-slim

WORKDIR /app

Expand Down
40 changes: 25 additions & 15 deletions app/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,11 +541,10 @@ def generate_ideal_answer(question:str, snippets:str, n_shots: int):


model_name = "gemini-1.5-flash-002"
model_name_extract = "gemini-1.5-flash-002"
model_name_rerank = "gemini-1.5-flash-002"
model_ideal = "gemini-1.5-flash-002"
model_name_extract = model_name
model_name_rerank = model_name
model_ideal = model_name
n_shot = 3
use_wiki = True

def read_jsonl_file(file_path: str) -> List[Dict[str, Any]]:
"""Reads a JSONL file and returns a list of examples."""
Expand Down Expand Up @@ -759,33 +758,44 @@ def enable_inputs_and_hide_spinner():
question_search_button.click(
disable_inputs_and_show_spinner,
inputs=[],
outputs=[loading_spinner, question_input, question_search_button, expanded_query_search_button]
outputs=[loading_spinner, question_input, question_search_button, expanded_query_search_button],
concurrency_limit=5
).success(
log_question, inputs=question_input, outputs=None
).success(
create_query, inputs=question_input, outputs=expanded_query_output
create_query, inputs=question_input, outputs=expanded_query_output,
concurrency_limit=5
).success(
search_expanded_query, inputs=[expanded_query_output, question_input], outputs=snippets_result
search_expanded_query, inputs=[expanded_query_output, question_input], outputs=snippets_result,
concurrency_limit=5
).success(
generate_ideal_answer_with_citations, inputs=[question_input, snippets_result, n_shots], outputs=answer_with_citations_output
generate_ideal_answer_with_citations, inputs=[question_input, snippets_result, n_shots], outputs=answer_with_citations_output,
concurrency_limit=5
).success(
generate_ideal_answer, inputs=[question_input, snippets_result, n_shots], outputs=answer_output
generate_ideal_answer, inputs=[question_input, snippets_result, n_shots], outputs=answer_output,
concurrency_limit=5
).success(
enable_inputs_and_hide_spinner, inputs=[], outputs=[loading_spinner, question_input, question_search_button, expanded_query_search_button]
enable_inputs_and_hide_spinner, inputs=[], outputs=[loading_spinner, question_input, question_search_button, expanded_query_search_button],
concurrency_limit=5
)

expanded_query_search_button.click(
disable_inputs_and_show_spinner,
inputs=[],
outputs=[loading_spinner, question_input, question_search_button, expanded_query_search_button]
outputs=[loading_spinner, question_input, question_search_button, expanded_query_search_button],
concurrency_limit=5
).success(
search_expanded_query, inputs=[expanded_query_output, question_input], outputs=snippets_result
search_expanded_query, inputs=[expanded_query_output, question_input], outputs=snippets_result,
concurrency_limit=5
).success(
generate_ideal_answer_with_citations, inputs=[question_input, snippets_result, n_shots], outputs=answer_with_citations_output
generate_ideal_answer_with_citations, inputs=[question_input, snippets_result, n_shots], outputs=answer_with_citations_output,
concurrency_limit=5
).success(
generate_ideal_answer, inputs=[question_input, snippets_result, n_shots], outputs=answer_output
generate_ideal_answer, inputs=[question_input, snippets_result, n_shots], outputs=answer_output,
concurrency_limit=5
).success(
enable_inputs_and_hide_spinner, inputs=[], outputs=[loading_spinner, question_input, question_search_button, expanded_query_search_button]
enable_inputs_and_hide_spinner, inputs=[], outputs=[loading_spinner, question_input, question_search_button, expanded_query_search_button],
concurrency_limit=5
)

if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion app/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
elasticsearch==7.17.12
python-dotenv
google-generativeai
gradio==5.4
gradio==5.9
pandas
portalocker

0 comments on commit c8af890

Please sign in to comment.