GameSentenceMiner 2.14.1__tar.gz → 2.14.3__tar.gz

{gamesentenceminer-2.14.1 → gamesentenceminer-2.14.3}/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.1 → gamesentenceminer-2.14.3}/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
 
@@ -870,6 +875,7 @@ class OneOCR:
                 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!')

{gamesentenceminer-2.14.1 → gamesentenceminer-2.14.3}/GameSentenceMiner/util/get_overlay_coords.py

@@ -8,16 +8,24 @@ from PIL import Image
 from typing import Dict, Any, List, Tuple
 
 # Local application imports
-from GameSentenceMiner.util.configuration import get_config
+from GameSentenceMiner.ocr.gsm_ocr_config import set_dpi_awareness
+from GameSentenceMiner.util.configuration import get_config, is_windows
 from GameSentenceMiner.util.electron_config import get_ocr_language
 from GameSentenceMiner.obs import get_screenshot_PIL, logger
 from GameSentenceMiner.web.texthooking_page import send_word_coordinates_to_overlay
 
 # 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 +48,31 @@ 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.")
+        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.")
+            if is_windows:
+                set_dpi_awareness()
+                
+            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,8 +144,9 @@ 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()

{gamesentenceminer-2.14.1 → gamesentenceminer-2.14.3}/GameSentenceMiner.egg-info/PKG-INFO

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

{gamesentenceminer-2.14.1 → gamesentenceminer-2.14.3}/PKG-INFO

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

{gamesentenceminer-2.14.1 → gamesentenceminer-2.14.3}/pyproject.toml

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