GameSentenceMiner 2.17.0__tar.gz → 2.17.1__tar.gz

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner/anki.py

@@ -1,4 +1,8 @@
 import copy
+import json
+import os
+import shutil
+import threading
 from pathlib import Path
 import queue
 import time
@@ -15,8 +19,8 @@ from GameSentenceMiner.util.db import GameLinesTable
 from GameSentenceMiner.util.gsm_utils import make_unique, sanitize_filename, wait_for_stable_file, remove_html_and_cloze_tags, combine_dialogue, \
     run_new_thread, open_audio_in_external
 from GameSentenceMiner.util import ffmpeg, notification
-from GameSentenceMiner.util.configuration import *
-from GameSentenceMiner.util.configuration import get_config
+from GameSentenceMiner.util.configuration import get_config, AnkiUpdateResult, logger, anki_results, gsm_status, \
+    gsm_state
 from GameSentenceMiner.util.model import AnkiCard
 from GameSentenceMiner.util.text_log import get_all_lines, get_text_event, get_mined_line, lines_match
 from GameSentenceMiner.obs import get_current_game

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner/config_gui.py

@@ -1,7 +1,9 @@
 import asyncio
 import copy
 import json
+import os
 import subprocess
+import sys
 import time
 import tkinter as tk
 from tkinter import filedialog, messagebox, simpledialog, scrolledtext, font
@@ -12,7 +14,11 @@ import ttkbootstrap as ttk
 from GameSentenceMiner import obs
 from GameSentenceMiner.util import configuration
 from GameSentenceMiner.util.communication.send import send_restart_signal
-from GameSentenceMiner.util.configuration import *
+from GameSentenceMiner.util.configuration import Config, Locale, logger, CommonLanguages, ProfileConfig, General, Paths, \
+    Anki, Features, Screenshot, Audio, OBS, Hotkeys, VAD, Overlay, Ai, Advanced, OverlayEngine, get_app_directory, \
+    get_config, is_beangate, AVAILABLE_LANGUAGES, WHSIPER_LARGE, WHISPER_TINY, WHISPER_BASE, WHISPER_SMALL, \
+    WHISPER_MEDIUM, WHISPER_TURBO, SILERO, WHISPER, OFF, gsm_state, DEFAULT_CONFIG, get_latest_version, \
+    get_current_version, AI_GEMINI, AI_GROQ, AI_OPENAI, save_full_config, get_default_anki_media_collection_path
 from GameSentenceMiner.util.db import AIModelsTable
 from GameSentenceMiner.util.downloader.download_tools import download_ocenaudio_if_needed
     

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner/gametext.py

@@ -1,5 +1,7 @@
 import asyncio
+import json
 import re
+from datetime import datetime
 
 import pyperclip
 import requests
@@ -7,12 +9,11 @@ import websockets
 from websockets import InvalidStatus
 from rapidfuzz import fuzz
 
-
+from GameSentenceMiner.util.configuration import get_config, gsm_status, logger, gsm_state
 from GameSentenceMiner.util.db import GameLinesTable
 from GameSentenceMiner.util.gsm_utils import do_text_replacements, TEXT_REPLACEMENTS_FILE, run_new_thread
-from GameSentenceMiner.util.configuration import *
-from GameSentenceMiner.util.text_log import *
 from GameSentenceMiner import obs
+from GameSentenceMiner.util.text_log import add_line, get_text_log
 from GameSentenceMiner.web.texthooking_page import add_event_to_texthooker, overlay_server_thread
 
 from GameSentenceMiner.util.get_overlay_coords import OverlayProcessor

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner/gsm.py

@@ -1,10 +1,11 @@
-import tempfile
-import time
 import asyncio
+import os
+import shutil
 import subprocess
 import sys
-
-import os
+import tempfile
+import threading
+import time
 import warnings
 
 import requests
@@ -42,7 +43,10 @@ try:
     import psutil
 
     start_time = time.time()
-    from GameSentenceMiner.util.configuration import *
+    from GameSentenceMiner.util.configuration import logger, gsm_state, get_config, anki_results, AnkiUpdateResult, \
+    get_temporary_directory, get_log_path, get_master_config, switch_profile_and_save, get_app_directory, gsm_status, \
+    is_windows, is_linux
+
     logger.debug(f"[Import] configuration: {time.time() - start_time:.3f}s")
 
     start_time = time.time()
