ocrd 3.6.0__py3-none-any.whl → 3.8.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ocrd/cli/__init__.py +2 -4
- ocrd/cli/bashlib.py +6 -117
- ocrd/cli/network.py +2 -0
- ocrd/cli/resmgr.py +29 -65
- ocrd/constants.py +0 -2
- ocrd/mets_server.py +5 -5
- ocrd/processor/base.py +6 -16
- ocrd/processor/builtin/dummy/ocrd-tool.json +25 -0
- ocrd/processor/builtin/merge_processor.py +131 -0
- ocrd/processor/builtin/param_command_header2unordered.json +7 -0
- ocrd/processor/builtin/param_command_heading2unordered.json +7 -0
- ocrd/processor/builtin/param_command_lines2orientation.json +6 -0
- ocrd/processor/builtin/param_command_page-update-version.json +5 -0
- ocrd/processor/builtin/param_command_transkribus-to-prima.json +8 -0
- ocrd/processor/builtin/shell_processor.py +128 -0
- ocrd/resource_manager.py +213 -124
- {ocrd-3.6.0.dist-info → ocrd-3.8.0.dist-info}/METADATA +23 -10
- {ocrd-3.6.0.dist-info → ocrd-3.8.0.dist-info}/RECORD +40 -34
- {ocrd-3.6.0.dist-info → ocrd-3.8.0.dist-info}/entry_points.txt +2 -0
- ocrd_models/ocrd_agent.py +3 -3
- ocrd_network/__init__.py +1 -0
- ocrd_network/cli/__init__.py +2 -0
- ocrd_network/cli/resmgr_server.py +23 -0
- ocrd_network/constants.py +3 -0
- ocrd_network/logging_utils.py +5 -0
- ocrd_network/models/job.py +29 -28
- ocrd_network/models/messages.py +3 -2
- ocrd_network/models/workspace.py +4 -4
- ocrd_network/resource_manager_server.py +182 -0
- ocrd_network/runtime_data/connection_clients.py +1 -1
- ocrd_network/runtime_data/hosts.py +43 -16
- ocrd_network/runtime_data/network_agents.py +15 -1
- ocrd_utils/__init__.py +5 -1
- ocrd_utils/constants.py +5 -0
- ocrd_utils/logging.py +3 -0
- ocrd_utils/os.py +142 -62
- ocrd_validators/ocrd_tool.schema.yml +7 -4
- ocrd/cli/log.py +0 -56
- ocrd/lib.bash +0 -310
- ocrd/resource_list.yml +0 -61
- {ocrd-3.6.0.dist-info → ocrd-3.8.0.dist-info}/LICENSE +0 -0
- {ocrd-3.6.0.dist-info → ocrd-3.8.0.dist-info}/WHEEL +0 -0
- {ocrd-3.6.0.dist-info → ocrd-3.8.0.dist-info}/top_level.txt +0 -0
ocrd/cli/__init__.py
CHANGED
|
@@ -32,12 +32,11 @@ from ..decorators import ocrd_loglevel
|
|
|
32
32
|
from .ocrd_tool import ocrd_tool_cli
|
|
33
33
|
from .workspace import workspace_cli
|
|
34
34
|
from .process import process_cli
|
|
35
|
-
from .bashlib import bashlib_cli
|
|
36
35
|
from .validate import validate_cli
|
|
37
36
|
from .resmgr import resmgr_cli
|
|
38
37
|
from .zip import zip_cli
|
|
39
|
-
from .log import log_cli
|
|
40
38
|
from .network import network_cli
|
|
39
|
+
from .bashlib import bashlib_cli
|
|
41
40
|
|
|
42
41
|
|
|
43
42
|
__all__ = ['cli']
|
|
@@ -117,9 +116,8 @@ def cli(**kwargs): # pylint: disable=unused-argument
|
|
|
117
116
|
cli.add_command(ocrd_tool_cli)
|
|
118
117
|
cli.add_command(workspace_cli)
|
|
119
118
|
cli.add_command(process_cli)
|
|
120
|
-
cli.add_command(bashlib_cli)
|
|
121
119
|
cli.add_command(zip_cli)
|
|
122
120
|
cli.add_command(validate_cli)
|
|
123
|
-
cli.add_command(log_cli)
|
|
124
121
|
cli.add_command(resmgr_cli)
|
|
125
122
|
cli.add_command(network_cli)
|
|
123
|
+
cli.add_command(bashlib_cli)
|
ocrd/cli/bashlib.py
CHANGED
|
@@ -6,24 +6,14 @@ OCR-D CLI: bash library
|
|
|
6
6
|
:nested: full
|
|
7
7
|
|
|
8
8
|
"""
|
|
9
|
-
from __future__ import print_function
|
|
10
|
-
import sys
|
|
11
|
-
import click
|
|
12
9
|
|
|
10
|
+
# WARNING: bashlib processors have been deprecated as of v3 of the OCR-D/core API
|
|
11
|
+
# and will be removed in v3.7.0. We retain the `ocrd bashlib` CLI only
|
|
12
|
+
# to not break the `ocrd bashlib filename` command, which is used in CD
|
|
13
|
+
# scripts to get the `share` directory of the core installation.
|
|
14
|
+
|
|
15
|
+
import click
|
|
13
16
|
from ocrd.constants import BASHLIB_FILENAME
|
|
14
|
-
import ocrd.constants
|
|
15
|
-
import ocrd_utils.constants
|
|
16
|
-
from ocrd_utils.constants import DEFAULT_METS_BASENAME
|
|
17
|
-
import ocrd_models.constants
|
|
18
|
-
import ocrd_validators.constants
|
|
19
|
-
from ocrd.decorators import (
|
|
20
|
-
parameter_option,
|
|
21
|
-
parameter_override_option,
|
|
22
|
-
ocrd_loglevel,
|
|
23
|
-
ocrd_cli_wrap_processor
|
|
24
|
-
)
|
|
25
|
-
from ocrd_utils import make_file_id
|
|
26
|
-
from ocrd.processor import Processor
|
|
27
17
|
|
|
28
18
|
# ----------------------------------------------------------------------
|
|
29
19
|
# ocrd bashlib
|
|
@@ -50,104 +40,3 @@ def bashlib_filename():
|
|
|
50
40
|
"""
|
|
51
41
|
print(BASHLIB_FILENAME)
|
|
52
42
|
|
|
53
|
-
|
|
54
|
-
@bashlib_cli.command('constants')
|
|
55
|
-
@click.argument('name')
|
|
56
|
-
def bashlib_constants(name):
|
|
57
|
-
"""
|
|
58
|
-
Query constants from ocrd_utils and ocrd_models
|
|
59
|
-
"""
|
|
60
|
-
all_constants = {}
|
|
61
|
-
for src in [ocrd.constants, ocrd_utils.constants, ocrd_models.constants, ocrd_validators.constants]:
|
|
62
|
-
for k in src.__all__:
|
|
63
|
-
all_constants[k] = src.__dict__[k]
|
|
64
|
-
if name in ['*', 'KEYS', '__all__']:
|
|
65
|
-
print(sorted(all_constants.keys()))
|
|
66
|
-
sys.exit(0)
|
|
67
|
-
if name not in all_constants:
|
|
68
|
-
print("ERROR: name '%s' is not a known constant" % name, file=sys.stderr)
|
|
69
|
-
sys.exit(1)
|
|
70
|
-
val = all_constants[name]
|
|
71
|
-
if isinstance(val, dict):
|
|
72
|
-
# make this bash-friendly (show initialization for associative array)
|
|
73
|
-
for key in val:
|
|
74
|
-
print("[%s]=%s" % (key, val[key]), end=' ')
|
|
75
|
-
else:
|
|
76
|
-
print(val)
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
@bashlib_cli.command('input-files')
|
|
80
|
-
@click.option('--ocrd-tool', help="path to ocrd-tool.json of processor to feed", default=None)
|
|
81
|
-
@click.option('--executable', help="name of processor executable in ocrd-tool.json", default=None)
|
|
82
|
-
@click.option('-m', '--mets', help="METS to process", default=DEFAULT_METS_BASENAME)
|
|
83
|
-
@click.option('-U', '--mets-server-url', help='TCP host URI or UDS path of METS server', default=None)
|
|
84
|
-
@click.option('-d', '--working-dir', help="Working Directory")
|
|
85
|
-
@click.option('-I', '--input-file-grp', help='File group(s) used as input.', default=None)
|
|
86
|
-
@click.option('-O', '--output-file-grp', help='File group(s) used as output.', default=None)
|
|
87
|
-
@click.option('-g', '--page-id', help="ID(s) of the pages to process")
|
|
88
|
-
@click.option('--overwrite', is_flag=True, default=False, help="Remove output pages/images if they already exist\n"
|
|
89
|
-
"(with '--page-id', remove only those).\n"
|
|
90
|
-
"Short-hand for OCRD_EXISTING_OUTPUT=OVERWRITE")
|
|
91
|
-
@click.option('--debug', is_flag=True, default=False, help="Abort on any errors with full stack trace.\n"
|
|
92
|
-
"Short-hand for OCRD_MISSING_OUTPUT=ABORT")
|
|
93
|
-
@parameter_option
|
|
94
|
-
@parameter_override_option
|
|
95
|
-
@ocrd_loglevel
|
|
96
|
-
def bashlib_input_files(ocrd_tool, executable, **kwargs):
|
|
97
|
-
"""
|
|
98
|
-
List input files for processing
|
|
99
|
-
|
|
100
|
-
Instantiate a processor and workspace from the given processing options.
|
|
101
|
-
Then loop through the input files of the input fileGrp, and for each one,
|
|
102
|
-
print its `url`, `ID`, `mimetype` and `pageId`, as well as its recommended
|
|
103
|
-
`outputFileId` (from ``make_file_id``).
|
|
104
|
-
|
|
105
|
-
(The printing format is one associative array initializer per line.)
|
|
106
|
-
"""
|
|
107
|
-
class BashlibProcessor(Processor):
|
|
108
|
-
# go half way of the normal run_processor / process_workspace call tree
|
|
109
|
-
# by just delegating to process_workspace, overriding process_page_file
|
|
110
|
-
# to ensure all input files exist locally (without persisting them in the METS)
|
|
111
|
-
# and print what needs to be acted on in bash-friendly way
|
|
112
|
-
def process_page_file(self, *input_files):
|
|
113
|
-
for field in ['url', 'local_filename', 'ID', 'mimetype', 'pageId']:
|
|
114
|
-
# make this bash-friendly (show initialization for associative array)
|
|
115
|
-
if len(input_files) > 1:
|
|
116
|
-
# single quotes allow us to preserve the list value inside the alist
|
|
117
|
-
value = ' '.join(str(getattr(res, field)) for res in input_files)
|
|
118
|
-
else:
|
|
119
|
-
value = str(getattr(input_files[0], field))
|
|
120
|
-
print(f"[{field}]='{value}'", end=' ')
|
|
121
|
-
output_file_id = make_file_id(input_files[0], kwargs['output_file_grp'])
|
|
122
|
-
print(f"[outputFileId]='{output_file_id}'")
|
|
123
|
-
if ocrd_tool and executable:
|
|
124
|
-
class FullBashlibProcessor(BashlibProcessor):
|
|
125
|
-
@property
|
|
126
|
-
def metadata_location(self):
|
|
127
|
-
# needed for metadata loading and validation mechanism
|
|
128
|
-
return ocrd_tool
|
|
129
|
-
|
|
130
|
-
@property
|
|
131
|
-
def executable(self):
|
|
132
|
-
# needed for ocrd_tool lookup
|
|
133
|
-
return executable
|
|
134
|
-
processor_class = FullBashlibProcessor
|
|
135
|
-
else:
|
|
136
|
-
# we have no true metadata file, so fill in just to make it work
|
|
137
|
-
class UnknownBashlibProcessor(BashlibProcessor):
|
|
138
|
-
@property
|
|
139
|
-
def ocrd_tool(self):
|
|
140
|
-
# needed to satisfy the validator
|
|
141
|
-
return {'executable': '',
|
|
142
|
-
# required now
|
|
143
|
-
'input_file_grp_cardinality': 1,
|
|
144
|
-
'output_file_grp_cardinality': 1,
|
|
145
|
-
'steps': ['']}
|
|
146
|
-
|
|
147
|
-
@property
|
|
148
|
-
def version(self):
|
|
149
|
-
# needed to satisfy the validator and wrapper
|
|
150
|
-
return '1.0'
|
|
151
|
-
processor_class = UnknownBashlibProcessor
|
|
152
|
-
|
|
153
|
-
ocrd_cli_wrap_processor(processor_class, **kwargs)
|
ocrd/cli/network.py
CHANGED
|
@@ -12,6 +12,7 @@ from ocrd_network.cli import (
|
|
|
12
12
|
client_cli,
|
|
13
13
|
processing_server_cli,
|
|
14
14
|
processing_worker_cli,
|
|
15
|
+
resource_manager_server_cli
|
|
15
16
|
)
|
|
16
17
|
|
|
17
18
|
|
|
@@ -26,3 +27,4 @@ def network_cli():
|
|
|
26
27
|
network_cli.add_command(client_cli)
|
|
27
28
|
network_cli.add_command(processing_server_cli)
|
|
28
29
|
network_cli.add_command(processing_worker_cli)
|
|
30
|
+
network_cli.add_command(resource_manager_server_cli)
|
ocrd/cli/resmgr.py
CHANGED
|
@@ -20,6 +20,7 @@ from ocrd_utils import (
|
|
|
20
20
|
get_ocrd_tool_json,
|
|
21
21
|
initLogging,
|
|
22
22
|
RESOURCE_LOCATIONS,
|
|
23
|
+
RESOURCE_TYPES
|
|
23
24
|
)
|
|
24
25
|
from ocrd.constants import RESOURCE_USER_LIST_COMMENT
|
|
25
26
|
|
|
@@ -70,16 +71,16 @@ def list_installed(executable=None):
|
|
|
70
71
|
@resmgr_cli.command('download')
|
|
71
72
|
@click.option('-n', '--any-url', default='', help='URL of unregistered resource to download/copy from')
|
|
72
73
|
@click.option('-D', '--no-dynamic', default=False, is_flag=True,
|
|
73
|
-
help="
|
|
74
|
-
@click.option('-t', '--resource-type', type=click.Choice(
|
|
75
|
-
help='Type of resource',)
|
|
76
|
-
@click.option('-P', '--path-in-archive', default='.', help='Path to extract in case of archive type')
|
|
74
|
+
help="Skip looking into each processor's --dump-{json,module-dir} module-registered resources")
|
|
75
|
+
@click.option('-t', '--resource-type', type=click.Choice(RESOURCE_TYPES), default='file',
|
|
76
|
+
help='Type of resource (when unregistered or incomplete)',)
|
|
77
|
+
@click.option('-P', '--path-in-archive', default='.', help='Path to extract in case of archive type (when unregistered or incomplete)')
|
|
77
78
|
@click.option('-a', '--allow-uninstalled', is_flag=True,
|
|
78
|
-
help="Allow installing resources for
|
|
79
|
+
help="Allow installing resources for not installed processors",)
|
|
79
80
|
@click.option('-o', '--overwrite', help='Overwrite existing resources', is_flag=True)
|
|
80
|
-
@click.option('-l', '--location', type=click.Choice(RESOURCE_LOCATIONS),
|
|
81
|
+
@click.option('-l', '--location', type=click.Choice(RESOURCE_LOCATIONS),
|
|
81
82
|
help="Where to store resources - defaults to first location in processor's 'resource_locations' "
|
|
82
|
-
"list
|
|
83
|
+
"list, i.e. usually 'data'")
|
|
83
84
|
@click.argument('executable', required=True)
|
|
84
85
|
@click.argument('name', required=False)
|
|
85
86
|
def download(any_url, no_dynamic, resource_type, path_in_archive, allow_uninstalled, overwrite, location, executable,
|
|
@@ -106,8 +107,6 @@ def download(any_url, no_dynamic, resource_type, path_in_archive, allow_uninstal
|
|
|
106
107
|
executable = None
|
|
107
108
|
if name == '*':
|
|
108
109
|
name = None
|
|
109
|
-
is_url = (any_url.startswith('https://') or any_url.startswith('http://')) if any_url else False
|
|
110
|
-
is_filename = Path(any_url).exists() if any_url else False
|
|
111
110
|
if executable and not which(executable):
|
|
112
111
|
if not allow_uninstalled:
|
|
113
112
|
log.error(f"Executable '{executable}' is not installed. "
|
|
@@ -126,65 +125,30 @@ def download(any_url, no_dynamic, resource_type, path_in_archive, allow_uninstal
|
|
|
126
125
|
'path_in_archive': path_in_archive}]
|
|
127
126
|
)]
|
|
128
127
|
for this_executable, this_reslist in reslist:
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
log.warning(f"Cannot download user resource {resdict['name']}")
|
|
138
|
-
continue
|
|
139
|
-
if resdict['url'].startswith('https://') or resdict['url'].startswith('http://'):
|
|
140
|
-
log.info(f"Downloading {registered} resource '{resdict['name']}' ({resdict['url']})")
|
|
141
|
-
if 'size' not in resdict:
|
|
142
|
-
with requests.head(resdict['url']) as r:
|
|
143
|
-
resdict['size'] = int(r.headers.get('content-length', 0))
|
|
144
|
-
else:
|
|
145
|
-
log.info(f"Copying {registered} resource '{resdict['name']}' ({resdict['url']})")
|
|
146
|
-
urlpath = Path(resdict['url'])
|
|
147
|
-
resdict['url'] = str(urlpath.resolve())
|
|
148
|
-
if Path(urlpath).is_dir():
|
|
149
|
-
resdict['size'] = directory_size(urlpath)
|
|
150
|
-
else:
|
|
151
|
-
resdict['size'] = urlpath.stat().st_size
|
|
152
|
-
if not location:
|
|
153
|
-
location = get_ocrd_tool_json(this_executable)['resource_locations'][0]
|
|
154
|
-
elif location not in get_ocrd_tool_json(this_executable)['resource_locations']:
|
|
155
|
-
log.error(f"The selected --location {location} is not in the {this_executable}'s resource search path, "
|
|
156
|
-
f"refusing to install to invalid location")
|
|
157
|
-
sys.exit(1)
|
|
158
|
-
if location != 'module':
|
|
159
|
-
basedir = resmgr.location_to_resource_dir(location)
|
|
160
|
-
else:
|
|
161
|
-
basedir = get_moduledir(this_executable)
|
|
162
|
-
if not basedir:
|
|
163
|
-
basedir = resmgr.location_to_resource_dir('data')
|
|
164
|
-
|
|
128
|
+
resource_locations = get_ocrd_tool_json(this_executable)['resource_locations']
|
|
129
|
+
if not location:
|
|
130
|
+
location = resource_locations[0]
|
|
131
|
+
elif location not in resource_locations:
|
|
132
|
+
log.warning(f"The selected --location {location} is not in the {this_executable}'s resource search path, "
|
|
133
|
+
f"refusing to install to invalid location. Instead installing to: {resource_locations[0]}")
|
|
134
|
+
res_dest_dir = resmgr.build_resource_dest_dir(location=location, executable=this_executable)
|
|
135
|
+
for res_dict in this_reslist:
|
|
165
136
|
try:
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
)
|
|
178
|
-
if registered == 'unregistered':
|
|
179
|
-
log.info(f"{this_executable} resource '{name}' ({any_url}) not a known resource, creating stub "
|
|
180
|
-
f"in {resmgr.user_list}'")
|
|
181
|
-
resmgr.add_to_user_database(this_executable, fpath, url=any_url)
|
|
182
|
-
resmgr.save_user_list()
|
|
183
|
-
log.info(f"Installed resource {resdict['url']} under {fpath}")
|
|
137
|
+
fpath = resmgr.handle_resource(
|
|
138
|
+
res_dict=res_dict,
|
|
139
|
+
executable=this_executable,
|
|
140
|
+
dest_dir=res_dest_dir,
|
|
141
|
+
any_url=any_url,
|
|
142
|
+
overwrite=overwrite,
|
|
143
|
+
resource_type=resource_type,
|
|
144
|
+
path_in_archive=path_in_archive
|
|
145
|
+
)
|
|
146
|
+
if not fpath:
|
|
147
|
+
continue
|
|
184
148
|
except FileExistsError as exc:
|
|
185
149
|
log.info(str(exc))
|
|
186
|
-
|
|
187
|
-
|
|
150
|
+
usage = res_dict.get('parameter_usage', 'as-is')
|
|
151
|
+
log.info(f"Use in parameters as '{resmgr.parameter_usage(res_dict['name'], usage)}'")
|
|
188
152
|
|
|
189
153
|
|
|
190
154
|
@resmgr_cli.command('migrate')
|
ocrd/constants.py
CHANGED
|
@@ -9,7 +9,6 @@ __all__ = [
|
|
|
9
9
|
'DOWNLOAD_DIR',
|
|
10
10
|
'DEFAULT_REPOSITORY_URL',
|
|
11
11
|
'BASHLIB_FILENAME',
|
|
12
|
-
'RESOURCE_LIST_FILENAME',
|
|
13
12
|
'BACKUP_DIR',
|
|
14
13
|
'RESOURCE_USER_LIST_COMMENT',
|
|
15
14
|
]
|
|
@@ -19,6 +18,5 @@ DEFAULT_UPLOAD_FOLDER = '/tmp/uploads-ocrd-core'
|
|
|
19
18
|
DOWNLOAD_DIR = '/tmp/ocrd-core-downloads'
|
|
20
19
|
DEFAULT_REPOSITORY_URL = 'http://localhost:5000/'
|
|
21
20
|
BASHLIB_FILENAME = resource_filename(__package__, 'lib.bash')
|
|
22
|
-
RESOURCE_LIST_FILENAME = resource_filename(__package__, 'resource_list.yml')
|
|
23
21
|
RESOURCE_USER_LIST_COMMENT = "# OCR-D private resource list (consider sending a PR with your own resources to OCR-D/core)"
|
|
24
22
|
BACKUP_DIR = '.backup'
|
ocrd/mets_server.py
CHANGED
|
@@ -258,12 +258,12 @@ class ClientSideOcrdMets:
|
|
|
258
258
|
|
|
259
259
|
def add_agent(self, **kwargs):
|
|
260
260
|
if not self.multiplexing_mode:
|
|
261
|
-
return self.session.request("POST", f"{self.url}/agent", json=OcrdAgentModel.create(**kwargs).
|
|
261
|
+
return self.session.request("POST", f"{self.url}/agent", json=OcrdAgentModel.create(**kwargs).model_dump())
|
|
262
262
|
else:
|
|
263
263
|
self.session.request(
|
|
264
264
|
"POST",
|
|
265
265
|
self.url,
|
|
266
|
-
json=MpxReq.add_agent(self.ws_dir_path, OcrdAgentModel.create(**kwargs).
|
|
266
|
+
json=MpxReq.add_agent(self.ws_dir_path, OcrdAgentModel.create(**kwargs).model_dump())
|
|
267
267
|
).json()
|
|
268
268
|
return OcrdAgentModel.create(**kwargs)
|
|
269
269
|
|
|
@@ -305,7 +305,7 @@ class ClientSideOcrdMets:
|
|
|
305
305
|
mimetype=mimetype, url=url, local_filename=local_filename
|
|
306
306
|
)
|
|
307
307
|
# add force+ignore
|
|
308
|
-
kwargs = {**kwargs, **data.
|
|
308
|
+
kwargs = {**kwargs, **data.model_dump()}
|
|
309
309
|
|
|
310
310
|
if not self.multiplexing_mode:
|
|
311
311
|
r = self.session.request("POST", f"{self.url}/file", data=kwargs)
|
|
@@ -530,7 +530,7 @@ class OcrdMetsServer:
|
|
|
530
530
|
|
|
531
531
|
@app.post(path='/agent', response_model=OcrdAgentModel)
|
|
532
532
|
async def add_agent(agent: OcrdAgentModel):
|
|
533
|
-
kwargs = agent.
|
|
533
|
+
kwargs = agent.model_dump()
|
|
534
534
|
kwargs['_type'] = kwargs.pop('type')
|
|
535
535
|
workspace.mets.add_agent(**kwargs)
|
|
536
536
|
response = agent
|
|
@@ -575,7 +575,7 @@ class OcrdMetsServer:
|
|
|
575
575
|
local_filename=local_filename
|
|
576
576
|
)
|
|
577
577
|
# Add to workspace
|
|
578
|
-
kwargs = file_resource.
|
|
578
|
+
kwargs = file_resource.model_dump()
|
|
579
579
|
workspace.add_file(**kwargs, force=force)
|
|
580
580
|
response = file_resource
|
|
581
581
|
self.log.debug(f"POST /file -> {response.__dict__}")
|
ocrd/processor/base.py
CHANGED
|
@@ -42,15 +42,14 @@ from .ocrd_page_result import OcrdPageResult
|
|
|
42
42
|
from ocrd_utils import (
|
|
43
43
|
VERSION as OCRD_VERSION,
|
|
44
44
|
MIMETYPE_PAGE,
|
|
45
|
-
MIME_TO_EXT,
|
|
46
45
|
config,
|
|
47
46
|
getLogger,
|
|
48
47
|
list_resource_candidates,
|
|
49
|
-
pushd_popd,
|
|
50
48
|
list_all_resources,
|
|
51
49
|
get_processor_resource_types,
|
|
52
50
|
resource_filename,
|
|
53
51
|
parse_json_file_with_comments,
|
|
52
|
+
pushd_popd,
|
|
54
53
|
make_file_id,
|
|
55
54
|
deprecation_warning
|
|
56
55
|
)
|
|
@@ -608,7 +607,7 @@ class Processor():
|
|
|
608
607
|
"""
|
|
609
608
|
Ensure all input files for a single page are
|
|
610
609
|
downloaded to the workspace, then schedule
|
|
611
|
-
:py:meth:`.
|
|
610
|
+
:py:meth:`.process_page_file` to be run on
|
|
612
611
|
them via `executor` (enforcing a per-page time
|
|
613
612
|
limit of `max_seconds`).
|
|
614
613
|
|
|
@@ -935,9 +934,8 @@ class Processor():
|
|
|
935
934
|
cwd = self.old_pwd
|
|
936
935
|
else:
|
|
937
936
|
cwd = getcwd()
|
|
938
|
-
ret =
|
|
939
|
-
|
|
940
|
-
if exists(cand)]
|
|
937
|
+
ret = list(filter(exists, list_resource_candidates(executable, val,
|
|
938
|
+
cwd=cwd, moduled=self.moduledir)))
|
|
941
939
|
if ret:
|
|
942
940
|
self._base_logger.debug("Resolved %s to absolute path %s" % (val, ret[0]))
|
|
943
941
|
return ret[0]
|
|
@@ -968,17 +966,9 @@ class Processor():
|
|
|
968
966
|
"""
|
|
969
967
|
List all resources found in the filesystem and matching content-type by filename suffix
|
|
970
968
|
"""
|
|
971
|
-
|
|
972
|
-
for res in list_all_resources(self.ocrd_tool['executable'], moduled=self.moduledir):
|
|
969
|
+
for res in list_all_resources(self.executable, ocrd_tool=self.ocrd_tool, moduled=self.moduledir):
|
|
973
970
|
res = Path(res)
|
|
974
|
-
|
|
975
|
-
if res.is_dir() and 'text/directory' not in mimetypes:
|
|
976
|
-
continue
|
|
977
|
-
# if we do not know all MIME types, then keep the file, otherwise require suffix match
|
|
978
|
-
if res.is_file() and not any(res.suffix == MIME_TO_EXT.get(mime, res.suffix)
|
|
979
|
-
for mime in mimetypes):
|
|
980
|
-
continue
|
|
981
|
-
yield res
|
|
971
|
+
yield res.name
|
|
982
972
|
|
|
983
973
|
@property
|
|
984
974
|
def module(self):
|
|
@@ -37,6 +37,31 @@
|
|
|
37
37
|
"description": "Whether to extract an image for each filtered segment and write to the output fileGrp."
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
+
},
|
|
41
|
+
"ocrd-command": {
|
|
42
|
+
"executable": "ocrd-command",
|
|
43
|
+
"description": "Bare-bones processor runs shell commands to process PAGE files",
|
|
44
|
+
"steps": ["recognition/text-recognition", "recognition/font-identification", "recognition/post-correction", "layout/segmentation", "layout/analysis"],
|
|
45
|
+
"categories": [],
|
|
46
|
+
"input_file_grp_cardinality": [1, -1],
|
|
47
|
+
"output_file_grp_cardinality": 1,
|
|
48
|
+
"parameters": {
|
|
49
|
+
"command": {
|
|
50
|
+
"type": "string",
|
|
51
|
+
"default": "cat @INFILE > @OUTFILE",
|
|
52
|
+
"description": "Shell command to operate on PAGE files, with @INFILE as place-holder for the input file path(s), and @OUTFILE as place-holder for the output file path. If running on multiple input fileGrps, then @INFILE must be repeated as many times."
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
"ocrd-merge": {
|
|
57
|
+
"executable": "ocrd-merge",
|
|
58
|
+
"description": "Bare-bones processor merges annotations from multiple fileGrps",
|
|
59
|
+
"steps": ["layout/segmentation"],
|
|
60
|
+
"categories": [],
|
|
61
|
+
"input_file_grp_cardinality": [1, -1],
|
|
62
|
+
"output_file_grp_cardinality": 1,
|
|
63
|
+
"parameters": {
|
|
64
|
+
}
|
|
40
65
|
}
|
|
41
66
|
}
|
|
42
67
|
}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
# pylint: disable=missing-module-docstring,invalid-name
|
|
2
|
+
from typing import Optional
|
|
3
|
+
from itertools import count
|
|
4
|
+
from collections import OrderedDict as odict
|
|
5
|
+
|
|
6
|
+
import click
|
|
7
|
+
|
|
8
|
+
from ocrd import Processor, OcrdPageResult
|
|
9
|
+
from ocrd.decorators import ocrd_cli_options, ocrd_cli_wrap_processor
|
|
10
|
+
from ocrd_modelfactory import page_from_file
|
|
11
|
+
from ocrd_models import OcrdPage
|
|
12
|
+
from ocrd_models.ocrd_page import (
|
|
13
|
+
BorderType,
|
|
14
|
+
CoordsType,
|
|
15
|
+
ReadingOrderType,
|
|
16
|
+
UnorderedGroupType,
|
|
17
|
+
)
|
|
18
|
+
from ocrd_utils import bbox_from_points
|
|
19
|
+
|
|
20
|
+
_SEGTYPES = [
|
|
21
|
+
"NoiseRegion",
|
|
22
|
+
"LineDrawingRegion",
|
|
23
|
+
"AdvertRegion",
|
|
24
|
+
"ImageRegion",
|
|
25
|
+
"ChartRegion",
|
|
26
|
+
"MusicRegion",
|
|
27
|
+
"GraphicRegion",
|
|
28
|
+
"UnknownRegion",
|
|
29
|
+
"CustomRegion",
|
|
30
|
+
"SeparatorRegion",
|
|
31
|
+
"MathsRegion",
|
|
32
|
+
"TextRegion",
|
|
33
|
+
"MapRegion",
|
|
34
|
+
"ChemRegion",
|
|
35
|
+
"TableRegion",
|
|
36
|
+
"TextLine",
|
|
37
|
+
"Word",
|
|
38
|
+
"Glyph"
|
|
39
|
+
]
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
def get_border_bbox(pcgts):
|
|
43
|
+
if pcgts.Page.Border is None:
|
|
44
|
+
return [0, 0, pcgts.Page.imageWidth, pcgts.Page.imageHeight]
|
|
45
|
+
return bbox_from_points(pcgts.Page.Border.Coords.points)
|
|
46
|
+
|
|
47
|
+
def rename_segments(pcgts, start=1):
|
|
48
|
+
renamed = {}
|
|
49
|
+
rodict = pcgts.Page.get_ReadingOrderGroups()
|
|
50
|
+
# get everything that has an identifier
|
|
51
|
+
nodes = pcgts.xpath("//*[@id]")
|
|
52
|
+
# filter segments
|
|
53
|
+
segments = [segment for segment in map(pcgts.revmap.get, nodes)
|
|
54
|
+
# get PAGE objects from matching etree nodes
|
|
55
|
+
# but allow only hierarchy segments
|
|
56
|
+
if segment.__class__.__name__.replace('Type', '') in _SEGTYPES]
|
|
57
|
+
# count segments and rename them
|
|
58
|
+
# fixme: or perhaps better to have each segment type named and counted differently?
|
|
59
|
+
num = 0
|
|
60
|
+
regions = []
|
|
61
|
+
for num, segment in zip(count(start=start), segments):
|
|
62
|
+
segtype = segment.original_tagname_
|
|
63
|
+
#parent = segment.parent_object_
|
|
64
|
+
newname = "seg%011d" % num
|
|
65
|
+
assert not segment.id in renamed
|
|
66
|
+
if segtype.endswith('Region') and segment.id in rodict:
|
|
67
|
+
# update reading order
|
|
68
|
+
roelem = rodict[segment.id]
|
|
69
|
+
roelem.regionRef = newname
|
|
70
|
+
renamed[segment.id] = newname
|
|
71
|
+
segment.id = newname
|
|
72
|
+
return num
|
|
73
|
+
|
|
74
|
+
class MergeProcessor(Processor):
|
|
75
|
+
def process_page_pcgts(self, *input_pcgts: Optional[OcrdPage], page_id: Optional[str] = None) -> OcrdPageResult:
|
|
76
|
+
"""
|
|
77
|
+
Merge PAGE segment hierarchy elements from all input file groups.
|
|
78
|
+
|
|
79
|
+
For each page, open and deserialise PAGE input files. Rename all elements
|
|
80
|
+
of the segment hierarchy to new (clash-free) identifers. Redefine the
|
|
81
|
+
`Border` coordinates as the convex hull of all input borders. Then add all
|
|
82
|
+
regions from all input files, concatenating them into a single `ReadingOrder`
|
|
83
|
+
in the order of input file groups.
|
|
84
|
+
|
|
85
|
+
Produce a new PAGE output file by serialising the resulting hierarchy.
|
|
86
|
+
"""
|
|
87
|
+
actual_pcgts = list(filter(None, input_pcgts))
|
|
88
|
+
assert len(set(pcgts.Page.imageFilename for pcgts in actual_pcgts)) == 1, \
|
|
89
|
+
"input files must all reference the same @imageFilename"
|
|
90
|
+
# create new PAGE for image
|
|
91
|
+
result = OcrdPageResult(page_from_file(actual_pcgts[0].Page.imageFilename))
|
|
92
|
+
# unify Border
|
|
93
|
+
borders = [get_border_bbox(pcgts) for pcgts in actual_pcgts]
|
|
94
|
+
minx, miny, maxx, maxy = zip(*borders)
|
|
95
|
+
minx = min(minx)
|
|
96
|
+
miny = min(miny)
|
|
97
|
+
maxx = max(maxx)
|
|
98
|
+
maxy = max(maxy)
|
|
99
|
+
result.pcgts.Page.set_Border(
|
|
100
|
+
BorderType(CoordsType(
|
|
101
|
+
points=f"{minx},{miny} {maxx},{miny} {maxx},{maxy} {minx},{maxy}")))
|
|
102
|
+
# rename all segments
|
|
103
|
+
num = 1
|
|
104
|
+
for pcgts in actual_pcgts:
|
|
105
|
+
num = rename_segments(pcgts, num)
|
|
106
|
+
# concatenate all regions
|
|
107
|
+
ug = UnorderedGroupType(id="merged")
|
|
108
|
+
result.pcgts.Page.set_ReadingOrder(ReadingOrderType(UnorderedGroup=ug))
|
|
109
|
+
for pcgts in actual_pcgts:
|
|
110
|
+
for region in pcgts.Page.get_AllRegions():
|
|
111
|
+
adder = getattr(result.pcgts.Page, 'add_' + region.original_tagname_)
|
|
112
|
+
adder(region)
|
|
113
|
+
if pcgts.Page.ReadingOrder:
|
|
114
|
+
group = pcgts.Page.ReadingOrder.OrderedGroup or pcgts.Page.ReadingOrder.UnorderedGroup
|
|
115
|
+
adder = getattr(ug, 'add_' + group.original_tagname_)
|
|
116
|
+
adder(group)
|
|
117
|
+
return result
|
|
118
|
+
|
|
119
|
+
@property
|
|
120
|
+
def metadata_filename(self):
|
|
121
|
+
return 'processor/builtin/dummy/ocrd-tool.json'
|
|
122
|
+
|
|
123
|
+
@property
|
|
124
|
+
def executable(self):
|
|
125
|
+
return 'ocrd-merge'
|
|
126
|
+
|
|
127
|
+
|
|
128
|
+
@click.command()
|
|
129
|
+
@ocrd_cli_options
|
|
130
|
+
def cli(*args, **kwargs):
|
|
131
|
+
return ocrd_cli_wrap_processor(MergeProcessor, *args, **kwargs)
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
# requires https://github.com/bertsky/workflow-configuration installed
|
|
3
|
+
# partitions PAGE-XML ReadingOrder from single OrderedGroup to top
|
|
4
|
+
# UnorderedGroup divided into OrderedGroups starting at every @type=header
|
|
5
|
+
# text regions.
|
|
6
|
+
"command": "page-header2unordered @INFILE > @OUTFILE"
|
|
7
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
# requires https://github.com/bertsky/workflow-configuration installed
|
|
3
|
+
# partitions PAGE-XML ReadingOrder from single OrderedGroup to top
|
|
4
|
+
# UnorderedGroup divided into OrderedGroups starting at every @type=heading
|
|
5
|
+
# text regions.
|
|
6
|
+
"command": "page-heading2unordered @INFILE > @OUTFILE"
|
|
7
|
+
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
# requires https://github.com/bertsky/workflow-configuration installed
|
|
3
|
+
# retrieves lines from all paragraphs and geometrically determines
|
|
4
|
+
# their average skew, annotating the result under /Page/@orientation
|
|
5
|
+
"command": "page-lines2orientation @INFILE > @OUTFILE"
|
|
6
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
{
|
|
2
|
+
# requires https://github.com/kba/transkribus-to-prima installed
|
|
3
|
+
# converts PAGE from Transkribus dialect to PRImA standard
|
|
4
|
+
# also runs various fixes often necessary to make this work:
|
|
5
|
+
# - ensuring coordinates range within the image size
|
|
6
|
+
# - ensuring segment identifiers do not start with numbers
|
|
7
|
+
"command": "page-fix-coordinates @INFILE - | sed -e 's/ id=\"/ id=\"id/' -e 's/regionRef=\"/regionRef=\"id/' | transkribus-to-prima -V - @OUTFILE"
|
|
8
|
+
}
|