Merge branch 'huggingface' into develop

backend.spec

@@ -5,7 +5,7 @@ a = Analysis(
     ['src-python\\mainloop.py'],
     pathex=[],
     binaries=[],
-    datas=[('./fonts', 'fonts/'), ('.venv/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv/Lib/site-packages/openvr', 'openvr/'), ('.venv/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv/Lib/site-packages/faster_whisper', 'faster_whisper/')],
+    datas=[('./fonts', 'fonts/'), ('.venv/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv/Lib/site-packages/openvr', 'openvr/'), ('.venv/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv/Lib/site-packages/faster_whisper', 'faster_whisper/'), ('.venv/Lib/site-packages/hf_xet', 'hf_xet/')],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},

backend_cuda.spec

@@ -5,7 +5,7 @@ a = Analysis(
     ['src-python\\mainloop.py'],
     pathex=[],
     binaries=[],
-    datas=[('./fonts', 'fonts/'), ('.venv_cuda/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv_cuda/Lib/site-packages/openvr', 'openvr/'), ('.venv_cuda/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv_cuda/Lib/site-packages/faster_whisper', 'faster_whisper/')],
+    datas=[('./fonts', 'fonts/'), ('.venv_cuda/Lib/site-packages/zeroconf', 'zeroconf/'), ('.venv_cuda/Lib/site-packages/openvr', 'openvr/'), ('.venv_cuda/Lib/site-packages/pykakasi', 'pykakasi/'), ('.venv_cuda/Lib/site-packages/faster_whisper', 'faster_whisper/'), ('.venv/Lib/site-packages/hf_xet', 'hf_xet/')],
     hiddenimports=[],
     hookspath=[],
     hooksconfig={},

build.bat

@@ -1,2 +1,2 @@
 call .venv/Scripts/activate
-pyinstaller backend.spec --distpath src-tauri/bin --clean --noconfirm
+pyinstaller backend.spec --distpath src-tauri/bin --clean --noconfirm --log-level ERROR

build_cuda.bat

@@ -1,2 +1,2 @@
 call .venv_cuda/Scripts/activate
-pyinstaller backend_cuda.spec --distpath src-tauri/bin --clean --noconfirm
+pyinstaller backend_cuda.spec --distpath src-tauri/bin --clean --noconfirm --log-level ERROR

install.bat

@@ -1,10 +1,25 @@
-python -m venv .venv
+REM .venv exists
-python -m venv .venv_cuda
+if exist .venv (
+    rmdir /s /q .venv
+)
 
+REM make .venv
+python -m venv .venv
+
+REM install packages for .venv
 call .venv/Scripts/activate
 python.exe -m pip install --upgrade pip
 pip install --no-cache-dir --force-reinstall -r requirements.txt
 
+REM if .venv_cuda exists
+if exist .venv_cuda (
+    rmdir /s /q .venv_cuda
+)
+
+REM make .venv_cuda
+python -m venv .venv_cuda
+
+REM install packages for .venv_cuda
 call .venv_cuda/Scripts/activate
 python.exe -m pip install --upgrade pip
 pip install --no-cache-dir --force-reinstall -r requirements_cuda.txt

requirements.txt

@@ -16,6 +16,9 @@ psutil==5.9.8
 pykakasi==2.3.0
 pycaw==20240210
 websockets==15.0.1
+huggingface_hub==0.32.2
+hf-xet==1.1.2
+setuptools==80.8.0
 translators @ git+https://github.com/misyaguziya/translators@5.9.2.1
 SpeechRecognition @ git+https://github.com/misyaguziya/custom_speech_recognition@3.10.4.1
 tinyoscquery @ git+https://github.com/cyberkitsune/tinyoscquery@0.1.3

requirements_cuda.txt

@@ -17,6 +17,9 @@ psutil==5.9.8
 pykakasi==2.3.0
 pycaw==20240210
 websockets==15.0.1
+huggingface_hub==0.32.2
+hf-xet==1.1.2
+setuptools==80.8.0
 translators @ git+https://github.com/misyaguziya/translators@5.9.2.1
 SpeechRecognition @ git+https://github.com/misyaguziya/custom_speech_recognition@3.10.4.1
 tinyoscquery @ git+https://github.com/cyberkitsune/tinyoscquery@0.1.3

src-python/controller.py

@@ -1,4 +1,4 @@
-from typing import Callable, Union, Any
+from typing import Callable, Any
 from time import sleep
 from subprocess import Popen
 from threading import Thread

src-python/mainloop.py

@@ -4,8 +4,11 @@ import time
 from typing import Any
 from threading import Thread
 from queue import Queue
-from controller import Controller
+import logging
-from utils import printLog, printResponse, errorLogging, encodeBase64
+from controller import Controller  # noqa: E402
+from utils import printLog, printResponse, errorLogging, encodeBase64 # noqa: E402
+
+logging.getLogger("huggingface_hub").setLevel(logging.ERROR)
 
 run_mapping = {
     "connected_network":"/run/connected_network",
@@ -376,7 +379,7 @@ class Main:
                 if status == 423:
                     self.queue.put((endpoint, data))
                 else:
-                    printLog(endpoint, {"send_data":result})
+                    printLog(endpoint, {"status": status, "send_data": result})
                     printResponse(status, endpoint, result)
             time.sleep(0.1)