Multivocoder Update: A substantial infrastructure upgrade proposed as a version improvement.

.github/PULL_REQUEST_TEMPLATE/pull_request.md

@@ -0,0 +1,37 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+
+<!--- Describe your changes in detail -->
+
+## Motivation and Context
+
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How has this been tested?
+
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, tests ran to see how -->
+<!--- your change affects other areas of the code, etc. -->
+
+## Screenshots (if appropriate):
+
+## Types of changes
+
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+
+## Checklist:
+
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have added tests to cover my changes.
+- [ ] All new and existing tests passed.

.github/release.yml

@@ -0,0 +1,20 @@
+# .github/release.yml
+
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - blaise.tk
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - Fix
+        - breaking-change
+    - title: Exciting New Features 🎉
+      labels:
+        - Add
+        - enhancement
+    - title: Other Changes
+      labels:
+        - "*"

assets/flask/routes.py

@@ -2,8 +2,7 @@
 import signal
 from flask import Flask, request, redirect
 
-now_dir = os.getcwd()
-sys.path.append(now_dir)
+sys.path.append(os.getcwd())
 
 from core import run_download_script
 

assets/flask/server.py

@@ -6,10 +6,9 @@
 import json
 
 # Constants
-NOW_DIR = os.getcwd()
-CONFIG_FILE = os.path.join(NOW_DIR, "assets", "config.json")
-ENV_PATH = os.path.join(NOW_DIR, "env", "python.exe")
-FLASK_SCRIPT_PATH = os.path.join(NOW_DIR, "assets", "flask", "routes.py")
+CONFIG_FILE = os.path.join(os.getcwd(), "assets", "config.json")
+ENV_PATH = os.path.join(os.getcwd(), "env", "python.exe")
+FLASK_SCRIPT_PATH = os.path.join(os.getcwd(), "assets", "flask", "routes.py")
 HOST = "localhost"
 PORT = 8000
 TIMEOUT = 2

assets/formant_shift/f2m.json

@@ -1,4 +1,4 @@
-{
-    "formant_qfrency": 1.0,
-    "formant_timbre": 0.8
-}
+{
+    "formant_qfrency": 1.0,
+    "formant_timbre": 0.8
+}

assets/formant_shift/m2f.json

@@ -1,4 +1,4 @@
-{
-    "formant_qfrency": 1.0,
-    "formant_timbre": 1.2
-}
+{
+    "formant_qfrency": 1.0,
+    "formant_timbre": 1.2
+}

assets/formant_shift/random.json

@@ -1,4 +1,4 @@
-{
-    "formant_qfrency": 32.0,
-    "formant_timbre": 9.8
-}
+{
+    "formant_qfrency": 32.0,
+    "formant_timbre": 9.8
+}

assets/i18n/i18n.py

@@ -3,16 +3,15 @@
 from pathlib import Path
 from locale import getdefaultlocale
 
-now_dir = os.getcwd()
-sys.path.append(now_dir)
+sys.path.append(os.getcwd())
 
 
 class I18nAuto:
-    LANGUAGE_PATH = os.path.join(now_dir, "assets", "i18n", "languages")
+    LANGUAGE_PATH = os.path.join(os.getcwd(), "assets", "i18n", "languages")
 
     def __init__(self, language=None):
         with open(
-            os.path.join(now_dir, "assets", "config.json"), "r", encoding="utf8"
+            os.path.join(os.getcwd(), "assets", "config.json"), "r", encoding="utf8"
         ) as file:
             config = json.load(file)
             override = config["lang"]["override"]

assets/installation_checker.py

@@ -1,8 +1,7 @@
 import sys
 import os
 
-now_dir = os.getcwd()
-sys.path.append(now_dir)
+sys.path.append(os.getcwd())
 
 
 class InstallationError(Exception):
@@ -14,24 +13,24 @@ def __init__(self, message="InstallationError"):
 def check_installation():
     try:
         system_drive = os.getenv("SystemDrive")
