GameSentenceMiner 2.7.4__py3-none-any.whl → 2.7.6__py3-none-any.whl

GameSentenceMiner/gametext.py

@@ -44,6 +44,9 @@ class GameLine:
             return self.next.time
         return 0
 
+    def __str__(self):
+        return str({"text": self.text, "time": self.time})
+
 @dataclass
 class GameText:
     values: list[GameLine]
@@ -71,6 +74,7 @@ class GameText:
         if not line_text:
             return
         new_line = GameLine(line_text, line_time if line_time else datetime.now(), self.values[-1] if self.values else None, None, self.game_line_index)
+        logger.debug(f"Adding line: {new_line}")
         self.game_line_index += 1
         if self.values:
             self.values[-1].next = new_line

GameSentenceMiner/ocr/owocr_helper.py

@@ -153,7 +153,7 @@ def text_callback(text, rectangle, time):
     if not text:
         return
     if not twopassocr or not ocr2:
-        websocket_server_thread.send_text(text, datetime.now())
+        websocket_server_thread.send_text(text, time if time else datetime.now())
         return
     with mss.mss() as sct:
         line_time = time if time else datetime.now()

GameSentenceMiner/owocr/owocr/__main__.py

@@ -1,8 +1,9 @@
-from .run import run
+from .run import run, init_config
+
 
 def main():
     run()
 
-
 if __name__ == '__main__':
+    init_config(True)
     main()

GameSentenceMiner/owocr/owocr/ocr.py

@@ -973,3 +973,82 @@ class OCRSpace:
 
     def _preprocess(self, img):       
         return limit_image_size(img, self.max_byte_size)
+
+
+class GeminiOCR:
+    name = 'gemini'
+    readable_name = 'Gemini'
+    key = 'm'
+    available = False
+
+    def __init__(self, config={'api_key': None}):
+        # if "google-generativeai" not in sys.modules:
+        #     logger.warning('google-generativeai not available, GeminiOCR will not work!')
+        # else:
+        import google.generativeai as genai
+        try:
+            self.api_key = config['api_key']
+            if not self.api_key:
+                logger.warning('Gemini API key not provided, GeminiOCR will not work!')
+            else:
+                genai.configure(api_key=self.api_key)
+                self.model = genai.GenerativeModel(config['model'])
+                self.available = True
+                logger.info('Gemini (using google-generativeai) ready')
+        except KeyError:
+            logger.warning('Gemini API key not found in config, GeminiOCR will not work!')
+        except Exception as e:
+            logger.error(f'Error configuring google-generativeai: {e}')
+
+    def __call__(self, img_or_path):
+        if not self.available:
+            return (False, 'GeminiOCR is not available due to missing API key or configuration error.')
+
+        try:
+            import google.generativeai as genai
+            if isinstance(img_or_path, str) or isinstance(img_or_path, Path):
+                img = Image.open(img_or_path).convert("RGB")
+            elif isinstance(img_or_path, Image.Image):
+                img = img_or_path.convert("RGB")
+            else:
+                raise ValueError(f'img_or_path must be a path or PIL.Image, instead got: {img_or_path}')
+
+            img_bytes = self._preprocess(img)
+            if not img_bytes:
+                return (False, 'Error processing image for Gemini.')
+
+            contents = [
+                {
+                    'parts': [
+                        {
+                            'inline_data': {
+                                'mime_type': 'image/png',
+                                'data': base64.b64encode(img_bytes).decode('utf-8')
+                            }
+                        },
+                        {
+                            'text': 'As Quick as Possible, Give me the text from this image, no other output. If there is no text, return nothing.'
+                        }
+                    ]
+                }
+            ]
+
+            response = self.model.generate_content(contents)
+            text_output = response.text.strip()
+
+            return (True, text_output)
+
+        except FileNotFoundError:
+            return (False, f'File not found: {img_or_path}')
+        except Exception as e:
+            return (False, f'Gemini API request failed: {e}')
+
+    def _preprocess(self, img):
+        try:
+            from io import BytesIO
+            img_io = BytesIO()
+            img.save(img_io, 'PNG')  # Save as PNG
+            return img_io.getvalue()
+        except Exception as e:
+            logger.error(f'Error preprocessing image for Gemini: {e}')
+            return None

