ocrd 3.6.0__py3-none-any.whl → 3.8.0__py3-none-any.whl

{ocrd-3.6.0.dist-info → ocrd-3.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocrd
-Version: 3.6.0
+Version: 3.8.0
 Summary: OCR-D framework
 Author-email: Konstantin Baierer <unixprog@gmail.com>
 License: Apache License 2.0
@@ -16,12 +16,13 @@ Requires-Dist: beanie~=1.7
 Requires-Dist: click>=7
 Requires-Dist: cryptography<43.0.0
 Requires-Dist: Deprecated==1.2.0
-Requires-Dist: docker
+Requires-Dist: docker>=7.1.0
 Requires-Dist: elementpath
 Requires-Dist: fastapi>=0.78.0
 Requires-Dist: filetype
 Requires-Dist: Flask
 Requires-Dist: frozendict>=2.4.0
+Requires-Dist: gitpython
 Requires-Dist: gdown
 Requires-Dist: httpx>=0.22.0
 Requires-Dist: jsonschema>=4
@@ -35,7 +36,7 @@ Requires-Dist: opencv-python-headless
 Requires-Dist: paramiko
 Requires-Dist: pika>=1.2.0
 Requires-Dist: Pillow>=7.2.0
-Requires-Dist: pydantic==1.*
+Requires-Dist: pydantic>=2.0.0
 Requires-Dist: python-magic
 Requires-Dist: python-multipart
 Requires-Dist: pyyaml
@@ -68,6 +69,9 @@ Requires-Dist: shapely>=2; python_version >= "3.9"
 * [Command line tools](#command-line-tools)
 	* [`ocrd` CLI](#ocrd-cli)
 	* [`ocrd-dummy` CLI](#ocrd-dummy-cli)
+	* [`ocrd-filter` CLI](#ocrd-filter-cli)
+	* [`ocrd-command` CLI](#ocrd-command-cli)
+	* [`ocrd-merge` CLI](#ocrd-merge-cli)
 * [Configuration](#configuration)
 * [Packages](#packages)
 	* [ocrd_utils](#ocrd_utils)
@@ -76,7 +80,6 @@ Requires-Dist: shapely>=2; python_version >= "3.9"
 	* [ocrd_validators](#ocrd_validators)
 	* [ocrd_network](#ocrd_network)
 	* [ocrd](#ocrd)
-* [bash library](#bash-library)
 * [Testing](#testing)
 * [See Also](#see-also)
 
@@ -121,6 +124,22 @@ supported flags, options and arguments.
 
 A minimal [OCR-D processor](https://ocr-d.de/en/user_guide#using-the-ocr-d-processors) that copies from `-I/-input-file-grp` to `-O/-output-file-grp`
 
+### `ocrd-filter` CLI
+
+A simple [OCR-D processor](https://ocr-d.de/en/user_guide#using-the-ocr-d-processors) that removes segments in PAGE-XML files from `-I/-input-file-grp` to `-O/-output-file-grp` with arbitrary selection based on powerful XPath 2.0 expressions.
+
+### `ocrd-command` CLI
+
+A simple [OCR-D processor](https://ocr-d.de/en/user_guide#using-the-ocr-d-processors) that runs arbitrary shell commands to transform PAGE-XML files from `-I/-input-file-grp` to `-O/-output-file-grp` (in effect "wrapping" them for OCR-D).
+
+### `ocrd-merge` CLI
+
+A simple [OCR-D processor](https://ocr-d.de/en/user_guide#using-the-ocr-d-processors) that (for every page) joins PAGE-XML files from multiple `-I/-input-file-grp` into a single `-O/-output-file-grp`, ensuring that
+- `Border` polygons are joined
+- all regions are concatenated, while
+- ensuring segment identifiers do not clash,
+- and the reading order simply gets concatenated.
+
 ## Configuration
 
 Almost all behaviour of the OCR-D/core software is configured via CLI options and flags, which can be listed with the `--help` flag that all CLI support.
@@ -220,12 +239,6 @@ Also contains the command line tool `ocrd`.
 
 See [README for `ocrd`](./README_ocrd.md) for further information.
 
-## bash library
-
-Builds a bash script that can be sourced by other bash scripts to create OCRD-compliant CLI.
-
-See [README for `bashlib`](./README_bashlib.md) for further information.
-
 ## Testing
 
 Download assets (`make assets`)

{ocrd-3.6.0.dist-info → ocrd-3.8.0.dist-info}/RECORD

@@ -1,22 +1,19 @@
 ocrd/__init__.py,sha256=ZswMVmlqFhAEIzMR3my6IKPq9XLH21aDPC_m_8Jh4dA,1076
-ocrd/constants.py,sha256=6dn3mG54WqHsKInmLZp4kJjNqqPtBoFoSuLUuRbOps0,740
-ocrd/lib.bash,sha256=Eu-_Eb3uUNEoa3GmSDyUm_4FmmSJctglPOWz8EcBJ2c,10395
-ocrd/mets_server.py,sha256=eXIbSip6gYi5RyJZlriIrR9lUGpJjL0kXq3UDZPeqVs,22274
+ocrd/constants.py,sha256=REPY-y28MMsrTWBNB4oOsvX3W06Xr2fvtv9wuWH9oAI,633
+ocrd/mets_server.py,sha256=LbZ0U2_o0W7cWO639U7E816dXabro8-8yHGX0quvHn4,22304
 ocrd/ocrd-all-tool.json,sha256=EYXmMzP68p3KzL8nUZ16TCX2chQzKkAeISvuXqI_yIw,2094
 ocrd/resolver.py,sha256=7uwHRxaK8YMdKHe_a2dfrcNwL6UhQRJRVBrIX7GST7Q,15443
-ocrd/resource_list.yml,sha256=82-PiqkZnka1kTj3MQqNn4wXWKHHtoFchsQuetWuqFs,2633
-ocrd/resource_manager.py,sha256=kIWDoKxWH4IJE1gcoTcCRQjYjieCqiQclyuyF6Y9b8A,16813
+ocrd/resource_manager.py,sha256=2wo3JSCYE1oA0VgI8H901IsC-fnx6vRJ5qSMFgYNorE,20664
 ocrd/task_sequence.py,sha256=r4e4iaP9AXzTL2xQZpfYnHuFXty5pE-ym3gIyUz1aJc,7180
 ocrd/workspace.py,sha256=UL_gX0KA-MmpayBl9KGYTfcl-1Canj8S991G9RHhu70,65216
 ocrd/workspace_backup.py,sha256=aUOnYeJ-nWu-Zve27B0cYd9ZtBkmQX4F4Wim2UcrR5I,3624
 ocrd/workspace_bagger.py,sha256=4viSQoWteW0V4B_blB6asJXd4-qniGGJyCPfKnrsyrY,12054
-ocrd/cli/__init__.py,sha256=klgd85WNdLzqivbkEbt5cMOFvEoMoEE2KnT_oKAwTBs,2888
-ocrd/cli/bashlib.py,sha256=RLp6ejgbxLjGfNmeniVTuzLtrGeJrGJAZYc9JPT7U68,5998
-ocrd/cli/log.py,sha256=jRgxdoJS14OPXI9LpovPqB3JcxlcGZH7QOde6-TmykQ,1566
-ocrd/cli/network.py,sha256=iQ0AhQRGvIFyJY9RBArUiA_wuz7IfNKvU4L8KpVggnY,530
+ocrd/cli/__init__.py,sha256=-n2jpGBZs_OMpI31E7CljGVdoFxDhgCAYwibcl_vp1Q,2838
+ocrd/cli/bashlib.py,sha256=sEpTKbqM5DEo6838Ki5aFU8QsokA2SqQ841gcBu7M5M,1148
+ocrd/cli/network.py,sha256=HA-JeyedsZksTQzuDoSBwyxEHIyIlc7oCmvNNDMA4vA,615
 ocrd/cli/ocrd_tool.py,sha256=kB3Y3tj7Fpz6Ts4KgVlznhXpAx8gCDvJTnO39j8SGL4,7679
 ocrd/cli/process.py,sha256=yfhBSYmuY5k2AccKwiNvG9hCDx1coYyWjq9BBwYaL3Y,1234
-ocrd/cli/resmgr.py,sha256=b1TMZ3D0d50RR9XjQdPil3sfaoTVAso8LjHXZ9P7WfI,10109
+ocrd/cli/resmgr.py,sha256=7hRRi8EryQwakRdZgguee3ercA5_T48BKGWWfgAVfzM,8072
 ocrd/cli/validate.py,sha256=P8jrzAnoU-5TUjLNA7s_ZMY2Krw5Y-SVIZPhdOk25cw,5931
 ocrd/cli/workspace.py,sha256=0UzKN7vvD0n5wwxldzLHOlikDDIyiBiV1PuTOKCnnnE,41279
 ocrd/cli/zip.py,sha256=3HMUbVsPTK3SRuF5oZnCZLjoqXJK-AYpA-rMqenY858,5965
@@ -26,19 +23,26 @@ ocrd/decorators/mets_find_options.py,sha256=8fiSdk-415o6-iBPB2T9He_v52qE8cTj3cCn
 ocrd/decorators/ocrd_cli_options.py,sha256=Bemkq3V3QkOI3nNqGzphaNW7gjU9vNN-M5F2DvxvioM,2479
 ocrd/decorators/parameter_option.py,sha256=TnCIcV9L5oAnI1Ew2TyFzo5FAwiIzWl2pn8oaD9jfEU,1056
 ocrd/processor/__init__.py,sha256=39ymNwYRdc-b_OJzzKmWCvo2ga3KdsGSYDHE1Hzkn_w,274
-ocrd/processor/base.py,sha256=TOUy_s14aM-09HSSzihgCeTOSHRpTO4U4bze7QUSDwg,60382
+ocrd/processor/base.py,sha256=DxBsRn8VLsfNvc9_2BU0KxUv4t9XtHSSu9uiabxn8Nk,59850
 ocrd/processor/helpers.py,sha256=4lR_QvZsxvh7f8_uK9YzdHP5-hvFU4qqYM_Cu_k41KI,10937
 ocrd/processor/ocrd_page_result.py,sha256=qo9pGV4r9S5--NAq5clIJOfs4b1vavoDOTbDqAEAAKA,507
 ocrd/processor/builtin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ocrd/processor/builtin/dummy_processor.py,sha256=SmMRtN0w88kBU24654ThT-yf84SFsFW4BOcmwsDDWdc,3533
 ocrd/processor/builtin/filter_processor.py,sha256=9mbMq_XTJa8wrlbNdf46GUMNdjedz-enxafsCrnNhEo,4295
+ocrd/processor/builtin/merge_processor.py,sha256=UvYgB73Y9lzJSMMNaVO6nk3rAcONHvQ-E-XAhaseZno,4655
+ocrd/processor/builtin/param_command_header2unordered.json,sha256=K6xEcDXc3Qsaxt96wdISK22UxHf517O-E8JHryDwAfE,307
+ocrd/processor/builtin/param_command_heading2unordered.json,sha256=nBenDJYlV-POfoM2R6izxcA5pW3rz-czGaoKudj3OTY,309
+ocrd/processor/builtin/param_command_lines2orientation.json,sha256=2cGv5fXqAVAUyP8K1IT6vrSLCGhAtdXAvVxdSfjp8KQ,282
+ocrd/processor/builtin/param_command_page-update-version.json,sha256=4JsXEltEOG89Q8PT8eBxQXnxp3Mez3EsRz4GfshjJEY,267
+ocrd/processor/builtin/param_command_transkribus-to-prima.json,sha256=AvPNNS5uBmh69i6irRhIdHN9gE28yN9ufV7jfpFAeME,472
+ocrd/processor/builtin/shell_processor.py,sha256=aWsB_m7o4ypG1DBAE0sNMFnaw9ptONqchLLl06KgTEo,5888
 ocrd/processor/builtin/dummy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ocrd/processor/builtin/dummy/ocrd-tool.json,sha256=NgMAXN1AQpGk4Ss73ThDY4QyFPKhj54qcrdeCGwTb10,2339
+ocrd/processor/builtin/dummy/ocrd-tool.json,sha256=t_M3HABw7k_Ufi1L9Mr4t3LSCRnu0HH8-fvEs3u2PQY,3487
 ocrd_modelfactory/__init__.py,sha256=sjAwPwDzetvPHdV6nPquHtMdFUBYRmo1P-VKER9YCWM,4404
 ocrd_models/__init__.py,sha256=A0aj0mOraNb-xfiUueACdoaqISnp0qH-F49nTJg2vCs,380
 ocrd_models/constants.py,sha256=R7-jOGabFd8HP0qRWfTMk0RcUmdwN-jhmDVbUW_QfU4,6961
 ocrd_models/mets-empty.xml,sha256=dFixfbxSXrgjZx9BfdIKWHX-khNmp7dNYaFe2qQSwCY,1203
-ocrd_models/ocrd_agent.py,sha256=fY3BQE7otU9KLHaKC9L7BjuU1PIXXTy17V-OAW8LzjI,5609
+ocrd_models/ocrd_agent.py,sha256=Nm0XDNCmWZ8O3xsXaY-WmEghttXmh90UKmAObCL99IY,5617
 ocrd_models/ocrd_exif.py,sha256=HSLPn_WBDRIlMtKNYilLHm8WjX-b14HgnqT_KfzjS_0,4680
 ocrd_models/ocrd_file.py,sha256=9-mfDb91RVy3p9rKryl-C39P4Of6Rb8OZBuxAee4VrI,9723
 ocrd_models/ocrd_mets.py,sha256=lz9mlDq9A9UmZDoN8lh5XRnBzdAtLLZywDZSbyZPS84,50905
@@ -48,29 +52,31 @@ ocrd_models/ocrd_xml_base.py,sha256=iOnDl2zBNhN-Q4moLWiFkSqXvfRzxE5wbp5Tjsu1W6A,
 ocrd_models/report.py,sha256=CX-t9ZDi2VmAy8M1Azsh83UsvE_f5pMeEC7tPaA-ztU,2021
 ocrd_models/utils.py,sha256=A-H11ZJ65ZjH4DPK9s_Yz6JtA9fbTQ2jY-__9s7Hrg8,2320
 ocrd_models/xpath_functions.py,sha256=VM2f9hl8ja4NrDOEQRSYdx7GewwAxfoyGMDjqjgA_7g,1439
-ocrd_network/__init__.py,sha256=w6uj3joSsg5NAzQPDsHkuwVjHXukO_JrvcAX07cBlHA,317
+ocrd_network/__init__.py,sha256=NWlSgXi7z45ow37AmITxfCB1d-L39rO8ttyxNJ-z8G0,376
 ocrd_network/client.py,sha256=pL-g79cQgulXyGYgLOh--oxl1hZEMu48PTbuvMW1jIE,3007
 ocrd_network/client_utils.py,sha256=Ne1a0fteb-TBuc0EAD6X_fh2RAl4hmPt2oluhpB28iU,5371
-ocrd_network/constants.py,sha256=iLHPX5H3g6QKhqIPXCNRILVG7eFUIWuuiBWKp0_dBLw,1812
+ocrd_network/constants.py,sha256=XyRYjFO38yIBD6s1wsA-z6V16tBmbUw4LXlFkj-tQC8,1943
 ocrd_network/database.py,sha256=-SddvaMLKn0pjdONyvWmjxfPJd6viedAIp6Lj1sU1Zs,10705
-ocrd_network/logging_utils.py,sha256=Ez5f_BRp0SiW2sP71yTT7zOJmuMzHYPLNWObq5fBLCw,2188
+ocrd_network/logging_utils.py,sha256=hXwS46FzY_HTh92DgnxTuARxj8C18bOBmFKVrvBlUgc,2409
 ocrd_network/param_validators.py,sha256=Jl1VwiPPKJ50k-xEHLdvW-1QDOkJHCiMz4k9Ipqm-Uc,1489
 ocrd_network/process_helpers.py,sha256=t2qltUpRefzLwdSGsiUEOGYO4Pz2OH7arpgjmCAeXMU,3086
 ocrd_network/processing_server.py,sha256=z21DvRleEeo0hkpc1-2z0jLKuf5WSipL95MVEns8eJE,38457
 ocrd_network/processing_worker.py,sha256=5AtvIhfcePzltKj4SElh7Aj9zlUOEiMVPTjtXuFSbT8,12659
+ocrd_network/resource_manager_server.py,sha256=Ihz2g9uhkPSJee9GL7485DFC4cORhro4JQI6QzHoUA4,7255
 ocrd_network/server_cache.py,sha256=orfAMw3LwUnduRHFAB6MpfoORTDoPV4ntSdAcQHBOyI,13148
 ocrd_network/server_utils.py,sha256=Lxby62gHvrSbHgpWXvyZGdsWajp2TFzyxjHdMZWBESk,10229
 ocrd_network/tcp_to_uds_mets_proxy.py,sha256=yRW-O6ihd31gf7xqQBIBb_ZQQgqisMyOdRI216ehq_A,3160
 ocrd_network/utils.py,sha256=yE-nV_sv171tPp7weIFOxYw6HJlxvGBmrS8b1rIHS7c,6760
-ocrd_network/cli/__init__.py,sha256=7dzZLbGHaqMGToNZhll-q87Jh4UP6NSuvxbVuUOIkqY,228
+ocrd_network/cli/__init__.py,sha256=VBjjXcn-2O5gerqE6UdNfS-EkVFEVPQFHylsn8F9kfY,317
 ocrd_network/cli/client.py,sha256=H5fiJhBqbFn4_B2p3V20GejGTIYO-mNglh3y5nzUGhs,10350
 ocrd_network/cli/processing_server.py,sha256=NsuI0f9h4KDwe39YugmHo5cJ_29chcLLQ7DThKfPO7s,770
 ocrd_network/cli/processing_worker.py,sha256=ZuaCkbKV_WKJV7cGOjZ6RLrjjppymnwNCiznFMlclAg,1897
+ocrd_network/cli/resmgr_server.py,sha256=sc0VX_RehTbg8Qp7ht_DvVqsrdL5b9Zw3bBgWcAD13A,826
 ocrd_network/models/__init__.py,sha256=eVYMZaktzlyHKx-zI7GLYyRlZd3Vi_lNgsqSSFwqb6U,475
-ocrd_network/models/job.py,sha256=6NxcNIUHMS9Ft5UGWegngB6uNUOnE_6nOnRGKFbjI6A,4243
-ocrd_network/models/messages.py,sha256=XnyLMX77NchgmtKJRtqtBFsk_sCR4OGEuWm_d3uDkj8,657
+ocrd_network/models/job.py,sha256=9bwp8DFoRH96WnRpkDV3XRfXCBiupzK6WXjqPsTcvLg,4440
+ocrd_network/models/messages.py,sha256=OUDTjUiaATStsSAHCEDilUhBSruPsjpBtIBsllqN2Z0,672
 ocrd_network/models/workflow.py,sha256=GL8q7RX9fGdXG3iVyJpCeLXbWa-2qI_SIxqhzxs9VK8,189
-ocrd_network/models/workspace.py,sha256=7kjCTY0ixqcyJP9eHnptkrJnPTCD3zFNfhApZz9w6OU,1568
+ocrd_network/models/workspace.py,sha256=rZcBWNlQOZX2KukP79IDRrXJvZ-H5pPH3WpPuw72HBM,1596
 ocrd_network/rabbitmq_utils/__init__.py,sha256=XLIqZhfin4I4m80G9B__UcP45Lz10_mEpMYLXGOByUk,741
 ocrd_network/rabbitmq_utils/connector.py,sha256=N6mzjIf5FkVIno3FI1AksZY4F5jMUAm8baay0nXZx8w,11343
 ocrd_network/rabbitmq_utils/constants.py,sha256=Zu_dKJASfrgnIvEZZlFX9uDR9y6w7zy0KhW7gP7wHDE,1063
@@ -80,20 +86,20 @@ ocrd_network/rabbitmq_utils/ocrd_messages.py,sha256=wwzfMWbXmOFo_nd32_XySCso91_U
 ocrd_network/rabbitmq_utils/publisher.py,sha256=mw4XQQhRE1xUQVgEUseyG845iIgVO-9GdGwNH6nUFms,2433
 ocrd_network/runtime_data/__init__.py,sha256=PnWuuagElbkTzGtPWQEk5wlFtDxqT7B48S0Zrgt8H68,320
 ocrd_network/runtime_data/config_parser.py,sha256=Vr0FbsqmsoiuhDgZ7KFdeFZj9JvUulcOS2PCRFQQNHY,2364
-ocrd_network/runtime_data/connection_clients.py,sha256=DZyAvkNyMaIddGJs56s2pMP_fK-XWAtICxk1cjvkWYM,4207
+ocrd_network/runtime_data/connection_clients.py,sha256=HKf_aSfwg11JeH6qiQXnqxbnvNgCAMRnVIpj30k93Bc,4207
 ocrd_network/runtime_data/deployer.py,sha256=j3tcauURZtu7MKcEIE9B5eMCMSYMbxhB8LmtK72Zk1c,5314
-ocrd_network/runtime_data/hosts.py,sha256=n0azh_1XBc8-F9GtX-8q61iFzfxZjtjG-2D8qroihGA,7233
-ocrd_network/runtime_data/network_agents.py,sha256=UKcAO1lMZkXgmhMbltBnRo1j7QVSbfDTxA52YrNqP2Y,3891
+ocrd_network/runtime_data/hosts.py,sha256=P1bLh1NjgL-ajgP-VhGCACvy6rgJ5nZhGKsHaldzatk,8921
+ocrd_network/runtime_data/network_agents.py,sha256=wwN7IJei4UdlyfhjvdmB5TB4O0Gn8icSkArJe-suvAY,4523
 ocrd_network/runtime_data/network_services.py,sha256=5aH3RNGCi1fBuSdRp_Xz0MzyD_FmnvPnaBYAiYY3gp4,7891
-ocrd_utils/__init__.py,sha256=gcO26xJ6dIUtJIvAr8wOe3CM4b7Revn07-DwEureoEc,5973
+ocrd_utils/__init__.py,sha256=Cl_lrZxjXuTZ_me4I_lpaFNTpSdacWhQetOtHdrkUsU,6057
 ocrd_utils/config.py,sha256=Oe8JBGb8r4z274XNWcdMV-GApzxmAYO8hHmbAV5bXf8,12609
-ocrd_utils/constants.py,sha256=ImbG1d8t2MW3uuFi-mN6aY90Zn74liAKZBKlfuKN86w,3278
+ocrd_utils/constants.py,sha256=6lqMLeJdkFBlvGVmGjcExWbRKzNU6QT0kADBb5BkcBc,3464
 ocrd_utils/deprecate.py,sha256=luAqGWUSF-9DHmTd2lDiQoQPA5SrJazdoDPQYQ6A7Z4,1029
 ocrd_utils/image.py,sha256=tG5WnNtrrvGjm2-r6NVs1Jm7z8fee3MuLKotAD6C2RU,24818
 ocrd_utils/introspect.py,sha256=LPhgcUuoicQcURDCWlCpSdbfVyxID5vmQPXJ9vzuYV0,1977
-ocrd_utils/logging.py,sha256=Kj_z92pXbzWmc0jMJ299Pup9hfcnzJH8ltvI9w7STZc,7824
+ocrd_utils/logging.py,sha256=-cCi_9kIzmLUixfnDcx2jq9IQuwMqrU-71RJhKOQilQ,7929
 ocrd_utils/ocrd_logging.conf,sha256=JlWmA_5vg6HnjPGjTC4mA5vFHqmnEinwllSTiOw5CCo,3473
-ocrd_utils/os.py,sha256=GstXB4i3kDBy7PXU-TaPYV4BI-lkqd_cYKl6uDkVMkw,9829
+ocrd_utils/os.py,sha256=Fmy-Q4OMGlbHLMH9jhPRAxRN5curyEXrYoWJxztIl1w,13756
 ocrd_utils/str.py,sha256=4P0MdX0LCTqDTnsi_y5wNOBXW_TuTFANF7NYRXjo4x0,10136
 ocrd_validators/__init__.py,sha256=ZFc-UqRVBk9o1YesZFmr9lOepttNJ_NKx1Zdb7g_YsU,972
 ocrd_validators/bagit-profile.yml,sha256=sdQJlSi7TOn1E9WYMOZ1shewJ-i_nPaKmsAFkh28TGY,1011
@@ -103,7 +109,7 @@ ocrd_validators/message_processing.schema.yml,sha256=HL7o96-7ejslVMXcp16sbo5IjfU
 ocrd_validators/message_result.schema.yml,sha256=G6vt_JgIU7OGSaHj-2Jna6KWQ3bFWol5tnBArWEiVjM,681
 ocrd_validators/mets.xsd,sha256=0Wrs9bObn0n-yEEIWyguIcUUuuP6KMEjD4I_p1_UlwY,138290
 ocrd_validators/ocrd_network_message_validator.py,sha256=oafNWOjieBmTHFfYeCtyFFpW1gI0lDT6ycRr5Kvmfq0,561
-ocrd_validators/ocrd_tool.schema.yml,sha256=BQkRIRDbn9B8gFeVxz_EpNdleh_x2dCtIpJEC4HqFHw,10125
+ocrd_validators/ocrd_tool.schema.yml,sha256=fDNr-QdEOBtYbz8aHmjdOUirPBKr3vfLUDtC88gu75U,10231
 ocrd_validators/ocrd_tool_validator.py,sha256=0DWuyyOSbdbrrQ5kEfWZv_qp5rSmLzmFMUKcPGfCBgM,749
 ocrd_validators/ocrd_zip_validator.py,sha256=t-cYIZ5llZSQ2EspFzm0m-FajkLRfAFTISmXe27wMtA,3720
 ocrd_validators/page.xsd,sha256=abQ8C3gRLPMFm8lH62aTCfvTIWI23TpgEDcaW9YCt7I,85770
@@ -117,9 +123,9 @@ ocrd_validators/xlink.xsd,sha256=8fW7YAMWXN2PbB_MMvj9H5ZeFoEBDzuYBtlGC8_6ijw,318
 ocrd_validators/xsd_mets_validator.py,sha256=YgiuNtwNDtn3LuvdFFscnmsGREF_wQ4wtA76yE2Iljw,469
 ocrd_validators/xsd_page_validator.py,sha256=ggt-nmaz-DDyAPwm3ZMVvtChuV2BJ2ZEEbWpePL9vTk,469
 ocrd_validators/xsd_validator.py,sha256=ahJo_oVvTK_JB0Cu4CkMC8l_gbzsyW91AxGtelMjqrg,2115
-ocrd-3.6.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ocrd-3.6.0.dist-info/METADATA,sha256=Qc1Nap_yo-Y3_8FYaVIvGXV79q4NKrCZs6h4BEKXIg4,10523
-ocrd-3.6.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-ocrd-3.6.0.dist-info/entry_points.txt,sha256=4hcJ2LkK_OlIabHnKgFit35Ap7b5Lz1Gb4hzkxV0Kiw,152
-ocrd-3.6.0.dist-info/top_level.txt,sha256=pUgiN42t4KXC5rvpi6V8atza31XP4SCznXpXlVlvomM,75
-ocrd-3.6.0.dist-info/RECORD,,
+ocrd-3.8.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ocrd-3.8.0.dist-info/METADATA,sha256=ieqTzchmz7OXQV6vlize7XzWDzWEk5ypLXtn4VTduHY,11396
+ocrd-3.8.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+ocrd-3.8.0.dist-info/entry_points.txt,sha256=CI-NoDR1BYmsuAsJmPAn4NrN9guzdedHGUbC8QSmdGs,266
+ocrd-3.8.0.dist-info/top_level.txt,sha256=pUgiN42t4KXC5rvpi6V8atza31XP4SCznXpXlVlvomM,75
+ocrd-3.8.0.dist-info/RECORD,,

{ocrd-3.6.0.dist-info → ocrd-3.8.0.dist-info}/entry_points.txt

@@ -1,4 +1,6 @@
 [console_scripts]
 ocrd = ocrd.cli:cli
+ocrd-command = ocrd.processor.builtin.shell_processor:cli
 ocrd-dummy = ocrd.processor.builtin.dummy_processor:cli
 ocrd-filter = ocrd.processor.builtin.filter_processor:cli
+ocrd-merge = ocrd.processor.builtin.merge_processor:cli

ocrd_models/ocrd_agent.py

@@ -43,7 +43,7 @@ class OcrdAgent():
         self.otherrole = otherrole
         self.notes = notes
 
-    def __str__(self):
+    def __repr__(self):
         """
         String representation
         """
@@ -142,7 +142,7 @@ class OcrdAgent():
         """
         el_notes = self._el.findall(TAG_METS_NOTE)
         if el_notes is not None:
-            return [(note.attrib, note.text)
+            return [(dict(note.attrib), note.text)
                     for note in el_notes]
 
     @notes.setter
@@ -190,7 +190,7 @@ class ClientSideOcrdAgent():
         self.otherrole = otherrole
         self.notes = notes
 
-    def __str__(self):
+    def __repr__(self):
         props = ', '.join([
             '='.join([k, getattr(self, k) if getattr(self, k) else '---'])
             for k in ['type', 'othertype', 'role', 'otherrole', 'name']

ocrd_network/__init__.py

@@ -3,4 +3,5 @@ from .constants import JobState
 from .processing_server import ProcessingServer
 from .processing_worker import ProcessingWorker
 from .param_validators import DatabaseParamType, ServerAddressParamType, QueueServerParamType
+from .resource_manager_server import ResourceManagerServer
 from .server_cache import CacheLockedPages, CacheProcessingRequests

ocrd_network/cli/__init__.py

@@ -1,9 +1,11 @@
 from .client import client_cli
 from .processing_server import processing_server_cli
 from .processing_worker import processing_worker_cli
+from .resmgr_server import resource_manager_server_cli
 
 __all__ = [
     'client_cli',
     'processing_server_cli',
     'processing_worker_cli',
+    'resource_manager_server_cli'
 ]

ocrd_network/cli/resmgr_server.py

@@ -0,0 +1,23 @@
+import click
+from ocrd_network import ResourceManagerServer, ServerAddressParamType
+
+
+@click.command('resmgr-server')
+@click.option('-a', '--address',
+              help='The URL of the OCR-D resource manager server, format: host:port',
+              type=ServerAddressParamType(),
+              required=True)
+def resource_manager_server_cli(address: str):
+    """
+    Start standalone REST API OCR-D Resource Manager Server
+    """
+    try:
+        # Note, the address is already validated with the type field
+        host, port = address.split(':')
+        resource_manager_server = ResourceManagerServer(
+            host = host,
+            port = int(port)
+        )
+        resource_manager_server.start()
+    except Exception as e:
+        raise Exception("OCR-D Resource Manager Server has failed with error") from e

ocrd_network/constants.py

@@ -10,6 +10,8 @@ OCRD_ALL_TOOL_JSON = "ocrd-all-tool.json"
 # Used as a placeholder to lock all pages when no page_id is specified
 SERVER_ALL_PAGES_PLACEHOLDER = "all_pages"
 
+# TODO: Make this more configurable
+RESOURCE_MANAGER_SERVER_PORT = 45555
 
 class StrEnum(str, Enum):
     def __str__(self):
@@ -48,6 +50,7 @@ class NetworkLoggingDirs(StrEnum):
     PROCESSING_JOBS = "processing_jobs"
     PROCESSING_SERVERS = "processing_servers"
     PROCESSING_WORKERS = "processing_workers"
+    RESOURCE_MANAGER_SERVERS = "resource_manager_servers"
 
 
 class ServerApiTags(StrEnum):

ocrd_network/logging_utils.py

@@ -56,3 +56,8 @@ def get_processing_server_logging_file_path(pid: int) -> Path:
 def get_processing_worker_logging_file_path(processor_name: str, pid: int) -> Path:
     log_file: str = f"worker.{pid}.{processor_name}.log"
     return Path(get_root_logging_dir(NetworkLoggingDirs.PROCESSING_WORKERS), log_file)
+
+
+def get_resource_manager_server_logging_file_path(pid: int) -> Path:
+    log_file: str = f"resource_manager_server.{pid}.log"
+    return Path(get_root_logging_dir(NetworkLoggingDirs.RESOURCE_MANAGER_SERVERS), log_file)

ocrd_network/models/job.py

@@ -13,7 +13,7 @@ class PYJobInput(BaseModel):
     workspace_id: Optional[str] = None
     description: Optional[str] = None
     input_file_grps: List[str]
-    output_file_grps: Optional[List[str]]
+    output_file_grps: Optional[List[str]] = None
     page_id: Optional[str] = None
     parameters: dict = {}  # Always set to empty dict when None, otherwise it fails ocr-d-validation
     result_queue_name: Optional[str] = None
@@ -23,8 +23,8 @@ class PYJobInput(BaseModel):
     # If set, specifies a list of job ids this job depends on
     depends_on: Optional[List[str]] = None
 
-    class Config:
-        schema_extra = {
+    model_config = {
+        'json_schema_extra': {
             'example': {
                 'path_to_mets': '/path/to/mets.xml',
                 'description': 'The description of this execution',
@@ -34,6 +34,7 @@ class PYJobInput(BaseModel):
                 'parameters': {}
             }
         }
+    }
 
 
 class PYJobOutput(BaseModel):
@@ -42,12 +43,12 @@ class PYJobOutput(BaseModel):
     job_id: str
     processor_name: str
     state: JobState = JobState.unset
-    path_to_mets: Optional[str]
-    workspace_id: Optional[str]
+    path_to_mets: Optional[str] = None
+    workspace_id: Optional[str] = None
     input_file_grps: List[str]
-    output_file_grps: Optional[List[str]]
+    output_file_grps: Optional[List[str]] = None
     page_id: Optional[str] = None
-    log_file_path: Optional[str]
+    log_file_path: Optional[str] = None
 
 
 class DBProcessorJob(Document):
@@ -55,22 +56,22 @@ class DBProcessorJob(Document):
     """
     job_id: str
     processor_name: str
-    path_to_mets: Optional[str]
-    workspace_id: Optional[str]
-    description: Optional[str]
+    path_to_mets: Optional[str] = None
+    workspace_id: Optional[str] = None
+    description: Optional[str] = None
     state: JobState = JobState.unset
     input_file_grps: List[str]
-    output_file_grps: Optional[List[str]]
-    page_id: Optional[str]
-    parameters: Optional[dict]
-    depends_on: Optional[List[str]]
-    result_queue_name: Optional[str]
-    callback_url: Optional[str]
-    internal_callback_url: Optional[str]
-    start_time: Optional[datetime]
-    end_time: Optional[datetime]
-    exec_time: Optional[str]
-    log_file_path: Optional[str]
+    output_file_grps: Optional[List[str]] = None
+    page_id: Optional[str] = None
+    parameters: Optional[dict] = None
+    depends_on: Optional[List[str]] = None
+    result_queue_name: Optional[str] = None
+    callback_url: Optional[str] = None
+    internal_callback_url: Optional[str] = None
+    start_time: Optional[datetime] = None
+    end_time: Optional[datetime] = None
+    exec_time: Optional[str] = None
+    log_file_path: Optional[str] = None
 
     class Settings:
         use_enum_values = True
@@ -99,9 +100,9 @@ class PYWorkflowJobOutput(BaseModel):
     page_id: str
     page_wise: bool = False
     job_id: str
-    path_to_mets: Optional[str]
-    workspace_id: Optional[str]
-    description: Optional[str]
+    path_to_mets: Optional[str] = None
+    workspace_id: Optional[str] = None
+    description: Optional[str] = None
 
 
 class DBWorkflowJob(Document):
@@ -114,10 +115,10 @@ class DBWorkflowJob(Document):
     # key: page_id
     # value: List of and processing job ids sorted in dependency order
     processing_job_ids: Dict
-    path_to_mets: Optional[str]
-    workspace_id: Optional[str]
-    description: Optional[str]
-    workflow_callback_url: Optional[str]
+    path_to_mets: Optional[str] = None
+    workspace_id: Optional[str] = None
+    description: Optional[str] = None
+    workflow_callback_url: Optional[str] = None
 
     class Settings:
         use_enum_values = True

ocrd_network/models/messages.py

@@ -11,8 +11,8 @@ class PYResultMessage(BaseModel):
     path_to_mets: Optional[str] = None
     workspace_id: Optional[str] = None
 
-    class Config:
-        schema_extra = {
+    model_config = {
+        "json_schema_extra": {
             "example": {
                 "job_id": "d8e36726-ed28-5476-b83c-bc31d2eecf1f",
                 "state": JobState.success,
@@ -20,3 +20,4 @@ class PYResultMessage(BaseModel):
                 "workspace_id": "c7f25615-fc17-4365-a74d-ad20e1ddbd0e"
             }
         }
+    }

ocrd_network/models/workspace.py

@@ -25,10 +25,10 @@ class DBWorkspace(Document):
     workspace_mets_path: str
     ocrd_identifier: str
     bagit_profile_identifier: str
-    ocrd_base_version_checksum: Optional[str]
-    ocrd_mets: Optional[str]
-    bag_info_adds: Optional[dict]
-    mets_server_url: Optional[str]
+    ocrd_base_version_checksum: Optional[str] = None
+    ocrd_mets: Optional[str] = None
+    bag_info_adds: Optional[dict] = None
+    mets_server_url: Optional[str] = None
     deleted: bool = False
 
     class Settings: