diff --git a/build.bat b/build.bat index 89ee8cbb..3c08629c 100644 --- a/build.bat +++ b/build.bat @@ -1,2 +1,2 @@ call .venv/Scripts/activate -pyinstaller backend.spec --distpath src-tauri/bin --clean --noconfirm \ No newline at end of file +pyinstaller backend.spec --distpath src-tauri/bin --clean --noconfirm --log-level ERROR \ No newline at end of file diff --git a/build_cuda.bat b/build_cuda.bat index 73c85676..308b9174 100644 --- a/build_cuda.bat +++ b/build_cuda.bat @@ -1,2 +1,2 @@ call .venv_cuda/Scripts/activate -pyinstaller backend_cuda.spec --distpath src-tauri/bin --clean --noconfirm \ No newline at end of file +pyinstaller backend_cuda.spec --distpath src-tauri/bin --clean --noconfirm --log-level ERROR \ No newline at end of file diff --git a/install.bat b/install.bat index 69c5152b..aeb3d9b5 100644 --- a/install.bat +++ b/install.bat @@ -1,21 +1,25 @@ -REM .venv .venv_cuda があれば削除 +REM .venv exists if exist .venv ( rmdir /s /q .venv ) -if exist .venv_cuda ( - rmdir /s /q .venv_cuda -) - -REM .venv .venv_cuda を作成 +REM make .venv python -m venv .venv -python -m venv .venv_cuda -REM .venv .venv_cuda に必要なパッケージをインストール +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 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index c6b7ba57..244a9238 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,8 @@ psutil==5.9.8 pykakasi==2.3.0 pycaw==20240210 websockets==15.0.1 -huggingface_hub[hf-xet] +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 diff --git a/requirements_cuda.txt b/requirements_cuda.txt index 00293ea3..4dadf192 100644 --- a/requirements_cuda.txt +++ b/requirements_cuda.txt @@ -17,7 +17,8 @@ psutil==5.9.8 pykakasi==2.3.0 pycaw==20240210 websockets==15.0.1 -huggingface[hub] +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 diff --git a/src-python/controller.py b/src-python/controller.py index c2db0f45..f74b01ca 100644 --- a/src-python/controller.py +++ b/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 diff --git a/src-python/mainloop.py b/src-python/mainloop.py index c2429a58..6b684b38 100644 --- a/src-python/mainloop.py +++ b/src-python/mainloop.py @@ -1,26 +1,14 @@ -import os import sys import json import time from typing import Any from threading import Thread from queue import Queue -import warnings -warnings.filterwarnings('ignore') +import logging +from controller import Controller # noqa: E402 +from utils import printLog, printResponse, errorLogging, encodeBase64 # noqa: E402 -if getattr(sys, 'frozen', False): - cache_dir = os.path.join(os.path.dirname(sys.executable), ".cache") - hub_dir = os.path.join(os.path.dirname(sys.executable), ".cache", "hub") -else: - cache_dir = os.path.join(os.path.dirname(__file__), ".cache") - hub_dir = os.path.join(os.path.dirname(__file__), ".cache", "hub") - -os.makedirs(cache_dir, exist_ok=True) -os.makedirs(hub_dir, exist_ok=True) -os.environ["HF_HOME"] = os.path.join(cache_dir) - -from controller import Controller -from utils import printLog, printResponse, errorLogging, encodeBase64 +logging.getLogger("huggingface_hub").setLevel(logging.ERROR) run_mapping = { "connected_network":"/run/connected_network",