Don't process files in subdirectories

.gitlab-ci.yml

@@ -1,44 +1,68 @@
-image: docker:stable
+image: docker:19.03.13
 
 services:
-  - docker:stable-dind
-
-variables:
-  DOCKER_DRIVER: overlay2
+  - docker:19.03.13-dind
 
 stages:
   - build
   - push
 
-before_script:
-  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+variables:
+  DOCKER_TLS_CERTDIR: "/certs"
+  INTERMEDIATE_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA
 
-Build:
+.reg_setup:
+  before_script:
+    - apk add --no-cache curl
+    - curl --fail --show-error --location "https://github.com/genuinetools/reg/releases/download/v$REG_VERSION/reg-linux-amd64" --output /usr/local/bin/reg
+    - echo "$REG_SHA256  /usr/local/bin/reg" | sha256sum -c -
+    - chmod a+x /usr/local/bin/reg
+  variables:
+    REG_SHA256: ade837fc5224acd8c34732bf54a94f579b47851cc6a7fd5899a98386b782e228
+    REG_VERSION: 0.16.1
+
+build_image:
   script:
-    - docker build --pull -t $CI_REGISTRY_IMAGE:tmp .
-    - docker push $CI_REGISTRY_IMAGE:tmp
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $INTERMEDIATE_IMAGE_TAG .
+    - docker push $INTERMEDIATE_IMAGE_TAG
   stage: build
   tags:
-  - docker
+    - docker
 
-Push latest:
+push_master:
+  extends:
+    - .reg_setup
   only:
     - master
   script:
-    - docker pull $CI_REGISTRY_IMAGE:tmp
-    - docker tag $CI_REGISTRY_IMAGE:tmp $CI_REGISTRY_IMAGE:latest
-    - docker push $CI_REGISTRY_IMAGE:latest
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker pull $INTERMEDIATE_IMAGE_TAG
+    - /usr/local/bin/reg rm -d --auth-url $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $INTERMEDIATE_IMAGE_TAG
+    - docker tag $INTERMEDIATE_IMAGE_TAG $IMAGE_TAG
+    - docker push $IMAGE_TAG
   stage: push
   tags:
-  - docker
+    - docker
+  variables:
+    IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
 
-Push tag:
+push_other:
+  extends:
+    - .reg_setup
+  except:
+    - master
   only:
+    - branches
     - tags
   script:
-    - docker pull $CI_REGISTRY_IMAGE:tmp
-    - docker tag $CI_REGISTRY_IMAGE:tmp $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker pull $INTERMEDIATE_IMAGE_TAG
+    - /usr/local/bin/reg rm -d --auth-url $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $INTERMEDIATE_IMAGE_TAG
+    - docker tag $INTERMEDIATE_IMAGE_TAG $IMAGE_TAG
+    - docker push $IMAGE_TAG
   stage: push
   tags:
-  - docker
+    - docker
+  variables:
+    IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME

Dockerfile

@@ -1,73 +1,96 @@
-FROM debian:9-slim
+FROM debian:buster-slim
 
 
-# Define image metadata
-LABEL maintainer="inf_sfb1288@lists.uni-bielefeld.de"
+LABEL authors="Patrick Jentsch <p.jentsch@uni-bielefeld.de>, Stephan Porada <porada@posteo.de>"
 
 
 ENV LANG=C.UTF-8
 
 
-# Install prerequisites
 RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-      apt-transport-https \
