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

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

@@ -1,20 +1,19 @@
 ocrd/__init__.py,sha256=ZswMVmlqFhAEIzMR3my6IKPq9XLH21aDPC_m_8Jh4dA,1076
-ocrd/constants.py,sha256=6dn3mG54WqHsKInmLZp4kJjNqqPtBoFoSuLUuRbOps0,740
+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=-n2jpGBZs_OMpI31E7CljGVdoFxDhgCAYwibcl_vp1Q,2838
 ocrd/cli/bashlib.py,sha256=sEpTKbqM5DEo6838Ki5aFU8QsokA2SqQ841gcBu7M5M,1148
-ocrd/cli/network.py,sha256=iQ0AhQRGvIFyJY9RBArUiA_wuz7IfNKvU4L8KpVggnY,530
+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
@@ -24,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
@@ -46,24 +52,26 @@ 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=9bwp8DFoRH96WnRpkDV3XRfXCBiupzK6WXjqPsTcvLg,4440
 ocrd_network/models/messages.py,sha256=OUDTjUiaATStsSAHCEDilUhBSruPsjpBtIBsllqN2Z0,672
@@ -78,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=-cCi_9kIzmLUixfnDcx2jq9IQuwMqrU-71RJhKOQilQ,7929
 ocrd_utils/ocrd_logging.conf,sha256=JlWmA_5vg6HnjPGjTC4mA5vFHqmnEinwllSTiOw5CCo,3473
-ocrd_utils/os.py,sha256=QEOramsUmBDzZxslPMZhfTviPr7EnopXKEgNc5zwwTs,9817
+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
@@ -101,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
@@ -115,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.7.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ocrd-3.7.0.dist-info/METADATA,sha256=yCPxM32p95ODwi46-eVJxTjxCheoiuxOZujpKYmEzIA,10340
-ocrd-3.7.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-ocrd-3.7.0.dist-info/entry_points.txt,sha256=4hcJ2LkK_OlIabHnKgFit35Ap7b5Lz1Gb4hzkxV0Kiw,152
-ocrd-3.7.0.dist-info/top_level.txt,sha256=pUgiN42t4KXC5rvpi6V8atza31XP4SCznXpXlVlvomM,75
-ocrd-3.7.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.7.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/resource_manager_server.py

