GameSentenceMiner 2.14.0rc1__tar.gz → 2.14.2__tar.gz

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.2}/GameSentenceMiner/gametext.py

@@ -7,12 +7,14 @@ import websockets
 from websockets import InvalidStatus
 from rapidfuzz import fuzz
 
+
 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.web.texthooking_page import add_event_to_texthooker, send_word_coordinates_to_overlay, overlay_server_thread
+from GameSentenceMiner.web.texthooking_page import add_event_to_texthooker, overlay_server_thread
+
 from GameSentenceMiner.util.get_overlay_coords import OverlayProcessor
 
 
@@ -29,8 +31,7 @@ last_clipboard = ''
 
 reconnecting = False
 websocket_connected = {}
-
-overlay_processor = OverlayProcessor()
+overlay_processor = None
 
 async def monitor_clipboard():
     global current_line, last_clipboard
@@ -179,6 +180,7 @@ async def handle_new_text_event(current_clipboard, line_time=None):
 
                 
 async def add_line_to_text_log(line, line_time=None):
+    global overlay_processor
     if get_config().general.texthook_replacement_regex:
         current_line_after_regex = re.sub(get_config().general.texthook_replacement_regex, '', line)
     else:
@@ -191,7 +193,10 @@ async def add_line_to_text_log(line, line_time=None):
     if len(get_text_log().values) > 0:
         await add_event_to_texthooker(get_text_log()[-1])
     if get_config().overlay.websocket_port and overlay_server_thread.has_clients():
-        await overlay_processor.find_box_and_send_to_overlay(current_line_after_regex)
+        if not overlay_processor:
+            overlay_processor = OverlayProcessor()
+        if overlay_processor.ready:
+            await overlay_processor.find_box_and_send_to_overlay(current_line_after_regex)
     GameLinesTable.add_line(get_text_log()[-1])
 
 

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.2}/GameSentenceMiner/obs.py

@@ -461,11 +461,12 @@ if __name__ == '__main__':
     from mss import mss
     logging.basicConfig(level=logging.INFO)
     # main()
-    connect_to_obs_sync()
-    
-    while True:
-        print(get_active_source())
-        time.sleep(3)
+    # connect_to_obs_sync()
+    # img = get_screenshot_PIL(source_name="Display Capture 2", compression=75, img_format='png', width=1280, height=720)
+    # img.show()
+    # while True:
+    #     print(get_active_source())
+    #     time.sleep(3)
     # i = 100
     # for i in range(1, 100):
     #     print(f"Getting screenshot {i}")

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.2}/GameSentenceMiner/owocr/owocr/ocr.py

@@ -71,7 +71,12 @@ except ImportError:
     pass
 
 try:
-    import oneocr
+    try:
+        if os.path.exists(os.path.expanduser('~/.config/oneocr/oneocr.dll')):
+            import oneocr
+    except Exception as e:
+        oneocr = None
+        logger.warning(f'Failed to import OneOCR: {e}', exc_info=True)
 except ImportError:
     pass
 
@@ -280,7 +285,10 @@ class GoogleLens:
             logger.info('Google Lens ready')
 
     def __call__(self, img, furigana_filter_sensitivity=0, return_coords=False):
-        furigana_filter_sensitivity = get_furigana_filter_sensitivity()
+        if furigana_filter_sensitivity != None:
+            furigana_filter_sensitivity = get_furigana_filter_sensitivity()
+        else:
+            furigana_filter_sensitivity = 0
         lang = get_ocr_language()
         img, is_path = input_to_pil_image(img)
         if lang != self.initial_lang:
@@ -863,8 +871,11 @@ class OneOCR:
                 logger.warning('OneOCR is not supported on Windows older than 10!')
             elif 'oneocr' not in sys.modules:
                 logger.warning('oneocr not available, OneOCR will not work!')
+            elif not os.path.exists(os.path.expanduser('~/.config/oneocr/oneocr.dll')):
+                logger.warning('OneOCR DLLs not found, please install OwOCR Dependencies via OCR Tab in GSM.')
             else:
                 try:
+                    logger.info(f'Loading OneOCR model')
                     self.model = oneocr.OcrEngine()
                 except RuntimeError as e:
                     logger.warning(e + ', OneOCR will not work!')
@@ -902,7 +913,10 @@ class OneOCR:
 
     def __call__(self, img, furigana_filter_sensitivity=0, return_coords=False, multiple_crop_coords=False, return_one_box=True):
         lang = get_ocr_language()
-        furigana_filter_sensitivity = get_furigana_filter_sensitivity()
+        if furigana_filter_sensitivity != None:
+            furigana_filter_sensitivity = get_furigana_filter_sensitivity()
+        else:
+            furigana_filter_sensitivity = 0
         if lang != self.initial_lang:
             self.initial_lang = lang
             self.regex = get_regex(lang)

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.2}/GameSentenceMiner/util/get_overlay_coords.py