-      ca-certificates \
-      gnupg2 \
-      imagemagick \
-      poppler-utils \
-      python2.7 \
-      python3.5 \
-      wget \
-      zip \
- && rm -rf /var/lib/apt/lists/*
+ && apt-get install --no-install-recommends --yes \
+      wget
 
-ENV OCROPY_VERSION 1.3.3
-ADD "https://github.com/tmbdev/ocropy/archive/v${OCROPY_VERSION}.tar.gz" .
-RUN tar -xzf "v${OCROPY_VERSION}.tar.gz" \
+
+# Install the OCR pipeline and it's dependencies #
+## Install pyFlow ##
+ENV PYFLOW_VERSION=1.1.20
+RUN wget --no-check-certificate --quiet \
+      "https://github.com/Illumina/pyflow/releases/download/v${PYFLOW_VERSION}/pyflow-${PYFLOW_VERSION}.tar.gz" \
+ && tar -xzf "pyflow-${PYFLOW_VERSION}.tar.gz" \
+ && cd "pyflow-${PYFLOW_VERSION}" \
+ && apt-get install --no-install-recommends --yes \
+      python2.7 \
+ && python2.7 setup.py build install \
+ && cd - > /dev/null \
+ && rm -r "pyflow-${PYFLOW_VERSION}" "pyflow-${PYFLOW_VERSION}.tar.gz"
+
+
+## Install ocropy ##
+ENV OCROPY_VERSION=1.3.3
+RUN wget --no-check-certificate --quiet \
+      "https://github.com/tmbdev/ocropy/archive/v${OCROPY_VERSION}.tar.gz" \
+ && tar -xzf "v${OCROPY_VERSION}.tar.gz" \
  && cd "ocropy-${OCROPY_VERSION}" \
- && apt-get update \
- && apt-get install -y --no-install-recommends \
+ && apt-get install --no-install-recommends --yes \
+      python2.7 \
       python-pil \
       python-tk \
       $(cat PACKAGES) \
- && rm -rf /var/lib/apt/lists/* \
  && python2.7 setup.py install \
- && cd .. \
- && rm -rf \
-      "ocropy-${OCROPY_VERSION}" \
-      "v${OCROPY_VERSION}.tar.gz"
-
-ENV PYFLOW_VERSION=1.1.20
-ADD "https://github.com/Illumina/pyflow/releases/download/v${PYFLOW_VERSION}/pyflow-${PYFLOW_VERSION}.tar.gz" .
-RUN tar -xzf "pyflow-${PYFLOW_VERSION}.tar.gz" \
- && cd "pyflow-${PYFLOW_VERSION}" \
- && python2.7 setup.py build install \
- && cd .. \
- && rm -rf \
-      "pyflow-${PYFLOW_VERSION}" \
-      "pyflow-${PYFLOW_VERSION}.tar.gz"
-
-RUN echo "deb https://notesalexp.org/tesseract-ocr/stretch/ stretch main" >> /etc/apt/sources.list \
- && wget -O - https://notesalexp.org/debian/alexp_key.asc | apt-key add - \
- && apt-get update \
- && apt-get install -y --no-install-recommends \
-      tesseract-ocr  \
-      tesseract-ocr-deu \
-      tesseract-ocr-eng \
-      tesseract-ocr-enm \
-      tesseract-ocr-fra \
-      tesseract-ocr-frk \
-      tesseract-ocr-frm \
-      tesseract-ocr-ita \
-      tesseract-ocr-por \
-      tesseract-ocr-spa \
- && rm -rf /var/lib/apt/lists/*
+ && cd - > /dev/null \
+ && rm -r "ocropy-${OCROPY_VERSION}" "v${OCROPY_VERSION}.tar.gz"
 
 
-# Install OCR pipeline
-COPY hocrtotei /usr/local/bin
-COPY ocr /usr/local/bin
+## Install Tesseract OCR ##
+ENV TESSERACT_VERSION=4.1.1
+RUN wget --no-check-certificate --quiet \
+      "https://github.com/tesseract-ocr/tesseract/archive/${TESSERACT_VERSION}.tar.gz" \
+ && tar -xzf "${TESSERACT_VERSION}.tar.gz" \
+ && cd "tesseract-${TESSERACT_VERSION}" \
+ && apt-get install --no-install-recommends --yes \
+      autoconf \
+      automake \
+      g++ \
+      libjpeg62-turbo-dev \
+      libleptonica-dev \
+      libtiff5-dev \
+      libtool \
+      libpng-dev \
+      make \
+      pkg-config \
+      zlib1g-dev \
+ && ./autogen.sh \
+ && ./configure \
+ && make \
+ && make install \
+ && ldconfig \
+ && cd - > /dev/null \
+ && rm -r "tesseract-${TESSERACT_VERSION}" "${TESSERACT_VERSION}.tar.gz"
+
+ENV TESSERACT_MODELS="ara,chi_tra,dan,deu,ell,eng,enm,fra,frk,frm,ita,por,rus,spa"
+ENV TESSDATA_BEST_VERSION=4.1.0
+RUN wget --no-check-certificate --quiet \
+      "https://github.com/tesseract-ocr/tessdata_best/archive/${TESSDATA_BEST_VERSION}.tar.gz" \
+ && tar -xzf "${TESSDATA_BEST_VERSION}.tar.gz" \
+ && for tesseract_model in $(echo ${TESSERACT_MODELS} | tr "," "\n"); do mv "tessdata_best-${TESSDATA_BEST_VERSION}/${tesseract_model}.traineddata" "/usr/local/share/tessdata/"; done \
+ && rm -r "tessdata_best-${TESSDATA_BEST_VERSION}" "${TESSDATA_BEST_VERSION}.tar.gz"
+
+
+## Further dependencies ##
+RUN apt-get install --no-install-recommends --yes \
+      procps \
+      ghostscript \
+      python3.7 \
+      rename \
+      zip
+
+
+## Install Pipeline ##
+COPY hocrtotei ocr /usr/local/bin/
+
+
+RUN rm -r /var/lib/apt/lists/*
 
 
 ENTRYPOINT ["ocr"]

README.md

@@ -1,96 +1,44 @@
-# OCR
+# OCR - Optical Character Recognition
 
-## Build image
+This software implements a heavily parallelized pipeline to recognize text in PDF files. It is used for nopaque's OCR service but you can also use it standalone, for that purpose a convenient wrapper script is provided.
 
-1. Clone this repository and navigate into it:
-```
-git clone https://gitlab.ub.uni-bielefeld.de/sfb1288inf/ocr.git && cd ocr
+## Software used in this pipeline implementation
+
+- Official Debian Docker image (buster-slim): https://hub.docker.com/_/debian
+  - Software from Debian Buster's free repositories
+- ocropy (1.3.3): https://github.com/ocropus/ocropy/releases/tag/v1.3.3
+- pyFlow (1.1.20): https://github.com/Illumina/pyflow/releases/tag/v1.1.20
+- Tesseract OCR (4.1.1): https://github.com/tesseract-ocr/tesseract/releases/tag/4.1.1
+- tessdata_best (4.1.0): https://github.com/tesseract-ocr/tessdata_best/releases/tag/4.1.0
+
+## Use this image
+
+1. Create input and output directories for the pipeline.
+``` bash
+mkdir -p /<my_data_location>/input /<my_data_location>/output
 ```
 
-2. Build image:
-```
-docker build -t sfb1288inf/ocr:latest .
-```
+2. Place your PDF files inside `/<my_data_location>/input`. Files should all contain text of the same language.
 
-Alternatively build from the GitLab repository without cloning:
-
-1. Build image:
-```
-docker build -t sfb1288inf/ocr:latest https://gitlab.ub.uni-bielefeld.de/sfb1288inf/ocr.git
+3. Start the pipeline process. Check the pipeline help (`ocr --help`) for more details.
 ```
+# Option one: Use the wrapper script
+## Install the wrapper script (only on first run). Get it from https://gitlab.ub.uni-bielefeld.de/sfb1288inf/ocr/-/raw/development/wrapper/ocr, make it executeable and add it to your ${PATH}
+cd /<my_data_location>
+ocr -i input -l <language_code> -o output <optional_pipeline_arguments>
 
-## Download prebuilt image
-
-The GitLab registry provides a prebuilt image. It is automatically created, utilizing the conquaire build servers.
-
-1. Download image:
-```
-docker pull gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/ocr:latest
-```
-
-## Run
-
-1. Create input and output directories for the OCR software:
-```
-mkdir -p /<mydatalocation>/files_for_ocr /<mydatalocation>/files_from_ocr
-```
-
-2. Place your files inside the `/<mydatalocation>/files_for_ocr` directory. Files can either be PDF (.pdf) or multipage TIFF (.tiff, .tif) files. Files should all contain text of the same language.
-
-3. Start the OCR process.
-```
+# Option two: Classic Docker style
 docker run \
     --rm \
     -it \
     -u $(id -u $USER):$(id -g $USER) \
-    -v /<mydatalocation>/files_for_ocr:/input \
-    -v /<mydatalocation>/files_from_ocr:/output \
-    sfb1288inf/ocr:latest \
-        -i /input \
-        -l <languagecode> \
-        -o /output
+    -v /<my_data_location>/input:/input \
+    -v /<my_data_location>/output:/output \
+    gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/ocr:development \
+        -i /ocr_pipeline/input \
+        -l <language_code> \
+        -o /ocr_pipeline/output \
+        <optional_pipeline_arguments>
 ```
-The arguments below `sfb1288inf/ocr:latest` are described in the [OCR arguments](#ocr-arguments) part.
 
-If you want to use the prebuilt image, replace `sfb1288inf/ocr:latest` with `gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/ocr:latest`.
-
-4. Check your results in the `/<mydatalocation>/files_from_ocr` directory.
-
-### OCR arguments
-
-`-l languagecode`
-* Tells tesseract which language will be used.
-* options = deu (German), eng (English), enm (Middle englisch), fra (French), frk (German Fraktur), frm (Middle french), ita (Italian), por (Portuguese), spa (Spanish)
-* required = True
-
-`--keep-intermediates`
-* If set, all intermediate files created during the OCR process will be
-kept.
-* default = False
-* required = False
-
-`--nCores corenumber`
-* Sets the number of CPU cores being used during the OCR process.
-* default = min(4, multiprocessing.cpu_count())
-* required = False
-
-`--skip-binarisation`
-* Used to skip binarization with ocropus. If skipped, only the tesseract binarization is used.
-* default = False
-
-Example with all arguments used:
-```
-docker run \
-    --rm \
-    -it \
-    -u $(id -u $USER):$(id -g $USER) \
-    -v "$HOME"/ocr/files_for_ocr:/input \
-    -v "$HOME"/ocr/files_from_ocr:/output \
-    sfb1288inf/ocr:latest \
-        -i /input \
-        -l eng \
-        -o /output \
-        --keep_intermediates \
-        --nCores 8 \
-        --skip-binarisation
-```
+4. Check your results in the `/<my_data_location>/output` directory.

hocrtotei

@@ -1,58 +1,57 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.7
 # coding=utf-8
 
+""""Convert hOCR to TEI XML."""
+
 from xml.sax.saxutils import escape
-import argparse
+from argparse import ArgumentParser
+import re
 import xml.etree.ElementTree as ET
 
-parser = argparse.ArgumentParser(
-    description='Merges several hOCR files in order of their occurrence on command line to one TEI result file.'
-)
-parser.add_argument(
-    'i',
-    metavar='hOCR-sourcefile',
-    nargs='+'
-)
-parser.add_argument(
-    'o',
-    metavar='TEI-destfile',
-)
+parser = ArgumentParser(description='Convert hOCR to TEI XML.')
+parser.add_argument('input', metavar='Path to hOCR input file')
+parser.add_argument('output', metavar='Path to TEI output file')
 args = parser.parse_args()
 
-output_file = open(args.o, 'w')
-
-output_file.write(
-      '<?xml version="1.0" encoding="UTF-8"?>\n'
-    + '<TEI xmlns="http://www.tei-c.org/ns/1.0" xml:id="dtabf">\n'
-    + '    <teiHeader>\n'
-    + '        <fileDesc>\n'
-    + '            <titleStmt/>\n'
-    + '            <publicationStmt/>\n'
-    + '            <sourceDesc/>\n'
-    + '        </fileDesc>\n'
-    + '        <encodingDesc/>\n'
-    + '        <profileDesc/>\n'
-    + '    </teiHeader>\n'
-    + '    <text>\n'
-    + '        <body>\n'
-)
-for index, input_file in enumerate(args.i):
-    tree = ET.parse(input_file)
-    output_file.write('            <pb n="%i"/>\n' % (index + 1))
-    for para in tree.findall('.//*[@class="ocr_par"]'):
-        output_file.write('            <p>\n')
+tei = ''
+tei += '<TEI xmlns="http://www.tei-c.org/ns/1.0">\n'
+tei += '  <teiHeader>\n'
+tei += '    <fileDesc>\n'
+tei += '      <titleStmt>\n'
+tei += '        <title></title>\n'
+tei += '      </titleStmt>\n'
+tei += '      <publicationStmt>\n'
+tei += '        <p></p>\n'
+tei += '      </publicationStmt>\n'
+tei += '      <sourceDesc>\n'
+tei += '        <p></p>\n'
+tei += '      </sourceDesc>\n'
+tei += '    </fileDesc>\n'
+tei += '  </teiHeader>\n'
+tei += '  <text>\n'
+tei += '    <body>\n'
+# Conversion start
+hocr = ET.parse(args.input)
+for page in hocr.findall('.//*[@class="ocr_page"]'):
+    page_properties = page.attrib.get('title')
+    facsimile = re.search(r'image \"(.*?)\"', page_properties).group(1)
+    page_number = re.search(r'ppageno (\d+)', page_properties).group(1)
+    tei += '      <pb facs="{}" n="{}"/>\n'.format(facsimile, page_number)
+    for para in page.findall('.//*[@class="ocr_par"]'):
+        tei += '      <p>\n'
         for line in para.findall('.//*[@class="ocr_line"]'):
-            first_word_in_line = True
+            tei += '        <lb/>'
+            indent = ''
             for word in line.findall('.//*[@class="ocrx_word"]'):
                 if word.text is not None:
-                    output_file.write(('                ' if first_word_in_line else ' ') + escape(word.text.strip()))
-                    first_word_in_line = False
-            if not first_word_in_line:
-                output_file.write('<lb/>\n')
-        output_file.write('            </p>\n')
-output_file.write(
-      '        </body>\n'
-    + '    </text>\n'
-    + '</TEI>')
+                    tei += indent + escape(word.text.strip())
+                    indent = ' '
+            tei += '\n'
+        tei += '      </p>\n'
+# Conversion end
+tei += '    </body>\n'
+tei += '  </text>\n'
+tei += '</TEI>\n'
 
-output_file.close()
+with open(args.output, 'w') as tei_file:
+    tei_file.write(tei)

ocr

@@ -1,556 +1,357 @@
 #!/usr/bin/env python2.7
 # coding=utf-8
 
+"""OCR pipeline for PDF file processing."""
 
-"""
-ocr
+__author__ = 'Patrick Jentsch <p.jentsch@uni-bielefeld.de>,' \
+             'Stephan Porada <porada@posteo.de>'
+__version__ = '1.0.0'
 
-Usage:  For usage instructions run with option --help
-Author: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
-"""
-
-
-import argparse
+from argparse import ArgumentParser
+from pyflow import WorkflowRunner
 import multiprocessing
 import os
-import re
 import sys
-from pyflow import WorkflowRunner
 
 
-def parse_arguments():
-    parser = argparse.ArgumentParser(
-        description='''Performs OCR of (historical) documents utilizing OCRopus
-                       for preprocessing and Tesseract OCR for OCR. The results
-                       are served as hOCR, PDF, raw text and TEI compliant XML
-                       files.\n
-                       Software requirements: imagemagick, ocropus, pdftoppm,
-                       pdfunite, poppler-utils, pyflow, python2.7, python3.5,
-                       tesseract'''
-    )
-    parser.add_argument(
-        '-i',
-        dest='input_dir',
-        required=True
-    )
-    parser.add_argument(
-        '-l',
-        choices=[
-            'deu', 'eng', 'enm', 'fra', 'frk', 'frm', 'ita', 'por', 'spa'
-        ],
-        dest='lang',
-        required=True
-    )
-    parser.add_argument(
-        '-o',
-        dest='output_dir',
-        required=True
-    )
-    parser.add_argument(
-        '--skip-binarisation',
-        action='store_true',
-        default=False,
-        dest='skip_binarisation',
-        help='skip ocropy binarisation',
-        required=False
-    )
-    parser.add_argument(
-        '--keep-intermediates',
-        action='store_true',
-        default=False,
-        dest='keep_intermediates',
-        help='keep intermediate files',
-        required=False
-    )
-    parser.add_argument(
-        '--nCores',
-        default=min(4, multiprocessing.cpu_count()),
-        dest='n_cores',
-        help='total number of cores available',
-        required=False,
-        type=int
-    )
-    parser.add_argument(
-        '--zip',
-        default='ocr-result-files',
-        dest='zip',
-        type=str,
-        help='package result files in zip bundles and asign an filename prefix',
-        required=False
-    )
-    return parser.parse_args()
+class OCRPipelineJob:
+    """An OCR pipeline job class
+
+    Each input file of the pipeline is represented as an OCR pipeline job,
+    which holds all necessary information for the pipeline to process it.
+
+    Arguments:
+    file -- Path to the file
+    output_dir -- Path to a directory, where job results a stored
+    """
+
+    def __init__(self, file, output_dir):
+        self.file = file
+        self.name = os.path.basename(file).rsplit('.', 1)[0]
+        self.output_dir = output_dir
+        self.page_dir = os.path.join(output_dir, 'pages')
 
 
-class OCRWorkflow(WorkflowRunner):
-    def __init__(self, args):
-        self.jobs = analyze_jobs(args.input_dir, args.output_dir)
-        self.skip_binarisation = args.skip_binarisation
-        self.keep_intermediates = args.keep_intermediates
-        self.lang = args.lang
-        self.n_cores = args.n_cores
-        self.output_dir = args.output_dir
-        self.zip = args.zip
+class OCRPipeline(WorkflowRunner):
+    def __init__(self, input_dir, lang, output_dir, binarize, zip):
+        self.input_dir = input_dir
+        self.lang = lang
+        self.output_dir = output_dir
+        self.binarize = binarize
+        self.zip = zip
+        self.jobs = collect_jobs(self.input_dir, self.output_dir)
 
     def workflow(self):
-        if len(self.jobs) == 0:
+        if not self.jobs:
             return
 
         '''
         ' ##################################################
-        ' # Create output directories                      #
+        ' # setup output directory                         #
         ' ##################################################
         '''
-        create_output_directories_jobs = []
-        for index, job in enumerate(self.jobs):
-            cmd = 'mkdir -p "%s"' % (
-                os.path.join(job['output_dir'], 'tmp')
-            )
-            if self.keep_intermediates:
-                cmd += ' "%s" "%s" "%s" "%s"' % (
-                    os.path.join(job['output_dir'], 'tmp', 'hocr'),
-                    os.path.join(job['output_dir'], 'tmp', 'pdf'),
-                    os.path.join(job['output_dir'], 'tmp', 'tiff'),
-                    os.path.join(job['output_dir'], 'tmp', 'txt')
-                )
-            if not self.skip_binarisation:
-                cmd += ' "%s"' % (
-                    os.path.join(job['output_dir'], 'tmp', 'bin.png')
-                )
-            create_output_directories_jobs.append(
-                self.addTask(
-                    command=cmd,
-                    label='create_output_directories_job_-_%i' % (index)
-                )
-            )
+        setup_output_directory_tasks = []
+        for i, job in enumerate(self.jobs):
+            cmd = 'mkdir -p "{}"'.format(job.page_dir)
+            lbl = 'setup_output_directory_-_{}'.format(i)
+            task = self.addTask(command=cmd, label=lbl)
+            setup_output_directory_tasks.append(task)
 
         '''
         ' ##################################################
-        ' # Split                                          #
+        ' # split input                                    #
         ' ##################################################
         '''
-        split_jobs = []
-        split_job_n_cores = min(
-            self.n_cores,
-            max(1, int(self.n_cores / len(self.jobs)))
-        )
-        for index, job in enumerate(self.jobs):
-            if job['filename'].endswith(('.tif', '.tiff')):
-                '''
-                ' This command also works for PDF input but ocropus-nlbin
-                ' is not able to handle the TIFF output of it.
-                '''
-                cmd = 'convert -density 300 "%s" -compress LZW -scene 1 "%s/page-%%d.tif"' % (
-                    job['path'],
-                    os.path.join(job['output_dir'], 'tmp')
-                )
-            else:
-                cmd = 'pdftoppm -r 300 -tiff -tiffcompression lzw "%s" "%s"' % (
-                    job['path'],
-                    os.path.join(job['output_dir'], 'tmp', 'page')
-                )
+        split_input_tasks = []
+        n_cores = max(1, int(self.getNCores() / len(self.jobs)))
+        for i, job in enumerate(self.jobs):
+            input_file = job.file
+            output_file = '{}/page-%d.tif'.format(job.page_dir)
+            cmd = 'gs'
+            cmd += ' -dBATCH'
+            cmd += ' -dNOPAUSE'
+            cmd += ' -dNumRenderingThreads={}'.format(n_cores)
+            cmd += ' -dQUIET'
+            cmd += ' -r300'
+            cmd += ' -sDEVICE=tiff24nc'
+            cmd += ' -sCompression=lzw'
+            cmd += ' "-sOutputFile={}"'.format(output_file)
+            cmd += ' "{}"'.format(input_file)
+            deps = 'setup_output_directory_-_{}'.format(i)
+            lbl = 'split_input_-_{}'.format(i)
+            task = self.addTask(command=cmd, dependencies=deps, label=lbl,
+                                nCores=n_cores)
+            split_input_tasks.append(task)
 
-            split_jobs.append(
-                self.addTask(
-                    command=cmd,
-                    dependencies='create_output_directories_job_-_%i' % (index),
-                    label='split_job_-_%i' % (index),
-                    nCores=split_job_n_cores
-                )
-            )
-
-        if not self.skip_binarisation:
+        if self.binarize:
             '''
-            ' The binarisation_jobs are created based of the output files of
-            ' the split_jobs. So wait until they are finished.
+            ' ##################################################
+            ' # pre binarization                               #
+            ' ##################################################
             '''
-            self.waitForTasks()
+            pre_binarization_tasks = []
+            for i, job in enumerate(self.jobs):
+                input_file = os.path.join(job.output_dir, 'binarization_input_files.txt')  # noqa
+                cmd = 'ls -dv "{}/"* >> "{}"'.format(job.page_dir, input_file)
+                deps = 'split_input_-_{}'.format(i)
+                lbl = 'pre_binarization_-_{}'.format(i)
+                task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+                pre_binarization_tasks.append(task)
 
             '''
             ' ##################################################
-            ' # Binarise                                       #
+            ' # binarization                                   #
             ' ##################################################
             '''
-            binarisation_jobs = []
-            '''
-            ' We run ocropus-nlbin with either four or, if there are less then
-            ' four cores available for this workflow, the available core
-            ' number.
-            '''
-            binarisation_job_n_cores = min(4, self.n_cores)
-            for index, job in enumerate(self.jobs):
-                files = os.listdir(os.path.join(job['output_dir'], 'tmp'))
-                files = filter(lambda x: x.endswith('.tif'), files)
-                files.sort(key=lambda x: int(re.search(r'\d+', x).group(0)))
-                files = map(
-                    lambda x: '"' + os.path.join(job['output_dir'], 'tmp', x) + '"',
-                    files
-                )
-                cmd = 'ocropus-nlbin --output "%s" --parallel "%i" %s' % (
-                    os.path.join(job['output_dir'], 'tmp'),
-                    binarisation_job_n_cores,
-                    ' '.join(files)
-                )
-                binarisation_jobs.append(
-                    self.addTask(
-                        command=cmd,
-                        dependencies='split_job_-_%i' % (index),
-                        label='binarisation_job_-_%i' % (index),
-                        nCores=binarisation_job_n_cores
-                    )
-                )
-
-            '''
-            ' The post_binarisation_jobs are created based of the output files
-            ' of the binarisation_jobs. So wait until they are finished.
-            '''
-            self.waitForTasks()
+            binarization_tasks = []
+            n_cores = self.getNCores()
+            mem_mb = self.getMemMb()
+            for i, job in enumerate(self.jobs):
+                input_file = os.path.join(job.output_dir, 'binarization_input_files.txt')  # noqa
+                cmd = 'ocropus-nlbin "@{}"'.format(input_file)
+                cmd += ' --nocheck'
+                cmd += ' --output "{}"'.format(job.page_dir)
+                cmd += ' --parallel "{}"'.format(n_cores)
+                deps = 'pre_binarization_-_{}'.format(i)
+                lbl = 'binarization_-_{}'.format(i)
+                task = self.addTask(command=cmd, dependencies=deps, label=lbl,
+                                    memMb=mem_mb, nCores=n_cores)
+                binarization_tasks.append(task)
 
             '''
             ' ##################################################
-            ' # Normalise file names from binarisation         #
+            ' # post binarization                              #
             ' ##################################################
             '''
-            post_binarisation_jobs = []
-            for index, job in enumerate(self.jobs):
-                number = 0
-                files = os.listdir(os.path.join(job['output_dir'], 'tmp'))
-                files = filter(lambda x: x.endswith('.bin.png'), files)
-                files.sort()
-                for file in files:
-                    cmd = 'mv "%s" "%s"' % (
-                        os.path.join(job['output_dir'], 'tmp', file),
-                        os.path.join(
-                            job['output_dir'],
-                            'tmp',
-                            'page-%i.bin.png' % (int(file.split('.', 1)[0]))
-                        )
-                    )
-                    post_binarisation_jobs.append(
-                        self.addTask(
-                            command=cmd,
-                            dependencies='binarisation_job_-_%i' % (index),
-                            label='post_binarisation_job_-_%i-%i' % (
-                                index,
-                                number
-                            )
-                        )
-                    )
-                    number += 1
-
-        '''
-        ' The ocr_jobs are created based of the output files of either the
-        ' split_jobs or post_binarisation_jobs. So wait until they are
-        ' finished.
-        '''
-        self.waitForTasks()
+            post_binarization_tasks = []
+            for i, job in enumerate(self.jobs):
+                input_file = os.path.join(job.output_dir, 'binarization_input_files.txt')  # noqa
+                cmd = 'rm "{}"'.format(input_file)
+                cmd += ' && '
+                cmd += 'cd "{}"'.format(job.page_dir)
+                cmd += ' && '
+                cmd += 'rm *.{nrm.png,tif}'
+                cmd += ' && '
+                cmd += 'rename \'s/^0*/page-/\' *'
+                cmd += ' && '
+                cmd += 'cd -'
+                deps = 'binarization_-_{}'.format(i)
+                lbl = 'post_binarization_-_{}'.format(i)
+                task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+                post_binarization_tasks.append(task)
 
         '''
         ' ##################################################
-        ' # Optical Character Recognition                  #
+        ' # pre ocr                                        #
         ' ##################################################
         '''
-        ocr_jobs = []
-        '''
-        ' Tesseract runs fastest with four cores. So we run it with either four
-        ' or, if there are less then four cores available for this workflow,
-        ' the available core number.
-        '''
-        ocr_job_n_cores = min(4, self.n_cores)
-        for index, job in enumerate(self.jobs):
-            files = os.listdir(os.path.join(job['output_dir'], 'tmp'))
-            if self.skip_binarisation:
-                files = filter(lambda x: x.endswith('.tif'), files)
-            else:
-                files = filter(lambda x: x.endswith('.bin.png'), files)
-            files.sort(key=lambda x: int(re.search(r'\d+', x).group(0)))
-            files = map(
-                lambda x: os.path.join(job['output_dir'], 'tmp', x),
-                files
-            )
-            number = 0
-            for file in files:
-                cmd = 'tesseract "%s" "%s" -l "%s" hocr pdf txt' % (
-                    file,
-                    os.path.join(
-                        job['output_dir'],
-                        'tmp',
-                        file.rsplit('.', 1 if self.skip_binarisation else 2)[0]
-                    ),
-                    self.lang
-                )
-                if self.skip_binarisation:
-                    ocr_job_dependencies = 'split_job_-_%i' % (index)
-                else:
-                    ocr_job_dependencies = filter(
-                        lambda x: x == 'post_binarisation_job_-_%i-%i' % (
-                            index,
-                            number
-                        ),
-                        post_binarisation_jobs
-                    )
-                ocr_jobs.append(
-                    self.addTask(
-                        command=cmd,
-                        dependencies=ocr_job_dependencies,
-                        label='ocr_job_-_%i-%i' % (index, number),
-                        nCores=ocr_job_n_cores
-                    )
-                )
-                number += 1
-
-        '''
-        ' The following jobs are created based of the output files of the
-        ' ocr_jobs. So wait until they are finished.
-        '''
-        self.waitForTasks()
+        pre_ocr_tasks = []
+        for i, job in enumerate(self.jobs):
+            input_file = os.path.join(job.output_dir, 'ocr_input_files.txt')
+            cmd = 'ls -dv "{}/"* >> "{}"'.format(job.page_dir, input_file)
+            deps = 'post_binarization_-_{}'.format(i) if self.binarize else 'split_input_-_{}'.format(i)  # noqa
+            lbl = 'pre_ocr_-_{}'.format(i)
+            task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+            pre_ocr_tasks.append(task)
 
         '''
         ' ##################################################
-        ' # Create TEI P5 files                            #
+        ' # ocr                                            #
         ' ##################################################
         '''
-        hocr_to_tei_jobs = []
-        for index, job in enumerate(self.jobs):
-            files = os.listdir(os.path.join(job['output_dir'], 'tmp'))
-            files = filter(lambda x: x.endswith('.hocr'), files)
-            files.sort(key=lambda x: int(re.search(r'\d+', x).group(0)))
-            files = map(
-                lambda x: '"' + os.path.join(job['output_dir'], 'tmp', x) + '"',
-                files
-            )
-            cmd = 'hocrtotei %s "%s"' % (
-                ' '.join(files),
-                os.path.join(
-                    job['output_dir'],
-                    os.path.join(job['output_dir'], job['name'] + '.xml')
-                )
-            )
-            hocr_to_tei_jobs.append(
-                self.addTask(
-                    command=cmd,
-                    dependencies=filter(
-                        lambda x: x.startswith('ocr_job_-_%i' % (index)),
-                        ocr_jobs
-                    ),
-                    label='hocr_to_tei_job_-_%i' % (index)
-                )
-            )
+        ocr_tasks = []
+        n_cores = min(4, self.getNCores())
+        mem_mb = min(n_cores * 2048, self.getMemMb())
+        for i, job in enumerate(self.jobs):
+            input_file = os.path.join(job.output_dir, 'ocr_input_files.txt')
+            output_file_base = os.path.join(job.output_dir, job.name)
+            cmd = 'tesseract "{}" "{}"'.format(input_file, output_file_base)
+            cmd += ' -l "{}"'.format(self.lang)
+            cmd += ' hocr pdf txt'
+            deps = 'pre_ocr_-_{}'.format(i)
+            lbl = 'ocr_-_{}'.format(i)
+            task = self.addTask(command=cmd, dependencies=deps,
+                                env={'OMP_THREAD_LIMIT': '{}'.format(n_cores)},
+                                label=lbl, memMb=mem_mb, nCores=n_cores)
+            ocr_tasks.append(task)
 
         '''
         ' ##################################################
-        ' # Merge PDF files                                #
+        ' # post ocr                                       #
         ' ##################################################
         '''