@@ -0,0 +1,182 @@
+from datetime import datetime
+from os import getpid
+from shutil import which
+from typing import Any
+from uvicorn import run as uvicorn_run
+from fastapi import APIRouter, FastAPI, HTTPException, status
+
+from ocrd import OcrdResourceManager
+from ocrd_utils import getLogger, get_ocrd_tool_json, initLogging
+from .logging_utils import configure_file_handler_with_formatter, get_resource_manager_server_logging_file_path
+
+
+class ResourceManagerServer(FastAPI):
+    def __init__(self, host: str, port: int) -> None:
+        self.title = f"OCR-D Resource Manager Server"
+        super().__init__(
+            title=self.title,
+            on_startup=[self.on_startup],
+            on_shutdown=[self.on_shutdown],
+            description=self.title
+        )
+        initLogging()
+        self.log = getLogger("ocrd_network.resource_manager_server")
+        log_file = get_resource_manager_server_logging_file_path(pid=getpid())
+        configure_file_handler_with_formatter(self.log, log_file=log_file, mode="a")
+
+        self.resmgr_instance = OcrdResourceManager()
+
+        self.hostname = host
+        self.port = port
+
+        self.add_api_routes()
+
+    def start(self):
+        uvicorn_run(self, host=self.hostname, port=int(self.port))
+
+    async def on_startup(self):
+        self.log.info(f"Starting {self.title}")
+        pass
+
+    async def on_shutdown(self) -> None:
+        pass
+
+    def add_api_routes(self):
+        base_router = APIRouter()
+        base_router.add_api_route(
+            path="/",
+            endpoint=self.home_page,
+            methods=["GET"],
+            status_code=status.HTTP_200_OK,
+            summary="Get information about the OCR-D Resource Manager Server"
+        )
+        base_router.add_api_route(
+            path="/list_available",
+            endpoint=self.list_available_resources,
+            methods=["GET"],
+            status_code=status.HTTP_200_OK,
+            summary=""
+        )
+        base_router.add_api_route(
+            path="/list_installed",
+            endpoint=self.list_installed_resources,
+            methods=["GET"],
+            status_code=status.HTTP_200_OK,
+            summary=""
+        )
+        base_router.add_api_route(
+            path="/download",
+            endpoint=self.download_resource,
+            methods=["GET"],
+            status_code=status.HTTP_200_OK,
+            summary=""
+        )
+        self.include_router(base_router)
+
+    async def home_page(self):
+        message = f"The home page of the {self.title}"
+        json_message = {
+            "message": message,
+            "time": datetime.now().strftime("%Y-%m-%d %H:%M")
+        }
+        return json_message
+
+    async def list_available_resources(
+        self,
+        executable: Any = "ocrd-dummy",
+        dynamic: bool = True,
+        name: Any = None,
+        database: Any = None,
+        url: Any = None
+    ):
+        if executable == '*':
+            message = f"'*' is not an acceptable executable name! Try with a specific executable."
+            self.log.error(message)
+            raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=message)
+        result = self.resmgr_instance.list_available(executable, dynamic, name, database, url)
+        json_message = {
+            "result": result
+        }
+        return json_message
+
+    async def list_installed_resources(self, executable: Any = None):
+        if executable == '*':
+            message = f"'*' is not an acceptable executable name! Try with a specific executable."
+            self.log.error(message)
+            raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=message)
+        result = self.resmgr_instance.list_available(executable)
+        json_message = {
+            "result": result
+        }
+        return json_message
+
+    async def download_resource(
+        self,
+        executable: str = "ocrd-dummy",
+        name: Any = None,
+        location: Any = None,
+        any_url: str = '',
+        no_dynamic: bool = False,
+        resource_type: str = 'file',
+        path_in_archive: str = '.',
+        allow_uninstalled: bool = True,
+        overwrite: bool = True
+    ):
+        resmgr = OcrdResourceManager()
+        response = []
+        if executable == '*':
+            message = f"'*' is not an acceptable executable name! Try with a specific executable."
+            self.log.error(message)
+            raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=message)
+        if name == '*':
+            name = None
+        if executable and not which(executable):
+            if not allow_uninstalled:
+                message = (f"Executable '{executable}' is not installed. To download resources anyway, "
+                           f"use the -a/--allow-uninstalled flag")
+                self.log.error(message)
+                raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=message)
+            else:
+                message = f"Executable '{executable}' is not installed, but downloading resources anyway."
+                self.log.info(message)
+                response.append(message)
+        reslist = resmgr.list_available(executable=executable, dynamic=not no_dynamic, name=name)
+        if not any(r[1] for r in reslist):
+            message = f"No resources {name} found in registry for executable {executable}"
+            self.log.info(message)
+            response.append(message)
+            if executable and name:
+                reslist = [(executable, [{
+                    'url': any_url or '???',
+                    'name': name,
+                    'type': resource_type,
+                    'path_in_archive': path_in_archive}]
+                )]
+        for this_executable, this_reslist in reslist:
+            resource_locations = get_ocrd_tool_json(this_executable)['resource_locations']
+            if not location:
+                location = resource_locations[0]
+            elif location not in resource_locations:
+                response.append(
+                    f"The selected --location {location} is not in the {this_executable}'s resource search path, "
+                    f"refusing to install to invalid location. Instead installing to: {resource_locations[0]}")
+            res_dest_dir = resmgr.build_resource_dest_dir(location=location, executable=this_executable)
+            for res_dict in this_reslist:
+                try:
+                    fpath = resmgr.handle_resource(
+                        res_dict=res_dict,
+                        executable=this_executable,
+                        dest_dir=res_dest_dir,
+                        any_url=any_url,
+                        overwrite=overwrite,
+                        resource_type=resource_type,
+                        path_in_archive=path_in_archive
+                    )
+                    if not fpath:
+                        continue
+                except FileExistsError as exc:
+                    response.append(str(exc))
+                usage = res_dict.get('parameter_usage', 'as-is')
+                response.append(f"Use in parameters as '{resmgr.parameter_usage(res_dict['name'], usage)}'")
+        json_message = { "result": response }
+        return json_message

ocrd_network/runtime_data/connection_clients.py

@@ -36,7 +36,7 @@ class CustomDockerClient(DockerClient):
                 raise ValueError("Both 'password' and 'keypath' provided - one must be provided")
         if ("password" not in kwargs) and ("keypath" not in kwargs):
             raise ValueError("Missing 'password' or 'keypath' - one must be provided")
-        self.api = APIClient(base_url=f"ssh://{host}", use_ssh_client=True, version="1.41")
+        self.api = APIClient(base_url=f"ssh://{host}", use_ssh_client=True, version="auto")
         self.api.mount(
             prefix="http+docker://ssh", adapter=self.CustomSshHttpAdapter(base_url=f"ssh://{user}@{host}:22", **kwargs)
         )

ocrd_network/runtime_data/hosts.py

@@ -1,9 +1,13 @@
 from logging import Logger
