S7 updates (d4lfteam#411)

cjshrader · Jan 24, 2025 · 103af1e · 103af1e
1 parent 9d7e626
commit 103af1e
Show file tree

Hide file tree

Showing 88 changed files with 148 additions and 851 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,4 +2,3 @@
 *.png binary
 *.traineddata binary
 *.whl binary
-benchmarks/assets/imageproc/*.png filter=lfs diff=lfs merge=lfs -text
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.2
+    rev: v0.9.3
     hooks:
       - id: ruff
         args: [--fix]

diff --git a/assets/lang/enUS/affixes.json b/assets/lang/enUS/affixes.json
diff --git a/assets/lang/enUS/uniques.json b/assets/lang/enUS/uniques.json
diff --git a/benchmarks/assets/imageproc/1080p_1.png b/benchmarks/assets/imageproc/1080p_1.png
diff --git a/benchmarks/assets/imageproc/1080p_2.png b/benchmarks/assets/imageproc/1080p_2.png
diff --git a/benchmarks/assets/imageproc/1080p_3.png b/benchmarks/assets/imageproc/1080p_3.png
diff --git a/benchmarks/assets/imageproc/1080p_4.png b/benchmarks/assets/imageproc/1080p_4.png
diff --git a/benchmarks/assets/imageproc/1080p_5.png b/benchmarks/assets/imageproc/1080p_5.png
diff --git a/benchmarks/assets/imageproc/1080p_chest.png b/benchmarks/assets/imageproc/1080p_chest.png
diff --git a/benchmarks/assets/imageproc/1080p_clear.png b/benchmarks/assets/imageproc/1080p_clear.png
diff --git a/benchmarks/assets/imageproc/1080p_inv.png b/benchmarks/assets/imageproc/1080p_inv.png
diff --git a/benchmarks/assets/imageproc/1440p_1.png b/benchmarks/assets/imageproc/1440p_1.png
diff --git a/benchmarks/assets/imageproc/1440p_2.png b/benchmarks/assets/imageproc/1440p_2.png
diff --git a/benchmarks/assets/imageproc/1440p_3.png b/benchmarks/assets/imageproc/1440p_3.png
diff --git a/benchmarks/assets/imageproc/1440p_4.png b/benchmarks/assets/imageproc/1440p_4.png
diff --git a/benchmarks/assets/imageproc/1440p_5.png b/benchmarks/assets/imageproc/1440p_5.png
diff --git a/benchmarks/assets/imageproc/1440p_chest.png b/benchmarks/assets/imageproc/1440p_chest.png
diff --git a/benchmarks/assets/imageproc/1440p_clear.png b/benchmarks/assets/imageproc/1440p_clear.png
diff --git a/benchmarks/assets/imageproc/1440p_inv.png b/benchmarks/assets/imageproc/1440p_inv.png
diff --git a/benchmarks/assets/imageproc/2160p_1.png b/benchmarks/assets/imageproc/2160p_1.png
diff --git a/benchmarks/assets/imageproc/2160p_2.png b/benchmarks/assets/imageproc/2160p_2.png
diff --git a/benchmarks/assets/imageproc/2160p_3.png b/benchmarks/assets/imageproc/2160p_3.png
diff --git a/benchmarks/assets/imageproc/2160p_4.png b/benchmarks/assets/imageproc/2160p_4.png
diff --git a/benchmarks/assets/imageproc/2160p_5.png b/benchmarks/assets/imageproc/2160p_5.png
diff --git a/benchmarks/assets/imageproc/2160p_chest.png b/benchmarks/assets/imageproc/2160p_chest.png
diff --git a/benchmarks/assets/imageproc/2160p_clear.png b/benchmarks/assets/imageproc/2160p_clear.png
diff --git a/benchmarks/assets/imageproc/2160p_inv.png b/benchmarks/assets/imageproc/2160p_inv.png
diff --git a/dependencies/tesserocr-2.7.1-cp313-cp313-win_amd64.whl b/dependencies/tesserocr-2.7.1-cp313-cp313-win_amd64.whl
diff --git a/src/main.py b/src/main.py
@@ -1,4 +1,5 @@
 import tesserocr  # noqa #  Note: Somehow needed, otherwise the binary has an issue with tesserocr
+from PIL import Image  # noqa #  Note: Somehow needed, otherwise the binary has an issue with tesserocr
 import logging
 import os
 import sys
@@ -7,7 +8,6 @@
 
 import keyboard
 from beautifultable import BeautifulTable
-from PIL import Image  # noqa #  Note: Somehow needed, otherwise the binary has an issue with tesserocr
 
 import src.logger
 from src import __version__

diff --git a/src/utils/ocr/read.py b/src/utils/ocr/read.py
@@ -4,7 +4,7 @@
 
 import cv2
 import numpy as np
-from tesserocr import OEM, RIL, PyTessBaseAPI
+import tesserocr
 
 from src.config import BASE_DIR
 from src.config.data import COLORS
@@ -24,13 +24,15 @@ def __init__(self):
         self._apis = []
         self._lock = threading.Lock()
 
-    def get_api(self, user: uuid.UUID) -> PyTessBaseAPI:
+    def get_api(self, user: uuid.UUID) -> tesserocr.PyTessBaseAPI:
         with self._lock:
             for api in self._apis:
                 if not api["user"]:
                     api["user"] = user
                     return api["api"]
-            new_api = PyTessBaseAPI(psm=3, oem=OEM.LSTM_ONLY, path=str(self.tessdata_path), lang=IniConfigLoader().general.language)
+            new_api = tesserocr.PyTessBaseAPI(
+                psm=3, oem=tesserocr.OEM.LSTM_ONLY, path=str(self.tessdata_path), lang=IniConfigLoader().general.language
+            )
             new_api.SetVariable("debug_file", "/dev/null")
             self._apis.append({"api": new_api, "user": user})
             return new_api
@@ -69,7 +71,7 @@ def image_to_text(img: np.ndarray, line_boxes: bool = False, do_pre_proc: bool =
     text = api.GetUTF8Text().strip()
     res = OcrResult(original_text=text, text=text, word_confidences=api.AllWordConfidences(), mean_confidence=api.MeanTextConf())
     if line_boxes:
-        line_boxes_res = api.GetComponentImages(RIL.TEXTLINE, True)
+        line_boxes_res = api.GetComponentImages(tesserocr.RIL.TEXTLINE, True)
         _APILoader().release_api(my_id)
         return res, line_boxes_res
     _APILoader().release_api(my_id)

diff --git a/tests/assets/item/season5/1080p_medium_read_descr_1.png b/tests/assets/item/season5/1080p_medium_read_descr_1.png
diff --git a/tests/assets/item/season5/1080p_medium_read_descr_2.png b/tests/assets/item/season5/1080p_medium_read_descr_2.png
diff --git a/tests/assets/item/season5/1080p_small_read_descr_1.png b/tests/assets/item/season5/1080p_small_read_descr_1.png
diff --git a/tests/assets/item/season5/1080p_small_read_descr_2.png b/tests/assets/item/season5/1080p_small_read_descr_2.png
diff --git a/tests/assets/item/season5/1080p_small_read_descr_3.png b/tests/assets/item/season5/1080p_small_read_descr_3.png
diff --git a/tests/assets/item/season5/1080p_small_read_descr_4.png b/tests/assets/item/season5/1080p_small_read_descr_4.png
diff --git a/tests/assets/item/season5/1080p_small_read_descr_5.png b/tests/assets/item/season5/1080p_small_read_descr_5.png
diff --git a/tests/assets/item/season5/1080p_small_read_descr_6.png b/tests/assets/item/season5/1080p_small_read_descr_6.png
diff --git a/tests/assets/item/season5/1080p_small_read_descr_7.png b/tests/assets/item/season5/1080p_small_read_descr_7.png
diff --git a/tests/assets/item/season5/1440p_small_read_descr_1.png b/tests/assets/item/season5/1440p_small_read_descr_1.png
diff --git a/tests/assets/item/season5/1440p_small_read_descr_2.png b/tests/assets/item/season5/1440p_small_read_descr_2.png
diff --git a/tests/assets/item/season5/1440p_small_read_descr_3.png b/tests/assets/item/season5/1440p_small_read_descr_3.png
diff --git a/tests/assets/item/season5/1440p_small_read_descr_6.png b/tests/assets/item/season5/1440p_small_read_descr_6.png
diff --git a/tests/assets/item/season5/2160p_medium_read_descr_1.png b/tests/assets/item/season5/2160p_medium_read_descr_1.png
diff --git a/tests/assets/item/season5/2160p_medium_read_descr_11.png b/tests/assets/item/season5/2160p_medium_read_descr_11.png
diff --git a/tests/assets/item/season5/2160p_medium_read_descr_2.png b/tests/assets/item/season5/2160p_medium_read_descr_2.png
diff --git a/tests/assets/item/season5/2160p_medium_read_descr_3.png b/tests/assets/item/season5/2160p_medium_read_descr_3.png
diff --git a/tests/assets/item/season5/2160p_medium_read_descr_8.png b/tests/assets/item/season5/2160p_medium_read_descr_8.png
diff --git a/tests/assets/item/season5/2160p_medium_read_descr_9.png b/tests/assets/item/season5/2160p_medium_read_descr_9.png
diff --git a/tests/assets/item/season5/2160p_small_read_descr_1.png b/tests/assets/item/season5/2160p_small_read_descr_1.png
diff --git a/tests/assets/item/season5/2160p_small_read_descr_11.png b/tests/assets/item/season5/2160p_small_read_descr_11.png
diff --git a/tests/assets/item/season5/2160p_small_read_descr_12.png b/tests/assets/item/season5/2160p_small_read_descr_12.png
diff --git a/tests/assets/item/season5/2160p_small_read_descr_13.png b/tests/assets/item/season5/2160p_small_read_descr_13.png
diff --git a/tests/assets/item/season5/2160p_small_read_descr_14.png b/tests/assets/item/season5/2160p_small_read_descr_14.png
diff --git a/tests/assets/item/season5/2160p_small_read_descr_2.png b/tests/assets/item/season5/2160p_small_read_descr_2.png
diff --git a/tests/assets/item/season5/2160p_small_read_descr_3.png b/tests/assets/item/season5/2160p_small_read_descr_3.png
diff --git a/tests/assets/item/season5/2160p_small_read_descr_8.png b/tests/assets/item/season5/2160p_small_read_descr_8.png
diff --git a/tests/assets/item/season5/2160p_small_read_descr_9.png b/tests/assets/item/season5/2160p_small_read_descr_9.png
diff --git a/tests/assets/item/season6/1080p_small_read_descr_1.png b/tests/assets/item/season6/1080p_small_read_descr_1.png
diff --git a/tests/assets/item/season6/1080p_small_read_descr_2.png b/tests/assets/item/season6/1080p_small_read_descr_2.png
diff --git a/tests/assets/item/season6/1440p_small_read_descr_1.png b/tests/assets/item/season6/1440p_small_read_descr_1.png
diff --git a/tests/assets/item/season6/1440p_small_read_descr_2.png b/tests/assets/item/season6/1440p_small_read_descr_2.png
diff --git a/tests/assets/item/season6/1440p_small_read_descr_3.png b/tests/assets/item/season6/1440p_small_read_descr_3.png
diff --git a/tests/assets/item/season6/1440p_small_read_descr_4.png b/tests/assets/item/season6/1440p_small_read_descr_4.png
diff --git a/tests/assets/item/season6/1440p_small_sigil_2.png b/tests/assets/item/season6/1440p_small_sigil_2.png
diff --git a/tests/assets/item/unknown/find_descr_common_1080p.png b/tests/assets/item/unknown/find_descr_common_1080p.png
diff --git a/tests/assets/item/unknown/find_descr_legendary_1080p.png b/tests/assets/item/unknown/find_descr_legendary_1080p.png
diff --git a/tests/assets/item/unknown/find_descr_legendary_1440p.png b/tests/assets/item/unknown/find_descr_legendary_1440p.png
diff --git a/tests/assets/item/unknown/find_descr_rare_1080p.png b/tests/assets/item/unknown/find_descr_rare_1080p.png
diff --git a/tests/assets/item/unknown/read_descr_codex_upgrade_1440p_2.png b/tests/assets/item/unknown/read_descr_codex_upgrade_1440p_2.png
diff --git a/tests/assets/item/unknown/read_descr_elixir_1080p.png b/tests/assets/item/unknown/read_descr_elixir_1080p.png
diff --git a/tests/assets/item/unknown/read_descr_legendary_1080p.png b/tests/assets/item/unknown/read_descr_legendary_1080p.png
diff --git a/tests/assets/item/unknown/read_descr_legendary_1080p_4.png b/tests/assets/item/unknown/read_descr_legendary_1080p_4.png
diff --git a/tests/assets/item/unknown/read_descr_legendary_1080p_7.png b/tests/assets/item/unknown/read_descr_legendary_1080p_7.png
diff --git a/tests/assets/item/unknown/read_descr_legendary_1080p_8.png b/tests/assets/item/unknown/read_descr_legendary_1080p_8.png
diff --git a/tests/assets/item/unknown/read_descr_legendary_1440p.png b/tests/assets/item/unknown/read_descr_legendary_1440p.png
diff --git a/tests/assets/item/unknown/read_descr_legendary_1440p_3.png b/tests/assets/item/unknown/read_descr_legendary_1440p_3.png
diff --git a/tests/assets/item/unknown/read_descr_legendary_1440p_4.png b/tests/assets/item/unknown/read_descr_legendary_1440p_4.png
diff --git a/tests/assets/item/unknown/read_descr_legendary_1600p.png b/tests/assets/item/unknown/read_descr_legendary_1600p.png
diff --git a/tests/assets/item/unknown/read_descr_material_1080p.png b/tests/assets/item/unknown/read_descr_material_1080p.png
diff --git a/tests/assets/item/unknown/read_descr_sigil_1440p_2.png b/tests/assets/item/unknown/read_descr_sigil_1440p_2.png
diff --git a/tests/assets/item/unknown/read_descr_temper_manual_2160p.png b/tests/assets/item/unknown/read_descr_temper_manual_2160p.png
diff --git a/tests/item/find_descr_unknown_test.py b/tests/item/find_descr_unknown_test.py