-        pdf_merge_jobs = []
-        for index, job in enumerate(self.jobs):
-            files = os.listdir(os.path.join(job['output_dir'], 'tmp'))
-            files = filter(lambda x: x.endswith('.pdf'), files)
-            files.sort(key=lambda x: int(re.search(r'\d+', x).group(0)))
-            files = map(
-                lambda x: '"' + os.path.join(job['output_dir'], 'tmp', x) + '"',
-                files
-            )
-            cmd = 'pdfunite %s "%s"' % (
-                ' '.join(files),
-                os.path.join(
-                    job['output_dir'],
-                    os.path.join(job['output_dir'], job['name'] + '.pdf')
-                )
-            )
-            pdf_merge_jobs.append(
-                self.addTask(
-                    command=cmd,
-                    dependencies=filter(
-                        lambda x: x.startswith('ocr_job_-_%i' % (index)),
-                        ocr_jobs
-                    ),
-                    label='pdf_merge_job_-_%i' % (index)
-                )
-            )
+        post_ocr_tasks = []
+        for i, job in enumerate(self.jobs):
+            input_file = os.path.join(job.output_dir, 'ocr_input_files.txt')
+            output_file_base = os.path.join(job.output_dir, job.name)
+            cmd = 'rm "{}"'.format(input_file)
+            cmd += ' && '
+            cmd += 'sed -i \'s+{}+pages+g\' "{}.hocr"'.format(job.page_dir, output_file_base)  # noqa
+            deps = 'ocr_-_{}'.format(i)
+            lbl = 'post_ocr_-_{}'.format(i)
+            task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+            post_ocr_tasks.append(task)
 
         '''
         ' ##################################################
-        ' # Merge text files                               #
+        ' # hocr to tei                                    #
         ' ##################################################
         '''
