ocrd 3.3.0__tar.gz → 3.3.1__tar.gz
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-3.3.0/src/ocrd.egg-info → ocrd-3.3.1}/PKG-INFO +1 -1
- ocrd-3.3.1/VERSION +1 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/decorators/__init__.py +3 -3
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/processor/base.py +1 -1
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/processor/builtin/dummy/ocrd-tool.json +1 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/processor/helpers.py +2 -2
- {ocrd-3.3.0 → ocrd-3.3.1/src/ocrd.egg-info}/PKG-INFO +1 -1
- ocrd-3.3.0/VERSION +0 -1
- {ocrd-3.3.0 → ocrd-3.3.1}/LICENSE +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/MANIFEST.in +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/README.md +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/README_bashlib.md +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/README_ocrd.md +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/README_ocrd_modelfactory.md +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/README_ocrd_models.md +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/README_ocrd_network.md +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/README_ocrd_utils.md +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/README_ocrd_validators.md +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/pyproject.toml +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/requirements.txt +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/setup.cfg +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/bashlib.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/log.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/network.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/ocrd_tool.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/process.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/resmgr.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/validate.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/workspace.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/cli/zip.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/constants.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/decorators/loglevel_option.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/decorators/mets_find_options.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/decorators/ocrd_cli_options.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/decorators/parameter_option.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/lib.bash +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/mets_server.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/ocrd-all-tool.json +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/processor/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/processor/builtin/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/processor/builtin/dummy/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/processor/builtin/dummy_processor.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/processor/builtin/filter_processor.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/processor/ocrd_page_result.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/resolver.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/resource_list.yml +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/resource_manager.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/task_sequence.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/workspace.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/workspace_backup.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd/workspace_bagger.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd.egg-info/SOURCES.txt +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd.egg-info/dependency_links.txt +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd.egg-info/entry_points.txt +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd.egg-info/requires.txt +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd.egg-info/top_level.txt +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_modelfactory/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/constants.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/mets-empty.xml +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/ocrd_agent.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/ocrd_exif.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/ocrd_file.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/ocrd_mets.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/ocrd_page.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/ocrd_page_generateds.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/ocrd_xml_base.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/report.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/utils.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_models/xpath_functions.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/cli/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/cli/client.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/cli/processing_server.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/cli/processing_worker.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/cli/processor_server.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/client.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/client_utils.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/constants.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/database.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/logging_utils.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/models/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/models/job.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/models/messages.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/models/ocrd_tool.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/models/workflow.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/models/workspace.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/param_validators.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/process_helpers.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/processing_server.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/processing_worker.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/processor_server.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/rabbitmq_utils/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/rabbitmq_utils/connector.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/rabbitmq_utils/constants.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/rabbitmq_utils/consumer.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/rabbitmq_utils/helpers.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/rabbitmq_utils/ocrd_messages.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/rabbitmq_utils/publisher.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/runtime_data/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/runtime_data/config_parser.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/runtime_data/connection_clients.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/runtime_data/deployer.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/runtime_data/hosts.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/runtime_data/network_agents.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/runtime_data/network_services.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/server_cache.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/server_utils.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/tcp_to_uds_mets_proxy.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_network/utils.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/config.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/constants.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/deprecate.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/image.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/introspect.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/logging.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/ocrd_logging.conf +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/os.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_utils/str.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/__init__.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/bagit-profile.yml +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/constants.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/json_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/message_processing.schema.yml +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/message_result.schema.yml +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/mets.xsd +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/ocrd_network_message_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/ocrd_tool.schema.yml +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/ocrd_tool_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/ocrd_zip_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/page.xsd +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/page_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/parameter_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/processing_server_config.schema.yml +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/processing_server_config_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/resource_list_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/workspace_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/xlink.xsd +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/xsd_mets_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/xsd_page_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/src/ocrd_validators/xsd_validator.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_decorators.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_logging.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_logging_conf.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_mets_server.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_model_factory.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_resolver.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_resolver_oai.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_resource_manager.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_task_sequence.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_utils.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_version.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_workspace.py +0 -0
- {ocrd-3.3.0 → ocrd-3.3.1}/tests/test_workspace_remove.py +0 -0
ocrd-3.3.1/VERSION
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
3.3.1
|
|
@@ -107,10 +107,10 @@ def ocrd_cli_wrap_processor(
|
|
|
107
107
|
if 'parameter_override' in kwargs:
|
|
108
108
|
set_json_key_value_overrides(kwargs['parameter'], *kwargs.pop('parameter_override'))
|
|
109
109
|
# Assert -I / -O
|
|
110
|
-
if not kwargs
|
|
110
|
+
if not kwargs.get('input_file_grp', None):
|
|
111
111
|
raise ValueError('-I/--input-file-grp is required')
|
|
112
|
-
if not kwargs
|
|
113
|
-
raise ValueError('-O/--output-file-grp is required')
|
|
112
|
+
if 'output_file_grp' not in kwargs:
|
|
113
|
+
raise ValueError('-O/--output-file-grp is required') # actually, it may be None
|
|
114
114
|
resolver = Resolver()
|
|
115
115
|
working_dir, mets, _, mets_server_url = \
|
|
116
116
|
resolver.resolve_mets_arguments(working_dir, mets, None, mets_server_url)
|
|
@@ -1112,7 +1112,7 @@ class Processor():
|
|
|
1112
1112
|
if not ifiles[i]:
|
|
1113
1113
|
# could be from non-unique with on_error=skip or from true gap
|
|
1114
1114
|
self._base_logger.error(f'Found no file for page {page} in file group {ifg}')
|
|
1115
|
-
if config.OCRD_MISSING_INPUT == '
|
|
1115
|
+
if config.OCRD_MISSING_INPUT == 'ABORT':
|
|
1116
1116
|
raise MissingInputFile(ifg, page, mimetype)
|
|
1117
1117
|
if not any(ifiles):
|
|
1118
1118
|
# must be from non-unique with on_error=skip
|
|
@@ -276,7 +276,7 @@ def get_processor(
|
|
|
276
276
|
# set current processing parameters
|
|
277
277
|
processor.workspace = workspace
|
|
278
278
|
processor.page_id = page_id
|
|
279
|
-
processor.input_file_grp = input_file_grp
|
|
280
|
-
processor.output_file_grp = output_file_grp
|
|
279
|
+
processor.input_file_grp = input_file_grp or ''
|
|
280
|
+
processor.output_file_grp = output_file_grp or ''
|
|
281
281
|
return processor
|
|
282
282
|
raise ValueError("Processor class is not known")
|
ocrd-3.3.0/VERSION
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
3.3.0
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|