From 1be04cb571e9b3ae564626d3261099f158d707af Mon Sep 17 00:00:00 2001 From: misyaguziya Date: Sat, 27 Jul 2024 01:30:36 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F=20[Update]=20python?= =?UTF-8?q?=E3=81=AE=E3=83=A1=E3=82=A4=E3=83=B3=E5=87=A6=E7=90=86=E9=83=A8?= =?UTF-8?q?=E5=88=86=E3=82=92=E7=A7=BB=E5=8B=95/webui=5Fmainloop.py?= =?UTF-8?q?=E3=82=92=E3=83=93=E3=83=AB=E3=83=89=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- config.py => src-python/config.py | 0 controller.py => src-python/controller.py | 0 main.py => src-python/main.py | 0 model.py => src-python/model.py | 0 .../models}/osc/osc_tools.py | 0 .../models}/overlay/overlay.py | 0 .../models}/overlay/overlay_image.py | 0 .../models}/overlay/overlay_utils.py | 0 .../transcription/transcription_languages.py | 0 .../transcription/transcription_recorder.py | 0 .../transcription_transcriber.py | 0 .../transcription/transcription_utils.py | 0 .../transcription/transcription_whisper.py | 0 .../translation/translation_languages.py | 0 .../translation/translation_translator.py | 0 .../models}/translation/translation_utils.py | 0 .../models}/xsoverlay/notification.py | 0 utils.py => src-python/utils.py | 0 .../webui_controller.py | 0 .../webui_mainloop.py | 72 ++++++++++++------- 21 files changed, 46 insertions(+), 28 deletions(-) rename config.py => src-python/config.py (100%) rename controller.py => src-python/controller.py (100%) rename main.py => src-python/main.py (100%) rename model.py => src-python/model.py (100%) rename {models => src-python/models}/osc/osc_tools.py (100%) rename {models => src-python/models}/overlay/overlay.py (100%) rename {models => src-python/models}/overlay/overlay_image.py (100%) rename {models => src-python/models}/overlay/overlay_utils.py (100%) rename {models => src-python/models}/transcription/transcription_languages.py (100%) rename {models => src-python/models}/transcription/transcription_recorder.py (100%) rename {models => src-python/models}/transcription/transcription_transcriber.py (100%) rename {models => src-python/models}/transcription/transcription_utils.py (100%) rename {models => src-python/models}/transcription/transcription_whisper.py (100%) rename {models => src-python/models}/translation/translation_languages.py (100%) rename {models => src-python/models}/translation/translation_translator.py (100%) rename {models => src-python/models}/translation/translation_utils.py (100%) rename {models => src-python/models}/xsoverlay/notification.py (100%) rename utils.py => src-python/utils.py (100%) rename webui_controller.py => src-python/webui_controller.py (100%) rename webui_mainloop.py => src-python/webui_mainloop.py (91%) diff --git a/package.json b/package.json index 32eafbb1..ffc2d145 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "module", "scripts": { "setup-python": "install.bat", - "build-python": "pyinstaller -F src-python/test.py --distpath src-tauri/bin --clean -n test-x86_64-pc-windows-msvc", + "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 test-x86_64-pc-windows-msvc", "dev": "vite", "build": "vite build", "preview": "vite preview", diff --git a/config.py b/src-python/config.py similarity index 100% rename from config.py rename to src-python/config.py diff --git a/controller.py b/src-python/controller.py similarity index 100% rename from controller.py rename to src-python/controller.py diff --git a/main.py b/src-python/main.py similarity index 100% rename from main.py rename to src-python/main.py diff --git a/model.py b/src-python/model.py similarity index 100% rename from model.py rename to src-python/model.py diff --git a/models/osc/osc_tools.py b/src-python/models/osc/osc_tools.py similarity index 100% rename from models/osc/osc_tools.py rename to src-python/models/osc/osc_tools.py diff --git a/models/overlay/overlay.py b/src-python/models/overlay/overlay.py similarity index 100% rename from models/overlay/overlay.py rename to src-python/models/overlay/overlay.py diff --git a/models/overlay/overlay_image.py b/src-python/models/overlay/overlay_image.py similarity index 100% rename from models/overlay/overlay_image.py rename to src-python/models/overlay/overlay_image.py diff --git a/models/overlay/overlay_utils.py b/src-python/models/overlay/overlay_utils.py similarity index 100% rename from models/overlay/overlay_utils.py rename to src-python/models/overlay/overlay_utils.py diff --git a/models/transcription/transcription_languages.py b/src-python/models/transcription/transcription_languages.py similarity index 100% rename from models/transcription/transcription_languages.py rename to src-python/models/transcription/transcription_languages.py diff --git a/models/transcription/transcription_recorder.py b/src-python/models/transcription/transcription_recorder.py similarity index 100% rename from models/transcription/transcription_recorder.py rename to src-python/models/transcription/transcription_recorder.py diff --git a/models/transcription/transcription_transcriber.py b/src-python/models/transcription/transcription_transcriber.py similarity index 100% rename from models/transcription/transcription_transcriber.py rename to src-python/models/transcription/transcription_transcriber.py diff --git a/models/transcription/transcription_utils.py b/src-python/models/transcription/transcription_utils.py similarity index 100% rename from models/transcription/transcription_utils.py rename to src-python/models/transcription/transcription_utils.py diff --git a/models/transcription/transcription_whisper.py b/src-python/models/transcription/transcription_whisper.py similarity index 100% rename from models/transcription/transcription_whisper.py rename to src-python/models/transcription/transcription_whisper.py diff --git a/models/translation/translation_languages.py b/src-python/models/translation/translation_languages.py similarity index 100% rename from models/translation/translation_languages.py rename to src-python/models/translation/translation_languages.py diff --git a/models/translation/translation_translator.py b/src-python/models/translation/translation_translator.py similarity index 100% rename from models/translation/translation_translator.py rename to src-python/models/translation/translation_translator.py diff --git a/models/translation/translation_utils.py b/src-python/models/translation/translation_utils.py similarity index 100% rename from models/translation/translation_utils.py rename to src-python/models/translation/translation_utils.py diff --git a/models/xsoverlay/notification.py b/src-python/models/xsoverlay/notification.py similarity index 100% rename from models/xsoverlay/notification.py rename to src-python/models/xsoverlay/notification.py diff --git a/utils.py b/src-python/utils.py similarity index 100% rename from utils.py rename to src-python/utils.py diff --git a/webui_controller.py b/src-python/webui_controller.py similarity index 100% rename from webui_controller.py rename to src-python/webui_controller.py diff --git a/webui_mainloop.py b/src-python/webui_mainloop.py similarity index 91% rename from webui_mainloop.py rename to src-python/webui_mainloop.py index dbe825bf..315cee44 100644 --- a/webui_mainloop.py +++ b/src-python/webui_mainloop.py @@ -222,35 +222,53 @@ def main(): received_data = json.loads(received_data) if received_data is True: - endpoint = received_data.get("endpoint", None) - data = received_data.get("data", None) - - match endpoint.split("/")[1]: - case "config": - response_data, status = handleConfigRequest(endpoint, data) - case "controller": - response_data, status = handleControllerRequest(endpoint, data) - case _: - pass - - response = { - "status": status, - "endpoint": endpoint, - "data": response_data, + response_data = { + "status": "ok", + "id": received_data["id"], + "data": received_data["data"], } - - response = json.dumps(response) + response = json.dumps(response_data) time.sleep(2) print(response, flush=True) + # endpoint = received_data.get("endpoint", None) + # data = received_data.get("data", None) + + # match endpoint.split("/")[1]: + # case "config": + # response_data, status = handleConfigRequest(endpoint, data) + # case "controller": + # response_data, status = handleControllerRequest(endpoint, data) + # case _: + # pass + + # response = { + # "status": status, + # "endpoint": endpoint, + # "data": response_data, + # } + + # response = json.dumps(response) + # time.sleep(2) + # print(response, flush=True) + if __name__ == "__main__": - endpoint = "/controller/list_mic_host" - data = None - response_data, status = handleControllerRequest(endpoint, data) - response = { - "status": status, - "endpoint": endpoint, - "data": response_data, - } - response = json.dumps(response) - print(response, flush=True) \ No newline at end of file + # endpoint = "/controller/list_mic_host" + # data = None + # response_data, status = handleControllerRequest(endpoint, data) + # response = { + # "status": status, + # "endpoint": endpoint, + # "data": response_data, + # } + # response = json.dumps(response) + # print(response, flush=True) + + try: + print(json.dumps({"init_key_from_py": "Initialization from Python."}), flush=True) + while True: + main() + except Exception: + import traceback + with open('error.log', 'a') as f: + traceback.print_exc(file=f) \ No newline at end of file