GameSentenceMiner 2.14.8__tar.gz → 2.14.9__tar.gz

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/GameSentenceMiner/config_gui.py

@@ -212,6 +212,7 @@ class ConfigApp:
 
         self.create_vars()
         self.create_tabs()
+        self.get_online_models()
         self.notebook.bind("<<NotebookTabChanged>>", self.on_profiles_tab_selected)
 
         button_frame = ttk.Frame(self.window)
@@ -285,6 +286,7 @@ class ConfigApp:
         self.obs_close_obs_value = tk.BooleanVar(value=self.settings.obs.close_obs)
         self.obs_get_game_from_scene_name_value = tk.BooleanVar(value=self.settings.obs.get_game_from_scene)
         self.obs_minimum_replay_size_value = tk.StringVar(value=str(self.settings.obs.minimum_replay_size))
+        self.obs_turn_off_output_check_value = tk.BooleanVar(value=self.settings.obs.turn_off_output_check)
         
         # Paths Settings
         self.folder_to_watch_value = tk.StringVar(value=self.settings.paths.folder_to_watch)
@@ -567,7 +569,8 @@ class ConfigApp:
                 port=int(self.obs_port_value.get()),
                 password=self.obs_password_value.get(),
                 get_game_from_scene=self.obs_get_game_from_scene_name_value.get(),
