GameSentenceMiner 2.13.6__tar.gz → 2.13.7.post1__tar.gz

{gamesentenceminer-2.13.6 → gamesentenceminer-2.13.7.post1}/GameSentenceMiner/gsm.py

@@ -9,6 +9,18 @@ import warnings
 os.environ.pop('TCL_LIBRARY', None)
 
 
+def handle_error_in_initialization(e):
+    """Handle errors that occur during initialization."""
+    logger.exception(e, exc_info=True)
+    logger.info(
+        "An error occurred during initialization, Maybe try updating GSM from the menu or if running manually, try installing `pip install --update GameSentenceMiner`")
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        logger.info("Exiting due to initialization error.")
+        sys.exit(1)
+
 try:
     import os.path
     import signal
@@ -45,11 +57,7 @@ try:
     from GameSentenceMiner.web.texthooking_page import run_text_hooker_page
 except Exception as e:
     from GameSentenceMiner.util.configuration import logger, is_linux, is_windows
-    logger.info(
-        "Something bad happened during import/initialization, closing in 5 seconds")
-    logger.exception(e)
-    time.sleep(5)
-    sys.exit(1)
+    handle_error_in_initialization(e)
 
 if is_windows():
     import win32api
@@ -688,11 +696,7 @@ async def async_main(reloading=False):
         except Exception as e:
             logger.error(f"Error stopping observer: {e}")
     except Exception as e:
-        logger.error(f"An error occurred during initialization: {e}", exc_info=True)
-        notification.send_error_notification(
-            "An error occurred during initialization. Check the log for details.")
-        asyncio.sleep(5)
-        raise e
+        handle_error_in_initialization(e)
 
 
 def main():
@@ -701,10 +705,8 @@ def main():
     try:
         asyncio.run(async_main())
     except Exception as e:
-        logger.exception(e, exc_info=True)
-        logger.info(
-            "An error occurred during initialization, closing in 5 seconds")
-        time.sleep(5)
+        handle_error_in_initialization(e)
+
 
 
 if __name__ == "__main__":
@@ -712,7 +714,4 @@ if __name__ == "__main__":
     try:
         asyncio.run(async_main())
     except Exception as e:
-        logger.exception(e, exc_info=True)
-        logger.info(
-            "An error occurred during initialization, closing in 5 seconds")
-        time.sleep(5)
+        handle_error_in_initialization(e)

{gamesentenceminer-2.13.6 → gamesentenceminer-2.13.7.post1}/GameSentenceMiner/owocr/owocr/ocr.py

@@ -1368,37 +1368,40 @@ class GroqOCR:
         return base64.b64encode(pil_image_to_bytes(img, png_compression=1)).decode('utf-8')
 
 # class QWENOCR:
-#     name = 'qwenvl'
+#     name = 'qwenv2'
 #     readable_name = 'Qwen2-VL'
 #     key = 'q'
 #     available = False
-#
+
 #     def __init__(self, config={}, lang='ja'):
 #         try:
 #             import torch
-#             from transformers import Qwen2VLForConditionalGeneration, AutoProcessor
-#             self.model = Qwen2VLForConditionalGeneration.from_pretrained(
+#             import transformers
+#             from transformers import AutoModelForImageTextToText, AutoProcessor
+#             self.model = AutoModelForImageTextToText.from_pretrained(
 #                 "Qwen/Qwen2-VL-2B-Instruct", torch_dtype="auto", device_map="auto"
 #             )
 #             self.processor = AutoProcessor.from_pretrained("Qwen/Qwen2-VL-2B-Instruct", use_fast=True)
 #             self.device = "cuda" if torch.cuda.is_available() else "cpu"
 #             print(self.device)
 #             self.available = True
-#             logger.info('Qwen2-VL ready')
+#             logger.info('Qwen2.5-VL ready')
 #         except Exception as e:
 #             logger.warning(f'Qwen2-VL not available: {e}')
-#
+
 #     def __call__(self, img, furigana_filter_sensitivity=0):
 #         if not self.available:
 #             return (False, 'Qwen2-VL is not available.')
 #         try:
-#             img = input_to_pil_image(img)
+#             img, is_path = input_to_pil_image(img)
+
+#             # img.show()
 #             conversation = [
 #                 {
 #                     "role": "user",
 #                     "content": [
 #                         {"type": "image"},
-#                         {"type": "text", "text": "Analyze the image. Extract text *only* from within dialogue boxes (speech bubbles or panels containing character dialogue). If Text appears to be vertical, read the text from top to bottom, right to left. From the extracted dialogue text, filter out any furigana. Ignore and do not include any text found outside of dialogue boxes, including character names, speaker labels, or sound effects. Return *only* the filtered dialogue text. If no text is found within dialogue boxes after applying filters, return nothing. Do not include any other output, formatting markers, or commentary."},
+#                         {"type": "text", "text": "Analyze the image. Extract text *only* from within dialogue boxes (speech bubbles or panels containing character dialogue). If Text appears to be vertical, read the text from top to bottom, right to left. From the extracted dialogue text, filter out any furigana (Small characters above the kanji). Ignore and do not include any text found outside of dialogue boxes, including character names, speaker labels, or sound effects. Return *only* the filtered dialogue text. If no text is found within dialogue boxes after applying filters, return nothing. Do not include any other output, formatting markers, or commentary."},
 #                     ],
 #                 }
 #             ]
@@ -1418,15 +1421,18 @@ class GroqOCR:
 #             return (True, output_text[0] if output_text else "")
 #         except Exception as e:
 #             return (False, f'Qwen2-VL inference failed: {e}')
+        
+#     def _preprocess(self, img):
+#         return base64.b64encode(pil_image_to_bytes(img, png_compression=6)).decode('utf-8')
 
 
 # qwenocr = QWENOCR()
-#
+
 # for i in range(10):
 #     start_time = time.time()
-#     res, text = qwenocr(Image.open('test_furigana.png'), furigana_filter_sensitivity=0)  # Example usage
+#     res, text = qwenocr(Image.open(r"C:\Users\Beangate\GSM\GameSentenceMiner\GameSentenceMiner\owocr\owocr\test_furigana.png"), furigana_filter_sensitivity=0)  # Example usage
 #     end_time = time.time()
-#
+
 #     print(f"Time taken: {end_time - start_time:.2f} seconds")
 #     print(text)
 # class LocalOCR: