Fix alpha shape

.circleci/config.yml

@@ -0,0 +1,43 @@
+version: 2.1
+jobs:
+  test-python3:
+    docker:
+      - image: ocrd/core
+    resource_class: large
+    environment:
+      PIP: pip3
+      PYTHON: python3
+    steps:
+      - checkout
+      - run: apt-get update && apt-get -y install default-jre-headless
+      - run: make install
+      - run: make -j test V=""
+
+  deploy-docker:
+    docker:
+      - image: circleci/buildpack-deps:stretch
+    environment:
+      DOCKER_TAG: ocrd/cis
+    steps:
+      - checkout
+      - setup_remote_docker: # https://circleci.com/docs/2.0/building-docker-images/
+         docker_layer_caching: true
+      - run: make docker-build TAG=$DOCKER_TAG
+      - run:
+          name: Login to Docker Hub
+          command: echo "$DOCKERHUB_PASS" | docker login --username "$DOCKERHUB_USER" --password-stdin
+      - run: docker push $DOCKER_TAG
+
+workflows:
+  version: 2
+  build-and-test:
+    jobs:
+      - test-python3
+  deploy:
+    jobs:
+      - deploy-docker:
+          filters:
+            branches:
+              only:
+                - master
+                - fix-alpha-shape

Dockerfile

@@ -1,8 +1,17 @@
-FROM ocrd/core:latest AS base
-ENV VERSION="Di 12. Mai 13:26:35 CEST 2020"
+FROM ocrd/core:v2.67.2 AS base
+ARG VCS_REF
+ARG BUILD_DATE
+LABEL \
+    maintainer="https://github.com/OCR-D/ocrd_cis/issues" \
+    org.label-schema.vcs-ref=$VCS_REF \
+    org.label-schema.vcs-url="https://github.com/OCR-D/ocrd_cis" \
+    org.label-schema.build-date=$BUILD_DATE
+
 ENV GITURL="https://github.com/cisocrgroup"
 ENV DOWNLOAD_URL="http://cis.lmu.de/~finkf"
 
+SHELL ["/bin/bash", "-c"]
+
 # deps
 RUN apt-get update \
 	&& apt-get -y install --no-install-recommends locales
@@ -16,14 +25,14 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
 FROM base AS profiler
 RUN apt-get update \
 	&& apt-get -y install --no-install-recommends cmake g++ libcppunit-dev libxerces-c-dev \
-	&& git clone ${GITURL}/Profiler --branch devel --single-branch /build \
-	&& cd /build \
+	&& git clone ${GITURL}/Profiler --branch devel --single-branch /build/Profiler \
+	&& pushd /build/Profiler \
 	&& cmake -DCMAKE_BUILD_TYPE=release . \
 	&& make compileFBDic trainFrequencyList runDictSearch profiler \
 	&& mkdir /apps \
 	&& cp bin/compileFBDic bin/trainFrequencyList bin/profiler bin/runDictSearch /apps/ \
-	&& cd / \
-    && rm -rf /build
+	&& popd \
+    && rm -rf /build/Profiler
 
 FROM profiler AS languagemodel
 # install the profiler's language backend
@@ -32,13 +41,13 @@ COPY --from=profiler /apps/trainFrequencyList /apps/
 COPY --from=profiler /apps/runDictSearch /apps/
 RUN apt-get update \
 	&& apt-get -y install --no-install-recommends icu-devtools \
-	&& git clone ${GITURL}/Resources --branch master --single-branch /build \
-	&& cd /build/lexica \
+	&& git clone ${GITURL}/Resources --branch master --single-branch /build/Resources \
+	&& pushd /build/Resources/lexica \
 	&& PATH=$PATH:/apps make \
 	&& PATH=$PATH:/apps make test \
 	&& PATH=$PATH:/apps make install \
-	&& cd / \
-	&& rm -rf /build
+	&& popd \
+	&& rm -rf /build/Resources
 
 FROM base AS postcorrection
 # install ocrd_cis (python)
@@ -48,11 +57,13 @@ COPY --from=profiler /apps/profiler /apps/
 COPY --from=profiler /usr/lib/x86_64-linux-gnu/libicuuc.so /usr/lib//x86_64-linux-gnu/
 COPY --from=profiler /usr/lib/x86_64-linux-gnu/libicudata.so /usr/lib//x86_64-linux-gnu/
 COPY --from=profiler /usr/lib//x86_64-linux-gnu/libxerces-c-3.2.so /usr/lib//x86_64-linux-gnu/
-COPY . /build
+COPY . /build/ocrd_cis
 RUN apt-get update \
 	&& apt-get -y install --no-install-recommends gcc wget default-jre-headless \
-	&& cd /build \
+	&& pushd /build/ocrd_cis \
 	&& make install \
-	&& make test \
-	&& cd / \
-	&& rm -rf /build
+	# test always fail, resources not available for download. Resources should be made available
+	# somewhere else, e.g. github.com/OCR-D/assets
+	# && make test \
+	&& popd \
+	&& rm -rf /build/ocrd_cis

Makefile

@@ -2,6 +2,7 @@ PY ?= python3
 PIP ?= pip3
 V ?= > /dev/null 2>&1
 PKG = ocrd_cis
+TAG = flobar/ocrd_cis
 
 install:
 	${PIP} install --upgrade pip .
@@ -11,14 +12,17 @@ uninstall:
 	${PIP} uninstall ${PKG}
 
 docker-build: Dockerfile
-	docker build -t flobar/ocrd_cis:latest .
+	docker build \
+	--build-arg VCS_REF=$$(git rev-parse --short HEAD) \
+	--build-arg BUILD_DATE=$$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
+	-t $(TAG):latest .
 docker-push: docker-build
-	docker push flobar/ocrd_cis:latest
+	docker push $(TAG):latest
 
-TEST_SCRIPTS=$(sort $(wildcard tests/run_*.bash))
+TEST_SCRIPTS=$(sort $(filter-out tests/run_training_test.bash, $(wildcard tests/run_*.bash)))
 .PHONY: $(TEST_SCRIPTS)
 $(TEST_SCRIPTS):
 	bash $@ $V
 test: $(TEST_SCRIPTS)
-	echo $^
-.PHONY: install test
+	@echo $^
+.PHONY: install install-devel uninstall test docker-build docker-push

ocrd_cis/align/cli.py

@@ -2,7 +2,7 @@
 import click
 import json
 import os
-import Levenshtein
+from rapidfuzz.distance import Levenshtein
 from ocrd import Processor
 from ocrd.decorators import ocrd_cli_options
 from ocrd.decorators import ocrd_cli_wrap_processor

ocrd_cis/div/cutter.py

@@ -26,7 +26,7 @@ def bounding_box(coord_points):
 def resize_keep_ratio(image, baseheight=48):
     hpercent = (baseheight / float(image.size[1]))
     wsize = int((float(image.size[0] * float(hpercent))))
-    image = image.resize((wsize, baseheight), Image.ANTIALIAS)
+    image = image.resize((wsize, baseheight), Image.LANCZOS)
     return image
 
 

ocrd_cis/div/eval.py

@@ -1,6 +1,6 @@
 import os
 from PIL import Image
-from Levenshtein import distance
+from rapidfuzz.distance.Levenshtein import distance
 
 
 path = '/mnt/c/Users/chris/Documents/projects/OCR-D/daten/gt/lines/'

ocrd_cis/div/stats.py

@@ -4,7 +4,7 @@
 from ocrd import Processor
 from ocrd_cis import get_ocrd_tool
 from ocrd_models.ocrd_page_generateds import parse
-from Levenshtein import distance
+from rapidfuzz.distance import Levenshtein
 
 
 class Stats(Processor):
@@ -81,7 +81,7 @@ def process(self):
                         # print(line.get_TextEquiv()[2].dataType)
                         unicodeline = line.get_TextEquiv()[i].Unicode
 
-                        d[i] += distance(gtline, unicodeline)
+                        d[i] += Levenshtein.distance(gtline, unicodeline)
 
                         # words = line.get_Word()
                         # for word in words:

ocrd_cis/ocrd-tool.json

@@ -191,7 +191,7 @@
 			"output_file_grp": [
 				"OCR-D-SEG-LINE"
 			],
-			"description": "Resegment text lines",
+			"description": "Improve coordinates of text lines",
 			"parameters": {
 				"level-of-operation": {
 					"type": "string",
@@ -205,6 +205,11 @@
 					"description": "source for new line polygon candidates ('lineest' for line estimation, i.e. how Ocropy would have segmented text lines; 'baseline' tries to re-polygonize from the baseline annotation; 'ccomps' avoids crossing connected components by majority rule)",
 					"default": "lineest"
 				},
+				"baseline_only": {
+					"type": "boolean",
+					"description": "ignore existing textline coords completely and use baseline as input if possible",
+					"default": false
+				},
 				"dpi": {
 					"type": "number",
 					"format": "float",
@@ -217,10 +222,16 @@
 					"description": "share of foreground pixels that must be retained by the output polygons",
 					"default": 0.75
 				},
+				"spread": {
+					"type": "number",
+					"format": "float",
+					"description": "distance in points (pt) from the foreground to project textline labels into the background for polygonal contours; if zero, project half a scale/capheight",
+					"default": 2.4
+				},
 				"extend_margins": {
 					"type": "number",
 					"format": "integer",
-					"description": "number of pixels to extend the input polygons in all directions",
+					"description": "(ignored)",
 					"default": 3
 				}
 			}
@@ -293,29 +304,37 @@
 				},
 				"model": {
 					"type": "string",
-					"description": "ocropy model to apply (e.g. fraktur.pyrnn)"
+					"format": "uri",
+					"content-type": "application/gzip",
+					"description": "ocropy model to apply (e.g. fraktur.pyrnn.gz)"
 				}
