Merge pull request #173 from MartinMF/fix/windows-tts-stt

Fix for Windows setup --server --local: TTS and STT

software/source/server/services/stt/local-whisper/stt.py

@@ -43,7 +43,9 @@ def install(service_dir):
     # Check if whisper-rust executable exists before attempting to build
     if not os.path.isfile(os.path.join(WHISPER_RUST_PATH, "target/release/whisper-rust")):
         # Check if Rust is installed. Needed to build whisper executable
-        rustc_path = shutil.which('rustc')
+
+        rustc_path = shutil.which("rustc")
+
         if rustc_path is None:
             print("Rust is not installed or is not in system PATH. Please install Rust before proceeding.")
             exit(1)

software/source/server/services/tts/piper/tts.py

@@ -49,22 +49,23 @@ def install(self, service_directory):
                     return
             elif OS == "Windows":
                 if ARCH == "AMD64":
-                    ARCH = "x64"
+                    ARCH = "amd64"
                 else:
                     print("Piper: unsupported architecture")
                     return
 
             PIPER_ASSETNAME = f"piper_{OS}_{ARCH}.tar.gz"
             PIPER_URL = "https://github.com/rhasspy/piper/releases/latest/download/"
 
-            if OS == "windows":
-                asset_url = f"{PIPER_URL}{PIPER_ASSETNAME}".replace(".tar.gz", ".zip")
+            asset_url = f"{PIPER_URL}{PIPER_ASSETNAME}"
+            if OS == "Windows":
+                asset_url = asset_url.replace(".tar.gz", ".zip")
 
             # Download and extract Piper
             urllib.request.urlretrieve(asset_url, os.path.join(PIPER_FOLDER_PATH, PIPER_ASSETNAME))
 
             # Extract the downloaded file
-            if OS == "windows":
+            if OS == "Windows":
                 import zipfile
                 with zipfile.ZipFile(os.path.join(PIPER_FOLDER_PATH, PIPER_ASSETNAME), 'r') as zip_ref:
                     zip_ref.extractall(path=PIPER_FOLDER_PATH)
@@ -105,4 +106,4 @@ def install(self, service_directory):
 
             print("Piper setup completed.")
         else:
-            print("Piper already set up. Skipping download.")
+            print("Piper already set up. Skipping download.")

software/source/server/utils/kernel.py

@@ -45,16 +45,20 @@ def custom_filter(message):
 
 def check_filtered_kernel():
     messages = get_kernel_messages()
-    if messages:
-        messages.replace(last_messages, "")
-        messages = messages.split("\n")
-
-        filtered_messages = []
-        for message in messages:
-            if custom_filter(message):
-                filtered_messages.append(message)
-
-        return "\n".join(filtered_messages)
+    if messages is None:
+        return ""  # Handle unsupported platform or error in fetching kernel messages
+
+    global last_messages
+    messages.replace(last_messages, "")
+    messages = messages.split("\n")
+
+    filtered_messages = []
+    for message in messages:
+        if custom_filter(message):
+            filtered_messages.append(message)
+
+    return "\n".join(filtered_messages)
+
 
 async def put_kernel_messages_into_queue(queue):
     while True: