GameSentenceMiner 2.14.6__tar.gz → 2.14.8__tar.gz

{gamesentenceminer-2.14.6 → gamesentenceminer-2.14.8}/GameSentenceMiner/obs.py

@@ -62,7 +62,7 @@ class OBSConnectionManager(threading.Thread):
         else:
             is_empty = extrema[0] == extrema[1]
         if is_empty:
-            logger.info("Image is totally empty (all pixels the same), sleeping.")
+            return
         else:
             root = tk.Tk()
             root.attributes('-topmost', True)

{gamesentenceminer-2.14.6 → gamesentenceminer-2.14.8}/GameSentenceMiner/ocr/owocr_helper.py

@@ -476,8 +476,6 @@ def add_ss_hotkey(ss_hotkey="ctrl+shift+g"):
         img = run.apply_ocr_config_to_image(img, ocr_config, is_secondary=True)
         do_second_ocr("", datetime.now(), img, TextFiltering(lang=get_ocr_language()), ignore_furigana_filter=True, ignore_previous_result=True)
         
-    if not manual:
-        keyboard.add_hotkey(get_ocr_manual_ocr_hotkey().lower(), ocr_secondary_rectangles)
     secret_ss_hotkey = "F14"
     filtering = TextFiltering(lang=get_ocr_language())
     cropper = ScreenCropper()
@@ -495,19 +493,29 @@ def add_ss_hotkey(ss_hotkey="ctrl+shift+g"):
     hotkey_reg = None
     try:
         hotkey_reg = keyboard.add_hotkey(ss_hotkey, capture)
+        if not manual:
+            secondary_hotkey_reg = keyboard.add_hotkey(get_ocr_manual_ocr_hotkey().lower(), ocr_secondary_rectangles)
         if "f13" in ss_hotkey.lower():
-            keyboard.add_hotkey(secret_ss_hotkey, capture_main_monitor)
+            secret_hotkey_reg = keyboard.add_hotkey(secret_ss_hotkey, capture_main_monitor)
         print(f"Press {ss_hotkey} to take a screenshot.")
     except Exception as e:
         if hotkey_reg:
             keyboard.remove_hotkey(hotkey_reg)
+        if secondary_hotkey_reg:
+            keyboard.remove_hotkey(secondary_hotkey_reg)
+        if secret_hotkey_reg:
+            keyboard.remove_hotkey(secret_hotkey_reg)
         logger.error(f"Error setting up screenshot hotkey with keyboard, Attempting Backup: {e}")
         logger.debug(e)
         pynput_hotkey = ss_hotkey.replace("ctrl", "<ctrl>").replace("shift", "<shift>").replace("alt", "<alt>")
+        secret_ss_hotkey = secret_hotkey_reg.replace("ctrl", "<ctrl>").replace("shift", "<shift>").replace("alt", "<alt>")
+        secondary_ss_hotkey = secondary_hotkey_reg.replace("ctrl", "<ctrl>").replace("shift", "<shift>").replace("alt", "<alt>")
         try:
             from pynput import keyboard as pynput_keyboard
             listener = pynput_keyboard.GlobalHotKeys({
-                pynput_hotkey: capture
+                pynput_hotkey: capture,
+                secondary_ss_hotkey: ocr_secondary_rectangles,
+                secret_ss_hotkey: capture_main_monitor
             })
             listener.start()
             print(f"Press {pynput_hotkey} to take a screenshot.")

{gamesentenceminer-2.14.6 → gamesentenceminer-2.14.8}/GameSentenceMiner/owocr/owocr/ocr.py

@@ -1424,10 +1424,10 @@ class localLLMOCR:
             self.keep_warm = config.get('keep_warm', True)
             self.custom_prompt = config.get('prompt', None)
             self.available = True
-            if any(x in self.api_url for x in ['localhost', '127.0.0.1']):
-                if not self.check_connection(self.api_url):
-                    logger.warning('Local LLM OCR API is not reachable')
-                    return
+            # if any(x in self.api_url for x in ['localhost', '127.0.0.1']):
+            #     if not self.check_connection(self.api_url):
+            #         logger.warning('Local LLM OCR API is not reachable')
+            #         return
             self.client = openai.OpenAI(
                 base_url=self.api_url.replace('/v1/chat/completions', '/v1'),
                 api_key=self.api_key
@@ -1442,7 +1442,6 @@ class localLLMOCR:
             logger.warning(f'Error initializing Local LLM OCR, Local LLM OCR will not work!')
             
     def check_connection(self, url, port=None):
-        # simple connectivity check with mega low timeout
         import http.client
         conn = http.client.HTTPConnection(url, port or 1234, timeout=0.1)
         try:

{gamesentenceminer-2.14.6 → gamesentenceminer-2.14.8}/GameSentenceMiner/util/configuration.py

@@ -17,7 +17,6 @@ from dataclasses_json import dataclass_json
 
 from importlib import metadata
 
-import requests
 
 
 OFF = 'OFF'
@@ -361,6 +360,7 @@ def get_current_version():
 
 def get_latest_version():
     try:
+        import requests
         response = requests.get(f"https://pypi.org/pypi/{PACKAGE_NAME}/json")
         latest_version = response.json()["info"]["version"]
         return latest_version

{gamesentenceminer-2.14.6 → gamesentenceminer-2.14.8}/GameSentenceMiner.egg-info/PKG-INFO

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

{gamesentenceminer-2.14.6 → gamesentenceminer-2.14.8}/PKG-INFO

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

{gamesentenceminer-2.14.6 → gamesentenceminer-2.14.8}/pyproject.toml

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