GameSentenceMiner 2.16.12__py3-none-any.whl → 2.16.13__py3-none-any.whl

GameSentenceMiner/config_gui.py

@@ -417,10 +417,10 @@ class ConfigApp:
         self.create_screenshot_tab()
         self.create_audio_tab()
         self.create_obs_tab()
-        self.create_profiles_tab()
         self.create_ai_tab()
         self.create_advanced_tab()
         self.create_overlay_tab()
+        self.create_profiles_tab()
         # self.create_wip_tab()
 
     def add_reset_button(self, frame, category, row, column=0, recreate_tab=None):

GameSentenceMiner/util/get_overlay_coords.py

@@ -9,11 +9,11 @@ import time
 from PIL import Image
 from typing import Dict, Any, List, Tuple
 import json
-from rapidfuzz.distance import Levenshtein
+from rapidfuzz import fuzz
 
 # Local application imports
 from GameSentenceMiner.ocr.gsm_ocr_config import set_dpi_awareness
-from GameSentenceMiner.util.configuration import OverlayEngine, get_config, is_windows, is_beangate, logger
+from GameSentenceMiner.util.configuration import OverlayEngine, get_config, get_temporary_directory, is_windows, is_beangate, logger
 from GameSentenceMiner.util.electron_config import get_ocr_language
 from GameSentenceMiner.obs import get_screenshot_PIL
 from GameSentenceMiner.web.texthooking_page import send_word_coordinates_to_overlay
@@ -93,7 +93,8 @@ class OverlayThread(threading.Thread):
         super().__init__()
         self.overlay_processor = OverlayProcessor()
         self.loop = asyncio.new_event_loop()
-        self.daemon = True  # Ensure thread exits when main program exits
+        self.daemon = True
+        self.first_time_run = True
 
     def run(self):
         """Runs the overlay processing loop."""
@@ -103,11 +104,18 @@ class OverlayThread(threading.Thread):
     async def overlay_loop(self):
         """Main loop to periodically process and send overlay data."""
         while True:
-            if get_config().overlay.periodic and overlay_server_thread.has_clients():
-                await self.overlay_processor.find_box_and_send_to_overlay('')
-                await asyncio.sleep(get_config().overlay.periodic_interval)  # Adjust the interval as needed
+            if overlay_server_thread.has_clients():
+                if get_config().overlay.periodic:
+                    await self.overlay_processor.find_box_and_send_to_overlay('')
+                    await asyncio.sleep(get_config().overlay.periodic_interval)
+                elif self.first_time_run:
+                    await self.overlay_processor.find_box_and_send_to_overlay('')
+                    self.first_time_run = False
+                else:
+                    await asyncio.sleep(3)
             else:
-                await asyncio.sleep(3)  # Sleep briefly when not active
+                self.first_time_run = True
+                await asyncio.sleep(3)
 
 class OverlayProcessor:
     """
@@ -125,6 +133,8 @@ class OverlayProcessor:
         self.lens = None
         self.regex = None
         self.ready = False
+        self.last_oneocr_result = None
+        self.last_lens_result = None
 
         try:
             if self.config.overlay.websocket_port and all([GoogleLens, get_regex]):
@@ -221,6 +231,8 @@ class OverlayProcessor:
             monitor = self.get_monitor_workarea(0)  # Get primary monitor work area
             sct_img = sct.grab(monitor)
             img = Image.frombytes('RGB', sct_img.size, sct_img.bgra, 'raw', 'BGRX')
+            
+            img.save(os.path.join(get_temporary_directory(), "latest_overlay_screenshot.png"))
                 
             return img, monitor['width'], monitor['height']
 
@@ -261,6 +273,8 @@ class OverlayProcessor:
             paste_x = math.floor(x1)
             paste_y = math.floor(y1)
             composite_img.paste(cropped_image, (paste_x, paste_y))
+            
+        composite_img.save(os.path.join(get_temporary_directory(), "latest_overlay_screenshot_trimmed.png"))
         
         return composite_img
 
@@ -277,7 +291,7 @@ class OverlayProcessor:
             return []
         if self.oneocr:
             # 2. Use OneOCR to find general text areas (fast)
-            _, _, oneocr_results, crop_coords_list = self.oneocr(
+            res, text, oneocr_results, crop_coords_list = self.oneocr(
                 full_screenshot,
                 return_coords=True,
                 multiple_crop_coords=True,
@@ -285,8 +299,19 @@ class OverlayProcessor:
                 furigana_filter_sensitivity=None, # Disable furigana filtering
             )
             
+            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:
+                
+                score = fuzz.ratio(text_str, self.last_oneocr_result)
+                if score >= 80:
+                    logger.info("OneOCR results are similar to the last results (score: %d). Skipping overlay update.", score)
+                    return
+            self.last_oneocr_result = text_str
+
             logger.info("Sending OneOCR results to overlay.")
-            await send_word_coordinates_to_overlay(oneocr_results)
+            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:
@@ -317,9 +342,19 @@ class OverlayProcessor:
         if len(res) != 3:
             return
         
-        _, _, coords = res
+        success, text_list, coords = res
+        
+        text_str = "".join([text for text in text_list if self.regex.match(text)])
+        
+        # RapidFuzz fuzzy match 90% to not send the same results repeatedly
+        if self.last_lens_result:
+            score = fuzz.ratio(text_str, self.last_lens_result)
+            if score >= 80:
+                logger.info("Google Lens results are similar to the last results (score: %d). Skipping overlay update.", score)
+                return
+        self.last_lens_result = text_str
 
-        if not res or not coords:
+        if not success or not coords:
             return
         
         # 5. Process the high-accuracy results into the desired format
@@ -433,6 +468,38 @@ class OverlayProcessor:
             "x3": center_x + half_w, "y3": center_y + half_h,
             "x4": center_x - half_w, "y4": center_y + half_h,
         }
+        
+    def _convert_oneocr_results_to_percentages(
+        self,
+        oneocr_results: List[Dict[str, Any]],
+        monitor_width: int,
+        monitor_height: int
+    ) -> List[Dict[str, Any]]:
+        """
+        Converts OneOCR results with pixel coordinates to percentages relative to the monitor size.
+        """
+        converted_results = []
+        for item in oneocr_results:
+            bbox = item.get("bounding_rect", {})
+            if not bbox:
+                continue
+            # Convert each coordinate to a percentage of the monitor dimensions
+            converted_bbox = {
+                key: (value / monitor_width if "x" in key else value / monitor_height)
+                for key, value in bbox.items()
+            }
+            converted_item = item.copy()
+            converted_item["bounding_rect"] = converted_bbox
+            converted_results.append(converted_item)
+            for word in converted_item.get("words", []):
+                word_bbox = word.get("bounding_rect", {})
+                if word_bbox:
+                    word["bounding_rect"] = {
+                        key: (value / monitor_width if "x" in key else value / monitor_height)
+                        for key, value in word_bbox.items()
+                    }
+        # logger.info(f"Converted OneOCR results to percentages: {converted_results}")
+        return converted_results
 
 async def main_test_screenshot():
     """

