GameSentenceMiner 2.8.48__py3-none-any.whl → 2.8.49__py3-none-any.whl

GameSentenceMiner/ai/ai_prompting.py

@@ -6,6 +6,7 @@ from enum import Enum
 from typing import List, Any, Optional
 
 import google.generativeai as genai
+from google.generativeai import GenerationConfig
 from groq import Groq
 
 from GameSentenceMiner.configuration import get_config, Ai, logger
@@ -98,7 +99,14 @@ class GeminiAI(AIManager):
         try:
             genai.configure(api_key=self.ai_config.api_key)
             model_name = self.ai_config.model
-            self.model = genai.GenerativeModel(model_name)
+            self.model = genai.GenerativeModel(model_name,
+                                               generation_config=GenerationConfig(
+                                                   temperature=0.5,
+                                                   max_output_tokens=1024,
+                                                   top_p=1,
+                                                   stop_sequences=None,
+                                               )
+                                               )
             self.logger.debug(f"GeminiAIManager initialized with model: {model_name}")
         except Exception as e:
             self.logger.error(f"Failed to initialize Gemini API: {e}")

GameSentenceMiner/obs.py

@@ -18,6 +18,7 @@ obs_process_pid = None
 OBS_PID_FILE = os.path.join(configuration.get_app_directory(), 'obs-studio', 'obs_pid.txt')
 obs_connection_manager = None
 logging.getLogger("obsws_python").setLevel(logging.CRITICAL)
+connecting = False
 
 class OBSConnectionManager(threading.Thread):
     def __init__(self):
@@ -29,9 +30,9 @@ class OBSConnectionManager(threading.Thread):
         while self.running:
             time.sleep(1)
             try:
-                if not client or not client.get_version():
+                if not client or not client.get_version() and not connecting:
                     logger.info("OBS WebSocket not connected. Attempting to reconnect...")
-                    connect_to_obs()
+                    asyncio.run(connect_to_obs())
             except Exception as e:
                 logger.debug(f"Error checking OBS connection: {e}")
 
@@ -135,14 +136,15 @@ def get_obs_websocket_config_values():
         reload_config()
 
 async def connect_to_obs(retry_count=0):
-    global client, obs_connection_manager, event_client
-    if not get_config().obs.enabled or client:
+    global client, obs_connection_manager, event_client, connecting
+    if not get_config().obs.enabled:
         return
 
     if util.is_windows():
         get_obs_websocket_config_values()
 
     while True:
+        connecting = True
         try:
             client = obs.ReqClient(
                 host=get_config().obs.host,
@@ -156,6 +158,7 @@ async def connect_to_obs(retry_count=0):
                 password=get_config().obs.password,
                 timeout=1,
             )
+            logger.info("Connected to OBS WebSocket.")
             if not obs_connection_manager:
                 obs_connection_manager = OBSConnectionManager()
                 obs_connection_manager.start()
@@ -164,6 +167,7 @@ async def connect_to_obs(retry_count=0):
         except Exception as e:
             await asyncio.sleep(1)
             retry_count += 1
+    connecting = False
 
 def connect_to_obs_sync(retry_count=0):
     global client, obs_connection_manager, event_client

GameSentenceMiner/ocr/owocr_helper.py

@@ -207,16 +207,20 @@ all_cords = None
 rectangles = None
 last_ocr2_result = ""
 
-def do_second_ocr(ocr1_text, time, img, filtering):
+def do_second_ocr(ocr1_text, time, img, filtering, scrolling=False):
     global twopassocr, ocr2, last_ocr2_result
     try:
