GameSentenceMiner 2.8.35__tar.gz → 2.8.37__tar.gz

gamesentenceminer-2.8.37/GameSentenceMiner/communication/send.py

@@ -0,0 +1,7 @@
+import json
+
+from GameSentenceMiner.communication.websocket import websocket, Message
+
+async def send_restart_signal():
+    if websocket:
+        await websocket.send(json.dumps(Message(function="restart").to_json()))

{gamesentenceminer-2.8.35 → gamesentenceminer-2.8.37}/GameSentenceMiner/config_gui.py

@@ -1,3 +1,4 @@
+import asyncio
 import tkinter as tk
 from tkinter import filedialog, messagebox, simpledialog, scrolledtext
 
@@ -7,6 +8,7 @@ from GameSentenceMiner import obs, configuration
 from GameSentenceMiner.communication.send import send_restart_signal
 from GameSentenceMiner.configuration import *
 from GameSentenceMiner.downloader.download_tools import download_ocenaudio_if_needed
+from GameSentenceMiner.model import SceneItem, SceneInfo
 from GameSentenceMiner.package import get_current_version, get_latest_version
 
 settings_saved = False
@@ -79,10 +81,27 @@ class ConfigApp:
         self.create_advanced_tab()
         self.create_ai_tab()
 
+        self.notebook.bind("<<NotebookTabChanged>>", self.on_profiles_tab_selected)
+
         ttk.Button(self.window, text="Save Settings", command=self.save_settings).pack(pady=20)
 
         self.window.withdraw()
 
+    def show_scene_selection(self, matched_configs):
+        selected_scene = None
+        if matched_configs:
+            selection_window = tk.Toplevel(self.window)
+            selection_window.title("Select Profile")
+            ttk.Label(selection_window, text="Multiple profiles match the current scene. Please select the profile:").pack(pady=10)
+            profile_var = tk.StringVar(value=matched_configs[0])
+            profile_dropdown = ttk.Combobox(selection_window, textvariable=profile_var, values=matched_configs, state="readonly")
+            profile_dropdown.pack(pady=5)
+            ttk.Button(selection_window, text="OK", command=lambda: [selection_window.destroy(), setattr(self, 'selected_scene', profile_var.get())]).pack(pady=10)
+            self.window.wait_window(selection_window)
+            selected_scene = self.selected_scene
+        return selected_scene
+
+
     def add_save_hook(self, func):
         on_save.append(func)
 