-from time import sleep
-from typing import Dict, List
+from typing import Dict, List, Optional
 
-from .connection_clients import create_docker_client, create_ssh_client
-from .network_agents import DataProcessingWorker, DeployType
+from docker import APIClient
+from paramiko import SSHClient
+
+from ..constants import RESOURCE_MANAGER_SERVER_PORT
+from .connection_clients import CustomDockerClient, create_docker_client, create_ssh_client
+from .network_agents import (
+    DataProcessingWorker, DeployType, deploy_agent_native_get_pid_hack)
 
 
 class DataHost:
@@ -11,6 +15,8 @@ class DataHost:
         self, host: str, username: str, password: str, keypath: str, workers: List[Dict], servers: List[Dict]
     ) -> None:
         self.host = host
+        self.resource_manager_port = RESOURCE_MANAGER_SERVER_PORT
+        self.resource_manager_pid = None
         self.username = username
         self.password = password
         self.keypath = keypath
@@ -22,14 +28,11 @@ class DataHost:
 
         # Connection clients, ssh for native deployment, docker for docker deployment
         self.ssh_client = None
-        self.docker_client = None
-
-        # Time to wait between deploying single workers
-        self.wait_between_deploys: float = 0.3
+        self.docker_client: Optional[CustomDockerClient] = None
 
-        # Lists of Processing Workers based on their deployment type
-        self.workers_native = []
-        self.workers_docker = []
+        # Lists of network agents based on their agent and deployment type
+        self.workers_native: List[DataProcessingWorker] = []
+        self.workers_docker: List[DataProcessingWorker] = []
 
         if not workers:
             workers = []
@@ -68,6 +71,13 @@ class DataHost:
             self.docker_client = create_docker_client(self.host, self.username, self.password, self.keypath)
             return self.docker_client
 
