GameSentenceMiner 2.14.6__py3-none-any.whl → 2.14.8__py3-none-any.whl

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/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/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/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.dist-info → gamesentenceminer-2.14.8.dist-info}/METADATA

@@ -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.dist-info → gamesentenceminer-2.14.8.dist-info}/RECORD

@@ -3,7 +3,7 @@ GameSentenceMiner/anki.py,sha256=xTXCACDM_u9natCFnbqdxEX24F9bTsdoI7PoskWbdkk,230
 GameSentenceMiner/config_gui.py,sha256=dTYBe3ZI9tsOiOtT2WEMnodj3q5-U4Kj5l1l1qutlsw,137549
 GameSentenceMiner/gametext.py,sha256=fgBgLchezpauWELE9Y5G3kVCLfAneD0X4lJFoI3FYbs,10351
 GameSentenceMiner/gsm.py,sha256=GdqegZnKrTMVRvp43bK7oNlWj5OxLx2PNdVWyHL9Gc4,28282
-GameSentenceMiner/obs.py,sha256=f1hSG7tHCJPBjY_eq6fbQnEiLtboik77Sd2YzDFD2cg,20662
+GameSentenceMiner/obs.py,sha256=JmtO7Ojcm14Q8P_bz8TdS24rwDdwQasg2gnO2J0KcuQ,20598
 GameSentenceMiner/vad.py,sha256=zFReBMvNEEaQ_YEozCTCaMdV-o40FwtlxYRb17cYZio,19125
 GameSentenceMiner/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/ai/ai_prompting.py,sha256=D1KyHER_sj4jYvOKGRbp8FkKZSKWzAaXHbpmZLLFctg,23998
@@ -22,13 +22,13 @@ GameSentenceMiner/ocr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 GameSentenceMiner/ocr/gsm_ocr_config.py,sha256=QyBarjb6Wjt-oyor1sIT9hG-KrGdi6wODLyCrHXun6E,6008
 GameSentenceMiner/ocr/ocrconfig.py,sha256=_tY8mjnzHMJrLS8E5pHqYXZjMuLoGKYgJwdhYgN-ny4,6466
 GameSentenceMiner/ocr/owocr_area_selector.py,sha256=Rm1_nuZotJhfOfoJ_3mesh9udtOBjYqKhnAvSief6fo,29181
-GameSentenceMiner/ocr/owocr_helper.py,sha256=Ls_M-m3_4e561g72H0k6bQQi2H-9_NkmUQb6c2C-yrE,28261
+GameSentenceMiner/ocr/owocr_helper.py,sha256=6R6IbdwpjWmIrXnUvyQ_0kXRYhJe2tphqyapoxc_PsQ,28857
 GameSentenceMiner/ocr/ss_picker.py,sha256=0IhxUdaKruFpZyBL-8SpxWg7bPrlGpy3lhTcMMZ5rwo,5224
 GameSentenceMiner/owocr/owocr/__init__.py,sha256=87hfN5u_PbL_onLfMACbc0F5j4KyIK9lKnRCj6oZgR0,49
 GameSentenceMiner/owocr/owocr/__main__.py,sha256=XQaqZY99EKoCpU-gWQjNbTs7Kg17HvBVE7JY8LqIE0o,157
 GameSentenceMiner/owocr/owocr/config.py,sha256=qM7kISHdUhuygGXOxmgU6Ef2nwBShrZtdqu4InDCViE,8103
 GameSentenceMiner/owocr/owocr/lens_betterproto.py,sha256=oNoISsPilVVRBBPVDtb4-roJtAhp8ZAuFTci3TGXtMc,39141
-GameSentenceMiner/owocr/owocr/ocr.py,sha256=oLySYDJz-OUCJTHDl6xe1BQ2NMDjaKgHc_SIHJ1Eca4,70607
+GameSentenceMiner/owocr/owocr/ocr.py,sha256=xU1PkkDkOZ36phzmaXdOrfw08zy0YkSNbKTgIDAqBYs,70556
 GameSentenceMiner/owocr/owocr/run.py,sha256=-aRSIcwc-qIn2s-JVaAMGvzJHjvqw4LsLQKLtswEfcE,75570
 GameSentenceMiner/owocr/owocr/screen_coordinate_picker.py,sha256=Na6XStbQBtpQUSdbN3QhEswtKuU1JjReFk_K8t5ezQE,3395
 GameSentenceMiner/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -36,7 +36,7 @@ GameSentenceMiner/tools/audio_offset_selector.py,sha256=8Stk3BP-XVIuzRv9nl9Eqd2D
 GameSentenceMiner/tools/ss_selector.py,sha256=cbjMxiKOCuOfbRvLR_PCRlykBrGtm1LXd6u5czPqkmc,4793
 GameSentenceMiner/tools/window_transparency.py,sha256=GtbxbmZg0-UYPXhfHff-7IKZyY2DKe4B9GdyovfmpeM,8166
 GameSentenceMiner/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/util/configuration.py,sha256=p595-YJUbmg5EwjYQlNYpjQ0m7iMIyxPSjMPEpvPfFg,40009
+GameSentenceMiner/util/configuration.py,sha256=NnKcMyFV4y6gB6AwFUP-B-tdfk0_Awh5bJ6FHtXr6Vk,40017
 GameSentenceMiner/util/db.py,sha256=2bO0rD4i8A1hhsRBER-wgZy9IK17ibRbI8DHxdKvYsI,16598
 GameSentenceMiner/util/electron_config.py,sha256=KfeJToeFFVw0IR5MKa-gBzpzaGrU-lyJbR9z-sDEHYU,8767
 GameSentenceMiner/util/ffmpeg.py,sha256=iqsdp3TbBv6KMACJxkUF3e5VWak3jHPZdIEMrUdKFtE,23073
@@ -69,9 +69,9 @@ GameSentenceMiner/web/templates/index.html,sha256=VrhrkQKcOAPuoWRcilFLDXjvNf6WTO
 GameSentenceMiner/web/templates/text_replacements.html,sha256=tV5c8mCaWSt_vKuUpbdbLAzXZ3ATZeDvQ9PnnAfqY0M,8598
 GameSentenceMiner/web/templates/utility.html,sha256=3flZinKNqUJ7pvrZk6xu__v67z44rXnaK7UTZ303R-8,16946
 GameSentenceMiner/wip/__init___.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gamesentenceminer-2.14.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.14.6.dist-info/METADATA,sha256=CwW-bxgvQQbSJIEDlddSbN6HTZPrhdeh4HeSGLvmNL4,7330
-gamesentenceminer-2.14.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamesentenceminer-2.14.6.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.14.6.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.14.6.dist-info/RECORD,,
+gamesentenceminer-2.14.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.14.8.dist-info/METADATA,sha256=vvvPFxb_AjD9_1NkCTKCj5E9feTflY5TgINHIyEOd-0,7330
+gamesentenceminer-2.14.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamesentenceminer-2.14.8.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.14.8.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.14.8.dist-info/RECORD,,