@@ -113,10 +117,6 @@ try:
     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(
@@ -675,6 +675,7 @@ def initialize_async():
 
 
 def handle_websocket_message(message: Message):
+    logger.info(f"WebSocket Message Received: {message.to_json()}")
     try:
         match FunctionName(message.function):
             case FunctionName.QUIT:
@@ -683,7 +684,7 @@ def handle_websocket_message(message: Message):
             case FunctionName.QUIT_OBS:
                 close_obs()
             case FunctionName.START_OBS:
-                obs.start_obs()
+                obs.start_obs(force_restart=not gsm_status.obs_connected)
             case FunctionName.OPEN_SETTINGS:
                 open_settings()
             case FunctionName.OPEN_TEXTHOOKER:

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner/obs.py

@@ -165,28 +165,36 @@ class OBSConnectionManager(threading.Thread):
                 self.counter = 0
                 return
             start_replay_buffer()
-
+    
 def get_obs_path():
     return os.path.join(configuration.get_app_directory(), 'obs-studio/bin/64bit/obs64.exe')
 
 def is_process_running(pid):
     try:
         process = psutil.Process(pid)
-        return 'obs' in process.exe()
+        return 'obs' in process.exe().lower()
     except (psutil.NoSuchProcess, psutil.AccessDenied, OSError):
         if os.path.exists(OBS_PID_FILE):
             os.remove(OBS_PID_FILE)
         return False
 
-def start_obs():
+def start_obs(force_restart=False):
     global obs_process_pid
     if os.path.exists(OBS_PID_FILE):
         with open(OBS_PID_FILE, "r") as f:
             try:
                 obs_process_pid = int(f.read().strip())
                 if is_process_running(obs_process_pid):
-                    print(f"OBS is already running with PID: {obs_process_pid}")
-                    return obs_process_pid
+                    if force_restart:
+                        try:
+                            process = psutil.Process(obs_process_pid)
+                            process.terminate()
+                            process.wait(timeout=10)
+                            print("OBS process terminated for restart.")
+                        except Exception as e:
+                            print(f"Error terminating OBS process: {e}")
+                    else:
+                        return obs_process_pid
             except ValueError:
                 print("Invalid PID found in file. Launching new OBS instance.")
             except OSError:

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner/ocr/owocr_helper.py

@@ -19,13 +19,15 @@ from PIL import Image
 from rapidfuzz import fuzz
 
 from GameSentenceMiner import obs
-from GameSentenceMiner.util.electron_config import *
 from GameSentenceMiner.ocr.ss_picker import ScreenCropper
 from GameSentenceMiner.owocr.owocr.run import TextFiltering
 from GameSentenceMiner.util.configuration import get_config, get_app_directory, get_temporary_directory
 from GameSentenceMiner.ocr.gsm_ocr_config import OCRConfig, has_config_changed, set_dpi_awareness, get_window, get_ocr_config_path
-from GameSentenceMiner.owocr.owocr import screen_coordinate_picker, run
-from GameSentenceMiner.util.gsm_utils import sanitize_filename, do_text_replacements, OCR_REPLACEMENTS_FILE
+from GameSentenceMiner.owocr.owocr import run
+from GameSentenceMiner.util.electron_config import get_ocr_ocr2, get_ocr_send_to_clipboard, get_ocr_scan_rate, \
+    has_ocr_config_changed, reload_electron_config, get_ocr_two_pass_ocr, get_ocr_optimize_second_scan, \
+    get_ocr_language, get_ocr_manual_ocr_hotkey
+from GameSentenceMiner.util.gsm_utils import sanitize_filename
 import threading
 import time
 
@@ -420,7 +422,7 @@ def get_ocr2_image(crop_coords, og_image: Image.Image, ocr2_engine=None):
     Logic is unchanged, but code is refactored for clarity and maintainability.
     """
     def return_original_image():
-        logger.info("Returning original image for OCR2 (no cropping or optimization).")
+        logger.debug("Returning original image for OCR2 (no cropping or optimization).")
         if not crop_coords or not get_ocr_optimize_second_scan():
             return og_image
         x1, y1, x2, y2 = crop_coords
@@ -546,9 +548,10 @@ def add_ss_hotkey(ss_hotkey="ctrl+shift+g"):
         ocr_config = get_ocr_config()
         img = obs.get_screenshot_PIL(compression=80, img_format="jpg")
         ocr_config.scale_to_custom_size(img.width, img.height)
-        img = run.apply_ocr_config_to_image(img, ocr_config, is_secondary=True)
-        do_second_ocr("", datetime.now(), img, TextFiltering(lang=get_ocr_language()), ignore_furigana_filter=True, ignore_previous_result=True)
-        
+        for rectangle in [rectangle for rectangle in ocr_config.rectangles if rectangle.is_secondary]:
+            new_img = run.apply_ocr_config_to_image(img, ocr_config, is_secondary=True, rectangles=[rectangle])
+            do_second_ocr("", datetime.now(), new_img, TextFiltering(lang=get_ocr_language()), ignore_furigana_filter=True, ignore_previous_result=True)
+
     filtering = TextFiltering(lang=get_ocr_language())
     cropper = ScreenCropper()
     def capture():

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner/owocr/owocr/run.py

@@ -1,6 +1,11 @@
+import os
+import sys
+
 from GameSentenceMiner.ocr.gsm_ocr_config import set_dpi_awareness, get_scene_ocr_config
-from GameSentenceMiner.util.electron_config import *  # noqa: F403
 from GameSentenceMiner.util.gsm_utils import do_text_replacements, OCR_REPLACEMENTS_FILE
+from GameSentenceMiner.util.electron_config import get_ocr_language, get_ocr_requires_open_window, \
+    has_ocr_config_changed, reload_electron_config, get_ocr_scan_rate, get_ocr_two_pass_ocr, get_ocr_keep_newline, \
+    get_ocr_ocr1, get_furigana_filter_sensitivity
 
 try:
     import win32gui
@@ -1135,14 +1140,15 @@ def scale_down_width_height(width, height):
             return width, height
 
 
-def apply_ocr_config_to_image(img, ocr_config, is_secondary=False):
+def apply_ocr_config_to_image(img, ocr_config, is_secondary=False, rectangles=None):
     for rectangle in ocr_config.rectangles:
         if rectangle.is_excluded:
             left, top, width, height = rectangle.coordinates
             draw = ImageDraw.Draw(img)
             draw.rectangle((left, top, left + width, top + height), fill=(0, 0, 0, 0))
             
-    rectangles = [r for r in ocr_config.rectangles if not r.is_excluded and r.is_secondary == is_secondary]
+    if not rectangles:   
+        rectangles = [r for r in ocr_config.rectangles if not r.is_excluded and r.is_secondary == is_secondary]
     
     # Sort top to bottom
     if rectangles:

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner/util/ffmpeg.py

@@ -1,13 +1,16 @@
+import json
+import os
 import subprocess
+import sys
 import tempfile
 import time
 from pathlib import Path
 
 from GameSentenceMiner import obs
+from GameSentenceMiner.util.configuration import get_app_directory, is_windows, logger, get_config, \
+    get_temporary_directory, gsm_state, is_linux
 from GameSentenceMiner.util.gsm_utils import make_unique_file_name, get_file_modification_time
 from GameSentenceMiner.util import configuration
-from GameSentenceMiner.util.configuration import *
-from GameSentenceMiner.util.model import VADResult
 from GameSentenceMiner.util.text_log import initial_time
 
 

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner/vad.py

@@ -1,11 +1,14 @@
+import json
+import logging
+import os
+import shutil
 import tempfile
 import time
 import warnings
-import requests
 from abc import abstractmethod, ABC
 
 from GameSentenceMiner.util import configuration, ffmpeg
-from GameSentenceMiner.util.configuration import *
+from GameSentenceMiner.util.configuration import get_config, get_temporary_directory, logger, SILERO, WHISPER
 from GameSentenceMiner.util.ffmpeg import get_audio_length
 from GameSentenceMiner.util.gsm_utils import make_unique_file_name, run_new_thread
 from GameSentenceMiner.util.model import VADResult

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.17.0
+Version: 2.17.1
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.17.0
+Version: 2.17.1
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.17.0 → gamesentenceminer-2.17.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.17.0"
+version = "2.17.1"
 description = "A tool for mining sentences from games. Update: Overlay?"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -61,8 +61,8 @@ dependencies = [
 ]
 
 # This creates a command-line script named `gamesentenceminer` that will
-# call the `main()` function defined in the package’s __main__.py (or wherever
-# you’ve placed your entry function). Adjust the import path as needed.
+# call the `main()` function defined in the package's __main__.py (or wherever
+# you've placed your entry function). Adjust the import path as needed.
 [project.scripts]
 gamesentenceminer = "GameSentenceMiner.gsm:main"