GameSentenceMiner 2.12.1__tar.gz → 2.12.3__tar.gz

{gamesentenceminer-2.12.1 → gamesentenceminer-2.12.3}/GameSentenceMiner/config_gui.py

@@ -139,6 +139,16 @@ class ConfigApp:
         self.ai_tab = None
         self.advanced_tab = None
         self.wip_tab = None
+        self.monitors = []
+        
+        try:
+            import mss as mss
+            self.monitors = [f"Monitor {i}: width: {monitor['width']}, height: {monitor['height']}" for i, monitor in enumerate(mss.mss().monitors[1:], start=1)]
+            print(self.monitors)
+            if len(self.monitors) == 0:
+                self.monitors = [1]
+        except ImportError:
+            self.monitors = []
 
         self.create_tabs()
 
@@ -375,7 +385,8 @@ class ConfigApp:
             ),
             wip=WIP(
                 overlay_websocket_port=int(self.overlay_websocket_port.get()),
-                overlay_websocket_send=self.overlay_websocket_send.get()
+                overlay_websocket_send=self.overlay_websocket_send.get(),
+                monitor_to_capture=self.monitor_to_capture.current()
             )
         )
 
@@ -1743,6 +1754,19 @@ class ConfigApp:
             row=self.current_row, column=1, sticky='W', pady=2)
         self.current_row += 1
 
+        HoverInfoLabelWidget(wip_frame, text="Monitor to Capture:",
+                             tooltip="Select the monitor to capture (1-based index).",
+                             row=self.current_row, column=0)
+        self.monitor_to_capture = ttk.Combobox(wip_frame, values=self.monitors, state="readonly")
+        
+        # set index of monitor to capture, not the string
+        if self.monitors:
+            self.monitor_to_capture.current(self.settings.wip.monitor_to_capture)
+        else:
+            self.monitor_to_capture.set("OwOCR Not Detected")
+        self.monitor_to_capture.grid(row=self.current_row, column=1, sticky='EW', pady=2)
+        self.current_row += 1
+
         self.add_reset_button(wip_frame, "wip", self.current_row, 0, self.create_wip_tab)
 
         for col in range(2):

{gamesentenceminer-2.12.1 → gamesentenceminer-2.12.3}/GameSentenceMiner/gametext.py

@@ -10,7 +10,9 @@ from GameSentenceMiner.util.gsm_utils import do_text_replacements, TEXT_REPLACEM
 from GameSentenceMiner.util.configuration import *
 from GameSentenceMiner.util.text_log import *
 from GameSentenceMiner.web.texthooking_page import add_event_to_texthooker, send_word_coordinates_to_overlay, overlay_server_thread
-from GameSentenceMiner.wip import get_overlay_coords
+
+if get_config().wip.overlay_websocket_send:
+    import GameSentenceMiner.wip.get_overlay_coords as get_overlay_coords
 
 current_line = ''
 current_line_after_regex = ''
@@ -135,7 +137,7 @@ async def find_box_for_sentence(sentence):
     boxes = []
     logger.info(f"Finding Box for Sentence: {sentence}")
     boxes, font_size = await get_overlay_coords.find_box_for_sentence(sentence)
-    logger.info(f"Found Boxes: {boxes}, Font Size: {font_size}")
+    # logger.info(f"Found Boxes: {boxes}, Font Size: {font_size}")
     # if boxes:
         # x1, y1, x2, y2 = box
         # boxes.append({'sentence': sentence, 'x1': x1, 'y1': y1, 'x2': x2, 'y2': y2, 'fontSize': font_size})

{gamesentenceminer-2.12.1 → gamesentenceminer-2.12.3}/GameSentenceMiner/obs.py

@@ -383,7 +383,33 @@ def get_screenshot_base64(compression=75, width=None, height=None):
     except Exception as e:
         logger.error(f"Error getting screenshot: {e}")
         return None
+    
 