+    def __deploy_network_agent_resource_manager_server(self, logger: Logger):
+        logger.info(f"Deploying resource manager server on host: {self.host}:{self.resource_manager_port}")
+        start_cmd = f"ocrd network resmgr-server --address {self.host}:{self.resource_manager_port} &"
+        pid = deploy_agent_native_get_pid_hack(logger, self.ssh_client, start_cmd)
+        logger.info(f"Deployed: OCR-D Resource Manager Server [{pid}]: {self.host}:{self.resource_manager_port}")
+        self.resource_manager_pid = pid
+
     def __deploy_single_worker(
         self, logger: Logger, worker_data: DataProcessingWorker,
         mongodb_url: str, rabbitmq_url: str
@@ -86,7 +96,6 @@ class DataHost:
             connection_client = self.docker_client
 
         worker_data.deploy_network_agent(logger, connection_client, mongodb_url, rabbitmq_url)
-        sleep(self.wait_between_deploys)
 
     def __deploy_all_workers(self, logger: Logger, mongodb_url: str, rabbitmq_url: str):
         logger.info(f"Deploying processing workers on host: {self.host}")
@@ -95,17 +104,24 @@ class DataHost:
             logger.info("No processing workers found to be deployed")
         for data_worker in self.workers_native:
             self.__deploy_single_worker(logger, data_worker, mongodb_url, rabbitmq_url)
+            logger.info(f"Deployed: {data_worker}")
         for data_worker in self.workers_docker:
             self.__deploy_single_worker(logger, data_worker, mongodb_url, rabbitmq_url)
+            logger.info(f"Deployed: {data_worker}")
 
     def deploy_workers(self, logger: Logger, mongodb_url: str, rabbitmq_url: str) -> None:
         if self.needs_ssh_connector and not self.ssh_client:
             logger.debug("Creating missing ssh connector before deploying")
-            self.ssh_client = self.create_connection_client(client_type="ssh")
+            client = self.create_connection_client(client_type="ssh")
+            assert isinstance(client, SSHClient)
+            self.ssh_client = client
         if self.needs_docker_connector:
             logger.debug("Creating missing docker connector before deploying")
-            self.docker_client = self.create_connection_client(client_type="docker")
+            client = self.create_connection_client(client_type="docker")
+            assert isinstance(client, CustomDockerClient)
+            self.docker_client = client
 
+        self.__deploy_network_agent_resource_manager_server(logger)
         self.__deploy_all_workers(logger=logger, mongodb_url=mongodb_url, rabbitmq_url=rabbitmq_url)
 
         if self.ssh_client:
@@ -115,6 +131,12 @@ class DataHost:
             self.docker_client.close()
             self.docker_client = None
 
+    def __stop_network_agent_resource_manager_server(self, logger: Logger):
+        logger.info(f"Stopping OCR-D Resource Manager Server [{self.resource_manager_pid}]: "
+                    f"{self.host}:{self.resource_manager_port}")
+        assert self.ssh_client, "SSH client connection missing"
+        self.ssh_client.exec_command(f"kill {self.resource_manager_pid}")
+
     def __stop_worker(self, logger: Logger, name: str, deploy_type: DeployType, pid: str):
         worker_info = f"Processing Worker: deploy: {deploy_type}, name: {name}"
         if not pid:
@@ -132,10 +154,15 @@ class DataHost:
     def stop_workers(self, logger: Logger):
         if self.needs_ssh_connector and not self.ssh_client:
             logger.debug("Creating missing ssh connector before stopping")
-            self.ssh_client = self.create_connection_client(client_type="ssh")
+            client = self.create_connection_client(client_type="ssh")
+            assert isinstance(client, SSHClient)
+            self.ssh_client = client
         if self.needs_docker_connector and not self.docker_client:
             logger.debug("Creating missing docker connector before stopping")
-            self.docker_client = self.create_connection_client(client_type="docker")
+            client = self.create_connection_client(client_type="docker")
+            assert isinstance(client, CustomDockerClient)
+            self.docker_client = client
+        self.__stop_network_agent_resource_manager_server(logger=logger)
 
         logger.info(f"Stopping processing workers on host: {self.host}")
         amount_workers = len(self.workers_native) + len(self.workers_docker)

ocrd_network/runtime_data/network_agents.py

@@ -1,4 +1,5 @@
 from logging import Logger
+from time import sleep
 from typing import Any
 
 from re import search as re_search
@@ -25,7 +26,8 @@ def deploy_agent_native_get_pid_hack(logger: Logger, ssh_client, start_cmd: str)
     output = stdout.read().decode("utf-8")
     stdout.close()
     stdin.close()
-    return re_search(r"xyz([0-9]+)xyz", output).group(1)  # type: ignore
+    pid = re_search(r"xyz([0-9]+)xyz", output).group(1)  # type: ignore
+    return pid
 
 
 # TODO: Implement the actual method that is missing
@@ -51,6 +53,12 @@ class DataNetworkAgent:
         # The id is assigned when the agent is deployed
         self.pid = pid
 
+        # Time to wait between deploying agents
+        self.wait_between_agent_deploys: float = 0.3
+
+    def __str__(self):
+        return f"{self.pid} {self.deploy_type} {self.processor_name} on host: {self.host}"
+
     def _start_native_instance(self, logger: Logger, ssh_client, start_cmd: str):
         if self.deploy_type != DeployType.NATIVE:
             raise RuntimeError(f"Mismatch of deploy type when starting network agent: {self.processor_name}")
@@ -76,11 +84,17 @@ class DataProcessingWorker(DataNetworkAgent):
     def deploy_network_agent(self, logger: Logger, connector_client, database_url: str, queue_url: str):
         if self.deploy_type == DeployType.NATIVE:
             start_cmd = f"{self.processor_name} --database {database_url} --queue {queue_url} &"
+            assert connector_client, f"SSH client connection missing."
             self.pid = self._start_native_instance(logger, connector_client, start_cmd)
+            sleep(self.wait_between_agent_deploys)
             return self.pid
         if self.deploy_type == DeployType.DOCKER:
             # TODO: add real command to start processing worker in docker here
             start_cmd = ""
+            assert connector_client, f"Docker client connection missing."
+            if not start_cmd:
+                raise RuntimeError("Missing start command for the Processing Worker in docker mode")
             self.pid = self._start_docker_instance(logger, connector_client, start_cmd)
+            sleep(self.wait_between_agent_deploys)
             return self.pid
         raise RuntimeError(f"Unknown deploy type of {self.__dict__}")

ocrd_utils/__init__.py

@@ -70,7 +70,8 @@ Utility functions and constants usable in various circumstances.
 
     filesystem-related utilities
 
-* :py:func:`is_string`,
+* :py:func:`is_git_url`,
+  :py:func:`is_string`,
   :py:func:`membername`,
   :py:func:`concat_padded`,
   :py:func:`nth_url_segment`,
@@ -118,6 +119,7 @@ from .constants import (
     REGEX_PREFIX,
     REGEX_FILE_ID,
     RESOURCE_LOCATIONS,
+    RESOURCE_TYPES,
     LOG_FORMAT,
     LOG_TIMEFMT,
     VERSION,
@@ -184,9 +186,11 @@ from .os import (
     get_processor_resource_types,
     get_ocrd_tool_json,
     get_moduledir,
+    get_env_locations,
     guess_media_type,
     list_all_resources,
     is_file_in_directory,
+    is_git_url,
     list_resource_candidates,
     atomic_write,
     pushd_popd,