-        txt_merge_jobs = []
-        for index, job in enumerate(self.jobs):
-            files = os.listdir(os.path.join(job['output_dir'], 'tmp'))
-            files = filter(lambda x: x.endswith('.txt'), files)
-            files.sort(key=lambda x: int(re.search(r'\d+', x).group(0)))
-            files = map(
-                lambda x: '"' + os.path.join(job['output_dir'], 'tmp', x) + '"',
-                files
-            )
-            cmd = 'cat %s > "%s"' % (
-                ' '.join(files),
-                os.path.join(
-                    job['output_dir'],
-                    os.path.join(job['output_dir'], job['name'] + '.txt')
-                )
-            )
-            txt_merge_jobs.append(
-                self.addTask(
-                    command=cmd,
-                    dependencies=filter(
-                        lambda x: x.startswith('ocr_job_-_%i' % (index)),
-                        ocr_jobs
-                    ),
-                    label='txt_merge_job_-_%i' % (index)
-                )
-            )
-
-        if self.zip:
-            all_zip_jobs = []
-            all_zip_job_dependencies = (hocr_to_tei_jobs
-                                        + pdf_merge_jobs
-                                        + txt_merge_jobs)
-            cmd = 'cd "%s" && zip "%s"-all-ocr-files.zip */*.{pdf,txt,xml} -x "pyflow.data*" && cd -' % (
-                self.output_dir,
-                self.zip
-            )
-            all_zip_jobs.append(
-                self.addTask(
-                    command=cmd,
-                    dependencies=all_zip_job_dependencies,
-                    label='all_zip_job'
-                )
-            )
-
-            pdf_zip_jobs = []
-            pdf_zip_job_dependencies = all_zip_jobs
-            cmd = 'cd "%s" && zip -m "%s"-ocr-pdf.zip */*.pdf -x "pyflow.data*" && cd -' % (
-                self.output_dir,
-                self.zip
-            )
-            pdf_zip_jobs.append(
-                self.addTask(
-                    command=cmd,
-                    dependencies=pdf_zip_job_dependencies,
-                    label='pdf_zip_job'
-                )
-            )
-
-            txt_zip_jobs = []
-            txt_zip_job_dependencies = all_zip_jobs
-            cmd = 'cd "%s" && zip -m "%s"-ocr-txt.zip */*.txt -x "pyflow.data*" && cd -' % (
-                self.output_dir,
-                self.zip
-            )
-            txt_zip_jobs.append(
-                self.addTask(
-                    command=cmd,
-                    dependencies=txt_zip_job_dependencies,
-                    label='txt_zip_job'
-                )
-            )
-
-            xml_zip_jobs = []
-            xml_zip_job_dependencies = all_zip_jobs
-            cmd = 'cd "%s" && zip -m "%s"-ocr-xml.zip */*.xml -x "pyflow.data*" && cd -' % (
-                self.output_dir,
-                self.zip
-            )
-            xml_zip_jobs.append(
-                self.addTask(
-                    command=cmd,
-                    dependencies=xml_zip_job_dependencies,
-                    label='xml_zip_job'
-                )
-            )
+        hocr_to_tei_tasks = []
+        for i, job in enumerate(self.jobs):
+            output_file_base = os.path.join(job.output_dir, job.name)
+            cmd = 'hocrtotei "{}.hocr" "{}.xml"'.format(output_file_base, output_file_base)  # noqa
+            deps = 'post_ocr_-_{}'.format(i)
+            lbl = 'hocr_to_tei_-_{}'.format(i)
+            task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+            hocr_to_tei_tasks.append(task)
 
         '''
         ' ##################################################
-        ' # Cleanup                                        #
+        ' # zip creation                                   #
         ' ##################################################
         '''
