GameSentenceMiner 2.19.1__tar.gz → 2.19.3__tar.gz

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.3}/GameSentenceMiner/anki.py

@@ -559,10 +559,10 @@ def update_new_card():
     else:
         logger.info("New card(s) detected! Added to Processing Queue!")
         gsm_state.last_mined_line = game_line
-        queue_card_for_processing(last_card, lines)
+        queue_card_for_processing(last_card, lines, game_line)
         
-def queue_card_for_processing(last_card, lines):
-    card_queue.append((last_card, datetime.now(), lines))
+def queue_card_for_processing(last_card, lines, last_mined_line):
+    card_queue.append((last_card, datetime.now(), lines, last_mined_line))
     texthooking_page.reset_checked_lines()
     try:
         obs.save_replay_buffer()

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.3}/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.3}/GameSentenceMiner/gsm.py

@@ -187,7 +187,7 @@ class VideoToAudioHandler(FileSystemEventHandler):
             return
         try:
             if anki.card_queue and len(anki.card_queue) > 0:
-                last_note, anki_card_creation_time, selected_lines = anki.card_queue.pop(
+                last_note, anki_card_creation_time, selected_lines, mined_line = anki.card_queue.pop(
                     0)
             else:
                 logger.info(
@@ -211,11 +211,11 @@ class VideoToAudioHandler(FileSystemEventHandler):
             full_text = ''
             if selected_lines:
                 start_line = selected_lines[0]
-                mined_line = get_mined_line(last_note, selected_lines)
+                # mined_line = get_mined_line(last_note, selected_lines)
                 line_cutoff = selected_lines[-1].get_next_time()
                 full_text = remove_html_and_cloze_tags(note['fields'][get_config().anki.sentence_field])
             else:
-                mined_line = get_text_event(last_note)
+                # mined_line = get_text_event(last_note)
                 if mined_line:
                     start_line = mined_line
                     if mined_line.next:

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.3}/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.3}/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.3}/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.3}/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(
@@ -819,6 +845,14 @@ class ConfigApp:
 
         title_template = self.i18n.get('app', {}).get('title_with_profile', 'GameSentenceMiner Configuration - {profile_name}')
         self.window.title(title_template.format(profile_name=current_config.name))
+        
+        try:
+            import mss as mss
+            self.monitors = [f"Monitor {i}: width: {monitor['width']}, height: {monitor['height']}" for i, monitor in enumerate(mss.mss().monitors[1:], start=1)]
+            if len(self.monitors) == 0:
+                self.monitors = [1]
+        except ImportError:
+            self.monitors = []
 
         if current_config.name != self.settings.name or self.settings.config_changed(current_config) or force_refresh:
             logger.info("Config changed, reloading settings.")
@@ -2434,6 +2468,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.3}/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.3}/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.3}/GameSentenceMiner/util/text_log.py

@@ -146,25 +146,27 @@ def get_matching_line(last_note: AnkiCard, lines=None) -> GameLine:
     
     if not lines:
         raise Exception("No voicelines in GSM. GSM can only do work on text that has been sent to it since it started. If you are not getting any text into GSM, please check your setup/config.")
+    
+    last_line = lines[-1] # Store reference to the latest line
 
     if not last_note:
-        return lines[-1]
+        return last_line
 
     sentence = last_note.get_field(get_config().anki.sentence_field)
     if not sentence:
-        return lines[-1]
+        return last_line
 
     logger.info(f"Replay buffer length: {gsm_state.replay_buffer_length}")
     time_window = datetime.now() - timedelta(seconds=gsm_state.replay_buffer_length) - timedelta(seconds=5)
     for line in reversed(lines):
         if line.time < time_window:
             logger.info("Could not find matching sentence from GSM's history within the replay buffer time window. Using the latest line.")
-            return lines[-1]
+            return last_line
         if lines_match(line.text, remove_html_and_cloze_tags(sentence)):
             return line
 
     logger.info("Could not find matching sentence from GSM's history. Using the latest line.")
-    return lines[-1]
+    return last_line
 
 
 def get_text_event(last_note) -> GameLine:

{gamesentenceminer-2.19.1 → gamesentenceminer-2.19.3}/GameSentenceMiner/web/texthooking_page.py

@@ -235,14 +235,29 @@ def translate_line():
     if event_id is None:
         return jsonify({'error': 'Missing id'}), 400
     
+    prompt = f"""
+    **Professional Game Localization Task**
+
+    **Task Directive:**
+    Translate ONLY the provided line of game dialogue specified below into natural-sounding, context-aware {get_config().general.get_native_language_name()}. The translation must preserve the original tone and intent of the source.
+
+    **Output Requirements:**
+    - Provide only the single, best {get_config().general.get_native_language_name()} translation.
+    - Use expletives if they are natural for the context and enhance the translation's impact, but do not over-exaggerate.
+    - Do not include notes, alternatives, explanations, or any other surrounding text. Absolutely nothing but the translated line.
+
+    **Line to Translate:**
+    """
+
     if not get_config().ai.is_configured():
         return jsonify({'error': 'AI translation is not properly configured. Please check your settings in the "AI" Tab.'}), 400
     line = get_line_by_id(event_id)
     if line is None:
         return jsonify({'error': 'Invalid id'}), 400
     line_to_translate = text if text else line.text
-    translation = get_ai_prompt_result(get_all_lines(), line_to_translate,
-                                       line, get_current_game())
+    translation = get_ai_prompt_result(
+        get_all_lines(), line_to_translate, line, get_current_game(), custom_prompt=prompt
+    )
     line.set_TL(translation)
     return jsonify({'TL': translation}), 200
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.19.1
+Version: 2.19.3
 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.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.19.1
+Version: 2.19.3
 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.3}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.19.1"
+version = "2.19.3"
 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"