From 519ab571378216cf7f6c1202566af2cf59987efb Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Wed, 28 Aug 2024 11:36:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F[Removal]=20update/res?= =?UTF-8?q?tart=E5=87=A6=E7=90=86=E3=82=92=E5=88=A5=E3=83=97=E3=83=AD?= =?UTF-8?q?=E3=82=B0=E3=83=A9=E3=83=A0=E3=81=AB=E4=BB=BB=E3=81=9B=E3=82=8B?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=83=90=E3=83=83=E3=83=81=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- batch/restart.bat | 9 --------- batch/update.bat | 20 -------------------- package.json | 2 +- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 batch/restart.bat delete mode 100644 batch/update.bat diff --git a/batch/restart.bat b/batch/restart.bat deleted file mode 100644 index b3327d40..00000000 --- a/batch/restart.bat +++ /dev/null @@ -1,9 +0,0 @@ -@if not "%~0"=="%~dp0.\%~nx0" start /min cmd /c,"%~dp0.\%~nx0" %* & goto :eof - -set name=%1 -set local_path=%~dp0 - -taskkill /im %name% /F -ping -n 2 127.0.0.1 > nul -START "" "%local_path%%name%" -del /f "%~dp0%~nx0" \ No newline at end of file diff --git a/batch/update.bat b/batch/update.bat deleted file mode 100644 index 36087ca3..00000000 --- a/batch/update.bat +++ /dev/null @@ -1,20 +0,0 @@ -@if not "%~0"=="%~dp0.\%~nx0" start /min cmd /c,"%~dp0.\%~nx0" %* & goto :eof - -set exe_name=%1 -set folder_name=%2 -set folder_tmp=%3 -set restart=%4 -set local_path=%~dp0 - -taskkill /im %exe_name% /F -ping -n 2 127.0.0.1 > nul -del /f "%local_path%%exe_name%" -rmdir /s /q "%local_path%%folder_name%" -xcopy "%local_path%%folder_tmp%" "%local_path%" /E /I -rmdir /s /q "%local_path%%folder_tmp%" - -if %restart% == True ( - START "" "%local_path%%exe_name%" -) - -del /f "%~dp0%~nx0" \ No newline at end of file diff --git a/package.json b/package.json index 071b97dc..d3e91e6f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "module", "scripts": { "setup-python": "install.bat", - "build-python": "pyinstaller -F src-python/webui_mainloop.py --add-data ./fonts;fonts/ --add-data ./batch;batch/ --add-data .venv/Lib/site-packages/zeroconf;zeroconf/ --add-data .venv/Lib/site-packages/openvr;openvr/ --distpath src-tauri/bin --exclude-module pandas --exclude-module matplotlib --exclude-module PyQt5 --clean -n backend-x86_64-pc-windows-msvc", + "build-python": "pyinstaller -F src-python/webui_mainloop.py --add-data ./fonts;fonts/ --add-data .venv/Lib/site-packages/zeroconf;zeroconf/ --add-data .venv/Lib/site-packages/openvr;openvr/ --distpath src-tauri/bin --exclude-module pandas --exclude-module matplotlib --exclude-module PyQt5 --clean -n backend-x86_64-pc-windows-msvc --icon=./src-ui/assets/chato_icon_fill.png", "vite": "vite", "vite-build": "vite build", "vite-preview": "vite preview", From caab8f746b397028798795ee73a4e0f0a1f71e54 Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Wed, 28 Aug 2024 11:39:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Controller?= =?UTF-8?q?=20:=20=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB=E3=83=A2=E3=83=87?= =?UTF-8?q?=E3=83=AB=E3=81=AEweight=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=92=E3=83=80=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/webui_controller.py | 28 +++++++++++++++++++++++++++- src-python/webui_mainloop.py | 14 ++++++++------ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src-python/webui_controller.py b/src-python/webui_controller.py index 47003ba5..515e4e7d 100644 --- a/src-python/webui_controller.py +++ b/src-python/webui_controller.py @@ -1292,7 +1292,7 @@ def getListInputDevice(*args, **kwargs) -> dict: def getListOutputDevice(*args, **kwargs) -> dict: return {"status":200, "result": model.getListOutputDevice()} -def init(): +def init(endpoints:dict, *args, **kwargs) -> None: print(json.dumps({"status":348, "log": "Start Initialization"}), flush=True) print(json.dumps({"status":348, "log": "Start InitSetTranslateEngine"}), flush=True) initSetTranslateEngine() @@ -1311,6 +1311,19 @@ def init(): print(json.dumps({"status":348, "log": "Set Translation Engine"}), flush=True) updateTranslationEngineAndEngineList() + # check Downloaded CTranslate2 Model Weight + print(json.dumps({"status":348, "log": "Check Downloaded CTranslate2 Model Weight"}), flush=True) + if config.USE_TRANSLATION_FEATURE is True and model.checkCTranslatorCTranslate2ModelWeight() is False: + def callback(progress): + print(json.dumps({ + "endpoint":endpoints["ctranslate2"], + "status":200, + "result":{ + "progress":progress + } + }), flush=True) + model.downloadCTranslate2ModelWeight(callback) + # set Transcription Engine print(json.dumps({"status":348, "log": "Set Transcription Engine"}), flush=True) if config.USE_WHISPER_FEATURE is True: @@ -1318,6 +1331,19 @@ def init(): else: config.SELECTED_TRANSCRIPTION_ENGINE = "Google" + # check Downloaded Whisper Model Weight + print(json.dumps({"status":348, "log": "Check Downloaded Whisper Model Weight"}), flush=True) + if config.USE_WHISPER_FEATURE is True and model.checkTranscriptionWhisperModelWeight() is False: + def callback(progress): + print(json.dumps({ + "endpoint":endpoints["whisper"], + "status":200, + "result":{ + "progress":progress + } + }), flush=True) + model.downloadWhisperModelWeight(callback) + # set word filter print(json.dumps({"status":348, "log": "Set Word Filter"}), flush=True) model.addKeywords() diff --git a/src-python/webui_mainloop.py b/src-python/webui_mainloop.py index 485e5057..a6d73a19 100644 --- a/src-python/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -326,14 +326,18 @@ def main(): print(response, flush=True) if __name__ == "__main__": + print(json.dumps({"status":200, "endpoint": "/initialization/start", "result":True}), flush=True) + controller.init({ + "ctranslate2": action_mapping["/controller/callback_download_ctranslate2_weight"]["download"], + "whisper": action_mapping["/controller/callback_download_whisper_weight"]["download"], + }) + print(json.dumps({"status":200, "endpoint": "/initialization/completed", "result":True}), flush=True) + print(json.dumps({"status":348, "log": "Initialization from Python."}), flush=True) + process = "main" match process: case "main": try: - print(json.dumps({"status":200, "endpoint": "/initialization/start", "result":True}), flush=True) - controller.init() - print(json.dumps({"status":200, "endpoint": "/initialization/completed", "result":True}), flush=True) - print(json.dumps({"status":348, "log": "Initialization from Python."}), flush=True) while True: main() except Exception: @@ -342,7 +346,6 @@ if __name__ == "__main__": traceback.print_exc(file=f) case "test": - controller.init() response_data, status = handleControllerRequest("/controller/callback_download_ctranslate2_weight") response = { "status": status, @@ -360,7 +363,6 @@ if __name__ == "__main__": case "test_all": import time - controller.init() for endpoint, value in config_mapping.items(): response_data, status = handleConfigRequest(endpoint) response = {