Compare commits
No commits in common. 'master' and 'v0.9.6' have entirely different histories.
@ -1,5 +0,0 @@
|
|||||||
src/dinglehopper/tests
|
|
||||||
dist
|
|
||||||
build
|
|
||||||
*.egg-info
|
|
||||||
.git
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
ARG DOCKER_BASE_IMAGE
|
|
||||||
FROM $DOCKER_BASE_IMAGE
|
|
||||||
ARG VCS_REF
|
|
||||||
ARG BUILD_DATE
|
|
||||||
LABEL \
|
|
||||||
maintainer="https://github.com/qurator-spk/dinglehopper/issues" \
|
|
||||||
org.label-schema.vcs-ref=$VCS_REF \
|
|
||||||
org.label-schema.vcs-url="https://github.com/qurator-spk/dinglehopper" \
|
|
||||||
org.label-schema.build-date=$BUILD_DATE \
|
|
||||||
org.opencontainers.image.vendor="qurator" \
|
|
||||||
org.opencontainers.image.title="dinglehopper" \
|
|
||||||
org.opencontainers.image.description="An OCR evaluation tool" \
|
|
||||||
org.opencontainers.image.source="https://github.com/qurator-spk/dinglehopper" \
|
|
||||||
org.opencontainers.image.documentation="https://github.com/qurator-spk/dinglehopper/blob/${VCS_REF}/README.md" \
|
|
||||||
org.opencontainers.image.revision=$VCS_REF \
|
|
||||||
org.opencontainers.image.created=$BUILD_DATE \
|
|
||||||
org.opencontainers.image.base.name=ocrd/core
|
|
||||||
|
|
||||||
ENV LANG=C.UTF-8
|
|
||||||
ENV LC_ALL=C.UTF-8
|
|
||||||
|
|
||||||
# avoid HOME/.local/share (hard to predict USER here)
|
|
||||||
# so let XDG_DATA_HOME coincide with fixed system location
|
|
||||||
# (can still be overridden by derived stages)
|
|
||||||
ENV XDG_DATA_HOME /usr/local/share
|
|
||||||
# avoid the need for an extra volume for persistent resource user db
|
|
||||||
# (i.e. XDG_CONFIG_HOME/ocrd/resources.yml)
|
|
||||||
ENV XDG_CONFIG_HOME /usr/local/share/ocrd-resources
|
|
||||||
|
|
||||||
WORKDIR /build/dinglehopper
|
|
||||||
COPY . .
|
|
||||||
COPY ocrd-tool.json .
|
|
||||||
# prepackage ocrd-tool.json as ocrd-all-tool.json
|
|
||||||
RUN ocrd ocrd-tool ocrd-tool.json dump-tools > $(dirname $(ocrd bashlib filename))/ocrd-all-tool.json
|
|
||||||
RUN make install && rm -rf /build/dinglehopper
|
|
||||||
|
|
||||||
WORKDIR /data
|
|
||||||
VOLUME /data
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
PYTHON = python3
|
|
||||||
PIP = pip3
|
|
||||||
PYTHONIOENCODING=utf8
|
|
||||||
PYTEST_ARGS = -vv
|
|
||||||
|
|
||||||
DOCKER_BASE_IMAGE = docker.io/ocrd/core:v3.3.0
|
|
||||||
DOCKER_TAG = ocrd/dinglehopper
|
|
||||||
|
|
||||||
help:
|
|
||||||
@echo
|
|
||||||
@echo " Targets"
|
|
||||||
@echo
|
|
||||||
@echo " install Install full Python package via pip"
|
|
||||||
@echo " docker Build the ocrd/dinglehopper docker image"
|
|
||||||
|
|
||||||
# Install Python package via pip
|
|
||||||
install:
|
|
||||||
$(PIP) install .
|
|
||||||
|
|
||||||
install-dev:
|
|
||||||
$(PIP) install -e .
|
|
||||||
|
|
||||||
test:
|
|
||||||
pytest $(PYTEST_ARGS)
|
|
||||||
|
|
||||||
docker:
|
|
||||||
docker build \
|
|
||||||
--build-arg DOCKER_BASE_IMAGE=$(DOCKER_BASE_IMAGE) \
|
|
||||||
--build-arg VCS_REF=$$(git rev-parse --short HEAD) \
|
|
||||||
--build-arg BUILD_DATE=$$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
|
|
||||||
-t $(DOCKER_TAG) .
|
|
||||||
|
|
||||||
.PHONY: help install install-dev test docker
|
|
||||||
@ -1,76 +1,78 @@
|
|||||||
from functools import cached_property
|
import json
|
||||||
import os
|
import os
|
||||||
from typing import Optional
|
|
||||||
|
|
||||||
import click
|
import click
|
||||||
from ocrd_models import OcrdFileType
|
|
||||||
from ocrd import Processor
|
from ocrd import Processor
|
||||||
from ocrd.decorators import ocrd_cli_options, ocrd_cli_wrap_processor
|
from ocrd.decorators import ocrd_cli_options, ocrd_cli_wrap_processor
|
||||||
from ocrd_utils import make_file_id
|
from ocrd_utils import assert_file_grp_cardinality, getLogger, make_file_id
|
||||||
|
from pkg_resources import resource_string
|
||||||
|
|
||||||
from .cli import process as cli_process
|
from .cli import process as cli_process
|
||||||
|
|
||||||
|
OCRD_TOOL = json.loads(resource_string(__name__, "ocrd-tool.json").decode("utf8"))
|
||||||
|
|
||||||
|
|
||||||
@click.command()
|
@click.command()
|
||||||
@ocrd_cli_options
|
@ocrd_cli_options
|
||||||
def ocrd_dinglehopper(*args, **kwargs):
|
def ocrd_dinglehopper(*args, **kwargs):
|
||||||
return ocrd_cli_wrap_processor(OcrdDinglehopperEvaluate, *args, **kwargs)
|
return ocrd_cli_wrap_processor(OcrdDinglehopperEvaluate, *args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class OcrdDinglehopperEvaluate(Processor):
|
class OcrdDinglehopperEvaluate(Processor):
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
kwargs["ocrd_tool"] = OCRD_TOOL["tools"]["ocrd-dinglehopper"]
|
||||||
|
super(OcrdDinglehopperEvaluate, self).__init__(*args, **kwargs)
|
||||||
|
|
||||||
@cached_property
|
def process(self):
|
||||||
def executable(self):
|
assert_file_grp_cardinality(self.input_file_grp, 2, "GT and OCR")
|
||||||
return 'ocrd-dinglehopper'
|
assert_file_grp_cardinality(self.output_file_grp, 1)
|
||||||
|
|
||||||
def process_page_file(self, *input_files: Optional[OcrdFileType]) -> None:
|
log = getLogger("processor.OcrdDinglehopperEvaluate")
|
||||||
|
|
||||||
assert self.parameter
|
|
||||||
metrics = self.parameter["metrics"]
|
metrics = self.parameter["metrics"]
|
||||||
textequiv_level = self.parameter["textequiv_level"]
|
textequiv_level = self.parameter["textequiv_level"]
|
||||||
|
gt_grp, ocr_grp = self.input_file_grp.split(",")
|
||||||
|
|
||||||
|
input_file_tuples = self.zip_input_files(on_error="abort")
|
||||||
|
for n, (gt_file, ocr_file) in enumerate(input_file_tuples):
|
||||||
|
if not gt_file or not ocr_file:
|
||||||
|
# file/page was not found in this group
|
||||||
|
continue
|
||||||
|
gt_file = self.workspace.download_file(gt_file)
|
||||||
|
ocr_file = self.workspace.download_file(ocr_file)
|
||||||
|
page_id = gt_file.pageId
|
||||||
|
|
||||||
# wrong number of inputs: let fail
|
log.info("INPUT FILES %i / %s↔ %s", n, gt_file, ocr_file)
|
||||||
gt_file, ocr_file = input_files
|
|
||||||
# missing on either side: skip (zip_input_files already warned)
|
file_id = make_file_id(ocr_file, self.output_file_grp)
|
||||||
if not gt_file or not ocr_file:
|
report_prefix = os.path.join(self.output_file_grp, file_id)
|
||||||
return
|
|
||||||
# missing download (i.e. OCRD_DOWNLOAD_INPUT=false):
|
# Process the files
|
||||||
if not gt_file.local_filename:
|
try:
|
||||||
if config.OCRD_MISSING_INPUT == 'ABORT':
|
os.mkdir(self.output_file_grp)
|
||||||
raise MissingInputFile(gt_file.fileGrp, gt_file.pageId, gt_file.mimetype)
|
except FileExistsError:
|
||||||
return
|
pass
|
||||||
if not ocr_file.local_filename:
|
cli_process(
|
||||||
if config.OCRD_MISSING_INPUT == 'ABORT':
|
gt_file.local_filename,
|
||||||
raise MissingInputFile(ocr_file.fileGrp, ocr_file.pageId, ocr_file.mimetype)
|
ocr_file.local_filename,
|
||||||
return
|
report_prefix,
|
||||||
|
metrics=metrics,
|
||||||
page_id = gt_file.pageId
|
textequiv_level=textequiv_level,
|
||||||
|
|
||||||
file_id = make_file_id(ocr_file, self.output_file_grp)
|
|
||||||
cli_process(
|
|
||||||
gt_file.local_filename,
|
|
||||||
ocr_file.local_filename,
|
|
||||||
file_id,
|
|
||||||
self.output_file_grp,
|
|
||||||
metrics=metrics,
|
|
||||||
textequiv_level=textequiv_level,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Add reports to the workspace
|
|
||||||
for report_suffix, mimetype in [
|
|
||||||
[".html", "text/html"],
|
|
||||||
[".json", "application/json"],
|
|
||||||
]:
|
|
||||||
output_file_id = file_id + report_suffix
|
|
||||||
output_file = next(self.workspace.mets.find_files(ID=output_file_id), None)
|
|
||||||
if output_file and config.OCRD_EXISTING_OUTPUT != 'OVERWRITE':
|
|
||||||
raise FileExistsError(f"A file with ID=={output_file_id} already exists {output_file} and neither force nor ignore are set")
|
|
||||||
self.workspace.add_file(
|
|
||||||
file_id=output_file_id,
|
|
||||||
file_grp=self.output_file_grp,
|
|
||||||
page_id=page_id,
|
|
||||||
mimetype=mimetype,
|
|
||||||
local_filename=file_id + report_suffix,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Add reports to the workspace
|
||||||
|
for report_suffix, mimetype in [
|
||||||
|
[".html", "text/html"],
|
||||||
|
[".json", "application/json"],
|
||||||
|
]:
|
||||||
|
self.workspace.add_file(
|
||||||
|
file_id=file_id + report_suffix,
|
||||||
|
file_grp=self.output_file_grp,
|
||||||
|
page_id=page_id,
|
||||||
|
mimetype=mimetype,
|
||||||
|
local_filename=report_prefix + report_suffix,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
ocrd_dinglehopper()
|
ocrd_dinglehopper()
|
||||||
|
|||||||
Loading…
Reference in New Issue