+def get_screenshot_PIL(compression=75, img_format='png', width=None, height=None, retry=3):
+    import io
+    import base64
+    from PIL import Image
+    while True:
+        response = client.get_source_screenshot(name=get_current_game(), img_format=img_format, quality=compression, width=width, height=height)
+        try:
+            response.image_data = response.image_data.split(',', 1)[-1]  # Remove data:image/png;base64, prefix if present
+        except AttributeError:
+            retry -= 1
+            if retry <= 0:
+                logger.error(f"Error getting screenshot: {response}")
+                return None
+            continue
+        if response and response.image_data:
+            image_data = response.image_data.split(',', 1)[-1]  # Remove data:image/png;base64, prefix if present
+            image_data = base64.b64decode(image_data)
+            img = Image.open(io.BytesIO(image_data)).convert("RGBA")
+        # if width and height:
+            # img = img.resize((width, height), Image.Resampling.LANCZOS)
+            return img
+    return None
+
+    
+    
 
 def update_current_game():
     gsm_state.current_game = get_current_scene()
@@ -433,8 +459,31 @@ def main():
     disconnect_from_obs()
 
 if __name__ == '__main__':
+    from mss import mss
     logging.basicConfig(level=logging.INFO)
     # main()
     connect_to_obs_sync()
-    print(get_screenshot_base64(compression=75, width=1280, height=720))
+    i = 100
+    # for i in range(1, 100):
+    print(f"Getting screenshot {i}")
+    start = time.time()
+    # get_screenshot(compression=95)
+    # get_screenshot_base64(compression=95, width=1280, height=720)
+    img = get_screenshot_PIL(compression=i, img_format='png')
+    end = time.time()
+    print(f"Time taken to get screenshot with compression {i}: {end - start} seconds")
+    img.show()
+    
+    
+    start = time.time()
+    with mss() as sct:
+        monitor = sct.monitors[1]
+        sct_img = sct.grab(monitor)
+        img = Image.frombytes('RGB', sct_img.size, sct_img.bgra, 'raw', 'BGRX')
+        img.show()
+    end = time.time()
+    print(f"Time taken to get screenshot with mss: {end - start} seconds")
+
+    
+    # print(get_screenshot_base64(compression=75, width=1280, height=720))
 

{gamesentenceminer-2.12.1 → gamesentenceminer-2.12.3}/GameSentenceMiner/util/configuration.py

@@ -529,6 +529,7 @@ class Ai:
 class WIP:
     overlay_websocket_port: int = 55499
     overlay_websocket_send: bool = False
+    monitor_to_capture: int = 0
                     
 
 

{gamesentenceminer-2.12.1 → gamesentenceminer-2.12.3}/GameSentenceMiner/wip/get_overlay_coords.py

@@ -108,11 +108,24 @@ async def get_full_screenshot() -> Image.Image | None:
 
     logger.info("Getting Screenshot from OBS")
     try:
-        update_current_game()
+        import mss as mss
         start_time = time.time()
-        image_data = get_screenshot_base64(compression=75, width=1280, height=720)
-        image_data = base64.b64decode(image_data)
-        img = Image.open(io.BytesIO(image_data)).convert("RGBA").resize((WIDTH, HEIGHT), Image.Resampling.LANCZOS)
+        with mss.mss() as sct:
+            monitors = sct.monitors
+            if len(monitors) > 1:
+                monitors = monitors[1:]
+            else:
+                monitors = [monitors[0]]
+            monitor = monitors[get_config().wip.monitor_to_capture]
+            sct_img = sct.grab(monitor)
+            img = Image.frombytes('RGB', sct_img.size, sct_img.bgra, 'raw', 'BGRX')
+            # img.show()
+            return img
+            # update_current_game()
+
+            # image_data = get_screenshot_base64(compression=75, width=1280, height=720)
+            # image_data = base64.b64decode(image_data)
+        # img = Image.open(io.BytesIO(image_data)).convert("RGBA").resize((WIDTH, HEIGHT), Image.Resampling.LANCZOS)
         # img.show()
         logger.info(f"Screenshot captured in {time.time() - start_time:.2f} seconds.")
 

{gamesentenceminer-2.12.1 → gamesentenceminer-2.12.3}/GameSentenceMiner.egg-info/PKG-INFO

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

{gamesentenceminer-2.12.1 → gamesentenceminer-2.12.3}/PKG-INFO

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

{gamesentenceminer-2.12.1 → gamesentenceminer-2.12.3}/pyproject.toml

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