-        cleanup_jobs = []
-        if self.keep_intermediates:
-            for index, job in enumerate(self.jobs):
-                cleanup_job_dependencies = [
-                    'hocr_to_tei_job_-_%i' % (index),
-                    'pdf_merge_job_-_%i' % (index),
-                    'txt_merge_job_-_%i' % (index)
-                ]
-                cmd = 'mv "%s"/*.hocr "%s"' % (
-                    os.path.join(job['output_dir'], 'tmp'),
-                    os.path.join(job['output_dir'], 'tmp', 'hocr'),
-                )
-                cmd += ' && mv "%s"/*.pdf "%s"' % (
-                    os.path.join(job['output_dir'], 'tmp'),
-                    os.path.join(job['output_dir'], 'tmp', 'pdf'),
-                )
-                cmd += ' && mv "%s"/*.tif "%s"' % (
-                    os.path.join(job['output_dir'], 'tmp'),
-                    os.path.join(job['output_dir'], 'tmp', 'tiff'),
-                )
-                cmd += ' && mv "%s"/*.txt "%s"' % (
-                    os.path.join(job['output_dir'], 'tmp'),
-                    os.path.join(job['output_dir'], 'tmp', 'txt'),
-                )
-                if not self.skip_binarisation:
-                    cmd += ' && mv "%s"/*.bin.png "%s"' % (
-                        os.path.join(job['output_dir'], 'tmp'),
-                        os.path.join(job['output_dir'], 'tmp', 'bin.png'),
-                    )
-                    cmd += ' && rm "%s"/*.nrm.png' % (
-                        os.path.join(job['output_dir'], 'tmp')
-                    )
-                cleanup_jobs.append(
-                    self.addTask(
-                        command=cmd,
-                        dependencies=cleanup_job_dependencies,
-                        label='cleanup_job_-_%i' % (index)
-                    )
-                )
-        else:
-            for index, job in enumerate(self.jobs):
-                cleanup_job_dependencies = [
-                    'hocr_to_tei_job_-_%i' % (index),
-                    'pdf_merge_job_-_%i' % (index),
-                    'txt_merge_job_-_%i' % (index)
-                ]
-                cmd = 'rm -r "%s"' % (
-                    os.path.join(job['output_dir'], 'tmp')
-                )
-                cleanup_jobs.append(
-                    self.addTask(
-                        command=cmd,
-                        dependencies=cleanup_job_dependencies,
-                        label='cleanup_job_-_%i' % (index)
-                    )
-                )
+        zip_creation_tasks = []
+        if self.zip is not None:
+            # zip all files
+            cmd = 'cd "{}"'.format(self.output_dir)
+            cmd += ' && '
+            cmd += 'zip'
+            cmd += ' -r'
+            cmd += ' "{}.all.zip" .'.format(self.zip)
+            cmd += ' -x "pyflow.data*" "*tmp*"'
+            cmd += ' -i "*.pdf" "*.txt" "*.xml" "*.hocr" "*.{}"'.format('bin.png' if self.binarize else 'tif')  # noqa
+            cmd += ' && '
+            cmd += 'cd -'
+            deps = hocr_to_tei_tasks
+            lbl = 'zip_creation_-_all'
+            task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+            zip_creation_tasks.append(task)
+            # zip PDF files
+            cmd = 'cd "{}"'.format(self.output_dir)
+            cmd += ' && '
+            cmd += 'zip'
+            cmd += ' -r'
+            cmd += ' "{}.pdf.zip" .'.format(self.zip)
+            cmd += ' -x "pyflow.data*" "*tmp*"'
+            cmd += ' -i "*.pdf"'
+            cmd += ' && '
+            cmd += 'cd -'
+            deps = ocr_tasks
+            lbl = 'zip_creation_-_pdf'
+            task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+            zip_creation_tasks.append(task)
+            # zip TXT files
+            cmd = 'cd "{}"'.format(self.output_dir)
+            cmd += ' && '
+            cmd += 'zip'
+            cmd += ' -r'
+            cmd += ' "{}.txt.zip" .'.format(self.zip)
+            cmd += ' -x "pyflow.data*" "*tmp*"'
+            cmd += ' -i "*.txt"'
+            cmd += ' && '
+            cmd += 'cd -'
+            deps = ocr_tasks
+            lbl = 'zip_creation_-_txt'
+            task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+            zip_creation_tasks.append(task)
+            # zip XML files
+            cmd = 'cd "{}"'.format(self.output_dir)
+            cmd += ' && '
+            cmd += 'zip'
+            cmd += ' -r'
+            cmd += ' "{}.xml.zip" .'.format(self.zip)
+            cmd += ' -x "pyflow.data*" "*tmp*"'
+            cmd += ' -i "*.xml"'
+            cmd += ' && '
+            cmd += 'cd -'
+            deps = hocr_to_tei_tasks
+            lbl = 'zip_creation_-_xml'
+            task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+            zip_creation_tasks.append(task)
+            # zip PoCo bundles
+            cmd = 'cd "{}"'.format(self.output_dir)
+            cmd += ' && '
+            cmd += 'zip'
+            cmd += ' -r'
+            cmd += ' "{}.poco.zip" .'.format(self.zip)
+            cmd += ' -x "pyflow.data*" "*tmp*"'
+            cmd += ' -i "*.hocr" "*.{}"'.format('bin.png' if self.binarize else 'tif')  # noqa
+            cmd += ' && '
+            cmd += 'cd -'
+            deps = post_ocr_tasks
+            lbl = 'zip_creation_-_poco'
+            task = self.addTask(command=cmd, dependencies=deps, label=lbl)
+            zip_creation_tasks.append(task)
 
 
-def analyze_jobs(input_dir, output_dir):
+def collect_jobs(input_dir, output_dir):
     jobs = []
