GameSentenceMiner 2.12.6.dev0__tar.gz → 2.12.7.post1__tar.gz

{gamesentenceminer-2.12.6.dev0 → gamesentenceminer-2.12.7.post1}/GameSentenceMiner/config_gui.py

@@ -1725,47 +1725,52 @@ class ConfigApp:
                 widget.destroy()
 
         wip_frame = self.wip_tab
+        try:
 
-        ttk.Label(wip_frame, text="Warning: These features are experimental and may not work as expected.",
-                  foreground="red", font=("Helvetica", 10, "bold")).grid(row=self.current_row, column=0, columnspan=2,
-                                                                       sticky='W', pady=5)
-                  
-        self.current_row += 1
-        
-        ttk.Label(wip_frame, text="Overlay requires OwOCR dependencies to be installed, and requires an external app to be running.",
-                  foreground="red", font=("Helvetica", 10, "bold")).grid(row=self.current_row, column=0, columnspan=2,
-                                                                       sticky='W', pady=5)
-                  
-        self.current_row += 1
+            ttk.Label(wip_frame, text="Warning: These features are experimental and may not work as expected.",
+                    foreground="red", font=("Helvetica", 10, "bold")).grid(row=self.current_row, column=0, columnspan=2,
+                                                                        sticky='W', pady=5)
+                    
+            self.current_row += 1
+            
+            ttk.Label(wip_frame, text="Overlay requires OwOCR dependencies to be installed, and requires an external app to be running.",
+                    foreground="red", font=("Helvetica", 10, "bold")).grid(row=self.current_row, column=0, columnspan=2,
+                                                                        sticky='W', pady=5)
+                    
+            self.current_row += 1
 
-        HoverInfoLabelWidget(wip_frame, text="Overlay WebSocket Port:",
-                             tooltip="Port for the overlay WebSocket communication. Used for experimental overlay features.",
-                             row=self.current_row, column=0)
-        self.overlay_websocket_port = ttk.Entry(wip_frame)
-        self.overlay_websocket_port.insert(0, str(self.settings.wip.overlay_websocket_port))
-        self.overlay_websocket_port.grid(row=self.current_row, column=1, sticky='EW', pady=2)
-        self.current_row += 1
+            HoverInfoLabelWidget(wip_frame, text="Overlay WebSocket Port:",
+                                tooltip="Port for the overlay WebSocket communication. Used for experimental overlay features.",
+                                row=self.current_row, column=0)
+            self.overlay_websocket_port = ttk.Entry(wip_frame)
+            self.overlay_websocket_port.insert(0, str(self.settings.wip.overlay_websocket_port))
+            self.overlay_websocket_port.grid(row=self.current_row, column=1, sticky='EW', pady=2)
+            self.current_row += 1
 
