From 9f94353357fb820e7695ecdeb6bedd8b66a2ed00 Mon Sep 17 00:00:00 2001
From: deffcolony <61471128+deffcolony@users.noreply.github.com>
Date: Sun, 19 Nov 2023 16:25:00 +0100
Subject: [PATCH] added requirements.txt command

yeah this should fix the flask error because i forgot to put the most important command in this script
---
 Launcher.bat  | 21 +++++++++++++++++----
 install.sh    | 16 ++++++++++++++--
 installer.bat |  3 +++
 launcher.sh   | 16 ++++++++++++++--
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/Launcher.bat b/Launcher.bat
index 52ad53d..dca6b36 100644
--- a/Launcher.bat
+++ b/Launcher.bat
@@ -854,14 +854,27 @@ if /i "!confirmation!"=="Y" (
     REM Navigate to the SillyTavern-extras directory
     cd SillyTavern-extras
 
-    REM Install Python dependencies from requirements files
-    echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing pip requirements-complete...
-    pip install -r requirements-complete.txt
+    echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing modules from requirements.txt...
+    pip install -r requirements.txt
+
+    REM Provide a link to the Coqui documentation
+    echo %yellow_fg_strong%[DISCLAIMER] The installation of Coqui requirements is not recommended unless you have a specific use case. It may conflict with additional dependencies and functionalities to your environment.%reset%
+    echo %blue_fg_strong%[INFO]%reset% To learn more about Coqui, visit: https://docs.sillytavern.app/extras/installation/#decide-which-module-to-use
+
+    REM Ask the user if they want to install requirements-coqui.txt
+    set /p install_coqui_requirements=Do you want to install Coqui TTS? [Y/N] 
+
+    REM Check the user's response
+    if /i "%install_coqui_requirements%"=="Y" (
+        echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing pip requirements-coqui...
+        pip install -r requirements-coqui.txt
+    ) else (
+        echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]Coqui requirements installation skipped.%reset% 
+    )
 
     echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing pip requirements-rvc...
     pip install -r requirements-rvc.txt
 
-
     echo %cyan_fg_strong%Yes, If you are seeing errors about Numpy and Librosa then that is completely normal. If facebook updates their fairseq library to python 3.11 then this error will not appear anymore.%reset%
     echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% %green_fg_strong%Extras installed successfully.%reset%
 ) else (
diff --git a/install.sh b/install.sh
index 10e8b3a..d751520 100644
--- a/install.sh
+++ b/install.sh
@@ -237,8 +237,20 @@ install_st_extras() {
 
     cd SillyTavern-extras
 
-    log_message "INFO" "Installing pip requirements-complete..."
-    pip install -r requirements-complete.txt
+    log_message "INFO" "Installing modules from requirements.txt..."
+    pip install -r requirements.txt
+
+    log_message "DISCLAIMER" "The installation of Coqui requirements is not recommended unless you have a specific use case. It may conflict with additional dependencies and functionalities to your environment."
+    log_message "INFO" "To learn more about Coqui, visit: https://docs.sillytavern.app/extras/installation/#decide-which-module-to-use"
+
+    read -p "Do you want to install Coqui TTS? [Y/N] " install_coqui_requirements
+
+    if [[ "$install_coqui_requirements" == [Yy] ]]; then
+        log_message "INFO" "Installing pip requirements-coqui..."
+        pip install -r requirements-coqui.txt
+    else
+        log_message "INFO" "Coqui requirements installation skipped."
+    fi
 
     log_message "INFO" "Installing pip requirements-rvc..."
     pip install -r requirements-rvc.txt
diff --git a/installer.bat b/installer.bat
index 2aef100..c0aa240 100644
--- a/installer.bat
+++ b/installer.bat
@@ -208,6 +208,9 @@ git clone https://github.com/SillyTavern/SillyTavern-extras.git
 REM Navigate to the SillyTavern-extras directory
 cd SillyTavern-extras
 
+echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Installing modules from requirements.txt...
+pip install -r requirements.txt
+
 REM Provide a link to the Coqui documentation
 echo %yellow_fg_strong%[DISCLAIMER] The installation of Coqui requirements is not recommended unless you have a specific use case. It may conflict with additional dependencies and functionalities to your environment.%reset%
 echo %blue_fg_strong%[INFO]%reset% To learn more about Coqui, visit: https://docs.sillytavern.app/extras/installation/#decide-which-module-to-use
diff --git a/launcher.sh b/launcher.sh
index 5b403bb..6844d26 100644
--- a/launcher.sh
+++ b/launcher.sh
@@ -586,8 +586,20 @@ reinstall_extras() {
 
         cd SillyTavern-extras
 
-        log_message "INFO" "Installing pip requirements-complete..."
-        pip install -r requirements-complete.txt
+        log_message "INFO" "Installing modules from requirements.txt..."
+        pip install -r requirements.txt
+
+        log_message "DISCLAIMER" "The installation of Coqui requirements is not recommended unless you have a specific use case. It may conflict with additional dependencies and functionalities to your environment."
+        log_message "INFO" "To learn more about Coqui, visit: https://docs.sillytavern.app/extras/installation/#decide-which-module-to-use"
+
+        read -p "Do you want to install Coqui TTS? [Y/N] " install_coqui_requirements
+
+        if [[ "$install_coqui_requirements" == [Yy] ]]; then
+            log_message "INFO" "Installing pip requirements-coqui..."
+            pip install -r requirements-coqui.txt
+        else
+            log_message "INFO" "Coqui requirements installation skipped."
+        fi
 
         log_message "INFO" "Installing pip requirements-rvc..."
         pip install -r requirements-rvc.txt