GameSentenceMiner 2.19.1__tar.gz → 2.19.2.dev0__tar.gz

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/GameSentenceMiner/gametext.py

@@ -260,7 +260,7 @@ async def add_line_to_text_log(line, line_time=None):
         await add_event_to_texthooker(get_text_log()[-1])
     if get_config().overlay.websocket_port and overlay_server_thread.has_clients():
         if get_overlay_processor().ready:
-            await get_overlay_processor().find_box_and_send_to_overlay(current_line_after_regex)
+            asyncio.create_task(get_overlay_processor().find_box_and_send_to_overlay(current_line_after_regex))
     add_srt_line(line_time, new_line)
     if 'nostatspls' not in new_line.scene.lower():
         GameLinesTable.add_line(new_line)

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/GameSentenceMiner/locales/en_us.json

@@ -597,6 +597,16 @@
             "label": "Capture Interval (Seconds):",
             "tooltip": "Interval in seconds for periodic screen capture."
           }
+          ,
+          "periodic_ratio": {
+            "label": "Periodic Match Ratio:",
+            "tooltip": "Ratio (0-1) used during periodic scanning to determine how much of the region must match to count as detected. Higher = Less Strict, more Scanning."
+          }
+          ,
+          "number_of_local_scans_per_event": {
+            "label": "Local Scans Per Text Event:",
+            "tooltip": "How many local scans to perform per text event (agent, textractor, etc.) before stopping or sending results to the OCR engine. .1s delay between scans for now."
+          }
         },
         "wip": {
           "title": "WIP",

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/GameSentenceMiner/locales/ja_jp.json

@@ -596,6 +596,16 @@
             "label": "キャプチャ間隔（秒）:",
             "tooltip": "定期的な画面キャプチャの間隔（秒単位）。"
           }
+          ,
+          "periodic_ratio": {
+            "label": "定期一致比率:",
+            "tooltip": "定期スキャン中に使用される比率 (0-1)。領域がどれだけ一致すれば検出と見なすかを決定します。"
+          }
+          ,
+          "number_of_local_scans_per_event": {
+            "label": "イベントごとのローカルスキャン数:",
+            "tooltip": "停止するかOCRエンジンに送信する前に、イベントごとに実行するローカルスキャンの回数。"
+          }
         },
         "wip": {
           "title": "WIP",

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/GameSentenceMiner/locales/zh_cn.json

@@ -585,6 +585,16 @@
             "label": "捕获间隔（秒）:",
             "tooltip": "定期屏幕捕获的时间间隔（秒）。"
           }
+          ,
+          "periodic_ratio": {
+            "label": "定期匹配比率:",
+            "tooltip": "在定期扫描期间使用的比率（0-1），用于确定区域匹配多少才算检测到。"
+          }
+          ,
+          "number_of_local_scans_per_event": {
+            "label": "每次事件本地扫描数:",
+            "tooltip": "在停止或将结果发送到OCR引擎之前，每个事件执行的本地扫描次数。"
+          }
         },
         "wip": {
           "title": "WIP",

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/GameSentenceMiner/ui/config_gui.py

@@ -512,9 +512,11 @@ class ConfigApp:
         self.overlay_websocket_send_value = tk.BooleanVar(value=self.settings.overlay.monitor_to_capture)
         self.overlay_engine_value = tk.StringVar(value=self.settings.overlay.engine)
         self.periodic_value = tk.BooleanVar(value=self.settings.overlay.periodic)
+        self.periodic_ratio_value = tk.StringVar(value=str(self.settings.overlay.periodic_ratio))
         self.periodic_interval_value = tk.StringVar(value=str(self.settings.overlay.periodic_interval))
         self.scan_delay_value = tk.StringVar(value=str(self.settings.overlay.scan_delay))
         self.overlay_minimum_character_size_value = tk.StringVar(value=str(self.settings.overlay.minimum_character_size))
+        self.number_of_local_scans_per_event_value = tk.StringVar(value=str(getattr(self.settings.overlay, 'number_of_local_scans_per_event', 1)))
         
         # Master Config Settings
         self.switch_to_default_if_not_found_value = tk.BooleanVar(value=self.master_config.switch_to_default_if_not_found)
@@ -616,6 +618,28 @@ class ConfigApp:
             self.sync_changes_checkbutton.state(['!selected'])
 
         # Create a new Config instance
+        # Validate and clamp periodic_ratio to [0.0, 1.0]
+        try:
+            _periodic_ratio = float(self.periodic_ratio_value.get())
+        except Exception:
+            _periodic_ratio = 0.9
+        # clamp
+        if _periodic_ratio < 0.0:
+            _periodic_ratio = 0.0
+        if _periodic_ratio > 1.0:
+            _periodic_ratio = 1.0
+        # reflect back to UI variable (keep consistent formatting)
+        self.periodic_ratio_value.set(str(_periodic_ratio))
+
+        # Validate and clamp number_of_local_scans_per_event to positive integer
+        try:
+            _local_scans = int(float(self.number_of_local_scans_per_event_value.get()))
+        except Exception:
+            _local_scans = int(getattr(self.settings.overlay, 'number_of_local_scans_per_event', 1))
+        if _local_scans < 1:
+            _local_scans = 1
+        self.number_of_local_scans_per_event_value.set(str(_local_scans))
+
         config = ProfileConfig(
             scenes=self.settings.scenes,
             general=General(
@@ -754,7 +778,9 @@ class ConfigApp:
                 engine=OverlayEngine(self.overlay_engine_value.get()).value if self.overlay_engine_value.get() else OverlayEngine.LENS.value,
                 scan_delay=float(self.scan_delay_value.get()),
                 periodic=float(self.periodic_value.get()),
+                periodic_ratio=_periodic_ratio,
                 periodic_interval=float(self.periodic_interval_value.get()),
+                number_of_local_scans_per_event=int(self.number_of_local_scans_per_event_value.get()),
                 minimum_character_size=int(self.overlay_minimum_character_size_value.get()),
             )
             # wip=WIP(
@@ -2434,6 +2460,22 @@ class ConfigApp:
         ttk.Entry(overlay_frame, textvariable=self.periodic_interval_value).grid(row=self.current_row, column=1, sticky='EW', pady=2)
         self.current_row += 1
 
+        # Periodic Ratio (how much of the screen must match to count)
+        periodic_ratio_i18n = overlay_i18n.get('periodic_ratio', {})
+        HoverInfoLabelWidget(overlay_frame, text=periodic_ratio_i18n.get('label', 'Periodic Ratio:'),
+                             tooltip=periodic_ratio_i18n.get('tooltip', 'Ratio (0-1) used during periodic scanning to determine matching threshold.'),
+                             row=self.current_row, column=0)
+        ttk.Entry(overlay_frame, textvariable=self.periodic_ratio_value).grid(row=self.current_row, column=1, sticky='EW', pady=2)
+        self.current_row += 1
+
+        # Number of Local Scans Per Event
+        local_scans_i18n = overlay_i18n.get('number_of_local_scans_per_event', {})
+        HoverInfoLabelWidget(overlay_frame, text=local_scans_i18n.get('label', 'Local Scans Per Event:'),
+                             tooltip=local_scans_i18n.get('tooltip', 'How many local scans to perform per event before stopping or sending to lens.'),
+                             row=self.current_row, column=0)
+        ttk.Entry(overlay_frame, textvariable=self.number_of_local_scans_per_event_value).grid(row=self.current_row, column=1, sticky='EW', pady=2)
+        self.current_row += 1
+
         # Minimum Character Size
         minimum_character_size_i18n = overlay_i18n.get('minimum_character_size', {})
         HoverInfoLabelWidget(overlay_frame, text=minimum_character_size_i18n.get('label', 'Minimum Character Size:'),

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/GameSentenceMiner/util/configuration.py

@@ -675,8 +675,10 @@ class Overlay:
     monitor_to_capture: int = 0
     periodic: bool = False
     periodic_interval: float = 1.0
+    periodic_ratio: float = 0.9
     scan_delay: float = 0.25
     minimum_character_size: int = 0
+    number_of_local_scans_per_event: int = 1
 
     def __post_init__(self):
         if self.monitor_to_capture == -1:

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/GameSentenceMiner/util/get_overlay_coords.py

@@ -330,56 +330,64 @@ class OverlayProcessor:
         # Check for cancellation after screenshot
         if asyncio.current_task().cancelled():
             raise asyncio.CancelledError()
-            
+        
         if self.oneocr:
-            # 2. Use OneOCR to find general text areas (fast)
-            res, text, oneocr_results, crop_coords_list = self.oneocr(
-                full_screenshot,
-                return_coords=True,
-                multiple_crop_coords=True,
-                return_one_box=False,
-                furigana_filter_sensitivity=get_overlay_config().minimum_character_size,
-            )
-            
-            if not crop_coords_list:
-                return        
-            
-            # Check for cancellation after OneOCR
-            if asyncio.current_task().cancelled():
-                raise asyncio.CancelledError()
-            
-            text_str = "".join([text for text in text if self.regex.match(text)])
-            
-            # RapidFuzz fuzzy match 90% to not send the same results repeatedly
-            if self.last_oneocr_result and check_against_last:
+            tries = get_overlay_config().number_of_local_scans_per_event if not check_against_last else 1
+            for i in range(tries):
+                if i > 0:
+                    try:
+                        await asyncio.sleep(0.1)
+                    except asyncio.CancelledError:
+                        logger.info("OCR task cancelled during local scan delay")
+                        raise
+                # 2. Use OneOCR to find general text areas (fast)
+                res, text, oneocr_results, crop_coords_list = self.oneocr(
+                    full_screenshot,
+                    return_coords=True,
+                    multiple_crop_coords=True,
+                    return_one_box=False,
+                    furigana_filter_sensitivity=get_overlay_config().minimum_character_size,
+                )
+                
+                if not crop_coords_list:
+                    return        
+                
+                # Check for cancellation after OneOCR
+                if asyncio.current_task().cancelled():
+                    raise asyncio.CancelledError()
                 
-                score = fuzz.ratio(text_str, self.last_oneocr_result)
-                if score >= 80:
+                text_str = "".join([text for text in text if self.regex.match(text)])
+                
+                # RapidFuzz fuzzy match 90% to not send the same results repeatedly
+                if self.last_oneocr_result and check_against_last:
+                    
+                    score = fuzz.ratio(text_str, self.last_oneocr_result)
+                    if score >= get_config().overlay.periodic_ratio * 100:
+                        return
+                self.last_oneocr_result = text_str
+                
+                await send_word_coordinates_to_overlay(self._convert_oneocr_results_to_percentages(oneocr_results, monitor_width, monitor_height))
+                
+                # If User Home is beangate
+                if is_beangate:
+                    with open("oneocr_results.json", "w", encoding="utf-8") as f:
+                        f.write(json.dumps(oneocr_results, ensure_ascii=False, indent=2))
+                
+                if get_config().overlay.engine == OverlayEngine.ONEOCR.value and self.oneocr:
+                    logger.info("Sent %d text boxes to overlay.", len(oneocr_results))
                     return
-            self.last_oneocr_result = text_str
 
-            await send_word_coordinates_to_overlay(self._convert_oneocr_results_to_percentages(oneocr_results, monitor_width, monitor_height))
-            
-            # If User Home is beangate
-            if is_beangate:
-                with open("oneocr_results.json", "w", encoding="utf-8") as f:
-                    f.write(json.dumps(oneocr_results, ensure_ascii=False, indent=2))
-            
-            if get_config().overlay.engine == OverlayEngine.ONEOCR.value and self.oneocr:
-                logger.info("Sent %d text boxes to overlay.", len(oneocr_results))
-                return
+                # Check for cancellation before creating composite image
+                if asyncio.current_task().cancelled():
+                    raise asyncio.CancelledError()
 
-            # Check for cancellation before creating composite image
-            if asyncio.current_task().cancelled():
-                raise asyncio.CancelledError()
-
-            # 3. Create a composite image with only the detected text regions
-            composite_image = self._create_composite_image(
-                full_screenshot, 
-                crop_coords_list, 
-                monitor_width, 
-                monitor_height
-            )
+                # 3. Create a composite image with only the detected text regions
+                composite_image = self._create_composite_image(
+                    full_screenshot, 
+                    crop_coords_list, 
+                    monitor_width, 
+                    monitor_height
+                )
         else:
             composite_image = full_screenshot
         
@@ -408,7 +416,7 @@ class OverlayProcessor:
         # RapidFuzz fuzzy match 90% to not send the same results repeatedly
         if self.last_lens_result and check_against_last:
             score = fuzz.ratio(text_str, self.last_lens_result)
-            if score >= 80:
+            if score >= get_config().overlay.periodic_ratio * 100:
                 logger.info("Google Lens results are similar to the last results (score: %d). Skipping overlay update.", score)
                 return
         self.last_lens_result = text_str

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.19.1
+Version: 2.19.2.dev0
 Summary: A tool for mining sentences from games. Update: Dependencies, replay buffer based line searching, and bug fixes.
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.19.1
+Version: 2.19.2.dev0
 Summary: A tool for mining sentences from games. Update: Dependencies, replay buffer based line searching, and bug fixes.
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.2.dev0}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.19.1"
+version = "2.19.2.dev0"
 description = "A tool for mining sentences from games. Update: Dependencies, replay buffer based line searching, and bug fixes."
 readme = "README.md"
 requires-python = ">=3.10"