-        HoverInfoLabelWidget(wip_frame, text="Overlay WebSocket Send:",
-                             tooltip="Enable to send overlay data via WebSocket. Experimental feature.",
-                             row=self.current_row, column=0)
-        self.overlay_websocket_send = tk.BooleanVar(value=self.settings.wip.overlay_websocket_send)
-        ttk.Checkbutton(wip_frame, variable=self.overlay_websocket_send, bootstyle="round-toggle").grid(
-            row=self.current_row, column=1, sticky='W', pady=2)
-        self.current_row += 1
+            HoverInfoLabelWidget(wip_frame, text="Overlay WebSocket Send:",
+                                tooltip="Enable to send overlay data via WebSocket. Experimental feature.",
+                                row=self.current_row, column=0)
+            self.overlay_websocket_send = tk.BooleanVar(value=self.settings.wip.overlay_websocket_send)
+            ttk.Checkbutton(wip_frame, variable=self.overlay_websocket_send, bootstyle="round-toggle").grid(
+                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
+            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
+
+        except Exception as e:
+            logger.error(f"Error setting up wip tab to capture: {e}")
+            ttk.Label(wip_frame, text="Error setting up WIP tab", foreground="red").grid(row=self.current_row, column=0, columnspan=2, sticky='W', pady=5)
 
         self.add_reset_button(wip_frame, "wip", self.current_row, 0, self.create_wip_tab)
 

{gamesentenceminer-2.12.6.dev0 → gamesentenceminer-2.12.7.post1}/GameSentenceMiner/ocr/owocr_helper.py

@@ -197,7 +197,7 @@ last_ocr2_result = []
 last_sent_result = ""
 
 def do_second_ocr(ocr1_text, time, img, filtering, pre_crop_image=None, ignore_furigana_filter=False, ignore_previous_result=False):
-    global twopassocr, ocr2, last_ocr2_result
+    global twopassocr, ocr2, last_ocr2_result, last_sent_result
     try:
         orig_text, text = run.process_and_write_results(img, None, last_ocr2_result if not ignore_previous_result else None, filtering, None,
                                                         engine=get_ocr_ocr2(), furigana_filter_sensitivity=furigana_filter_sensitivity if not ignore_furigana_filter else 0)
@@ -293,7 +293,7 @@ def reset_callback_vars():
     run.set_last_image(None)
 
 def text_callback(text, orig_text, time, img=None, came_from_ss=False, filtering=None, crop_coords=None):
-    global twopassocr, ocr2, previous_text, last_oneocr_time, text_stable_start_time, previous_orig_text, previous_img, force_stable, previous_ocr1_result, previous_text_list
+    global twopassocr, ocr2, previous_text, last_oneocr_time, text_stable_start_time, previous_orig_text, previous_img, force_stable, previous_ocr1_result, previous_text_list, last_sent_result
     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)

{gamesentenceminer-2.12.6.dev0 → gamesentenceminer-2.12.7.post1}/GameSentenceMiner/owocr/owocr/run.py

@@ -900,7 +900,7 @@ class OBSScreenshotThread(threading.Thread):
                     logger.error("No active source found in the current scene.")
                     time.sleep(1)
                     continue
-                img = obs.get_screenshot_PIL(source_name=self.current_source_name, width=self.width, height=self.height, img_format='jpg', compression=90)
+                img = obs.get_screenshot_PIL(source_name=self.current_source_name, width=self.width, height=self.height, img_format='png', compression=80)
 
                 if img is not None:
                     if not img.getbbox():

{gamesentenceminer-2.12.6.dev0 → gamesentenceminer-2.12.7.post1}/GameSentenceMiner/wip/get_overlay_coords.py

@@ -9,13 +9,14 @@ from typing import Dict, Any, List, Tuple
 from GameSentenceMiner.util.electron_config import get_ocr_language
 
 if get_config().wip.overlay_websocket_send:
-    from GameSentenceMiner.owocr.owocr.ocr import GoogleLens, OneOCR, get_regex
+    try: 
+        from GameSentenceMiner.owocr.owocr.ocr import GoogleLens, OneOCR, get_regex
+        oneocr = OneOCR()
+        lens = GoogleLens()
+    except ImportError:
+        pass
 from GameSentenceMiner.obs import *
 
-if get_config().wip.overlay_websocket_send:
-    oneocr = OneOCR()
-    lens = GoogleLens()
-
 
 def _convert_box_to_pixels_v2(
     bbox_data: Dict[str, float], 
@@ -314,7 +315,7 @@ async def get_full_screenshot() -> Image.Image | None:
             else:
                 monitors = [monitors[0]]
             monitor = monitors[get_config().wip.monitor_to_capture]
-            img = get_screenshot_PIL(compression=100, img_format='jpg')
+            img = get_screenshot_PIL(compression=90, img_format='jpg')
             # Put the image over a transparent background without stretching
             new_img = Image.new("RGBA", (monitor['width'], monitor['height']), (0, 0, 0, 0))
             # Calculate coordinates to center img horizontally and vertically

{gamesentenceminer-2.12.6.dev0 → gamesentenceminer-2.12.7.post1}/GameSentenceMiner.egg-info/PKG-INFO

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

{gamesentenceminer-2.12.6.dev0 → gamesentenceminer-2.12.7.post1}/PKG-INFO

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

{gamesentenceminer-2.12.6.dev0 → gamesentenceminer-2.12.7.post1}/pyproject.toml

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