-        orig_text, text = run.process_and_write_results(img, None, None, None, None,
+        orig_text, text = run.process_and_write_results(img, None, last_ocr2_result, filtering, None,
                                                         engine=ocr2)
-        if fuzz.ratio(last_ocr2_result, text) >= 80:
+        print(filtering)
+        print(last_ocr2_result)
+        if scrolling:
+            return text
+        if fuzz.ratio(last_ocr2_result, orig_text) >= 80:
             logger.info("Seems like the same text from previous ocr2 result, not sending")
             return
         save_result_image(img)
-        last_ocr2_result = text
+        last_ocr2_result = orig_text
         send_result(text, time)
     except json.JSONDecodeError:
         print("Invalid JSON received.")
@@ -243,15 +247,19 @@ def send_result(text, time):
         websocket_server_thread.send_text(text, time)
 
 
+previous_text_list = []
 previous_text = ""  # Store last OCR result
+previous_ocr1_result = ""  # Store last OCR1 result
 last_oneocr_time = None  # Store last OCR time
 text_stable_start_time = None  # Store the start time when text becomes stable
 previous_img = None
 orig_text_result = ""  # Store original text result
 TEXT_APPEARENCE_DELAY = get_ocr_scan_rate() * 1000 + 500  # Adjust as needed
+force_stable = False
+scrolling_text_images = []
 
 def text_callback(text, orig_text, time, img=None, came_from_ss=False, filtering=None):
-    global twopassocr, ocr2, previous_text, last_oneocr_time, text_stable_start_time, orig_text_result, previous_img
+    global twopassocr, ocr2, previous_text, last_oneocr_time, text_stable_start_time, orig_text_result, previous_img, force_stable, previous_ocr1_result, scrolling_text_images, previous_text_list
     orig_text_string = ''.join([item for item in orig_text if item is not None]) if orig_text else ""
     if came_from_ss:
         save_result_image(img)
@@ -272,25 +280,48 @@ def text_callback(text, orig_text, time, img=None, came_from_ss=False, filtering
         text_stable_start_time = None
         last_oneocr_time = None
         return
-    if not text:
+    if not text or force_stable:
+        # if scrolling_text_images:
+        #     stable_time = text_stable_start_time
+        #     full_text = "".join([do_second_ocr(orig_text_string, line_start_time, img, filtering, True) for img in scrolling_text_images])
+        #     scrolling_text_images = []
+        #     send_result(full_text, stable_time)
+        #     orig_text_result = orig_text_string
+        #     previous_text = previous_text
+        #     previous_img = None
+        #     text_stable_start_time = None
+        #     last_oneocr_time = None
+        force_stable = False
         if previous_text:
             if text_stable_start_time:
                 stable_time = text_stable_start_time
                 previous_img_local = previous_img
-                if fuzz.ratio(orig_text_string, previous_text) >= 80:
+                if fuzz.ratio(orig_text_string, previous_ocr1_result) >= 90:
                     logger.info("Seems like Text we already sent, not doing anything.")
                     return
                 orig_text_result = orig_text_string
-                previous_text = previous_text
+                previous_ocr1_result = previous_text
                 do_second_ocr(previous_text, stable_time, previous_img_local, filtering)
                 previous_img = None
                 text_stable_start_time = None
                 last_oneocr_time = None
             return
         return
+    # elif previous_text_list and all(
+    #     fuzz.partial_ratio(token, prev_token) >= 95 for token in orig_text for prev_token in
+    #     previous_text_list[1:]):
+    #     logger.info(f"Previous text: {previous_text_list}. Current text: {orig_text}.")
+    #     logger.info("Seems like Scrolling text potentially...")
+    #     previous_img_local = previous_img
+    #     scrolling_text_images.append(previous_img_local)
+    #     previous_text_list = orig_text
+    #     previous_text = orig_text_string
+    #     return
+
     if not text_stable_start_time:
         text_stable_start_time = line_start_time
-    previous_text = orig_text
+    previous_text = orig_text_string
+    previous_text_list = orig_text
     last_oneocr_time = line_start_time
     previous_img = img
 
@@ -321,6 +352,7 @@ def run_oneocr(ocr_config: OCRConfig, area=False):
             screen_capture_exclusions=exclusions,
             language=language,
             monitor_index=ocr_config.window,
+            ocr1=ocr1,
             ocr2=ocr2,
             gsm_ocr_config=ocr_config,
             screen_capture_areas=screen_areas)
@@ -341,6 +373,19 @@ def get_window(window_name):
         print(f"Error finding window '{window_name}': {e}")
         return None
 
+def set_force_stable_hotkey():
+    import keyboard
+    global force_stable
+    def toggle_force_stable():
+        global force_stable
+        force_stable = not force_stable
+        if force_stable:
+            print("Force stable mode enabled.")
+        else:
+            print("Force stable mode disabled.")
+    keyboard.add_hotkey('p', toggle_force_stable)
+    print("Press Ctrl+Shift+F to toggle force stable mode.")
+
 if __name__ == "__main__":
     global ocr1, ocr2, twopassocr, language
     import sys
@@ -367,6 +412,7 @@ if __name__ == "__main__":
         ocr2 = "glens"
         twopassocr = True
     logger.info(f"Received arguments: ocr1={ocr1}, ocr2={ocr2}, twopassocr={twopassocr}")
+    # set_force_stable_hotkey()
     global ocr_config
     ocr_config: OCRConfig = get_ocr_config()
     set_dpi_awareness()

GameSentenceMiner/owocr/owocr/ocr.py

@@ -287,7 +287,7 @@ class GoogleLens:
         }
 
         try:
