From c724f7d7ae7faf4be5f0fc086ca91161186857a8 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Sun, 1 Sep 2024 17:59:07 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model=20:=20imp?= =?UTF-8?q?ort=20=E3=81=AE=E3=83=91=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/models/overlay/overlay.py | 5 +---- src-python/models/transcription/transcription_whisper.py | 4 +--- src-python/models/translation/translation_translator.py | 4 +--- src-python/models/translation/translation_utils.py | 4 +--- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src-python/models/overlay/overlay.py b/src-python/models/overlay/overlay.py index 72d35d8c..e83a341a 100644 --- a/src-python/models/overlay/overlay.py +++ b/src-python/models/overlay/overlay.py @@ -1,7 +1,3 @@ -from os import path as os_path -import sys -sys.path.append(os_path.join(os_path.dirname(__file__), "..", "..")) -from utils import printLog import ctypes import time from psutil import process_iter @@ -13,6 +9,7 @@ try: from . import overlay_utils as utils except ImportError: import overlay_utils as utils +from utils import printLog def mat34Id(array): arr = openvr.HmdMatrix34_t() diff --git a/src-python/models/transcription/transcription_whisper.py b/src-python/models/transcription/transcription_whisper.py index b032bd34..08113b8c 100644 --- a/src-python/models/transcription/transcription_whisper.py +++ b/src-python/models/transcription/transcription_whisper.py @@ -1,12 +1,10 @@ from os import path as os_path, makedirs as os_makedirs -import sys -sys.path.append(os_path.join(os_path.dirname(__file__), "..", "..")) -from utils import printLog from requests import get as requests_get from typing import Callable import huggingface_hub from faster_whisper import WhisperModel import logging +from utils import printLog logger = logging.getLogger('faster_whisper') logger.setLevel(logging.CRITICAL) diff --git a/src-python/models/translation/translation_translator.py b/src-python/models/translation/translation_translator.py index 7bcdffc8..f035c099 100644 --- a/src-python/models/translation/translation_translator.py +++ b/src-python/models/translation/translation_translator.py @@ -1,7 +1,4 @@ from os import path as os_path -import sys -sys.path.append(os_path.join(os_path.dirname(__file__), "..", "..")) -from utils import printLog from deepl import Translator as deepl_Translator from translators import translate_text as other_web_Translator from .translation_languages import translation_lang @@ -9,6 +6,7 @@ from .translation_utils import ctranslate2_weights import ctranslate2 import transformers +from utils import printLog import warnings warnings.filterwarnings("ignore") diff --git a/src-python/models/translation/translation_utils.py b/src-python/models/translation/translation_utils.py index 9a42e3d9..48e97e3a 100644 --- a/src-python/models/translation/translation_utils.py +++ b/src-python/models/translation/translation_utils.py @@ -2,12 +2,10 @@ import tempfile from zipfile import ZipFile from os import path as os_path from os import makedirs as os_makedirs -import sys -sys.path.append(os_path.join(os_path.dirname(__file__), "..", "..")) -from utils import printLog from requests import get as requests_get from typing import Callable import hashlib +from utils import printLog ctranslate2_weights = { "Small": { # M2M-100 418M-parameter model