-                minimum_replay_size=int(self.obs_minimum_replay_size_value.get())
+                minimum_replay_size=int(self.obs_minimum_replay_size_value.get()),
+                turn_off_output_check=self.obs_turn_off_output_check_value.get()
             ),
             hotkeys=Hotkeys(
                 reset_line=self.reset_line_hotkey_value.get(),
@@ -1721,6 +1724,14 @@ class ConfigApp:
         ttk.Entry(obs_frame, textvariable=self.obs_minimum_replay_size_value).grid(row=self.current_row, column=1, sticky='EW', pady=2)
         self.current_row += 1
 
+        turn_off_output_check_i18n = obs_i18n.get('turn_off_output_check', {})
+        HoverInfoLabelWidget(obs_frame, text=turn_off_output_check_i18n.get('label', '...'),
+                             tooltip=turn_off_output_check_i18n.get('tooltip', '...'),
+                             row=self.current_row, column=0)
+        ttk.Checkbutton(obs_frame, variable=self.obs_turn_off_output_check_value, bootstyle="round-toggle").grid(
+            row=self.current_row, column=1, sticky='W', pady=2)
+        self.current_row += 1
+
         self.add_reset_button(obs_frame, "obs", self.current_row, 0, self.create_obs_tab)
 
         for col in range(3): obs_frame.grid_columnconfigure(col, weight=0)
@@ -1968,9 +1979,7 @@ class ConfigApp:
         self.groq_models_combobox = ttk.Combobox(ai_frame, textvariable=self.groq_model_value, values=RECOMMENDED_GROQ_MODELS, state="readonly")
         self.groq_models_combobox.grid(row=self.current_row, column=1, sticky='EW', pady=2)
         self.current_row += 1
-        
-        self.get_online_models()
-        
+                
         groq_key_i18n = ai_i18n.get('groq_api_key', {})
         HoverInfoLabelWidget(ai_frame, text=groq_key_i18n.get('label', '...'), tooltip=groq_key_i18n.get('tooltip', '...'),
                              row=self.current_row, column=0)
@@ -1980,8 +1989,6 @@ class ConfigApp:
         groq_apikey_entry.bind("<Return>", lambda e, row=self.current_row: self.get_online_models())
         self.current_row += 1
         
-        
-        
         openai_url_i18n = ai_i18n.get('openai_url', {})
         HoverInfoLabelWidget(ai_frame, text=openai_url_i18n.get('label', '...'), tooltip=openai_url_i18n.get('tooltip', '...'),
                              row=self.current_row, column=0)
@@ -1994,6 +2001,7 @@ class ConfigApp:
 
         self.openai_model_options = []
         self.update_models_element(ai_frame, self.current_row)
+        # threading.Thread(target=self.update_models_element, args=(ai_frame, self.current_row)).start()
         self.current_row += 1
             
         
@@ -2050,7 +2058,7 @@ class ConfigApp:
     def get_online_models(self):
         ai_models = AIModelsTable.one()
 
-        def get_models_thread():
+        def get_models():
             groq_models = get_groq_models()
             gemini_models = get_gemini_models()
             AIModelsTable.update_models(gemini_models, groq_models)
@@ -2099,12 +2107,13 @@ class ConfigApp:
         if ai_models and ai_models.gemini_models and ai_models.groq_models:
             if time.time() - ai_models.last_updated > 3600 * 6:
                 print("AI models are outdated, fetching new ones.")
-                threading.Thread(target=get_models_thread, daemon=True).start()
+                threading.Thread(target=get_models, daemon=True).start()
             self.gemini_model_combobox['values'] = ai_models.gemini_models
             self.groq_models_combobox['values'] = ai_models.groq_models
         else:
             print("No AI models found, fetching new ones.")
-            threading.Thread(target=get_models_thread, daemon=True).start()
+            threading.Thread(target=get_models, daemon=True).start()
+            # get_models()
     
     def update_models_element(self, frame, row):
         if hasattr(self, 'last_url') and self.last_url == self.open_ai_url_value.get().strip():
@@ -2114,7 +2123,7 @@ class ConfigApp:
         if self.open_ai_url_value.get().strip() != "" and any(c in self.open_ai_url_value.get() for c in ["localhost", "127.0.0.1"]):
             import openai
             # get models from openai compatible url
-            client = openai.Client(api_key=self.settings.ai.open_ai_api_key, base_url=self.open_ai_url_value.get().strip())
+            client = openai.Client(api_key=self.settings.ai.open_ai_api_key, base_url=self.open_ai_url_value.get().strip(), timeout=1)
             try:
                 models = client.models.list()
                 if models:

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/GameSentenceMiner/gsm.py

@@ -34,27 +34,85 @@ try:
     from watchdog.observers import Observer
     import psutil
 
+    start_time = time.time()
+    from GameSentenceMiner.util.configuration import *
+    logger.debug(f"[Import] configuration: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.util.model import VADResult
+    logger.debug(f"[Import] VADResult model: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.vad import vad_processor
+    logger.debug(f"[Import] vad_processor: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.util.downloader.download_tools import download_obs_if_needed, download_ffmpeg_if_needed
+    logger.debug(f"[Import] download_tools (download_obs_if_needed, download_ffmpeg_if_needed): {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.util.communication.send import send_restart_signal
+    logger.debug(f"[Import] send_restart_signal: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.util.gsm_utils import wait_for_stable_file, make_unique_file_name, run_new_thread
+    logger.debug(f"[Import] gsm_utils (wait_for_stable_file, make_unique_file_name, run_new_thread): {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner import anki
+    logger.debug(f"[Import] anki: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner import config_gui
+    logger.debug(f"[Import] config_gui: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.util import configuration, notification, ffmpeg
+    logger.debug(f"[Import] util (configuration, notification, ffmpeg): {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner import gametext
+    logger.debug(f"[Import] gametext: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner import obs
+    logger.debug(f"[Import] obs: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.util.communication import Message
-    from GameSentenceMiner.util.communication.websocket import connect_websocket, register_websocket_message_handler, \
-        FunctionName
-    from GameSentenceMiner.util.configuration import *
+    logger.debug(f"[Import] Message: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
+    from GameSentenceMiner.util.communication.websocket import connect_websocket, register_websocket_message_handler, FunctionName
+    logger.debug(f"[Import] websocket (connect_websocket, register_websocket_message_handler, FunctionName): {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.util.ffmpeg import get_audio_and_trim, get_video_timings, get_ffmpeg_path
+    logger.debug(f"[Import] util.ffmpeg (get_audio_and_trim, get_video_timings, get_ffmpeg_path): {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.obs import check_obs_folder_is_correct
+    logger.debug(f"[Import] obs.check_obs_folder_is_correct: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.util.text_log import GameLine, get_text_event, get_mined_line, get_all_lines, game_log
+    logger.debug(f"[Import] util.text_log (GameLine, get_text_event, get_mined_line, get_all_lines, game_log): {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.util import *
+    logger.debug(f"[Import] util *: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.web import texthooking_page
+    logger.debug(f"[Import] web.texthooking_page: {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.web.service import handle_texthooker_button, set_get_audio_from_video_callback
+    logger.debug(f"[Import] web.service (handle_texthooker_button, set_get_audio_from_video_callback): {time.time() - start_time:.3f}s")
+
+    start_time = time.time()
     from GameSentenceMiner.web.texthooking_page import run_text_hooker_page
+    logger.debug(f"[Import] web.texthooking_page.run_text_hooker_page: {time.time() - start_time:.3f}s")
 except Exception as e:
     from GameSentenceMiner.util.configuration import logger, is_linux, is_windows
     handle_error_in_initialization(e)
@@ -583,7 +641,7 @@ def handle_websocket_message(message: Message):
                 f"unknown message from electron websocket: {message.to_json()}")
 
 
-def post_init2():
+def initialize_text_monitor():
     asyncio.run(gametext.start_text_monitor())
 
 
@@ -668,8 +726,8 @@ async def async_main(reloading=False):
     try:
         global root, settings_window
         initialize(reloading)
-        logger.info("Script started.")
         root = ttk.Window(themename='darkly')
+        start_time = time.time()
         settings_window = config_gui.ConfigApp(root)
         initialize_async()
         observer = Observer()
@@ -678,10 +736,12 @@ async def async_main(reloading=False):
         observer.start()
         if is_windows():
             register_hotkeys()
-
-        run_new_thread(post_init2)
+            
+        run_new_thread(initialize_text_monitor)
         run_new_thread(run_text_hooker_page)
-        run_new_thread(async_loop)
+        run_new_thread(async_loop).join()
+        
+        logger.info("Initialization complete. Happy Mining! がんばれ！")
         
         # await check_if_script_is_running()
         # await log_current_pid()

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/GameSentenceMiner/locales/en_us.json

@@ -415,6 +415,10 @@
           "min_replay_size": {
             "label": "Minimum Replay Size (KB):",
             "tooltip": "Minimum Replay Size for OBS Replays in KB. If Replay is Under this, Audio/Screenshot Will not be grabbed."
+          },
+          "turn_off_output_check": {
+            "label": "Turn Off Output Check:",
+            "tooltip": "Disable the video output Replay Buffer Check."
           }
         },
         "profiles": {

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/GameSentenceMiner/locales/ja_jp.json

@@ -414,6 +414,10 @@
           "min_replay_size": {
             "label": "最小リプレイサイズ (KB):",
             "tooltip": "このサイズ未満のリプレイは処理しません。"
+          },
+          "turn_off_output_check": {
+            "label": "出力チェックを無効化:",
+            "tooltip": "動画出力のリプレイバッファチェックを無効化します。"
           }
         },
         "profiles": {

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/GameSentenceMiner/locales/zh_cn.json

@@ -415,6 +415,10 @@
           "min_replay_size": {
             "label": "最小回放大小 (KB):",
             "tooltip": "OBS 录像回放的最小大小（KB）。如果回放小于此大小，将不抓取音频/截图。"
+          },
+          "turn_off_output_check": {
+            "label": "关闭输出检查:",
+            "tooltip": "禁用视频输出的回放缓冲区检查。"
           }
         },
         "profiles": {

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/GameSentenceMiner/obs.py

@@ -24,13 +24,14 @@ logging.getLogger("obsws_python").setLevel(logging.CRITICAL)
 connecting = False
 
 class OBSConnectionManager(threading.Thread):
-    def __init__(self):
+    def __init__(self, check_output=True):
         super().__init__()
         self.daemon = True
         self.running = True
         self.check_connection_interval = 1
         self.said_no_to_replay_buffer = False
         self.counter = 0
+        self.check_output = check_output
 
     def run(self):
         while self.running:
@@ -42,13 +43,16 @@ class OBSConnectionManager(threading.Thread):
                 logger.info(f"OBS WebSocket not connected. Attempting to reconnect... {e}")
                 gsm_status.obs_connected = False
                 asyncio.run(connect_to_obs())
-            if self.counter % 5 == 0:
+            if self.counter % 5 == 0 and not get_config().obs.turn_off_output_check and self.check_output:
                 replay_buffer_status = get_replay_buffer_status()
                 if replay_buffer_status and self.said_no_to_replay_buffer:
                     self.said_no_to_replay_buffer = False
                     self.counter = 0
                 if gsm_status.obs_connected and not replay_buffer_status and not self.said_no_to_replay_buffer:
-                    self.check_output()
+                    try:
+                        self.check_output()
+                    except Exception as e:
+                        pass
             self.counter += 1
 
     def stop(self):
@@ -172,7 +176,7 @@ def get_obs_websocket_config_values():
         full_config.save()
         reload_config()
 
-async def connect_to_obs(retry=5):
+async def connect_to_obs(retry=5, check_output=True):
     global client, obs_connection_manager, event_client, connecting
     if is_windows():
         get_obs_websocket_config_values()
@@ -195,7 +199,7 @@ async def connect_to_obs(retry=5):
             gsm_status.obs_connected = True
             logger.info("Connected to OBS WebSocket.")
             if not obs_connection_manager:
-                obs_connection_manager = OBSConnectionManager()
+                obs_connection_manager = OBSConnectionManager(check_output=check_output)
                 obs_connection_manager.start()
             update_current_game()
             break  # Exit the loop once connected
@@ -211,7 +215,7 @@ async def connect_to_obs(retry=5):
             retry -= 1
     connecting = False
 
-def connect_to_obs_sync(retry=2):
+def connect_to_obs_sync(retry=2, check_output=True):
     global client, obs_connection_manager, event_client
     if is_windows():
         get_obs_websocket_config_values()
@@ -231,7 +235,7 @@ def connect_to_obs_sync(retry=2):
                 timeout=1,
             )
             if not obs_connection_manager:
-                obs_connection_manager = OBSConnectionManager()
+                obs_connection_manager = OBSConnectionManager(check_output=check_output)
                 obs_connection_manager.start()
             update_current_game()
             logger.info("Connected to OBS WebSocket.")
@@ -293,7 +297,7 @@ def get_replay_buffer_status():
     try:
         return client.get_replay_buffer_status().output_active
     except Exception as e:
-        logger.warning(f"Error getting replay buffer status: {e}")
+        logger.debug(f"Error getting replay buffer status: {e}")
         return None
 
 def stop_replay_buffer():

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.14.8
+Version: 2.14.9
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License
@@ -30,7 +30,6 @@ Requires-Dist: silero-vad~=5.1.2
 Requires-Dist: ttkbootstrap~=1.10.1
 Requires-Dist: dataclasses_json~=0.6.7
 Requires-Dist: win10toast; sys_platform == "win32"
-Requires-Dist: numpy==2.2.6
 Requires-Dist: pystray
 Requires-Dist: pywin32; sys_platform == "win32"
 Requires-Dist: pygetwindow; sys_platform == "win32"

gamesentenceminer-2.14.9/GameSentenceMiner.egg-info/SOURCES.txt

@@ -0,0 +1,27 @@
+LICENSE
+README.md
+pyproject.toml
+GameSentenceMiner/__init__.py
+GameSentenceMiner/anki.py
+GameSentenceMiner/config_gui.py
+GameSentenceMiner/gametext.py
+GameSentenceMiner/gsm.py
+GameSentenceMiner/obs.py
+GameSentenceMiner/vad.py
+GameSentenceMiner.egg-info/PKG-INFO
+GameSentenceMiner.egg-info/SOURCES.txt
+GameSentenceMiner.egg-info/dependency_links.txt
+GameSentenceMiner.egg-info/entry_points.txt
+GameSentenceMiner.egg-info/requires.txt
+GameSentenceMiner.egg-info/top_level.txt
+GameSentenceMiner/assets/__init__.py
+GameSentenceMiner/assets/icon.png
+GameSentenceMiner/assets/icon128.png
+GameSentenceMiner/assets/icon256.png
+GameSentenceMiner/assets/icon32.png
+GameSentenceMiner/assets/icon512.png
+GameSentenceMiner/assets/icon64.png
+GameSentenceMiner/assets/pickaxe.png
+GameSentenceMiner/locales/en_us.json
+GameSentenceMiner/locales/ja_jp.json
+GameSentenceMiner/locales/zh_cn.json

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/GameSentenceMiner.egg-info/requires.txt

@@ -13,7 +13,6 @@ stable-ts-whisperless
 silero-vad~=5.1.2
 ttkbootstrap~=1.10.1
 dataclasses_json~=0.6.7
-numpy==2.2.6
 pystray
 flask
 groq

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.14.8
+Version: 2.14.9
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License
@@ -30,7 +30,6 @@ Requires-Dist: silero-vad~=5.1.2
 Requires-Dist: ttkbootstrap~=1.10.1
 Requires-Dist: dataclasses_json~=0.6.7
 Requires-Dist: win10toast; sys_platform == "win32"
-Requires-Dist: numpy==2.2.6
 Requires-Dist: pystray
 Requires-Dist: pywin32; sys_platform == "win32"
 Requires-Dist: pygetwindow; sys_platform == "win32"

{gamesentenceminer-2.14.8 → gamesentenceminer-2.14.9}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.14.8"
+version = "2.14.9"
 description = "A tool for mining sentences from games. Update: Overlay?"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -40,7 +40,6 @@ dependencies = [
   "ttkbootstrap~=1.10.1",
   "dataclasses_json~=0.6.7",
   "win10toast; sys_platform == 'win32'",
-  "numpy==2.2.6",
   "pystray",
   "pywin32; sys_platform == 'win32'",
   "pygetwindow; sys_platform == 'win32'",
@@ -67,7 +66,9 @@ dependencies = [
 gamesentenceminer = "GameSentenceMiner.gsm:main"
 
 [tool.setuptools]
-packages = ["GameSentenceMiner", "GameSentenceMiner.util", 'GameSentenceMiner.util.downloader', "GameSentenceMiner.util.communication", "GameSentenceMiner.ai", "GameSentenceMiner.ocr", "GameSentenceMiner.owocr.owocr", "GameSentenceMiner.web",  "GameSentenceMiner.web.static", "GameSentenceMiner.web.templates", "GameSentenceMiner.wip", "GameSentenceMiner.tools"]
+packages = ["GameSentenceMiner"]
+include-package-data = true
+
 
 [tool.setuptools.package-data]
 "GameSentenceMiner.web" = ["static/*", "templates/*"]