-            res = requests.post('https://lensfrontend-pa.googleapis.com/v1/crupload', data=payload, headers=headers, timeout=20)
+            res = requests.post('https://lensfrontend-pa.googleapis.com/v1/crupload', data=payload, headers=headers, timeout=5)
         except requests.exceptions.Timeout:
             return (False, 'Request timeout!')
         except requests.exceptions.ConnectionError:
@@ -366,7 +366,7 @@ class GoogleLensWeb:
         cookies = {'SOCS': 'CAESEwgDEgk0ODE3Nzk3MjQaAmVuIAEaBgiA_LyaBg'}
 
         try:
-            res = self.requests_session.post(url, files=files, headers=headers, cookies=cookies, timeout=20, allow_redirects=False)
+            res = self.requests_session.post(url, files=files, headers=headers, cookies=cookies, timeout=5, allow_redirects=False)
         except requests.exceptions.Timeout:
             return (False, 'Request timeout!')
         except requests.exceptions.ConnectionError:
@@ -386,7 +386,7 @@ class GoogleLensWeb:
             return (False, 'Unknown error!')
 
         try:
-            res = self.requests_session.get(f"https://lens.google.com/qfmetadata?vsrid={query_params['vsrid'][0]}&gsessionid={query_params['gsessionid'][0]}", timeout=20)
+            res = self.requests_session.get(f"https://lens.google.com/qfmetadata?vsrid={query_params['vsrid'][0]}&gsessionid={query_params['gsessionid'][0]}", timeout=5)
         except requests.exceptions.Timeout:
             return (False, 'Request timeout!')
         except requests.exceptions.ConnectionError:
@@ -458,7 +458,7 @@ class Bing:
         for _ in range(2):
             api_host = urlparse(upload_url).netloc
             try:
-                res = self.requests_session.post(upload_url, headers=upload_headers, files=files, timeout=20, allow_redirects=False)
+                res = self.requests_session.post(upload_url, headers=upload_headers, files=files, timeout=5, allow_redirects=False)
             except requests.exceptions.Timeout:
                 return (False, 'Request timeout!')
             except requests.exceptions.ConnectionError:
@@ -499,7 +499,7 @@ class Bing:
         }
 
         try:
-            res = self.requests_session.post(api_url, headers=api_headers, files=files, timeout=20)
+            res = self.requests_session.post(api_url, headers=api_headers, files=files, timeout=5)
         except requests.exceptions.Timeout:
             return (False, 'Request timeout!')
         except requests.exceptions.ConnectionError:
@@ -961,7 +961,7 @@ class OCRSpace:
         files = {'file': ('image.' + img_extension, img_bytes, 'image/' + img_extension)}
 
         try:
-            res = requests.post('https://api.ocr.space/parse/image', data=data, files=files, timeout=20)
+            res = requests.post('https://api.ocr.space/parse/image', data=data, files=files, timeout=5)
         except requests.exceptions.Timeout:
             return (False, 'Request timeout!')
         except requests.exceptions.ConnectionError:

GameSentenceMiner/owocr/owocr/run.py

@@ -381,7 +381,12 @@ class TextFiltering:
             else:
                 orig_text_filtered.append(None)
 
