GameSentenceMiner 2.15.9__py3-none-any.whl → 2.15.10__py3-none-any.whl

GameSentenceMiner/ocr/gsm_ocr_config.py

@@ -83,7 +83,7 @@ class OCRConfig:
                 ]
 
     def scale_to_custom_size(self, width, height):
-        self.rectangles = self.pre_scale_rectangles.copy()
+        self.rectangles = deepcopy(self.pre_scale_rectangles)
         if self.coordinate_system and self.coordinate_system == "percentage":
             for rectangle in self.rectangles:
                 rectangle.coordinates = [

GameSentenceMiner/ocr/owocr_helper.py

@@ -424,13 +424,14 @@ def get_ocr2_image(crop_coords, og_image, ocr2_engine=None):
         if not crop_coords or not get_ocr_optimize_second_scan():
             return og_image
         x1, y1, x2, y2 = crop_coords
-        x1 = max(0, min(x1, og_image.width))
-        y1 = max(0, min(y1, og_image.height))
-        x2 = max(x1, min(x2, og_image.width))
-        y2 = max(y1, min(y2, og_image.height))
+        x1 = min(max(0, x1), img.width)
+        y1 = min(max(0, y1), img.height)
+        x2 = min(max(0, x2), img.width)
+        y2 = min(max(0, y2), img.height)
         og_image.save(os.path.join(get_temporary_directory(), "pre_oneocrcrop.png"))
         return og_image.crop((x1, y1, x2, y2))
     
+    # TODO Get rid of this check, and just always convert to full res
     LOCAL_OCR_ENGINES = ['easyocr', 'oneocr', 'rapidocr', 'mangaocr', 'winrtocr']
     local_ocr = ocr2_engine in LOCAL_OCR_ENGINES
     ocr_config_local = copy(ocr_config)
@@ -444,10 +445,17 @@ def get_ocr2_image(crop_coords, og_image, ocr2_engine=None):
     obs_height = getattr(run.obs_screenshot_thread, 'height', None)
     if not obs_width or not obs_height:
         return return_original_image()
+    
     logger.debug(f"Getting OCR2 image with OBS dimensions: {obs_width}x{obs_height}")
 
     img = obs.get_screenshot_PIL(compression=100, img_format="jpg")
+    
     ocr_config_local.scale_to_custom_size(img.width, img.height)
+    
+    # If img.width and height is the same as obs, no need to scale coords, tolerance of .1%
+    if abs(img.width - obs_width) <= 0.1 * obs_width and abs(img.height - obs_height) <= 0.1 * obs_height:
+        logger.info("Image size matches OBS size, no need to scale coordinates.")
+        return return_original_image()
 
     # If no crop or optimization, just apply config and return
     if not crop_coords or not get_ocr_optimize_second_scan():
@@ -464,18 +472,19 @@ def get_ocr2_image(crop_coords, og_image, ocr2_engine=None):
     y1 = int(crop_coords[1] * height_ratio)
     x2 = int(crop_coords[2] * width_ratio)
     y2 = int(crop_coords[3] * height_ratio)
-    logger.debug(f"Scaled crop coordinates: {(x1, y1, x2, y2)}")
 
     # Clamp coordinates to image bounds
-    x1 = max(0, min(x1, img.width))
-    y1 = max(0, min(y1, img.height))
-    x2 = max(x1, min(x2, img.width))
-    y2 = max(y1, min(y2, img.height))
-
-    img = run.apply_ocr_config_to_image(img, ocr_config_local, is_secondary=False)
+    x1 = min(max(0, x1), img.width)
+    y1 = min(max(0, y1), img.height)
+    x2 = min(max(0, x2), img.width)
+    y2 = min(max(0, y2), img.height)
     
+    logger.debug(f"Scaled crop coordinates: {(x1, y1, x2, y2)}")
+    
+    img = run.apply_ocr_config_to_image(img, ocr_config_local, is_secondary=False)
     
-    return img.crop((x1, y1, x2, y2))
+    ret = img.crop((x1, y1, x2, y2))
+    return ret
 
 def process_task_queue():
     while True:

GameSentenceMiner/owocr/owocr/run.py

@@ -1029,11 +1029,11 @@ class OBSScreenshotThread(threading.Thread):
             "sceneItemTransform").get("sourceWidth") or self.width
         self.source_height = self.current_source.get(
             "sceneItemTransform").get("sourceHeight") or self.height
-        if self.source_width and self.source_height and not self.is_manual_ocr and not get_ocr_two_pass_ocr():
+        if self.source_width and self.source_height and not self.is_manual_ocr and get_ocr_two_pass_ocr():
             self.width, self.height = scale_down_width_height(
                 self.source_width, self.source_height)
             logger.info(
-                f"Using OBS source dimensions: {self.source_width}x{self.source_height}")
+                f"Using OBS source dimensions: {self.width}x{self.height}")
         else:
             self.width = self.source_width or 1280
             self.height = self.source_height or 720

GameSentenceMiner/util/configuration.py

@@ -585,6 +585,9 @@ class Advanced:
     multi_line_sentence_storage_field: str = ''
     ocr_websocket_port: int = 9002
     texthooker_communication_websocket_port: int = 55001
+    afk_timer_seconds: int = 120
+    session_gap_seconds: int = 3600
+    streak_requirement_hours: float = 0.01 # 1 second required per day to keep your streak by default
 
     def __post_init__(self):
         if self.plaintext_websocket_port == -1:

GameSentenceMiner/util/text_log.py

@@ -119,7 +119,7 @@ def strip_whitespace_and_punctuation(text: str) -> str:
     return re.sub(r'[\s　、。「」【】《》., ]', '', text).strip()
 
 
-def lines_match(texthooker_sentence, anki_sentence):
+def lines_match(texthooker_sentence, anki_sentence, similarity_threshold=80) -> bool:
     # Replace newlines, spaces, other whitespace characters, AND japanese punctuation
     texthooker_sentence = strip_whitespace_and_punctuation(texthooker_sentence)
     anki_sentence = strip_whitespace_and_punctuation(anki_sentence)
@@ -129,7 +129,7 @@ def lines_match(texthooker_sentence, anki_sentence):
         logger.debug(f"One contains the other: {texthooker_sentence} in {anki_sentence} - Similarity: {similarity}")
     elif anki_sentence in texthooker_sentence:
         logger.debug(f"One contains the other: {anki_sentence} in {texthooker_sentence} - Similarity: {similarity}")
-    return (anki_sentence in texthooker_sentence) or (texthooker_sentence in anki_sentence) or (similarity >= 80)
+    return (anki_sentence in texthooker_sentence) or (texthooker_sentence in anki_sentence) or (similarity >= similarity_threshold)
 
 
 def get_text_event(last_note) -> GameLine: