diff --git a/backend.spec b/backend.spec index 33ec3cae..3933d942 100644 --- a/backend.spec +++ b/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={}, diff --git a/backend_cuda.spec b/backend_cuda.spec index 34ed248f..08ba5fd7 100644 --- a/backend_cuda.spec +++ b/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={}, diff --git a/install.bat b/install.bat index 5a57e817..69c5152b 100644 --- a/install.bat +++ b/install.bat @@ -1,6 +1,17 @@ +REM .venv .venv_cuda があれば削除 +if exist .venv ( + rmdir /s /q .venv +) + +if exist .venv_cuda ( + rmdir /s /q .venv_cuda +) + +REM .venv .venv_cuda を作成 python -m venv .venv python -m venv .venv_cuda +REM .venv .venv_cuda に必要なパッケージをインストール call .venv/Scripts/activate python.exe -m pip install --upgrade pip pip install --no-cache-dir --force-reinstall -r requirements.txt diff --git a/requirements.txt b/requirements.txt index 95501ea2..1f5cc9ed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,8 @@ psutil==5.9.8 pykakasi==2.3.0 pycaw==20240210 websockets==15.0.1 +huggingface-hub==0.31.2 +hf-xet==1.1.2 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 \ No newline at end of file diff --git a/requirements_cuda.txt b/requirements_cuda.txt index 768f45ba..347031cd 100644 --- a/requirements_cuda.txt +++ b/requirements_cuda.txt @@ -17,6 +17,8 @@ psutil==5.9.8 pykakasi==2.3.0 pycaw==20240210 websockets==15.0.1 +huggingface-hub==0.31.2 +hf-xet==1.1.2 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 \ No newline at end of file diff --git a/src-python/mainloop.py b/src-python/mainloop.py index d8ad52e7..f5e2318b 100644 --- a/src-python/mainloop.py +++ b/src-python/mainloop.py @@ -1,9 +1,16 @@ +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') +huggingface_cache_dir = os.path.join(os.path.dirname(__file__), ".cache") +os.makedirs(huggingface_cache_dir, exist_ok=True) +os.environ["HF_HOME"] = os.path.join(huggingface_cache_dir) + from controller import Controller from utils import printLog, printResponse, errorLogging, encodeBase64 @@ -376,7 +383,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)