From 3d5559996a3c68b2be2e17aa20ad0cfc997a8491 Mon Sep 17 00:00:00 2001
From: deffcolony <61471128+deffcolony@users.noreply.github.com>
Date: Tue, 20 Aug 2024 19:27:02 +0200
Subject: [PATCH] launcher upgrades

+fixes tabbyapi install for real this time with pip update
---
 Launcher.bat                                               | 7 +++++--
 .../App_Installer/Text_Completion/install_tabbyapi.bat     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Launcher.bat b/Launcher.bat
index 7c5790e..ac93095 100644
--- a/Launcher.bat
+++ b/Launcher.bat
@@ -776,7 +776,7 @@ set max_retries=3
 set retry_count=0
 
 :retry_update_tabbyapi
-echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Updating tabbyAPI...
+echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Updating tabbyAPI repository...
 cd /d "%tabbyapi_install_path%"
 call git pull
 if %errorlevel% neq 0 (
@@ -787,6 +787,9 @@ if %errorlevel% neq 0 (
     pause
     goto :update_manager_text_completion
 )
+echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Updating tabbyAPI Dependencies in a new window...
+start cmd /k "title UPDATE TABBYAPI && cd /d %tabbyapi_install_path% && python start.py --update-deps && echo  WARNING: DO NOT FOLLOW INSTRUCTIONS FROM ABOVE BECAUSE THAT IS ONLY FOR USERS THAT DID NOT USE SILLYTAVERN-LAUNCHER TO INSTALL TABBYAPI. UPDATE INSTALLED, YOU CAN CLOSE THIS WINDOW NOW."
+
 echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% %green_fg_strong%tabbyAPI updated successfully.%reset%
 pause
 goto :update_manager_text_completion
@@ -1992,7 +1995,7 @@ if "%app_installer_tabbyapi_choice%"=="1" (
     set "caller=app_installer_text_completion_tabbyapi"
     if exist "%app_installer_text_completion_dir%\install_tabbyapi.bat" (
         call %app_installer_text_completion_dir%\install_tabbyapi.bat
-        goto :install_tabbyapi_menu
+        goto :update_tabbyapi
     ) else (
         echo [%DATE% %TIME%] ERROR: install_tabbyapi.bat not found in: %app_installer_text_completion_dir% >> %logs_stl_console_path%
         echo %red_bg%[%time%]%reset% %red_fg_strong%[ERROR] install_tabbyapi.bat not found in: %app_installer_text_completion_dir%%reset%
diff --git a/bin/functions/Toolbox/App_Installer/Text_Completion/install_tabbyapi.bat b/bin/functions/Toolbox/App_Installer/Text_Completion/install_tabbyapi.bat
index 4d5d92b..ff7dd93 100644
--- a/bin/functions/Toolbox/App_Installer/Text_Completion/install_tabbyapi.bat
+++ b/bin/functions/Toolbox/App_Installer/Text_Completion/install_tabbyapi.bat
@@ -115,6 +115,6 @@ echo If you do want a config file, copy over config_sample.yml to config.yml. Al
 echo so make sure to read the descriptions and comment out or remove fields that you don't need.
 echo.
 
-echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% %green_fg_strong%TabbyAPI has been installed successfully.%reset%
+echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% %green_fg_strong%TabbyAPI has been installed successfully. Press any key to install update requirements%reset%
 pause
 goto :install_tabbyapi_menu
\ No newline at end of file