GameSentenceMiner/owocr/owocr/run.py

@@ -381,7 +381,7 @@ class AutopauseTimer:
             self.timer_thread.join()
 
     def _countdown(self):
-        seconds = self.timeout
+        seconds = self.timeout if self.timeout else 1
         while seconds > 0 and not self.stop_event.is_set():
             time.sleep(1)
             seconds -= 1
@@ -539,7 +539,7 @@ def are_images_identical(img1, img2):
     return (img1.shape == img2.shape) and (img1 == img2).all()
 
 
-def process_and_write_results(img_or_path, write_to, notifications, last_result, filtering, engine=None, rectangle=None, time=None):
+def process_and_write_results(img_or_path, write_to, notifications, last_result, filtering, engine=None, rectangle=None, start_time=None):
     global engine_index
     if auto_pause_handler:
         auto_pause_handler.stop()
@@ -571,7 +571,7 @@ def process_and_write_results(img_or_path, write_to, notifications, last_result,
         elif write_to == 'clipboard':
             pyperclipfix.copy(text)
         elif write_to == "callback":
-            txt_callback(text, rectangle, time)
+            txt_callback(text, rectangle, start_time)
         elif write_to:
             with Path(write_to).open('a', encoding='utf-8') as f:
                 f.write(text + '\n')
@@ -600,7 +600,7 @@ def run(read_from=None,
         ignore_flag=None,
         delete_images=None,
         notifications=None,
-        auto_pause=None,
+        auto_pause=0,
         combo_pause=None,
         combo_engine_switch=None,
         screen_capture_area=None,
@@ -638,6 +638,18 @@ def run(read_from=None,
     :param screen_capture_combo: When reading with screen capture, specifies a combo to wait on for taking a screenshot instead of using the delay. As an example: "<ctrl>+<shift>+s". The list of keys can be found here: https://pynput.readthedocs.io/en/latest/keyboard.html#pynput.keyboard.Key
     """
 
+    if not read_from:
+        read_from = config.get_general('read_from')
+
+    if not screen_capture_area:
+        screen_capture_area = config.get_general('screen_capture_area')
+
+    if not screen_capture_only_active_windows:
+        screen_capture_only_active_windows = config.get_general('screen_capture_only_active_windows')
+
+    if not write_to:
+        write_to = config.get_general('write_to')
+
     logger.configure(handlers=[{'sink': sys.stderr, 'format': config.get_general('logger_format')}])
 
     if config.has_config:
@@ -682,6 +694,7 @@ def run(read_from=None,
     global first_pressed
     global notifier
     global auto_pause_handler
+    custom_left = None
     terminated = False
     paused = pause_at_startup
     just_unpaused = True
@@ -818,7 +831,8 @@ def run(read_from=None,
 
             sct_params = {'top': coord_top, 'left': coord_left, 'width': coord_width, 'height': coord_height}
             logger.opt(ansi=True).info(f'Selected coordinates: {coord_left},{coord_top},{coord_width},{coord_height}')
-        custom_left, custom_top, custom_width, custom_height = [int(c.strip()) for c in screen_capture_area.split(',')]
+        if len(screen_capture_area.split(',')) == 4:
+            custom_left, custom_top, custom_width, custom_height = [int(c.strip()) for c in screen_capture_area.split(',')]
         if screencapture_mode == 2 or screen_capture_window:
             area_invalid_error = '"screen_capture_area" must be empty, "screen_N" where N is a screen number starting from 1, a valid set of coordinates, or a valid window name'
             if sys.platform == 'darwin':
@@ -907,7 +921,7 @@ def run(read_from=None,
     logger.opt(ansi=True).info(f"Reading from {read_from_readable}, writing to {write_to_readable} using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}")
 
     while not terminated and not stop_running_flag:
-        time = datetime.datetime.now()
+        start_time = datetime.datetime.now()
         if read_from == 'websocket':
             while True:
                 try:
@@ -917,7 +931,7 @@ def run(read_from=None,
                 else:
                     if not paused:
                         img = Image.open(io.BytesIO(item))
-                        process_and_write_results(img, write_to, notifications, None, None, time=time)
+                        process_and_write_results(img, write_to, notifications, None, None, start_time=start_time)
         elif read_from == 'unixsocket':
             while True:
                 try:
@@ -927,7 +941,7 @@ def run(read_from=None,
                 else:
                     if not paused:
                         img = Image.open(io.BytesIO(item))
-                        process_and_write_results(img, write_to, notifications, None, None, time=time)
+                        process_and_write_results(img, write_to, notifications, None, None, start_time=start_time)
         elif read_from == 'clipboard':
             process_clipboard = False
             if windows_clipboard_polling:
@@ -975,7 +989,7 @@ def run(read_from=None,
                             process_clipboard = True
 
             if process_clipboard:
-                process_and_write_results(img, write_to, notifications, None, None, time=time)
+                process_and_write_results(img, write_to, notifications, None, None, start_time=start_time)
 
             just_unpaused = False
 
@@ -1054,7 +1068,7 @@ def run(read_from=None,
                         draw.rectangle((left, top, right, bottom), fill=(0, 0, 0, 0))
                         # draw.rectangle((left, top, right, bottom), fill=(0, 0, 0))
                 # img.save(os.path.join(get_temporary_directory(), 'screencapture.png'), 'png')
-                res, _ = process_and_write_results(img, write_to, notifications, last_result, filtering, rectangle=rectangle, time=time)
+                res, _ = process_and_write_results(img, write_to, notifications, last_result, filtering, rectangle=rectangle, start_time=start_time)
                 if res:
                     last_result = (res, engine_index)
                 delay = screen_capture_delay_secs
@@ -1077,7 +1091,7 @@ def run(read_from=None,
                             except (UnidentifiedImageError, OSError) as e:
                                 logger.warning(f'Error while reading file {path}: {e}')
                             else:
-                                process_and_write_results(img, write_to, notifications, None, None, time=time)
+                                process_and_write_results(img, write_to, notifications, None, None, start_time=start_time)
                                 img.close()
                                 if delete_images:
                                     Path.unlink(path)

{gamesentenceminer-2.7.4.dist-info → gamesentenceminer-2.7.6.dist-info}/METADATA

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

{gamesentenceminer-2.7.4.dist-info → gamesentenceminer-2.7.6.dist-info}/RECORD

@@ -4,7 +4,7 @@ GameSentenceMiner/config_gui.py,sha256=-1PanqdtTKiwItxeyt0piXrWo7lGMWwrC4iSo4NiP
 GameSentenceMiner/configuration.py,sha256=TIL8yCr-FOScCA4OJt-BAtjEb50wtqFFrpmN-UlaQh4,20405
 GameSentenceMiner/electron_config.py,sha256=dGcPYCISPehXubYSzsDuI2Gl092MYK0u3bTnkL9Jh1Y,9787
 GameSentenceMiner/ffmpeg.py,sha256=iUj-1uLLJla6jjGDKuc1FbcXjMogYpoDhrQqCbQFcWA,13359
-GameSentenceMiner/gametext.py,sha256=brybSe7hRy13JAUwuSs6WqOPFH6to0detbIPVhnkinA,9062
+GameSentenceMiner/gametext.py,sha256=AAke4swwmN16da0IpyL5xMhU23nTz_c6z2kMfXPYv-8,9194
 GameSentenceMiner/gsm.py,sha256=fcczDPDcC0vDLAPZtIY64mU3Di3RZjR40tuLIiwB5lE,24827
 GameSentenceMiner/model.py,sha256=JdnkT4VoPOXmOpRgFdvERZ09c9wLN6tUJxdrKlGZcqo,5305
 GameSentenceMiner/notification.py,sha256=FY39ChSRK0Y8TQ6lBGsLnpZUFPtFpSy2tweeXVoV7kc,2809
@@ -23,21 +23,21 @@ GameSentenceMiner/downloader/download_tools.py,sha256=mI1u_FGBmBqDIpCH3jOv8DOoZ3
 GameSentenceMiner/ocr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/ocr/ocrconfig.py,sha256=hTROOZ3On2HngXKxwQFZvnr5AxlmlMV0mPxv-F3NbMg,6476
 GameSentenceMiner/ocr/owocr_area_selector.py,sha256=6MQPCSAhuyOSEDEgc-w6jVdsELjxstzI2Zhz0JBkG8g,11703
-GameSentenceMiner/ocr/owocr_helper.py,sha256=UsweqRllC_Tda4swamAcO2ZkuG0LUGHaJI5YXmTDUCQ,11822
+GameSentenceMiner/ocr/owocr_helper.py,sha256=yR_W_tK6w7c_zDj48d1B6-9f61fBD3PPnt_FSSPleLs,11840
 GameSentenceMiner/owocr/owocr/__init__.py,sha256=opjBOyGGyEqZCE6YdZPnyt7nVfiwyELHsXA0jAsjm14,25
-GameSentenceMiner/owocr/owocr/__main__.py,sha256=nkaZGTCZsPDKcej2O0S1SHkyzHJEboTUBc9izyGPvqw,92
+GameSentenceMiner/owocr/owocr/__main__.py,sha256=r8MI6RAmbkTWqOJ59uvXoDS7CSw5jX5war9ULGWELrA,128
 GameSentenceMiner/owocr/owocr/config.py,sha256=738QCJHEWpFhMh966plOcXYWwcshSiRsxjjIwldeTtI,7461
 GameSentenceMiner/owocr/owocr/lens_betterproto.py,sha256=oNoISsPilVVRBBPVDtb4-roJtAhp8ZAuFTci3TGXtMc,39141
-GameSentenceMiner/owocr/owocr/ocr.py,sha256=d0uLAQotZ6xhUSWWEXW07c0-EYjeTmumHxIEsT01Iuo,36604
-GameSentenceMiner/owocr/owocr/run.py,sha256=dkGNC5DtUN1jmon-m--f_nMJTuXHT6muKgM_7hXEAtA,46678
+GameSentenceMiner/owocr/owocr/ocr.py,sha256=t0kU2GQyW0gf0NGqaYiOO7SjYgX8mQXLaNKJ8Eup6mg,39704
+GameSentenceMiner/owocr/owocr/run.py,sha256=HE5plzuX9297q16b6ivSeGn1wZ4A3-hR-XfoSuM6PQs,47272
 GameSentenceMiner/owocr/owocr/screen_coordinate_picker.py,sha256=f_YIV4-2OEZ21CAEZ_pbqeTb5D28PS82Tig4ZSnkY4Q,3096
 GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/vad/silero_trim.py,sha256=ULf3zwS-JMsY82cKF7gZxREHw8L6lgpWF2U1YqgE9Oc,1681
 GameSentenceMiner/vad/vosk_helper.py,sha256=125X8C9NxFPlWWpoNsbOnEqKx8RCjXN109zNx_QXhyg,6070
 GameSentenceMiner/vad/whisper_helper.py,sha256=JJ-iltCh813XdjyEw0Wn5DaErf6PDqfH0Efu1Md8cIY,3543
-gamesentenceminer-2.7.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.7.4.dist-info/METADATA,sha256=91-FbrZOoHnvNM2FjS-2vgRUpk1__KcqmBEAiNnI1A8,5839
-gamesentenceminer-2.7.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-gamesentenceminer-2.7.4.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.7.4.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.7.4.dist-info/RECORD,,
+gamesentenceminer-2.7.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.7.6.dist-info/METADATA,sha256=MdR2tq4Bl2c5u4NPw_6bS-dOe3npgNU3Zzv8c9qcKEo,5839
+gamesentenceminer-2.7.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+gamesentenceminer-2.7.6.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.7.6.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.7.6.dist-info/RECORD,,