qurator-spk/eynollah
1
0
Fork 0
mirror of https://github.com/qurator-spk/eynollah.git synced 2026-07-26 05:29:16 +02:00
Code Issues Projects Releases Wiki Activity

ModelZoo type hints: reflect Predictor stand-in and inference backends

Browse source
This commit is contained in:
Robert Sachunsky 2026-07-19 15:05:11 +02:00
parent 4298b021e9
commit ca341f3edb
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/eynollah/model_zoo/model_zoo.py
View file

@ -49,7 +49,7 @@ class EynollahModelZoo:
self._overrides = [] self._overrides = []
if model_overrides: if model_overrides:
self.override_models(*model_overrides) self.override_models(*model_overrides)
self._loaded: Dict[str, Union[Predictor, AnyModel]] = {} self._loaded: Dict[str, Predictor] = {}
@property @property
def model_overrides(self): def model_overrides(self):
@ -163,7 +163,7 @@ class EynollahModelZoo:
model._name = model_category model._name = model_category
return model return model
def get(self, model_category: str) -> Union[Predictor, AnyModel]: def get(self, model_category: str) -> Predictor:
if model_category not in self._loaded: if model_category not in self._loaded:
raise ValueError(f'Model "{model_category}" not previously loaded with "load_model(..)"') raise ValueError(f'Model "{model_category}" not previously loaded with "load_model(..)"')
return self._loaded[model_category] return self._loaded[model_category]
@ -246,7 +246,7 @@ class EynollahModelZoo:
self.logger.warning("no GPU device available") self.logger.warning("no GPU device available")
return device0 return device0
def _load_keras_model(self, model_category, model_path, device=''): def _load_keras_model(self, model_category, model_path, device='') -> AnyModel:
os.environ['TF_USE_LEGACY_KERAS'] = '1' # avoid Keras 3 after TF 2.15 os.environ['TF_USE_LEGACY_KERAS'] = '1' # avoid Keras 3 after TF 2.15
from ocrd_utils import tf_disable_interactive_logs from ocrd_utils import tf_disable_interactive_logs
tf_disable_interactive_logs() tf_disable_interactive_logs()
@ -280,7 +280,7 @@ class EynollahModelZoo:
return model return model
def _load_serving_model(self, model_category, model_path, device=''): def _load_serving_model(self, model_category, model_path, device='') -> AnyModel:
from ocrd_utils import tf_disable_interactive_logs from ocrd_utils import tf_disable_interactive_logs
tf_disable_interactive_logs() tf_disable_interactive_logs()
import tensorflow as tf import tensorflow as tf
@ -304,7 +304,7 @@ class EynollahModelZoo:
return model return model
def _load_onnx_model(self, model_category, model_path, device=''): def _load_onnx_model(self, model_category, model_path, device='') -> AnyModel:
import onnxruntime as ort import onnxruntime as ort
import numpy as np import numpy as np
from ocrd_utils import config from ocrd_utils import config

2
src/eynollah/processor.py
View file

@ -5,7 +5,7 @@ from ocrd import OcrdPageResultImage, Processor, OcrdPageResult
from eynollah.model_zoo.model_zoo import EynollahModelZoo from eynollah.model_zoo.model_zoo import EynollahModelZoo
from .eynollah import Eynollah, EynollahXmlWriter from .eynollah import Eynollah
class EynollahProcessor(Processor): class EynollahProcessor(Processor):
@cached_property @cached_property