Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

S7 updates #411

Merged
merged 2 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
*.png binary
*.traineddata binary
*.whl binary
benchmarks/assets/imageproc/*.png filter=lfs diff=lfs merge=lfs -text
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
51 changes: 40 additions & 11 deletions assets/lang/enUS/affixes.json

Large diffs are not rendered by default.

132 changes: 98 additions & 34 deletions assets/lang/enUS/uniques.json

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1080p_1.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1080p_2.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1080p_3.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1080p_4.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1080p_5.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1080p_chest.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1080p_clear.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1080p_inv.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1440p_1.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1440p_2.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1440p_3.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1440p_4.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1440p_5.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1440p_chest.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1440p_clear.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/1440p_inv.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/2160p_1.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/2160p_2.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/2160p_3.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/2160p_4.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/2160p_5.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/2160p_chest.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/2160p_clear.png

This file was deleted.

3 changes: 0 additions & 3 deletions benchmarks/assets/imageproc/2160p_inv.png

This file was deleted.

Binary file modified dependencies/tesserocr-2.7.1-cp313-cp313-win_amd64.whl
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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__
Expand Down
10 changes: 6 additions & 4 deletions src/utils/ocr/read.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed tests/assets/item/season6/1440p_small_sigil_2.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed tests/assets/item/unknown/find_descr_rare_1080p.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
36 changes: 0 additions & 36 deletions tests/item/find_descr_unknown_test.py

This file was deleted.

Loading