@@ -104,6 +123,7 @@ class ConfigApp:
 
         # Create a new Config instance
         config = ProfileConfig(
+            scenes=[self.obs_scene_listbox.get(i) for i in self.obs_scene_listbox.curselection()],
             general=General(
                 use_websocket=self.websocket_enabled.get(),
                 use_clipboard=self.clipboard_enabled.get(),
@@ -234,12 +254,15 @@ class ConfigApp:
 
         current_profile = self.profile_combobox.get()
         prev_config = self.master_config.get_config()
+        self.master_config.switch_to_default_if_not_found=self.switch_to_default_if_not_found.get()
         if profile_change:
             self.master_config.current_profile = current_profile
         else:
             self.master_config.current_profile = current_profile
             self.master_config.set_config_for_profile(current_profile, config)
 
+
+
         self.master_config = self.master_config.sync_shared_fields()
 
         # Serialize the config instance to JSON
@@ -250,7 +273,7 @@ class ConfigApp:
 
         if self.master_config.get_config().restart_required(prev_config):
             logger.info("Restart Required for some settings to take affect!")
-            send_restart_signal()
+            asyncio.run(send_restart_signal())
 
         settings_saved = True
         configuration.reload_config()
@@ -684,6 +707,13 @@ class ConfigApp:
         #         ve.grid_configure(row=ve.grid_info()['row'] - 1)
         #         db.grid_configure(row=db.grid_info()['row'] - 1)
 
+    def on_profiles_tab_selected(self, event):
+        try:
+            if self.window.state() != "withdrawn" and self.notebook.tab(self.notebook.select(), "text") == "Profiles":
+                self.refresh_obs_scenes()
+        except Exception as e:
+            logger.debug(e)
+
     @new_tab
     def create_features_tab(self):
         features_frame = ttk.Frame(self.notebook)
@@ -967,16 +997,11 @@ class ConfigApp:
         self.take_screenshot_hotkey.grid(row=self.current_row, column=1)
         self.add_label_and_increment_row(hotkeys_frame, "Hotkey to take a screenshot.", row=self.current_row, column=2)
 
-        ttk.Label(hotkeys_frame, text="Open Utility Hotkey:").grid(row=self.current_row, column=0, sticky='W')
-        self.open_utility_hotkey = ttk.Entry(hotkeys_frame)
-        self.open_utility_hotkey.insert(0, self.settings.hotkeys.open_utility)
-        self.open_utility_hotkey.grid(row=self.current_row, column=1)
-        self.add_label_and_increment_row(hotkeys_frame, "Hotkey to open the text utility.", row=self.current_row, column=2)
-
 
     @new_tab
     def create_profiles_tab(self):
         profiles_frame = ttk.Frame(self.notebook)
+
         self.notebook.add(profiles_frame, text='Profiles')
 
         ttk.Label(profiles_frame, text="Select Profile:").grid(row=self.current_row, column=0, sticky='W')
@@ -990,6 +1015,32 @@ class ConfigApp:
         ttk.Button(profiles_frame, text="Copy Profile", command=self.copy_profile).grid(row=self.current_row, column=1, pady=5)
         if self.master_config.current_profile != DEFAULT_CONFIG:
             ttk.Button(profiles_frame, text="Delete Config", command=self.delete_profile).grid(row=self.current_row, column=2, pady=5)
+        self.current_row += 1
+
+        ttk.Label(profiles_frame, text="OBS Scene:").grid(row=self.current_row, column=0, sticky='W')
+        self.obs_scene_var = tk.StringVar(value="")
+        self.obs_scene_listbox = tk.Listbox(profiles_frame, listvariable=self.obs_scene_var, selectmode=tk.MULTIPLE, height=10)
+        self.obs_scene_listbox.grid(row=self.current_row, column=1)
+        ttk.Button(profiles_frame, text="Refresh Scenes", command=self.refresh_obs_scenes).grid(row=self.current_row, column=2, pady=5)
+        self.add_label_and_increment_row(profiles_frame, "Select an OBS scene to associate with this profile. (Optional)", row=self.current_row, column=3)
+
+        ttk.Label(profiles_frame, text="Switch To Default If Not Found:").grid(row=self.current_row, column=0, sticky='W')
+        self.switch_to_default_if_not_found = tk.BooleanVar(value=self.master_config.switch_to_default_if_not_found)
+        ttk.Checkbutton(profiles_frame, variable=self.switch_to_default_if_not_found).grid(row=self.current_row, column=1, sticky='W')
+        self.add_label_and_increment_row(profiles_frame, "Enable to switch to the default profile if the selected OBS scene is not found.", row=self.current_row, column=2)
+
+
+    def refresh_obs_scenes(self):
+        scenes = obs.get_obs_scenes()
+        obs_scene_names = [scene['sceneName'] for scene in scenes]
+        self.obs_scene_listbox.delete(0, tk.END)  # Clear existing items
+        for scene_name in obs_scene_names:
+            self.obs_scene_listbox.insert(tk.END, scene_name)  # Add each scene to the Listbox
+        for i, scene in enumerate(eval(self.obs_scene_var.get())):  # Parse the string as a tuple
+            if scene.strip() in self.settings.scenes:  # Use strip() to remove extra spaces
+                self.obs_scene_listbox.select_set(i)  # Select the item in the Listbox
+                self.obs_scene_listbox.activate(i)
+                self.obs_scene_listbox.update_idletasks()  # Ensure the GUI reflects the changes
 
     @new_tab
     def create_advanced_tab(self):
@@ -1013,7 +1064,6 @@ class ConfigApp:
         ttk.Button(advanced_frame, text="Browse", command=lambda: self.browse_file(self.video_player_path)).grid(row=self.current_row, column=2)
         self.add_label_and_increment_row(advanced_frame, "Path to the video player executable. Will seek to the location of the line in the replay", row=self.current_row, column=3)
 
-
         ttk.Label(advanced_frame, text="Play Latest Video/Audio Hotkey:").grid(row=self.current_row, column=0, sticky='W')
         self.play_latest_audio_hotkey = ttk.Entry(advanced_frame)
         self.play_latest_audio_hotkey.insert(0, self.settings.hotkeys.play_latest_audio)
@@ -1132,6 +1182,7 @@ class ConfigApp:
         print("profile Changed!")
         self.save_settings(profile_change=True)
         self.reload_settings()
+        self.refresh_obs_scenes()
 
     def add_profile(self):
         new_profile_name = simpledialog.askstring("Input", "Enter new profile name:")

{gamesentenceminer-2.8.35 → gamesentenceminer-2.8.37}/GameSentenceMiner/configuration.py

@@ -222,6 +222,7 @@ class Ai:
 @dataclass
 class ProfileConfig:
     name: str = 'Default'
+    scenes: List[str] = field(default_factory=list)
     general: General = field(default_factory=General)
     paths: Paths = field(default_factory=Paths)
     anki: Anki = field(default_factory=Anki)
@@ -304,10 +305,7 @@ class ProfileConfig:
 
     def restart_required(self, previous):
         previous: ProfileConfig
-        if any([previous.general.use_websocket != self.general.use_websocket,
-                previous.general.use_clipboard != self.general.use_clipboard,
-                previous.general.websocket_uri != self.general.websocket_uri,
-                previous.paths.folder_to_watch != self.paths.folder_to_watch,
+        if any([previous.paths.folder_to_watch != self.paths.folder_to_watch,
                 previous.obs.open_obs != self.obs.open_obs,
                 previous.obs.host != self.obs.host,
                 previous.obs.port != self.obs.port
@@ -325,6 +323,7 @@ class ProfileConfig:
 class Config:
     configs: Dict[str, ProfileConfig] = field(default_factory=dict)
     current_profile: str = DEFAULT_CONFIG
+    switch_to_default_if_not_found: bool = True
 
     @classmethod
     def new(cls):

{gamesentenceminer-2.8.35 → gamesentenceminer-2.8.37}/GameSentenceMiner/gametext.py

@@ -28,6 +28,9 @@ async def monitor_clipboard():
 
     skip_next_clipboard = False
     while True:
+        if not get_config().general.use_clipboard:
+            await asyncio.sleep(1)
+            continue
         if not get_config().general.use_both_clipboard_and_websocket and websocket_connected:
             await asyncio.sleep(1)
             skip_next_clipboard = True
@@ -44,8 +47,11 @@ async def monitor_clipboard():
 async def listen_websocket():
     global current_line, current_line_time, reconnecting, websocket_connected
     try_other = False
-    websocket_url = f'ws://{get_config().general.websocket_uri}/gsm'
     while True:
+        if not get_config().general.use_websocket:
+            await asyncio.sleep(1)
+            continue
+        websocket_url = f'ws://{get_config().general.websocket_uri}/gsm'
         if try_other:
             websocket_url = f'ws://{get_config().general.websocket_uri}/api/ws/text/origin'
         try:
@@ -114,13 +120,11 @@ def run_websocket_listener():
 
 
 async def start_text_monitor():
+    util.run_new_thread(run_websocket_listener)
     if get_config().general.use_websocket:
-        util.run_new_thread(run_websocket_listener)
-    if get_config().general.use_clipboard:
-        if get_config().general.use_websocket:
-            if get_config().general.use_both_clipboard_and_websocket:
-                logger.info("Listening for Text on both WebSocket and Clipboard.")
-            else:
-                logger.info("Both WebSocket and Clipboard monitoring are enabled. WebSocket will take precedence if connected.")
-        await monitor_clipboard()
+        if get_config().general.use_both_clipboard_and_websocket:
+            logger.info("Listening for Text on both WebSocket and Clipboard.")
+        else:
+            logger.info("Both WebSocket and Clipboard monitoring are enabled. WebSocket will take precedence if connected.")
+    await monitor_clipboard()
     await asyncio.sleep(1)

{gamesentenceminer-2.8.35 → gamesentenceminer-2.8.37}/GameSentenceMiner/gsm.py

@@ -67,6 +67,7 @@ class VideoToAudioHandler(FileSystemEventHandler):
 
     @staticmethod
     def convert_to_audio(video_path):
+        vad_trimmed_audio = ''
         try:
             if texthooking_page.event_manager.line_for_audio:
                 line: GameLine = texthooking_page.event_manager.line_for_audio
@@ -174,9 +175,9 @@ class VideoToAudioHandler(FileSystemEventHandler):
             logger.debug(f"Some error was hit catching to allow further work to be done: {e}", exc_info=True)
             notification.send_error_no_anki_update()
         finally:
-            if get_config().paths.remove_video and os.path.exists(video_path):
+            if video_path and get_config().paths.remove_video and os.path.exists(video_path):
                 os.remove(video_path)  # Optionally remove the video after conversion
-            if get_config().paths.remove_audio and os.path.exists(vad_trimmed_audio):
+            if vad_trimmed_audio and get_config().paths.remove_audio and os.path.exists(vad_trimmed_audio):
                 os.remove(vad_trimmed_audio)  # Optionally remove the screenshot after conversion
 
 
@@ -289,8 +290,6 @@ def register_hotkeys():
         keyboard.add_hotkey(get_config().hotkeys.take_screenshot, get_screenshot)
     if get_config().hotkeys.play_latest_audio:
         keyboard.add_hotkey(get_config().hotkeys.play_latest_audio, play_most_recent_audio)
-    if get_config().hotkeys.open_utility:
-        keyboard.add_hotkey(get_config().hotkeys.open_utility, texthooking_page.open_texthooker)
 
 
 def get_screenshot():
@@ -386,7 +385,7 @@ def open_multimine(icon, item):
     texthooking_page.open_texthooker()
 
 
-def update_icon():
+def update_icon(profile=None):
     global menu, icon
     # Recreate the menu with the updated button text
     profile_menu = Menu(
@@ -483,7 +482,6 @@ def restart_obs():
         close_obs()
         time.sleep(1)
         obs.start_obs()
-        obs.connect_to_obs()
 
 
 def cleanup():
@@ -558,25 +556,6 @@ def initialize_async():
         threads.append(util.run_new_thread(task))
     return threads
 
-
-def post_init():
-    def do_post_init():
-        global silero_trim, whisper_helper, vosk_helper
-        logger.info("Post-Initialization started.")
-        if get_config().obs.enabled:
-            obs.connect_to_obs()
-            check_obs_folder_is_correct()
-            from GameSentenceMiner.vad import vosk_helper
-            from GameSentenceMiner.vad import whisper_helper
-            if get_config().vad.is_vosk():
-                vosk_helper.get_vosk_model()
-            if get_config().vad.is_whisper():
-                whisper_helper.initialize_whisper_model()
-            if get_config().vad.is_silero():
-                from GameSentenceMiner.vad import silero_trim
-
-    util.run_new_thread(do_post_init)
-
 def handle_websocket_message(message: Message):
     match FunctionName(message.function):
         case FunctionName.QUIT:
@@ -586,19 +565,67 @@ def handle_websocket_message(message: Message):
             close_obs()
         case FunctionName.START_OBS:
             obs.start_obs()
-            obs.connect_to_obs()
         case _:
             logger.debug(f"unknown message from electron websocket: {message.to_json()}")
 
 def post_init2():
     asyncio.run(gametext.start_text_monitor())
 
+
+def async_loop():
+    async def loop():
+        await obs.connect_to_obs()
+        if get_config().obs.enabled:
+            await register_scene_switcher_callback()
+            await check_obs_folder_is_correct()
+        logger.info("Post-Initialization started.")
+        if get_config().vad.is_vosk():
+            from GameSentenceMiner.vad import vosk_helper
+            vosk_helper.get_vosk_model()
+        if get_config().vad.is_whisper():
+            from GameSentenceMiner.vad import whisper_helper
+            whisper_helper.initialize_whisper_model()
+        if get_config().vad.is_silero():
+            from GameSentenceMiner.vad import silero_trim
+
+    asyncio.run(loop())
+
+
+async def register_scene_switcher_callback():
+    def scene_switcher_callback(scene):
+        logger.info(f"Scene changed to: {scene}")
+        all_configured_scenes = [config.scenes for config in get_master_config().configs.values()]
+        print(all_configured_scenes)
+        matching_configs = [name.strip() for name, config in config_instance.configs.items() if scene.strip() in config.scenes]
+        switch_to = None
+
+        if len(matching_configs) > 1:
+            selected_scene = settings_window.show_scene_selection(matched_configs=matching_configs)
+            if selected_scene:
+                switch_to = selected_scene
+            else:
+                return
+        elif matching_configs:
+            switch_to = matching_configs[0]
+        elif get_master_config().switch_to_default_if_not_found:
+            switch_to = configuration.DEFAULT_CONFIG
+
+        if switch_to and switch_to != get_master_config().current_profile:
+            logger.info(f"Switching to profile: {switch_to}")
+            get_master_config().current_profile = switch_to
+            switch_profile_and_save(switch_to)
+            settings_window.reload_settings()
+            update_icon()
+
+    logger.info("Registering scene switcher callback")
+    await obs.register_scene_change_callback(scene_switcher_callback)
+
 async def main(reloading=False):
     global root, settings_window
+    initialize(reloading)
     logger.info("Script started.")
     root = ttk.Window(themename='darkly')
     settings_window = config_gui.ConfigApp(root)
-    initialize(reloading)
     initialize_async()
     observer = Observer()
     observer.schedule(VideoToAudioHandler(), get_config().paths.folder_to_watch, recursive=False)
@@ -608,6 +635,7 @@ async def main(reloading=False):
 
     util.run_new_thread(post_init2)
     util.run_new_thread(run_text_hooker_page)
+    util.run_new_thread(async_loop)
 
     # Register signal handlers for graceful shutdown
     signal.signal(signal.SIGTERM, handle_exit())  # Handle `kill` commands
@@ -619,7 +647,6 @@ async def main(reloading=False):
     try:
         # if get_config().general.open_config_on_startup:
         #     root.after(0, settings_window.show)
-        root.after(50, post_init)
         settings_window.add_save_hook(update_icon)
         settings_window.on_exit = exit_program
         root.mainloop()

{gamesentenceminer-2.8.35 → gamesentenceminer-2.8.37}/GameSentenceMiner/model.py

@@ -83,6 +83,24 @@ class SceneItemsResponse:
 class RecordDirectory:
     recordDirectory: str
 
+
+@dataclass_json
+@dataclass
+class SceneItemInfo:
+    sceneIndex: int
+    sceneName: str
+    sceneUuid: str
+
+
+@dataclass_json
+@dataclass
+class SceneListResponse:
+    scenes: List[SceneItemInfo]
+    currentProgramSceneName: Optional[str] = None
+    currentProgramSceneUuid: Optional[str] = None
+    currentPreviewSceneName: Optional[str] = None
+    currentPreviewSceneUuid: Optional[str] = None
+
 #
 # @dataclass_json
 # @dataclass