GameSentenceMiner 2.12.7.post1__tar.gz → 2.12.8__tar.gz

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/GameSentenceMiner/config_gui.py

@@ -265,6 +265,7 @@ class ConfigApp:
                 use_websocket=self.websocket_enabled.get(),
                 use_clipboard=self.clipboard_enabled.get(),
                 websocket_uri=self.websocket_uri.get(),
+                merge_matching_sequential_text= self.merge_matching_sequential_text.get(),
                 open_config_on_startup=self.open_config_on_startup.get(),
                 open_multimine_on_startup=self.open_multimine_on_startup.get(),
                 texthook_replacement_regex=self.texthook_replacement_regex.get(),
@@ -519,6 +520,19 @@ class ConfigApp:
             row=self.current_row, column=1,
             sticky='W', pady=2)
         self.current_row += 1
+        
+        HoverInfoLabelWidget(self.general_tab, text="Merge Matching Sequential Text:",
+                             foreground="red", font=("Helvetica", 10, "bold"),
+                             tooltip="Enable to merge matching sequential text into a single entry. Designed for Luna's Speech Recognition feature. Very niche.",
+                             row=self.current_row, column=0)
+        
+        self.merge_matching_sequential_text = tk.BooleanVar(
+            value=self.settings.general.merge_matching_sequential_text)
+        ttk.Checkbutton(self.general_tab, variable=self.merge_matching_sequential_text,
+                        bootstyle="round-toggle").grid(
+            row=self.current_row, column=1,
+            sticky='W', pady=2)
+        self.current_row += 1
 
         HoverInfoLabelWidget(self.general_tab, text="Websocket URI(s):",
                              tooltip="WebSocket URI for connecting. Allows Comma Separated Values for Connecting Multiple.",

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/GameSentenceMiner/gametext.py

@@ -5,6 +5,7 @@ import pyperclip
 import requests
 import websockets
 from websockets import InvalidStatus
+from rapidfuzz import fuzz
 
 from GameSentenceMiner.util.gsm_utils import do_text_replacements, TEXT_REPLACEMENTS_FILE, run_new_thread
 from GameSentenceMiner.util.configuration import *
@@ -14,9 +15,15 @@ from GameSentenceMiner.web.texthooking_page import add_event_to_texthooker, send
 if get_config().wip.overlay_websocket_send:
     import GameSentenceMiner.wip.get_overlay_coords as get_overlay_coords
 
+
 current_line = ''
 current_line_after_regex = ''
 current_line_time = datetime.now()
+# Track the start time for the current sequence
+current_sequence_start_time = None
+# Track the last raw clipboard text for prefix comparison
+last_raw_clipboard = ''
+timer = None
 
 last_clipboard = ''
 
@@ -84,8 +91,12 @@ async def listen_websockets():
                                 line_time = datetime.fromisoformat(data["time"])
                         except json.JSONDecodeError or TypeError:
                             current_clipboard = message
+                        logger.info
                         if current_clipboard != current_line:
-                            await handle_new_text_event(current_clipboard, line_time if line_time else None)
+                            try:
+                                await handle_new_text_event(current_clipboard, line_time if line_time else None)
+                            except Exception as e: 
+                                logger.error(f"Error handling new text event: {e}", exc_info=True)
             except (websockets.ConnectionClosed, ConnectionError, InvalidStatus, ConnectionResetError, Exception) as e:
                 if websocket_url in gsm_status.websockets_connected:
                     gsm_status.websockets_connected.remove(websocket_url)
@@ -112,26 +123,75 @@ async def listen_websockets():
     websocket_tasks.append(listen_on_websocket(f"localhost:{get_config().advanced.ocr_websocket_port}"))
 
     await asyncio.gather(*websocket_tasks)
+    
+    
+async def merge_sequential_lines(line, start_time=None):
+    if not get_config().general.merge_matching_sequential_text:
+        return
+    logger.info(f"Merging Sequential Lines: {line}")
+    # Use the sequence start time for the merged line
+    await add_line_to_text_log(line, start_time if start_time else datetime.now())
+    timer = None
+    # Reset sequence tracking
+    current_sequence_start_time = None
+    last_raw_clipboard = ''
+    
+def schedule_merge(wait, coro, args):
+    async def wrapper():
+        await asyncio.sleep(wait)
+        await coro(*args)
+    task = asyncio.create_task(wrapper())
+    return task
+
 
 async def handle_new_text_event(current_clipboard, line_time=None):
-    global current_line, current_line_time, current_line_after_regex
+    global current_line, current_line_time, current_line_after_regex, timer, current_sequence_start_time, last_raw_clipboard
     current_line = current_clipboard
+    logger.info(f"Current Line: {current_line} last raw clipboard: {last_raw_clipboard}")
+    # Only apply this logic if merging is enabled
+    if get_config().general.merge_matching_sequential_text:
+        logger.info(f"Handling new text event: {current_line}")
+        # If no timer is active, this is the start of a new sequence
+        if not timer:
+            logger.info("Starting a new sequence of text lines.")
+            current_sequence_start_time = line_time if line_time else datetime.now()
+            last_raw_clipboard = current_line
+            # Start the timer
+            timer = schedule_merge(2, merge_sequential_lines, [current_line[:], current_sequence_start_time])
+        else:
+            # If the new text starts with the previous, reset the timer (do not update start time)
+            if current_line.startswith(last_raw_clipboard) or fuzz.ratio(current_line, last_raw_clipboard) > 50:
+                logger.info(f"Current line starts with last raw clipboard: {current_line} starts with {last_raw_clipboard}")
+                last_raw_clipboard = current_line
+                timer.cancel()
+                timer = schedule_merge(2, merge_sequential_lines, [current_line[:], current_sequence_start_time])
+            else:
+                logger.info(f"Current line does not start with last raw clipboard: {current_line} does not start with {last_raw_clipboard}")
+                # If not a prefix, treat as a new sequence
+                # timer.cancel()
+                current_sequence_start_time = line_time if line_time else datetime.now()
+                last_raw_clipboard = current_line
+                timer = schedule_merge(2, merge_sequential_lines, [current_line[:], current_sequence_start_time])
+    else:
+        await add_line_to_text_log(current_line, line_time)
+
+                
+async def add_line_to_text_log(line, line_time=None):
     if get_config().general.texthook_replacement_regex:
-        current_line_after_regex = re.sub(get_config().general.texthook_replacement_regex, '', current_line)
+        current_line_after_regex = re.sub(get_config().general.texthook_replacement_regex, '', line)
     else:
-        current_line_after_regex = current_line
-    current_line_after_regex = do_text_replacements(current_line, TEXT_REPLACEMENTS_FILE)
+        current_line_after_regex = line
+    current_line_after_regex = do_text_replacements(current_line_after_regex, TEXT_REPLACEMENTS_FILE)
     logger.info(f"Line Received: {current_line_after_regex}")
     current_line_time = line_time if line_time else datetime.now()
     gsm_status.last_line_received = current_line_time.strftime("%Y-%m-%d %H:%M:%S")
-    add_line(current_line_after_regex, line_time)
+    add_line(current_line_after_regex, line_time if line_time else datetime.now())
     if len(get_text_log().values) > 0:
         await add_event_to_texthooker(get_text_log()[-1])
     if get_config().wip.overlay_websocket_port and get_config().wip.overlay_websocket_send and overlay_server_thread.has_clients():
         boxes = await find_box_for_sentence(current_line_after_regex)
         if boxes:
             await send_word_coordinates_to_overlay(boxes)
-    
 
 async def find_box_for_sentence(sentence):
     boxes = []

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/GameSentenceMiner/ocr/owocr_area_selector.py

@@ -13,6 +13,7 @@ from PIL import Image, ImageTk
 from GameSentenceMiner import obs
 from GameSentenceMiner.ocr.gsm_ocr_config import set_dpi_awareness, get_window, get_scene_ocr_config_path
 from GameSentenceMiner.util.gsm_utils import sanitize_filename
+from GameSentenceMiner.util.configuration import logger
 
 try:
     import tkinter as tk
@@ -95,6 +96,7 @@ class ScreenSelector:
         self.image_mode = True
         self.redo_stack = []
         self.bounding_box = {}  # Geometry of the single large canvas window
+        self.instructions_showing = True
 
         self.canvas = None
         self.window = None
@@ -282,11 +284,10 @@ class ScreenSelector:
         tk.Button(button_frame, text="Redo (Ctrl+Y)", command=canvas_event_wrapper(self.redo_last_rect)).pack(fill=tk.X, pady=2)
         tk.Button(button_frame, text="Toggle Background (M)", command=root_event_wrapper(self.toggle_image_mode)).pack(fill=tk.X, pady=2)
         tk.Button(button_frame, text="Quit without Saving (Esc)", command=root_event_wrapper(self.quit_app)).pack(fill=tk.X, pady=2)
+        tk.Button(button_frame, text="Toggle Instructions (I)", command=canvas_event_wrapper(self.toggle_instructions)).pack(fill=tk.X, pady=2)
 
-        hotkeys_text = "\n• I: Toggle this instruction panel"
-        tk.Label(main_frame, text=hotkeys_text, justify=tk.LEFT, anchor="w").pack(pady=(10, 0), fill=tk.X)
-
-        self.instructions_widget.protocol("WM_DELETE_WINDOW", self.toggle_instructions)
+        # hotkeys_text = "\n• I: Toggle this instruction panel"
+        # tk.Label(main_frame, text=hotkeys_text, justify=tk.LEFT, anchor="w").pack(pady=(10, 0), fill=tk.X)
 
 
     # --- NEW METHOD TO DISPLAY INSTRUCTIONS ---
@@ -310,7 +311,7 @@ class ScreenSelector:
         instruction_font = tkfont.Font(family="Segoe UI", size=10, weight="normal")
 
         # Create the text item first to get its size
-        text_id = canvas.create_text(
+        self.instructions_overlay = canvas.create_text(
             20, 20,  # Position with a small margin
             text=instructions_text,
             anchor=tk.NW,
@@ -320,10 +321,10 @@ class ScreenSelector:
         )
 
         # Get the bounding box of the text to draw a background
-        text_bbox = canvas.bbox(text_id)
+        text_bbox = canvas.bbox(self.instructions_overlay)
 
         # Create a background rectangle with padding
-        rect_id = canvas.create_rectangle(
+        self.instructions_rect = canvas.create_rectangle(
             text_bbox[0] - 10,  # left
             text_bbox[1] - 10,  # top
             text_bbox[2] + 10,  # right
@@ -334,15 +335,27 @@ class ScreenSelector:
         )
 
         # Lower the rectangle so it's behind the text
-        canvas.tag_lower(rect_id, text_id)
+        canvas.tag_lower(self.instructions_rect, self.instructions_overlay)
+        
 
     def toggle_instructions(self, event=None):
-        if self.instructions_widget and self.instructions_widget.winfo_exists() and self.instructions_widget.state() == "normal":
-            self.instructions_widget.withdraw()
-            print("Toggled instructions visibility: OFF")
-        else:
-            self._create_instructions_widget(self.canvas)
-            print("Toggled instructions visibility: ON")
+        canvas = event.widget.winfo_toplevel().winfo_children()[0]
+        for element in [self.instructions_overlay, self.instructions_rect]:
+            current_state = canvas.itemcget(element, 'state')
+            new_state = tk.NORMAL if current_state == tk.HIDDEN else tk.HIDDEN
+            canvas.itemconfigure(element, state=new_state)
+        
+        # if self.instructions_showing:
+        #     self.instructions_widget.withdraw()
+        #     logger.info(f"Toggled instructions visibility: OFF")
+        #     self.instructions_showing = False
+        # else:
+        #     self.instructions_widget.deiconify()
+        #     self.instructions_widget.lift()
+        #     self.canvas.focus_set()
+        #     self.instructions_widget.update_idletasks()  # Ensure it is fully rendered
+        #     logger.info("Toggled instructions visibility: ON")
+        #     self.instructions_showing = True
 
     def start(self):
         self.root = tk.Tk()

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/GameSentenceMiner/owocr/owocr/ocr.py

@@ -11,7 +11,6 @@ import json
 import base64
 from urllib.parse import urlparse, parse_qs
 
-import jaconv
 import numpy as np
 import rapidfuzz.fuzz
 from PIL import Image
@@ -95,6 +94,7 @@ def empty_post_process(text):
 
 
 def post_process(text, keep_blank_lines=False):
+    import jaconv
     if keep_blank_lines:
         text = '\n'.join([''.join(i.split()) for i in text.splitlines()])
     else:

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/GameSentenceMiner/util/configuration.py

@@ -312,6 +312,7 @@ class General:
     use_websocket: bool = True
     use_clipboard: bool = True
     use_both_clipboard_and_websocket: bool = False
+    merge_matching_sequential_text: bool = False
     websocket_uri: str = 'localhost:6677,localhost:9001,localhost:2333'
     open_config_on_startup: bool = False
     open_multimine_on_startup: bool = True
@@ -530,6 +531,10 @@ class WIP:
     overlay_websocket_port: int = 55499
     overlay_websocket_send: bool = False
     monitor_to_capture: int = 0
+    
+    def __post_init__(self):
+        if self.monitor_to_capture == -1:
+            self.monitor_to_capture = 0  # Default to the first monitor if not set
                     
 
 

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/GameSentenceMiner/util/window_transparency.py

@@ -65,18 +65,21 @@ def reset_window_state(hwnd):
 
 # --- Hotkey Callback (equivalent to AHK ^!y::) ---
 
-def toggle_functionality():
+def toggle_functionality(window_hwnd=None):
     """
     This function is called when the hotkey is pressed.
     It manages the toggling logic.
     """
     global is_toggled, target_hwnd
-
-    # Get the currently focused window (equivalent to WinGetID("A"))
-    current_hwnd = win32gui.GetForegroundWindow()
-    if not current_hwnd:
-        logger.info("No window is currently active!")
-        return
+    
+    if window_hwnd:
+        current_hwnd = window_hwnd
+    else:
+        # Get the currently focused window (equivalent to WinGetID("A"))
+        current_hwnd = win32gui.GetForegroundWindow()
+        if not current_hwnd:
+            logger.info("No window is currently active!")
+            return
 
     with state_lock:
         # Case 1: The hotkey is pressed on the currently toggled window to disable it.
@@ -167,8 +170,23 @@ if __name__ == "__main__":
     # get hotkey from args
     parser = argparse.ArgumentParser(description="Window Transparency Toggle Script")
     parser.add_argument('--hotkey', type=str, default=HOTKEY, help='Hotkey to toggle transparency (default: ctrl+alt+y)')
+    parser.add_argument('--window', type=str, help='Window title to target (optional)')
 
-    hotkey = parser.parse_args().hotkey.lower()
+    args = parser.parse_args()
+    hotkey = args.hotkey.lower()
+    target_window_title = args.window
+    
+    if target_window_title:
+        # Find the window by title if specified
+        target_hwnd = win32gui.FindWindow(None, target_window_title)
+        logger.info(f"Searching for window with title: {target_window_title}")
+        logger.info(f"Target HWND: {target_hwnd}")
+        if not target_hwnd:
+            logger.error(f"Window with title '{target_window_title}' not found.")
+            sys.exit(1)
+        else:
+            logger.info(f"Target window found: {target_window_title}")
+            toggle_functionality(target_hwnd)  # Enable functionality for the specified window
 
     # Register the global hotkey
     keyboard.add_hotkey(hotkey, toggle_functionality)

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.12.7.post1
+Version: 2.12.8
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License
@@ -29,7 +29,7 @@ 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
+Requires-Dist: numpy==2.2.6
 Requires-Dist: pystray
 Requires-Dist: pywin32; sys_platform == "win32"
 Requires-Dist: pygetwindow; sys_platform == "win32"

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/GameSentenceMiner.egg-info/requires.txt

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

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.12.7.post1
+Version: 2.12.8
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License
@@ -29,7 +29,7 @@ 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
+Requires-Dist: numpy==2.2.6
 Requires-Dist: pystray
 Requires-Dist: pywin32; sys_platform == "win32"
 Requires-Dist: pygetwindow; sys_platform == "win32"

{gamesentenceminer-2.12.7.post1 → gamesentenceminer-2.12.8}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.12.7.post1"
+version = "2.12.8"
 description = "A tool for mining sentences from games. Update: Overlay?"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -39,7 +39,7 @@ dependencies = [
   "ttkbootstrap~=1.10.1",
   "dataclasses_json~=0.6.7",
   "win10toast; sys_platform == 'win32'",
-  "numpy",
+  "numpy==2.2.6",
   "pystray",
   "pywin32; sys_platform == 'win32'",
   "pygetwindow; sys_platform == 'win32'",