-        current_drive = os.path.splitdrive(now_dir)[0]
+        current_drive = os.path.splitdrive(os.getcwd())[0]
         if current_drive.upper() != system_drive.upper():
             raise InstallationError(
                 f"Installation Error: The current working directory is on drive {current_drive}, but the default system drive is {system_drive}. Please move Applio to the {system_drive} drive."
             )
     except:
         pass
     else:
-        if "OneDrive" in now_dir:
+        if "OneDrive" in os.getcwd():
             raise InstallationError(
                 "Installation Error: The current working directory is located in OneDrive. Please move Applio to a different folder."
             )
-        elif " " in now_dir:
+        elif " " in os.getcwd():
             raise InstallationError(
                 "Installation Error: The current working directory contains spaces. Please move Applio to a folder without spaces in its path."
             )
         try:
-            now_dir.encode("ascii")
+            os.getcwd().encode("ascii")
         except UnicodeEncodeError:
             raise InstallationError(
                 "Installation Error: The current working directory contains non-ASCII characters. Please move Applio to a folder with only ASCII characters in its path."

assets/themes/loadThemes.py

@@ -1,118 +1,100 @@
 import json
 import os
+import sys
 import importlib
 import gradio as gr
 
-now_dir = os.getcwd()
-
-folder = os.path.dirname(os.path.abspath(__file__))
-folder = os.path.dirname(folder)
-folder = os.path.dirname(folder)
-folder = os.path.join(folder, "assets", "themes")
-config_file = os.path.join(now_dir, "assets", "config.json")
 
-import sys
+# Setting up the paths
+base_folder = os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+)
+themes_folder = os.path.join(base_folder, "assets", "themes")
+config_file_path = os.path.join(os.getcwd(), "assets", "config.json")
 
-sys.path.append(folder)
+sys.path.append(themes_folder)
 
 
 def get_class(filename):
     with open(filename, "r", encoding="utf8") as file:
-        for line_number, line in enumerate(file, start=1):
-            if "class " in line:
-                found = line.split("class ")[1].split(":")[0].split("(")[0].strip()
-                return found
-                break
+        for line in file:
+            if line.startswith("class "):
+                return line.split("class ")[1].split(":")[0].split("(")[0].strip()
     return None
 
 
 def get_list():
-
     themes_from_files = [
         os.path.splitext(name)[0]
-        for root, _, files in os.walk(folder, topdown=False)
+        for root, _, files in os.walk(themes_folder, topdown=False)
         for name in files
-        if name.endswith(".py") and root == folder
+        if name.endswith(".py") and root == themes_folder
     ]
 
-    json_file_path = os.path.join(folder, "theme_list.json")
+    json_file_path = os.path.join(themes_folder, "theme_list.json")
 
     try:
         with open(json_file_path, "r", encoding="utf8") as json_file:
             themes_from_url = [item["id"] for item in json.load(json_file)]
     except FileNotFoundError:
         themes_from_url = []
 
-    combined_themes = set(themes_from_files + themes_from_url)
-
-    return list(combined_themes)
+    return list(set(themes_from_files + themes_from_url))
 
 
 def select_theme(name):
-    selected_file = name + ".py"
-    full_path = os.path.join(folder, selected_file)
+    selected_file = f"{name}.py"
+    full_path = os.path.join(themes_folder, selected_file)
 
-    if not os.path.exists(full_path):
-        with open(config_file, "r", encoding="utf8") as json_file:
+    try:
+        with open(config_file_path, "r", encoding="utf8") as json_file:
             config_data = json.load(json_file)
 
-        config_data["theme"]["file"] = None
-        config_data["theme"]["class"] = name
+        if not os.path.exists(full_path):
+            config_data["theme"]["file"] = None
+            config_data["theme"]["class"] = name
+        else:
+            class_name = get_class(full_path)
+            if class_name:
+                config_data["theme"]["file"] = selected_file
+                config_data["theme"]["class"] = class_name
+            else:
+                print(f"Theme {name} was not found.")
+                return
 