-
     for file in os.listdir(input_dir):
         if os.path.isdir(os.path.join(input_dir, file)):
-            jobs += analyze_jobs(
-                os.path.join(input_dir, file),
-                os.path.join(output_dir, file)
-            )
-        elif file.endswith(('.pdf', '.tif', '.tiff')):
-            jobs.append(
-                {
-                    'filename': file,
-                    'name': file.rsplit('.', 1)[0],
-                    'output_dir': os.path.join(output_dir, file),
-                    'path': os.path.join(input_dir, file)
-                }
-            )
-
+            continue
+        if file.lower().endswith('.pdf'):
+            job = OCRPipelineJob(os.path.join(input_dir, file),
+                                 os.path.join(output_dir, file))
+            jobs.append(job)
     return jobs
 
 
+def parse_args():
+    parser = ArgumentParser(description='OCR pipeline for PDF file processing',
+                            prog='OCR pipeline')
+    parser.add_argument('-i', '--input-dir',
+                        help='Input directory',
+                        required=True)
+    parser.add_argument('-o', '--output-dir',
+                        help='Output directory',
+                        required=True)
+    parser.add_argument('-l', '--language',
+                        choices=list(map(lambda x: x[:-12], filter(lambda x: x.endswith('.traineddata'), os.listdir('/usr/local/share/tessdata')))),  # noqa
+                        help='Language of the input '
+                             '(3-character ISO 639-2 language codes)',
+                        required=True)
+    parser.add_argument('--binarize',
+                        action='store_true',
+                        help='Add binarization as a preprocessing step')
+    parser.add_argument('--log-dir',
+                        help='Logging directory')
+    parser.add_argument('--mem-mb',
+                        help='Amount of system memory to be used (Default: min(--n-cores * 2048, available system memory))',  # noqa
+                        type=int)
+    parser.add_argument('--n-cores',
+                        default=min(4, multiprocessing.cpu_count()),
+                        help='Number of CPU threads to be used (Default: min(4, number of CPUs))',  # noqa
+                        type=int)
+    parser.add_argument('--zip',
+                        help='Create one zip file per filetype')
+    parser.add_argument('-v', '--version',
+                        action='version',
+                        help='Returns the current version of the OCR pipeline',
+                        version='%(prog)s {}'.format(__version__))
+    args = parser.parse_args()
+
+    # Set some tricky default values and check for insufficient input
+    if args.log_dir is None:
+        args.log_dir = args.output_dir
+    if args.n_cores < 1:
+        raise Exception('--n-cores must be greater or equal 1')
+    if args.mem_mb is None:
+        max_mem_mb = int(os.popen('free -t -m').readlines()[-1].split()[1:][0])
+        args.mem_mb = min(args.n_cores * 2048, max_mem_mb)
+    if args.mem_mb < 2048:
+        raise Exception('--mem-mb must be greater or equal 2048')
+    if args.zip is not None and args.zip.lower().endswith('.zip'):
+        # Remove .zip file extension if provided
+        args.zip = args.zip[:-4]
+        args.zip = args.zip if args.zip else 'output'
+    return args
+
+
 def main():
-    args = parse_arguments()
-
-    wflow = OCRWorkflow(args)
-
-    retval = wflow.run(dataDirRoot=args.output_dir, nCores=args.n_cores)
-
+    args = parse_args()
+    ocr_pipeline = OCRPipeline(args.input_dir, args.language, args.output_dir, args.binarize, args.zip)  # noqa
+    retval = ocr_pipeline.run(dataDirRoot=args.log_dir, memMb=args.mem_mb, nCores=args.n_cores)  # noqa
     sys.exit(retval)
 
 

wrapper/ocr

@@ -1,39 +1,38 @@
 #!/usr/bin/env python3
 # coding=utf-8
 
-import argparse
+from argparse import ArgumentParser
 import os
 import subprocess
+import sys
 
-container_image = 'gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/ocr:latest'
-container_input_dir = '/input'
-container_output_dir = '/output'
-uid = str(os.getuid())
-gid = str(os.getgid())
+CONTAINER_IMAGE = 'gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/ocr:1.0.0'
+CONTAINER_INPUT_DIR = '/input'
+CONTAINER_OUTPUT_DIR = '/output'
+CONTAINER_LOG_DIR = '/logs'
+UID = str(os.getuid())
+GID = str(os.getgid())
 
-parser = argparse.ArgumentParser(add_help=False)
-parser.add_argument(
-    '-i',
-    dest='input_dir',
-    required=False
-)
-parser.add_argument(
-    '-o',
-    dest='output_dir',
-    required=False
-)
+parser = ArgumentParser(add_help=False)
+parser.add_argument('-i', '--input-dir')
+parser.add_argument('-o', '--output-dir')
+parser.add_argument('--log-dir')
 args, remaining_args = parser.parse_known_args()
 
-cmd = ['docker', 'run', '--rm', '-it', '-u', uid + ':' + gid]
+cmd = ['docker', 'run', '--rm', '-it', '-u', '{}:{}'.format(UID, GID)]
 if args.input_dir is not None:
-    host_input_dir = os.path.abspath(args.input_dir)
-    cmd += ['-v', host_input_dir + ':' + container_input_dir]
-    remaining_args += ['-i', container_input_dir]
+    mapping = os.path.abspath(args.input_dir) + ':' + CONTAINER_INPUT_DIR
+    cmd += ['-v', mapping]
+    remaining_args += ['-i', CONTAINER_INPUT_DIR]
 if args.output_dir is not None:
-    host_output_dir = os.path.abspath(args.output_dir)
-    cmd += ['-v', host_output_dir + ':' + container_output_dir]
-    remaining_args += ['-o', container_output_dir]
-cmd.append(container_image)
+    mapping = os.path.abspath(args.output_dir) + ':' + CONTAINER_OUTPUT_DIR
+    cmd += ['-v', mapping]
+    remaining_args += ['-o', CONTAINER_OUTPUT_DIR]
+if args.log_dir is not None:
+    mapping = os.path.abspath(args.log_dir) + ':' + CONTAINER_LOG_DIR
+    cmd += ['-v', mapping]
+    remaining_args += ['--log-dir', CONTAINER_LOG_DIR]
+cmd.append(CONTAINER_IMAGE)
 cmd += remaining_args
 
-subprocess.run(cmd)
+sys.exit(subprocess.run(cmd).returncode)