-			}
-		},
-		"ocrd-cis-ocropy-rec": {
-			"executable": "ocrd-cis-ocropy-rec",
-			"categories": [
-				"Text recognition and optimization"
-			],
-			"steps": [
-				"recognition/text-recognition"
-			],
-			"input_file_grp": [
-				"OCR-D-GT-SEG-BLOCK",
-				"OCR-D-SEG-BLOCK"
-			],
-			"description": "Recognize text snippets",
-			"parameters": {
-				"model": {
-					"type": "string",
-					"description": "ocropy model to apply (e.g. fraktur.pyrnn)"
+			},
+			"resources": [
+				{
+					"url": "https://github.com/zuphilip/ocropy-models/raw/master/en-default.pyrnn.gz",
+					"name": "en-default.pyrnn.gz",
+					"description": "Default ocropy model for English",
+					"size": 83826134
+				},
+				{
+					"url": "https://github.com/zuphilip/ocropy-models/raw/master/fraktur.pyrnn.gz",
+					"name": "fraktur.pyrnn.gz",
+					"description": "Default ocropy fraktur model",
+					"size": 43882365
+				},
+				{
+					"url": "https://github.com/jze/ocropus-model_fraktur/raw/master/fraktur.pyrnn.gz",
+					"name": "fraktur-jze.pyrnn.gz",
+					"description": "ocropy fraktur model by github.com/jze",
+					"size": 2961298
+				},
+				{
+					"url": "https://github.com/chreul/OCR_Testdata_EarlyPrintedBooks/raw/master/LatinHist-98000.pyrnn.gz",
+					"name": "LatinHist.pyrnn.gz",
+					"description": "ocropy historical latin model by github.com/chreul",
+					"size": 16989864
 				}
-			}
+			]
 		},
 		"ocrd-cis-ocropy-segment": {
 			"executable": "ocrd-cis-ocropy-segment",
@@ -433,13 +452,15 @@
 			"parameters": {
 				"textequiv_level": {
 					"type": "string",
-					"description": "PAGE XML hierarchy level granularity",
+					"description": "hierarchy level to extract GT pairs from",
 					"enum": ["line", "word", "glyph"],
 					"default": "line"
 				},
 				"model": {
 					"type": "string",
-					"description": "load model or crate new one (e.g. fraktur.pyrnn)"
+					"format": "uri",
+					"content-type": "application/gzip",
+					"description": "load model (e.g. 'fraktur.pyrnn.gz') to init weights, or none to train from scratch"
 				},
 				"ntrain": {
 					"type": "number",

ocrd_cis/ocrd_tool.py

@@ -1,7 +1,6 @@
 import json
-from pkg_resources import resource_string
+from ocrd_utils import resource_string
 
 
 def get_ocrd_tool():
-    return json.loads(
-        resource_string(__name__, 'ocrd-tool.json').decode('utf8'))
+    return json.loads(resource_string(__name__, 'ocrd-tool.json'))

ocrd_cis/ocropy/binarize.py

@@ -213,10 +213,8 @@ def process_page(self, page, page_image, page_xywh, zoom, page_id, file_id):
             file_id += '.IMG-BIN'
             features += ',binarized'
         file_path = self.workspace.save_image_file(
-            bin_image,
-            file_id,
-            page_id=page_id,
-            file_grp=self.output_file_grp)
+            bin_image, file_id, self.output_file_grp,
+            page_id=page_id)
         # update PAGE (reference the image file):
         page.add_AlternativeImage(AlternativeImageType(
             filename=file_path,
@@ -263,10 +261,8 @@ def process_region(self, region, region_image, region_xywh, zoom, page_id, file_
             file_id += '.IMG-BIN'
             features += ',binarized'
         file_path = self.workspace.save_image_file(
-            bin_image,
-            file_id,
-            page_id=page_id,
-            file_grp=self.output_file_grp)
+            bin_image, file_id, self.output_file_grp,
+            page_id=page_id)
         # update PAGE (reference the image file):
         region.add_AlternativeImage(AlternativeImageType(
             filename=file_path,
@@ -306,10 +302,8 @@ def process_line(self, line, line_image, line_xywh, zoom, page_id, region_id, fi
             file_id += '.IMG-BIN'
             features += ',binarized'
         file_path = self.workspace.save_image_file(
-            bin_image,
-            file_id,
-            page_id=page_id,
-            file_grp=self.output_file_grp)
+            bin_image, file_id, self.output_file_grp,
+            page_id=page_id)
         # update PAGE (reference the image file):
         line.add_AlternativeImage(AlternativeImageType(
             filename=file_path,

ocrd_cis/ocropy/clip.py

@@ -257,10 +257,8 @@ def process_segment(self, segment, segment_mask, segment_polygon, neighbours,
         segment_image = crop_image(segment_image,box=segment_bbox)
         # update METS (add the image file):
         file_path = self.workspace.save_image_file(
-            segment_image,
-            file_id=file_id + '.IMG-CLIP',
-            page_id=page_id,
-            file_grp=self.output_file_grp)
+            segment_image, file_id + '.IMG-CLIP', self.output_file_grp,
+            page_id=page_id)
         # update PAGE (reference the image file):
         segment.add_AlternativeImage(AlternativeImageType(
             filename=file_path,