Merge pull request #212 from rmusser01/dev

Sync latest changes - unstable....
rmusser01 · Sep 3, 2024 · 5e87a98 · 5e87a98
2 parents 7870234 + ddf2666
commit 5e87a98
Show file tree

Hide file tree

Showing 65 changed files with 2,645 additions and 590 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/App_Function_Libraries/Article_Summarization_Lib.py b/App_Function_Libraries/Article_Summarization_Lib.py
@@ -24,15 +24,15 @@
 # 3rd-Party Imports
 from tqdm import tqdm
 
-from App_Function_Libraries.Utils import sanitize_filename
+from App_Function_Libraries.Utils.Utils import sanitize_filename
 # Local Imports
 from Article_Extractor_Lib import scrape_article
 from Local_Summarization_Lib import summarize_with_llama, summarize_with_oobabooga, summarize_with_tabbyapi, \
     summarize_with_vllm, summarize_with_kobold, save_summary_to_file, summarize_with_local_llm
 from Summarization_General_Lib import summarize_with_openai, summarize_with_anthropic, summarize_with_cohere, \
     summarize_with_groq, summarize_with_openrouter, summarize_with_deepseek, summarize_with_huggingface, \
     summarize_with_mistral
-from App_Function_Libraries.DB_Manager import ingest_article_to_db
+from App_Function_Libraries.DB.DB_Manager import ingest_article_to_db
 #
 #######################################################################################################################
 # Function Definitions

diff --git a/App_Function_Libraries/Audio_Files.py b/App_Function_Libraries/Audio_Files.py
@@ -30,11 +30,11 @@
 from App_Function_Libraries.Chunk_Lib import improved_chunking_process
 #
 # Local Imports
-from App_Function_Libraries.DB_Manager import add_media_to_database, add_media_with_keywords, \
+from App_Function_Libraries.DB.DB_Manager import add_media_to_database, add_media_with_keywords, \
     check_media_and_whisper_model
 from App_Function_Libraries.Summarization_General_Lib import save_transcription_and_summary, perform_transcription, \
     perform_summarization
-from App_Function_Libraries.Utils import create_download_directory, save_segments_to_json, downloaded_files, \
+from App_Function_Libraries.Utils.Utils import create_download_directory, save_segments_to_json, downloaded_files, \
     sanitize_filename
 from App_Function_Libraries.Video_DL_Ingestion_Lib import extract_metadata
 

diff --git a/App_Function_Libraries/Book_Ingestion_Lib.py b/App_Function_Libraries/Book_Ingestion_Lib.py
@@ -20,7 +20,7 @@
 
 
 # Import Local
-from SQLite_DB import add_media_with_keywords
+from App_Function_Libraries.DB.SQLite_DB import add_media_with_keywords
 
 #######################################################################################################################
 # Function Definitions

diff --git a/App_Function_Libraries/Chat.py b/App_Function_Libraries/Chat.py
@@ -13,13 +13,13 @@
 # External Imports
 #
 # Local Imports
-from App_Function_Libraries.DB_Manager import get_conversation_name, save_chat_history_to_database
+from App_Function_Libraries.DB.DB_Manager import get_conversation_name, save_chat_history_to_database
 from App_Function_Libraries.LLM_API_Calls import chat_with_openai, chat_with_anthropic, chat_with_cohere, \
     chat_with_groq, chat_with_openrouter, chat_with_deepseek, chat_with_mistral, chat_with_huggingface#, chat_with_vllm
 from App_Function_Libraries.LLM_API_Calls_Local import chat_with_aphrodite, chat_with_local_llm, chat_with_ollama, \
     chat_with_kobold, chat_with_llama, chat_with_oobabooga, chat_with_tabbyapi
-from App_Function_Libraries.SQLite_DB import load_media_content
-from App_Function_Libraries.Utils import generate_unique_filename
+from App_Function_Libraries.DB.SQLite_DB import load_media_content
+from App_Function_Libraries.Utils.Utils import generate_unique_filename
 #
 ####################################################################################################
 #