{gamesentenceminer-2.16.12.dist-info → gamesentenceminer-2.16.13.dist-info}/METADATA

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

{gamesentenceminer-2.16.12.dist-info → gamesentenceminer-2.16.13.dist-info}/RECORD

@@ -1,6 +1,6 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/anki.py,sha256=Qq03nxYCA0bXS8IR1vnEB9cv2vxo6Ruy-UuiojC4ad0,26518
-GameSentenceMiner/config_gui.py,sha256=iOsi3IVati6JHCnoCIzLAxlrbZt4j4pL5KNFzSq4gJo,146121
+GameSentenceMiner/config_gui.py,sha256=kyAK3s1tkYmjO_zdJDYWR0rubAsS0vHiT46HdMTxJGk,146121
 GameSentenceMiner/gametext.py,sha256=fgBgLchezpauWELE9Y5G3kVCLfAneD0X4lJFoI3FYbs,10351
 GameSentenceMiner/gsm.py,sha256=1eq5nkYulfm85749g8g2s_WkqqiQWDopUXyimJLIy6M,33814
 GameSentenceMiner/obs.py,sha256=EyAYhaLvMjoeC-3j7fuvkqZN5logFFanPfb8Wn1C6m0,27296
@@ -41,7 +41,7 @@ GameSentenceMiner/util/configuration.py,sha256=qATOwZahVQNP8-ZnWiAKuR7UJLW25QNDm
 GameSentenceMiner/util/db.py,sha256=B2Qwg7i0Qn_yxov-NhcT9QdFkF218Cqea_V7ZPzYBzM,21365
 GameSentenceMiner/util/electron_config.py,sha256=KfeJToeFFVw0IR5MKa-gBzpzaGrU-lyJbR9z-sDEHYU,8767
 GameSentenceMiner/util/ffmpeg.py,sha256=g3v1aJnv3qWekDnO0FdYozB-MG9di4WUvPA3NyXY9Ws,28998
-GameSentenceMiner/util/get_overlay_coords.py,sha256=pkG8_3l3fuhm3DzFLuNwSeaYTkRMtyU3O7DB6s372QM,18961
+GameSentenceMiner/util/get_overlay_coords.py,sha256=lUD2YU4iVoXRHvQzkCN0Re3IQkYKemU2NV81MtQ94Uk,22028
 GameSentenceMiner/util/gsm_utils.py,sha256=Piwv88Q9av2LBeN7M6QDi0Mp0_R2lNbkcI6ekK5hd2o,11851
 GameSentenceMiner/util/model.py,sha256=R-_RYTYLSDNgBoVTPuPBcIHeOznIqi_vBzQ7VQ20WYk,6727
 GameSentenceMiner/util/notification.py,sha256=YBhf_mSo_i3cjBz-pmeTPx3wchKiG9BK2VBdZSa2prQ,4597
@@ -90,9 +90,9 @@ GameSentenceMiner/web/templates/utility.html,sha256=KtqnZUMAYs5XsEdC9Tlsd40NKAVi
 GameSentenceMiner/web/templates/components/navigation.html,sha256=6y9PvM3nh8LY6JWrZb6zVOm0vqkBLDc6d3gB9X5lT_w,1055
 GameSentenceMiner/web/templates/components/theme-styles.html,sha256=hiq3zdJljpRjQO1iUA7gfFKwXebltG-IWW-gnKS4GHA,3439
 GameSentenceMiner/wip/__init___.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gamesentenceminer-2.16.12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.16.12.dist-info/METADATA,sha256=SgT5FkcLIkIfeGJbk_hyrvw0fZCNY27li0gD42HsKrs,7349
-gamesentenceminer-2.16.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamesentenceminer-2.16.12.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.16.12.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.16.12.dist-info/RECORD,,
+gamesentenceminer-2.16.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.16.13.dist-info/METADATA,sha256=Y5s0ewCxQEPwTEo4MTRyUqaDrfWOiiVfL1qtWDmo-ew,7349
+gamesentenceminer-2.16.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamesentenceminer-2.16.13.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.16.13.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.16.13.dist-info/RECORD,,