-        if last_result and last_result[1] == engine_index:
+        if not isinstance(last_result, tuple):
+            print(type(last_result))
+        if isinstance(last_result, list):
+            print("last_result is a list")
+            last_text = last_result
+        elif last_result and last_result[1] == engine_index:
             last_text = last_result[0]
         else:
             last_text = []
@@ -884,18 +889,28 @@ def process_and_write_results(img_or_path, write_to=None, last_result=None, filt
         for i, instance in enumerate(engine_instances):
             if instance.name.lower() in engine.lower():
                 engine_instance = instance
-                if last_result:
-                    last_result = (last_result[0], i)
                 break
     else:
         engine_instance = engine_instances[engine_index]
 
+
+    engine_color = config.get_general('engine_color')
+
     start_time = time.time()
     res, text = engine_instance(img_or_path)
     end_time = time.time()
 
+    if not res and ocr_2 == engine:
+        logger.opt(ansi=True).info(f"<{engine_color}>{engine_instance.readable_name}</{engine_color}> failed with message: {text}, trying <{engine_color}>{ocr_1}</{engine_color}>")
+        for i, instance in enumerate(engine_instances):
+            if instance.name.lower() in ocr_1.lower():
+                engine_instance = instance
+                if last_result:
+                    last_result = []
+                break
+        res, text = engine_instance(img_or_path)
+
     orig_text = []
-    engine_color = config.get_general('engine_color')
     # print(filtering)
     #
     #
@@ -966,6 +981,7 @@ def run(read_from=None,
         text_callback=None,
         language=None,
         monitor_index=None,
+        ocr1=None,
         ocr2=None,
         gsm_ocr_config=None,
         ):
@@ -1083,6 +1099,10 @@ def run(read_from=None,
     global notifier
     global websocket_server_thread
     global image_queue
+    global ocr_1
+    global ocr_2
+    ocr_1 = ocr1
+    ocr_2 = ocr2
     custom_left = None
     terminated = False
     paused = pause_at_startup

{gamesentenceminer-2.8.48.dist-info → gamesentenceminer-2.8.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.8.48
+Version: 2.8.49
 Summary: A tool for mining sentences from games. Update: Multi-Line Mining! Fixed!
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.8.48.dist-info → gamesentenceminer-2.8.49.dist-info}/RECORD

@@ -8,14 +8,14 @@ GameSentenceMiner/gametext.py,sha256=hcyZQ69B7xB5ZG85wLzM5au7ZPKxmeUXsmUD26oyk_0
 GameSentenceMiner/gsm.py,sha256=dZt2Gnwqwj-i-yRpGJWBmCBRaBjEUCzi3L3P-gcVkfA,27266
 GameSentenceMiner/model.py,sha256=1lRyJFf_LND_4O16h8CWVqDfosLgr0ZS6ufBZ3qJHpY,5699
 GameSentenceMiner/notification.py,sha256=pXKoLfmRQLH55IQ5G6uxdMuczqX7D6l3ubVEY1e6hXg,2859
-GameSentenceMiner/obs.py,sha256=_u3HinIfxJIL7gN1KueOHCQYPDc3l9ctaX4kaV1qgC0,14632
+GameSentenceMiner/obs.py,sha256=JwcVPnjO-Lm0H5007o3rF-gMf4ypgIm5m8ntthfbTk8,14789
 GameSentenceMiner/obs_back.py,sha256=_N_UV7Nh5cyy3mnH5lOUOzhgZwHMACeFEuBo1Z-bNzg,10894
 GameSentenceMiner/package.py,sha256=YlS6QRMuVlm6mdXx0rlXv9_3erTGS21jaP3PNNWfAH0,1250
 GameSentenceMiner/ss_selector.py,sha256=csey9H3561-guRJcT6gQN6hXxvylP0CBI0dp2-kwo2Q,4446
 GameSentenceMiner/text_log.py,sha256=MD7LB5D-v4G0Bnm3uGvZQ0aV38Fcj4E0vgq7mmyQ7_4,5157
 GameSentenceMiner/util.py,sha256=PrDNnxWiJZh1lGuwnp3DjWIlwbkVxweRTYWLtQk94Ao,9122
 GameSentenceMiner/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/ai/ai_prompting.py,sha256=O1QBgCL6AkkDyhzxZuW8FPCKgUDfkl_ZlKGcEUfbRnk,9508
+GameSentenceMiner/ai/ai_prompting.py,sha256=xw8et6XNwQiDXOXZnw8iIntVSg8lni4YYZbgWsK7qDE,10013
 GameSentenceMiner/communication/__init__.py,sha256=_jGn9PJxtOAOPtJ2rI-Qu9hEHVZVpIvWlxKvqk91_zI,638
 GameSentenceMiner/communication/send.py,sha256=X0MytGv5hY-uUvkfvdCqQA_ljZFmV6UkJ6in1TA1bUE,217
 GameSentenceMiner/communication/websocket.py,sha256=pTcUe_ZZRp9REdSU4qalhPmbT_1DKa7w18j6RfFLELA,3074
@@ -27,13 +27,13 @@ GameSentenceMiner/ocr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 GameSentenceMiner/ocr/gsm_ocr_config.py,sha256=fEQ2o2NXksGRHpueO8c4TfAp75GEdAtAr1ngTFOsdpg,2257
 GameSentenceMiner/ocr/ocrconfig.py,sha256=_tY8mjnzHMJrLS8E5pHqYXZjMuLoGKYgJwdhYgN-ny4,6466
 GameSentenceMiner/ocr/owocr_area_selector.py,sha256=Q8ETMHL7BKMA1mbtjrntDLyqCQB0lZ5T4RCZsodjH7Y,47186
-GameSentenceMiner/ocr/owocr_helper.py,sha256=mcmljTQYfRHyoqtCVOHjyVAEGWwEkdUAYXY3Z85J4eg,16415
+GameSentenceMiner/ocr/owocr_helper.py,sha256=GzTpy3f8xbiaNoPNh3NotreYVFFPFnfoO732iDu9XqU,18402
 GameSentenceMiner/owocr/owocr/__init__.py,sha256=opjBOyGGyEqZCE6YdZPnyt7nVfiwyELHsXA0jAsjm14,25
 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=6P6zSoykrsJnYqngQI9ULc98zXeTMJCfAoCMedtphzw,41132
-GameSentenceMiner/owocr/owocr/run.py,sha256=oESHucfOXO_HXCjmbhEeRQ6CKeIo-sRN877EjdoKCgA,54169
+GameSentenceMiner/owocr/owocr/ocr.py,sha256=qLlqaxWNhkoAhPmZgIDI70lxf6l_eKji4suqNoUThdw,41126
+GameSentenceMiner/owocr/owocr/run.py,sha256=o7X44H4FQVw_Kgi7Zdsz9RBeHtUjmObBdoOlX2TXpiw,54911
 GameSentenceMiner/owocr/owocr/screen_coordinate_picker.py,sha256=Na6XStbQBtpQUSdbN3QhEswtKuU1JjReFk_K8t5ezQE,3395
 GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/vad/result.py,sha256=C08HsYH4qVjTRh_dvrWrskmXHJ950w0GWxPjGx_BfGY,275
@@ -54,9 +54,9 @@ GameSentenceMiner/web/static/web-app-manifest-512x512.png,sha256=wyqgCWCrLEUxSRX
 GameSentenceMiner/web/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/web/templates/text_replacements.html,sha256=tV5c8mCaWSt_vKuUpbdbLAzXZ3ATZeDvQ9PnnAfqY0M,8598
 GameSentenceMiner/web/templates/utility.html,sha256=P659ZU2j7tcbJ5xPO3p7E_SQpkp3CrrFtSvvXJNNuLI,16330
-gamesentenceminer-2.8.48.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.8.48.dist-info/METADATA,sha256=u7fFMnmpN0JaK_OMxFjfSug5xJ_hVWr0dA4VPb-kJe0,7218
-gamesentenceminer-2.8.48.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-gamesentenceminer-2.8.48.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.8.48.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.8.48.dist-info/RECORD,,
+gamesentenceminer-2.8.49.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.8.49.dist-info/METADATA,sha256=YW_c4ozhtyb_JkAFBkMatRc_ORbwraoLkBKzKGiaM7Q,7218
+gamesentenceminer-2.8.49.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+gamesentenceminer-2.8.49.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.8.49.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.8.49.dist-info/RECORD,,