GameSentenceMiner 2.8.46__py3-none-any.whl → 2.8.47__py3-none-any.whl

GameSentenceMiner/ocr/gsm_ocr_config.py

@@ -71,9 +71,5 @@ class OCRConfig:
 
 # try w10+, fall back to w8.1+
 def set_dpi_awareness():
-    try:
-        awareness_context = -4
-        ctypes.windll.user32.SetProcessDpiAwarenessContext(awareness_context)
-    except AttributeError:
-        per_monitor_awareness = 2
-        ctypes.windll.shcore.SetProcessDpiAwareness(per_monitor_awareness)
+    per_monitor_awareness = 2
+    ctypes.windll.shcore.SetProcessDpiAwareness(per_monitor_awareness)

GameSentenceMiner/owocr/owocr/ocr.py

@@ -13,6 +13,7 @@ from urllib.parse import urlparse, parse_qs
 import jaconv
 import numpy as np
 from PIL import Image
+from google.generativeai import GenerationConfig
 from loguru import logger
 import requests
 
@@ -1003,7 +1004,10 @@ class GeminiOCR:
                 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.model = genai.GenerativeModel(config['model'], generation_config=GenerationConfig(
+                    temperature=0.0,
+                    max_output_tokens=300
+                ))
                 self.available = True
                 logger.info('Gemini (using google-generativeai) ready')
         except KeyError:
@@ -1011,19 +1015,13 @@ class GeminiOCR:
         except Exception as e:
             logger.error(f'Error configuring google-generativeai: {e}')
 
-    def __call__(self, img_or_path):
+    def __call__(self, img):
         if not self.available:
             return (False, 'GeminiOCR is not available due to missing API key or configuration error.')
 
         try:
+            img = input_to_pil_image(img)
             import google.generativeai as genai
-            if isinstance(img_or_path, str) or isinstance(img_or_path, Path):
-                img = Image.open(img_or_path)
-            elif isinstance(img_or_path, Image.Image):
-                img = img_or_path
-            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.')
@@ -1050,7 +1048,7 @@ class GeminiOCR:
             return (True, text_output)
 
         except FileNotFoundError:
-            return (False, f'File not found: {img_or_path}')
+            return (False, f'File not found: {img}')
         except Exception as e:
             return (False, f'Gemini API request failed: {e}')
 
@@ -1079,17 +1077,12 @@ class GroqOCR:
         except Exception as e:
             logger.error(f'Error initializing Groq client: {e}')
 
-    def __call__(self, img_or_path):
+    def __call__(self, img):
         if not self.available:
             return (False, 'GroqOCR is not available due to missing API key or configuration error.')
 
         try:
-            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 = input_to_pil_image(img)
 
             img_base64 = self._preprocess(img)
             if not img_base64:
@@ -1116,7 +1109,8 @@ class GroqOCR:
                         ],
                     }
                 ],
-                max_tokens=300
+                max_tokens=300,
+                temperature=0.0
             )
 
             if response.choices and response.choices[0].message.content:
@@ -1126,7 +1120,7 @@ class GroqOCR:
                 return (True, "")
 
         except FileNotFoundError:
-            return (False, f'File not found: {img_or_path}')
+            return (False, f'File not found: {img}')
         except Exception as e:
             return (False, f'Groq API request failed: {e}')
 

GameSentenceMiner/owocr/owocr/run.py

@@ -1,3 +1,5 @@
+from ...ocr.gsm_ocr_config import set_dpi_awareness
+
 try:
     import win32gui
     import win32ui
@@ -520,7 +522,7 @@ class ScreenshotClass:
                 if not self.window_handle:
                     raise ValueError(area_invalid_error)
 
-                self.set_dpi_awareness()
+                set_dpi_awareness()
 
                 self.windows_window_tracker_instance = threading.Thread(target=self.windows_window_tracker)
                 self.windows_window_tracker_instance.start()
@@ -534,25 +536,6 @@ class ScreenshotClass:
         elif self.windows_window_tracker_instance:
             self.windows_window_tracker_instance.join()
 
-    @staticmethod
-    def set_dpi_awareness():
-        try:
-            # Try Windows 10+ API first
-            awareness_context = -4
-            success = ctypes.windll.user32.SetProcessDpiAwarenessContext(awareness_context)
-            if success:
-                print("Set DPI awareness: PER_MONITOR_AWARE_V2")
-            else:
-                print("Failed to set DPI awareness context (-4); falling back.")
-        except AttributeError:
-            # Fallback for older Windows versions (8.1+)
-            try:
-                per_monitor_awareness = 2
-                ctypes.windll.shcore.SetProcessDpiAwareness(per_monitor_awareness)
-                print("Set DPI awareness: PER_MONITOR_DPI_AWARE")
-            except Exception as e:
-                print("Could not set DPI awareness:", e)
-
     def get_windows_window_handle(self, window_title):
         def callback(hwnd, window_title_part):
             window_title = win32gui.GetWindowText(hwnd)

{gamesentenceminer-2.8.46.dist-info → gamesentenceminer-2.8.47.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.8.46
+Version: 2.8.47
 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.46.dist-info → gamesentenceminer-2.8.47.dist-info}/RECORD

@@ -24,7 +24,7 @@ GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 GameSentenceMiner/downloader/download_tools.py,sha256=aRfpCqEmKUFRVsGipwY-7PhY6AeWiFJanW4ZCB9e2iE,8124
 GameSentenceMiner/downloader/oneocr_dl.py,sha256=o3ANp5IodEQoQ8GPcJdg9Y8JzA_lictwnebFPwwUZVk,10144
 GameSentenceMiner/ocr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/ocr/gsm_ocr_config.py,sha256=WFTGg2J8FAqoILVbJaMt5XWhF-btXeDnj38Iuz-kf8k,2410
+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
@@ -32,8 +32,8 @@ GameSentenceMiner/owocr/owocr/__init__.py,sha256=opjBOyGGyEqZCE6YdZPnyt7nVfiwyEL
 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=dPnDmtG-I24kcfxC3iudeRIVgGhLmiWMGyRiMANcYsA,41573
-GameSentenceMiner/owocr/owocr/run.py,sha256=MekuzH78OxSa2a79YpXdgJikrRh01oxk3Ydre7bxjTE,54942
+GameSentenceMiner/owocr/owocr/ocr.py,sha256=6P6zSoykrsJnYqngQI9ULc98zXeTMJCfAoCMedtphzw,41132
+GameSentenceMiner/owocr/owocr/run.py,sha256=oESHucfOXO_HXCjmbhEeRQ6CKeIo-sRN877EjdoKCgA,54169
 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.46.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.8.46.dist-info/METADATA,sha256=GdOQ39XqFUzkGREBUaVLBWiBpP6Oak-SOzh-ur_r0tA,7218
-gamesentenceminer-2.8.46.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-gamesentenceminer-2.8.46.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.8.46.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.8.46.dist-info/RECORD,,
+gamesentenceminer-2.8.47.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.8.47.dist-info/METADATA,sha256=OijMxmkfSyISA99v3vVlf6FVJKzeD8pn65NlW2tz0gk,7218
+gamesentenceminer-2.8.47.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+gamesentenceminer-2.8.47.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.8.47.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.8.47.dist-info/RECORD,,