-        with open(config_file, "w", encoding="utf8") as json_file:
+        with open(config_file_path, "w", encoding="utf8") as json_file:
             json.dump(config_data, json_file, indent=2)
-        print(f"Theme {name} successfully selected, restart applio.")
-        gr.Info(f"Theme {name} successfully selected, restart applio.")
-        return
-
-    class_found = get_class(full_path)
-    if class_found:
-        with open(config_file, "r", encoding="utf8") as json_file:
-            config_data = json.load(json_file)
-
-        config_data["theme"]["file"] = selected_file
-        config_data["theme"]["class"] = class_found
 
-        with open(config_file, "w", encoding="utf8") as json_file:
-            json.dump(config_data, json_file, indent=2)
-        print(f"Theme {name} successfully selected, restart applio.")
-        gr.Info(f"Theme {name} successfully selected, restart applio.")
-    else:
-        print(f"Theme {name} was not found.")
+        print(f"Theme {name} successfully selected, restart Applio.")
+        gr.Info(f"Theme {name} successfully selected, restart Applio.")
+    except Exception as error:
+        print(f"An error occurred: {error}")
 
 
 def read_json():
     try:
-        with open(config_file, "r", encoding="utf8") as json_file:
+        with open(config_file_path, "r", encoding="utf8") as json_file:
             data = json.load(json_file)
-            selected_file = data["theme"]["file"]
-            class_name = data["theme"]["class"]
-
-            if selected_file is not None and class_name:
-                return class_name
-            elif selected_file == None and class_name:
-                return class_name
-            else:
-                return "ParityError/Interstellar"
+            return data["theme"].get("class", "ParityError/Interstellar")
     except Exception as error:
         print(f"An error occurred loading the theme: {error}")
         return "ParityError/Interstellar"
 
 
 def load_json():
     try:
-        with open(config_file, "r", encoding="utf8") as json_file:
+        with open(config_file_path, "r", encoding="utf8") as json_file:
             data = json.load(json_file)
-            selected_file = data["theme"]["file"]
-            class_name = data["theme"]["class"]
+            selected_file = data["theme"].get("file")
+            class_name = data["theme"].get("class")
 
-            if selected_file is not None and class_name:
+            if selected_file and class_name:
                 module = importlib.import_module(selected_file[:-3])
                 obtained_class = getattr(module, class_name)
                 instance = obtained_class()
                 print(f"Theme {class_name} successfully loaded.")
                 return instance
-            elif selected_file == None and class_name:
+            elif class_name:
                 return class_name
             else:
                 print("The theme is incorrect.")

assets/version_checker.py

@@ -3,10 +3,9 @@
 import json
 import requests
 
-now_dir = os.getcwd()
-sys.path.append(now_dir)
+sys.path.append(os.getcwd())
 
-config_file = os.path.join(now_dir, "assets", "config.json")
+config_file = os.path.join(os.getcwd(), "assets", "config.json")
 
 
 def load_local_version():

assets/zluda/reinstall-torch.bat

@@ -0,0 +1,11 @@
+set "principal=%cd%"
+set "URL_EXTRA=https://huggingface.co/IAHispano/applio/resolve/main"
+set "CONDA_ROOT_PREFIX=%UserProfile%\Miniconda3"
+set "INSTALL_ENV_DIR=%principal%\env"
+set "MINICONDA_DOWNLOAD_URL=https://repo.anaconda.com/miniconda/Miniconda3-py39_23.9.0-0-Windows-x86_64.exe"
+set "CONDA_EXECUTABLE=%CONDA_ROOT_PREFIX%\Scripts\conda.exe"
+
+call "%CONDA_ROOT_PREFIX%\condabin\conda.bat" activate "%INSTALL_ENV_DIR%"
+rem pip uninstall torch torchvision torchaudio -y
+rem pip install torch==2.1.1 torchvision==0.16.1 torchaudio==2.1.1 --index-url https://download.pytorch.org/whl/cu118
+call "%CONDA_ROOT_PREFIX%\condabin\conda.bat" deactivate