-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15 from jonfairbanks/develop
Logging, Caching & User Experience Improvements
- Loading branch information
Showing
13 changed files
with
319 additions
and
209 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| *.pyc | ||
| data/* | ||
| *.log | ||
| .cache/* | ||
| .nv/* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,162 +1,20 @@ | ||
| import os | ||
|
|
||
| import streamlit as st | ||
|
|
||
| import utils.helpers as func | ||
| import utils.ollama as ollama | ||
| import utils.llama_index as llama_index | ||
|
|
||
| from components.tabs.local_files import local_files | ||
| from components.tabs.github_repo import github_repo | ||
| from components.tabs.website import website | ||
|
|
||
|
|
||
| def file_upload(): | ||
| st.title("Directly import your files") | ||
| st.caption("Convert your files to embeddings for utilization during chat") | ||
| st.write("") | ||
|
|
||
| # Force users to confirm Settings before uploading files | ||
| if st.session_state["selected_model"] is not None: | ||
| file_upload_container = st.container(border=True) | ||
| with file_upload_container: | ||
| uploaded_files = st.file_uploader( | ||
| "Select Files", | ||
| accept_multiple_files=True, | ||
| type=( | ||
| "csv", | ||
| "docx", | ||
| "epub", | ||
| "ipynb", | ||
| "json", | ||
| "md", | ||
| "pdf", | ||
| "ppt", | ||
| "pptx", | ||
| ), | ||
| ) | ||
| else: | ||
| st.warning("Please configure Ollama settings before proceeding!", icon="⚠️") | ||
| file_upload_container = st.container(border=True) | ||
| with file_upload_container: | ||
| uploaded_files = st.file_uploader( | ||
| "Select Files", | ||
| accept_multiple_files=True, | ||
| type=( | ||
| "csv", | ||
| "docx", | ||
| "epub", | ||
| "ipynb", | ||
| "json", | ||
| "md", | ||
| "pdf", | ||
| "ppt", | ||
| "pptx", | ||
| ), | ||
| disabled=True, | ||
| ) | ||
|
|
||
| if len(uploaded_files) > 0: | ||
| st.session_state["file_list"] = uploaded_files | ||
|
|
||
| with st.status("Preparing your data...", expanded=True) as status: | ||
| error = None | ||
|
|
||
| ###################### | ||
| # Save Files to Disk # | ||
| ###################### | ||
|
|
||
| st.caption("Uploading Files Locally") | ||
| for uploaded_file in uploaded_files: | ||
| with st.spinner(f"Processing {uploaded_file.name}..."): | ||
| save_dir = os.getcwd() + "/data" | ||
| func.save_uploaded_file(uploaded_file, save_dir) | ||
|
|
||
| st.caption("Loading Embedding Model") | ||
|
|
||
| ###################################### | ||
| # Create Llama-Index service-context # | ||
| # to use local LLMs and embeddings # | ||
| ###################################### | ||
|
|
||
| try: | ||
| llm = ollama.create_ollama_llm( | ||
| st.session_state["selected_model"], | ||
| st.session_state["ollama_endpoint"], | ||
| ) | ||
|
|
||
| # resp = llm.complete("Hello!") | ||
| # print(resp) | ||
|
|
||
| # Determine embedding model to use | ||
|
|
||
| embedding_model = st.session_state["embedding_model"] | ||
| hf_embedding_model = None | ||
| with st.expander("💻 **Local Files**", expanded=False): | ||
| local_files() | ||
|
|
||
| if embedding_model == None: | ||
| print("No embedding model set; using defaults...") | ||
| hf_embedding_model = "BAAI/bge-large-en-v1.5" | ||
|
|
||
| if embedding_model == "Default (bge-large-en-v1.5)": | ||
| print("Using default embedding model...") | ||
| hf_embedding_model = "BAAI/bge-large-en-v1.5" | ||
|
|
||
| if embedding_model == "Large (Salesforce/SFR-Embedding-Mistral)": | ||
| print("Using the Salesforce embedding model; RIP yer VRAM...") | ||
| hf_embedding_model = "Salesforce/SFR-Embedding-Mistral" | ||
|
|
||
| if embedding_model == "Other": | ||
| print("Using a user-provided embedding model...") | ||
| hf_embedding_model = st.session_state["other_embedding_model"] | ||
|
|
||
| service_context = llama_index.create_service_context( | ||
| llm, | ||
| st.session_state["system_prompt"], | ||
| hf_embedding_model, | ||
| st.session_state["chunk_size"], | ||
| ) | ||
| except Exception as err: | ||
| print(f"Setting up Service Context failed: {err}") | ||
| error = err | ||
|
|
||
| ####################################### | ||
| # Load files from the data/ directory # | ||
| ####################################### | ||
|
|
||
| st.caption("Processing File Data") | ||
| try: | ||
| documents = llama_index.load_documents(save_dir) | ||
| st.session_state["documents"] = documents | ||
| except Exception as err: | ||
| print(f"Document Load Error: {err}") | ||
| error = err | ||
|
|
||
| ########################################### | ||
| # Create an index from ingested documents # | ||
| ########################################### | ||
|
|
||
| st.caption("Creating File Index") | ||
| try: | ||
| llama_index.create_query_engine(documents, service_context) | ||
| except Exception as err: | ||
| print(f"Index Creation Error: {err}") | ||
| error = err | ||
|
|
||
| ##################### | ||
| # Show Final Status # | ||
| ##################### | ||
|
|
||
| if error is not None: | ||
| status.update( | ||
| label="File processing failed.", | ||
| state="error", | ||
| expanded=True, | ||
| ) | ||
| st.error(error) | ||
| else: | ||
| status.update( | ||
| label="Your files are ready. Let's chat!", | ||
| state="complete", | ||
| expanded=False, | ||
| ) | ||
|
|
||
| with st.expander("GitHub Repo", expanded=False): | ||
| with st.expander("🗂️ **GitHub Repo**", expanded=False): | ||
| github_repo() | ||
|
|
||
| with st.expander("🌐 **Website**", expanded=False): | ||
| website() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.