feat: installer now records successful upgrade hash

Author: rsxdalv

installer_scripts/.gitignore

@@ -11,6 +11,7 @@ output.log
 .python_version
 .pip_packages
 .db_version
+.git_version
 
 # Diagnostic
 diagnostic.txt

installer_scripts/init_app.js

@@ -20,9 +20,20 @@ const updateConda = async () => {
 };
 
 const FORCE_REINSTALL = process.env.FORCE_REINSTALL ? true : false;
-const DEBUG_ALWAYS_RETURN_UPDATED = FORCE_REINSTALL || process.env.DEBUG_ALWAYS_RETURN_UPDATED
-  ? true
-  : false;
+const DEBUG_ALWAYS_RETURN_UPDATED =
+  FORCE_REINSTALL || process.env.DEBUG_ALWAYS_RETURN_UPDATED ? true : false;
+
+const getGitCommitHash = () =>
+  fs.readFileSync("./.git/refs/heads/main", "utf8");
+
+const AppliedGitVersion = {
+  file: "./.git_version",
+  get: () =>
+    fs.existsSync(AppliedGitVersion.file)
+      ? fs.readFileSync(AppliedGitVersion.file, "utf8")
+      : null,
+  save: () => fs.writeFileSync(AppliedGitVersion.file, getGitCommitHash()),
+};
 
 const syncRepo = async () => {
   if (!fs.existsSync(".git")) {
@@ -39,11 +50,10 @@ const syncRepo = async () => {
   } else {
     displayMessage("Pulling updates from tts-generation-webui");
     try {
-      const file = ".git/refs/heads/main";
-      const currentHash = fs.readFileSync(file, "utf8");
       await $("git pull");
-      const newHash = fs.readFileSync(file, "utf8");
-      if (currentHash === newHash) {
+      const newHash = getGitCommitHash();
+      if (AppliedGitVersion.get() === newHash) {
+        displayMessage("Current git version: " + newHash);
         displayMessage("No updates found, skipping...");
         return false || DEBUG_ALWAYS_RETURN_UPDATED;
       }
@@ -77,9 +87,8 @@ async function main() {
     // await updateConda();
     // check if there are any packages actually installed inside of conda
     const isUpdated = await syncRepo();
-    if (!isUpdated) {
-      return;
-    }
+    if (!isUpdated) return;
+
     const {
       initializeApp,
       repairTorch,
@@ -88,6 +97,8 @@ async function main() {
     await initializeApp();
     await setupReactUI();
     await repairTorch();
+
+    AppliedGitVersion.save();
   } catch (error) {
     displayError(error.message);
     processExit(1);

installer_scripts/js/applyDatabaseConfig.js

@@ -56,6 +56,8 @@ async function applyDatabaseConfig() {
     await awaitDatabase();
     try {
       await func();
+    } catch (error) {
+      throw error;
     } finally {
       await stopDatabase();
     }

installer_scripts/js/initializeApp.js

@@ -219,14 +219,8 @@ const checkIfTorchInstalled = async () => {
 
 const FORCE_REINSTALL = process.env.FORCE_REINSTALL ? true : false;
 
-const initializeApp = async () => {
-  displayMessage("Ensuring that python has the correct version...");
-  await ensurePythonVersion();
-  try {
-    await applyDatabaseConfig();
-  } catch (error) {
-    displayError("Failed to apply database config");
-  }
+async function applyCondaConfig() {
+  displayMessage("Applying conda config...");
   displayMessage("Checking if Torch is installed...");
   if (readMajorVersion() === majorVersion && !FORCE_REINSTALL) {
     if (await checkIfTorchInstalled()) {
@@ -251,6 +245,17 @@ const initializeApp = async () => {
     saveGPUChoice(gpuchoice);
     await installDependencies(gpuchoice);
   }
+}
+
+const initializeApp = async () => {
+  displayMessage("Ensuring that python has the correct version...");
+  await ensurePythonVersion();
+  await applyCondaConfig();
+  try {
+    await applyDatabaseConfig();
+  } catch (error) {
+    displayError("Failed to apply database config");
+  }
 };
 exports.initializeApp = initializeApp;