From 785cab6a6e06aac181a1fa42944719b9245cba42 Mon Sep 17 00:00:00 2001 From: w4ffl35 <25737761+w4ffl35@users.noreply.github.com> Date: Thu, 1 Feb 2024 08:08:56 -0700 Subject: [PATCH] enum updates --- src/airunner/enums.py | 38 ++++++++++++------- .../controlnet_settings_widget.py | 2 +- src/airunner/widgets/status/status_widget.py | 4 +- src/airunner/windows/main/main_window.py | 4 +- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/airunner/enums.py b/src/airunner/enums.py index edd9103ca..ed994762b 100644 --- a/src/airunner/enums.py +++ b/src/airunner/enums.py @@ -62,6 +62,8 @@ class SignalCode(Enum): APPLICATION_RESET_PATHS_SIGNAL = "reset_paths_signal" APPLICATION_STOP_SD_PROGRESS_BAR_SIGNAL = "stop_image_generator_progress_bar_signal" APPLICATION_SETTINGS_CHANGED_SIGNAL = "application_settings_changed_signal" + APPLICATION_STATUS_INFO_SIGNAL = "status_info_signal" + APPLICATION_STATUS_ERROR_SIGNAL = "status_error_signal" AUDIO_CAPTURE_WORKER_RESPONSE_SIGNAL = "AudioCaptureWorker_response_signal" AUDIO_PROCESSOR_WORKER_PROCESSED_SIGNAL = "AudioProcessorWorker_processed_audio" @@ -106,16 +108,18 @@ class SignalCode(Enum): LAYER_MOVE_DOWN_SIGNAL = "move_layer_down_signal" LAYERS_SHOW_SIGNAL = "show_layers_signal" - LLM_CLEAR_HISTORY = "clear_history" + # TODO: combine clear history signals - we have two by mistake + LLM_CLEAR_HISTORY = "llm_clear_history" + LLM_CLEAR_HISTORY_SIGNAL = "llm_clear_history_signal" LLM_RESPONSE_SIGNAL = "llm_response_signal" - LLM_CLEAR_HISTORY_SIGNAL = "clear_llm_history_signal" LLM_TEXT_STREAMED_SIGNAL = "llm_text_streamed_signal" LLM_REQUEST_WORKER_RESPONSE_SIGNAL = "LLMRequestWorker_response_signal" - LLM_UNLOAD_SIGNAL = "unload_llm_signal" + LLM_UNLOAD_SIGNAL = "llm_unload_signal" LLM_REQUEST_SIGNAL = "llm_request_signal" - LLM_TEXT_GENERATE_REQUEST_SIGNAL = "text_generate_request_signal" - LLM_TOKEN_SIGNAL = "token_signal" + LLM_TEXT_GENERATE_REQUEST_SIGNAL = "llm_text_generate_request_signal" + LLM_TOKEN_SIGNAL = "llm_token_signal" LLM_RESPOND_TO_USER = "llm_respond_to_user_signal" + LLM_PROCESS_STT_AUDIO_SIGNAL = "llm_process_stt_audio" LOG_ERROR_SIGNAL = "error_signal" LOG_WARNING_SIGNAL = "warning_signal" @@ -140,15 +144,16 @@ class SignalCode(Enum): SD_IMAGE_GENERATED_SIGNAL = "image_generated_signal" SD_NSFW_CONTENT_DETECTED_SIGNAL = "nsfw_content_detected_signal" - STATUS_INFO_SIGNAL = "status_info_signal" - STATUS_ERROR_SIGNAL = "status_error_signal" - STT_HEAR_SIGNAL = "hear_signal" STT_AUDIO_PROCESSED = "stt_audio_processed_signal" - STT_PROCESS_AUDIO_SIGNAL = "process_audio" + STT_PROCESS_AUDIO_SIGNAL = "stt_process_audio" + STT_START_CAPTURE_SIGNAL = "stt_start_capture" + STT_STOP_CAPTURE_SIGNAL = "stt_stop_capture" TTS_REQUEST = "tts_request" TTS_GENERATOR_WORKER_ADD_TO_STREAM_SIGNAL = "TTSGeneratorWorker_add_to_stream_signal" + TTS_ENABLE_SIGNAL = "tts_enable_signal" + TTS_DISABLE_SIGNAL = "tts_disable_signal" VISION_START_CAPTURE = "start_vision_capture" VISION_STOP_CAPTURE = "stop_vision_capture" @@ -158,6 +163,7 @@ class SignalCode(Enum): VISION_PROCESSED_SIGNAL = "vision_processed_signal" VISION_CAPTION_GENERATED_SIGNAL = "caption_generated_signal" VISION_DESCRIBE_IMAGE_SIGNAL = "describe_image_signal" + VISION_PROCESS_IMAGES = "process_images" QUIT_APPLICATION = "quit" @@ -245,11 +251,17 @@ class LLMChatRole(Enum): class LLMToolName(Enum): - RAG_SEARCH = "rag_search" COMMENT_ON_IMAGE = "comment_on_image" DESCRIBE_IMAGE = "describe_image" GENERATE_IMAGE = "generate_image" - QUIT_APPLICATION = "quit_application" - VISION_START_CAPTURE = "start_vision_capture" - VISION_STOP_CAPTURE = "stop_vision_capture" LLM_RESPOND_TO_USER = "llm_respond_to_user" + LLM_PROCESS_STT_AUDIO = "llm_process_stt_audio" + RAG_SEARCH = "llm_rag_search" + QUIT_APPLICATION = "quit_application" + STT_START_CAPTURE = "stt_start_audio_capture" + STT_STOP_CAPTURE = "stt_stop_audio_capture" + TTS_ENABLE = "tts_enable" + TTS_DISABLE = "tts_disable" + VISION_PROCESS_IMAGES = "vision_process_images" + VISION_START_CAPTURE = "vision_start_capture" + VISION_STOP_CAPTURE = "vision_stop_capture" diff --git a/src/airunner/widgets/controlnet_settings/controlnet_settings_widget.py b/src/airunner/widgets/controlnet_settings/controlnet_settings_widget.py index 78a622a12..01ffca259 100644 --- a/src/airunner/widgets/controlnet_settings/controlnet_settings_widget.py +++ b/src/airunner/widgets/controlnet_settings/controlnet_settings_widget.py @@ -157,7 +157,7 @@ def export_generated_controlnet_image(self): ) if path is not None: self.emit( - SignalCode.STATUS_INFO_SIGNAL, + SignalCode.APPLICATION_STATUS_INFO_SIGNAL, "Controlnet image exported to: {}".format(path) ) diff --git a/src/airunner/widgets/status/status_widget.py b/src/airunner/widgets/status/status_widget.py index 5627975e2..e38edc97e 100644 --- a/src/airunner/widgets/status/status_widget.py +++ b/src/airunner/widgets/status/status_widget.py @@ -13,8 +13,8 @@ class StatusWidget(BaseWidget): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - self.register(SignalCode.STATUS_INFO_SIGNAL, self.on_status_info_signal) - self.register(SignalCode.STATUS_ERROR_SIGNAL, self.on_status_error_signal) + self.register(SignalCode.APPLICATION_STATUS_INFO_SIGNAL, self.on_status_info_signal) + self.register(SignalCode.APPLICATION_STATUS_ERROR_SIGNAL, self.on_status_error_signal) self.register(SignalCode.APPLICATION_CLEAR_STATUS_MESSAGE_SIGNAL, self.on_clear_status_message_signal) self.timer = QTimer() diff --git a/src/airunner/windows/main/main_window.py b/src/airunner/windows/main/main_window.py index 4eb5e971f..b0058518b 100644 --- a/src/airunner/windows/main/main_window.py +++ b/src/airunner/windows/main/main_window.py @@ -372,7 +372,7 @@ def quick_export(self): ) if path is not None: self.emit( - SignalCode.STATUS_INFO_SIGNAL, + SignalCode.APPLICATION_STATUS_INFO_SIGNAL, f"Image exported to {path}" ) @@ -756,7 +756,7 @@ def model_manager_toggled(self, val): def show_update_message(self): self.emit( - SignalCode.STATUS_INFO_SIGNAL, + SignalCode.APPLICATION_STATUS_INFO_SIGNAL, f"New version available: {self.latest_version}" )