diff --git a/Makefile b/Makefile index eb6353a..2734672 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,8 @@ WGET = wget -O #SEG_MODEL := https://github.com/qurator-spk/eynollah/releases/download/v0.3.0/models_eynollah.tar.gz #SEG_MODEL := https://github.com/qurator-spk/eynollah/releases/download/v0.3.1/models_eynollah.tar.gz #SEG_MODEL := https://zenodo.org/records/17194824/files/models_layout_v0_5_0.tar.gz?download=1 -EYNOLLAH_MODELS_URL := https://zenodo.org/records/21362927/files/models_inference_all_v0_9_0.zip +# EYNOLLAH_MODELS_URL := https://zenodo.org/records/21362927/files/models_inference_all_v0_9_0.zip +EYNOLLAH_MODELS_URL := https://zenodo.org/records/21381102/files/models_inference_all_v0_9_1.zip EYNOLLAH_MODELS_ZIP = $(notdir $(EYNOLLAH_MODELS_URL)) EYNOLLAH_MODELS_DIR = $(EYNOLLAH_MODELS_ZIP:%.zip=%) diff --git a/src/eynollah/model_zoo/default_specs.py b/src/eynollah/model_zoo/default_specs.py index 2b1196b..7fe91f8 100644 --- a/src/eynollah/model_zoo/default_specs.py +++ b/src/eynollah/model_zoo/default_specs.py @@ -1,8 +1,8 @@ from .specs import EynollahModelSpec, EynollahModelSpecSet # NOTE: This needs to change whenever models/versions change -ZENODO = "https://zenodo.org/records/21362927" -MODELS_VERSION = "v0_9_0" +ZENODO = "https://zenodo.org/records/21381102" +MODELS_VERSION = "v0_9_1" def dist_url(dist_name: str="layout") -> str: return f'{ZENODO}/models_{dist_name}_{MODELS_VERSION}.zip' diff --git a/src/eynollah/ocrd-tool.json b/src/eynollah/ocrd-tool.json index 48c1740..5e36ecb 100644 --- a/src/eynollah/ocrd-tool.json +++ b/src/eynollah/ocrd-tool.json @@ -85,11 +85,11 @@ }, "resources": [ { - "url": "https://zenodo.org/records/21362927/files/models_inference_all_v0_9_0.zip", - "name": "models_inference_all_v0_9_0", + "url": "https://zenodo.org/records/21381102/files/models_inference_layout_v0_9_1.zip", + "name": "models_inference_layout_v0_9_1", "type": "archive", - "size": 5177204769, - "description": "Models for layout detection, reading order detection, textline detection, page extraction, column classification, table detection, binarization and image enhancement, as well as OCR", + "size": 1847700967, + "description": "Models for layout detection, reading order detection, textline detection, page extraction, column classification, table detection, binarization and image enhancement", "version_range": ">= v0.9.0" }, { @@ -159,6 +159,14 @@ } }, "resources": [ + { + "url": "https://zenodo.org/records/21381102/files/models_inference_all_v0_9_1.zip", + "name": "models_inference_all_v0_9_1", + "type": "archive", + "size": 3761011909, + "description": "Models for layout detection, reading order detection, textline detection, page extraction, column classification, table detection, binarization and image enhancement", + "version_range": ">= v0.9.0" + }, { "url": "https://zenodo.org/records/17727267/files/models_all_v0_8_0.zip", "name": "models_all_v0_8_0",