@@ -15,9 +15,16 @@ from GameSentenceMiner.web.texthooking_page import send_word_coordinates_to_over
 
 # Conditionally import OCR engines
 try:
-    from GameSentenceMiner.owocr.owocr.ocr import GoogleLens, OneOCR, get_regex
-except ImportError:
+    if os.path.exists(os.path.expanduser('~/.config/oneocr/oneocr.dll')):
+        from GameSentenceMiner.owocr.owocr.ocr import OneOCR
+    else:
+        OneOCR = None
+    from GameSentenceMiner.owocr.owocr.ocr import GoogleLens, get_regex
+except ImportError as import_err:
+    GoogleLens, OneOCR, get_regex = None, None, None
+except Exception as e:
     GoogleLens, OneOCR, get_regex = None, None, None
+    logger.error(f"Error importing OCR engines: {e}", exc_info=True)
 
 # Conditionally import screenshot library
 try:
@@ -40,19 +47,28 @@ class OverlayProcessor:
         self.oneocr = None
         self.lens = None
         self.regex = None
+        self.ready = False
 
-        if self.config.overlay.websocket_port and all([GoogleLens, OneOCR, get_regex]):
-            logger.info("Initializing OCR engines...")
-            self.oneocr = OneOCR(lang=get_ocr_language())
-            self.lens = GoogleLens(lang=get_ocr_language())
-            self.ocr_language = get_ocr_language()
-            self.regex = get_regex(self.ocr_language)
-            logger.info("OCR engines initialized.")
-        else:
-            logger.warning("OCR dependencies not found or websocket port not configured. OCR functionality will be disabled.")
-            
-        if not mss:
-            logger.warning("MSS library not found. Screenshot functionality may be limited.")
+        try:
+            if self.config.overlay.websocket_port and all([GoogleLens, get_regex]):
+                logger.info("Initializing OCR engines...")
+                if OneOCR:
+                    self.oneocr = OneOCR(lang=get_ocr_language())
+                self.lens = GoogleLens(lang=get_ocr_language())
+                self.ocr_language = get_ocr_language()
+                self.regex = get_regex(self.ocr_language)
+                logger.info("OCR engines initialized.")
+                self.ready = True
+            else:
+                logger.warning("OCR dependencies not found or websocket port not configured. OCR functionality will be disabled.")
+                
+            if not mss:
+                logger.warning("MSS library not found. Screenshot functionality may be limited.")
+        except Exception as e:
+            logger.error(f"Error initializing OCR engines for overlay, try installing owocr in OCR tab of GSM: {e}", exc_info=True)
+            self.oneocr = None
+            self.lens = None
+            self.regex = None
             
     async def find_box_and_send_to_overlay(self, sentence_to_check: str = None):
         """
@@ -124,41 +140,49 @@ class OverlayProcessor:
 
     async def _do_work(self, sentence_to_check: str = None) -> Tuple[List[Dict[str, Any]], int]:
         """The main OCR workflow."""
-        if not self.oneocr or not self.lens:
-            raise RuntimeError("OCR engines are not initialized. Cannot perform OCR.")
+        if not self.lens:
+            logger.error("OCR engines are not initialized. Cannot perform OCR for Overlay.")
+            return []
 
         # 1. Get screenshot
         full_screenshot, monitor_width, monitor_height = self._get_full_screenshot()
         if not full_screenshot:
             logger.warning("Failed to get a screenshot.")
             return []
+        if self.oneocr:
+            # 2. Use OneOCR to find general text areas (fast)
+            _, _, oneocr_results, crop_coords_list = self.oneocr(
+                full_screenshot,
+                return_coords=True,
+                multiple_crop_coords=True,
+                return_one_box=False,
+                furigana_filter_sensitivity=None # Disable furigana filtering
+            )
 
-        # 2. Use OneOCR to find general text areas (fast)
-        _, _, _, crop_coords_list = self.oneocr(
-            full_screenshot,
-            return_coords=True,
-            multiple_crop_coords=True,
-            return_one_box=False,
-            furigana_filter_sensitivity=0
-        )
-
-        # 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
         
         # 4. Use Google Lens on the cleaner composite image for higher accuracy
-        res, text, coords = self.lens(
+        res = self.lens(
             composite_image,
             return_coords=True,
-            furigana_filter_sensitivity=0
+            furigana_filter_sensitivity=None # Disable furigana filtering
         )
         
+        if len(res) != 3:
+            return oneocr_results
+        
+        _, _, coords = res
+
         if not res or not coords:
-            return []
+            return oneocr_results
         
         # 5. Process the high-accuracy results into the desired format
         extracted_data = self._extract_text_with_pixel_boxes(

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.2}/GameSentenceMiner.egg-info/PKG-INFO

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

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.2}/PKG-INFO

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

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.2}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.14.0.pre1"
+version = "2.14.2"
 description = "A tool for mining sentences from games. Update: Overlay?"
 readme = "README.md"
 requires-python = ">=3.10"