ocrd 3.0.0a2__py3-none-any.whl → 3.0.0b1__py3-none-any.whl

{ocrd-3.0.0a2.dist-info → ocrd-3.0.0b1.dist-info}/RECORD

@@ -1,67 +1,68 @@
 ocrd/__init__.py,sha256=ZswMVmlqFhAEIzMR3my6IKPq9XLH21aDPC_m_8Jh4dA,1076
 ocrd/constants.py,sha256=6dn3mG54WqHsKInmLZp4kJjNqqPtBoFoSuLUuRbOps0,740
-ocrd/lib.bash,sha256=nG5itqaYJFPHGe4gSEE_zikcyooGGAThKAJOU2CnYS8,10595
-ocrd/mets_server.py,sha256=YMfaN333aIBTS9RLIboHvPWJWgde_4IOT09YuXan5KY,20189
+ocrd/lib.bash,sha256=7amCf_0mwE3tkz-e_HxA30aQnL1x2O4BF_8dE9fbqJg,10692
+ocrd/mets_server.py,sha256=M7hZOvOEbCfx5jCjeZ5Uv4CgviVZjGV15N8SN1ATpNY,20149
 ocrd/ocrd-all-tool.json,sha256=9bX2VYnUwhTAzAvKaoT77BFzbgBGgyIt7qBqARpwWNc,586
-ocrd/resolver.py,sha256=P3UpKMz2xWiUdsbGWKvlEYhQQ4MSGDchNa2diWu3BBs,15005
+ocrd/resolver.py,sha256=Ba9ALQbTXz6_mla4VqN9tAfHoj6aKuNJAU4tIDnjcHE,14952
 ocrd/resource_list.yml,sha256=82-PiqkZnka1kTj3MQqNn4wXWKHHtoFchsQuetWuqFs,2633
-ocrd/resource_manager.py,sha256=5XG7rhrnTXuWDl6Oj9S04cwpkOcHmCbqIUW9ZlCzPr4,16698
+ocrd/resource_manager.py,sha256=8BMVKJq8J56hugi8vtGn9Ffuk7oRkbs197aG74aKbCY,16733
 ocrd/task_sequence.py,sha256=spiaUQaMM7M8WdBDoQGmLuTPm7tOugYXD6rcJ2UXzxw,6991
-ocrd/workspace.py,sha256=DPqK4zFj8gwCDvwsJKnwk27HKcIwyE4hRYJKrDZKZvQ,65596
-ocrd/workspace_backup.py,sha256=z6gMo3_RfbSTatcNrbj8dGP4oqLyZm1q8iZjlLy-KC8,3630
+ocrd/workspace.py,sha256=t5xveWhSLj5cbsuVkOqT6VZEQ9DRCxucT7FUvTNFnDA,65604
+ocrd/workspace_backup.py,sha256=iab_JjZ_mMP-G8NIUk4PZmfpNlQuGRoqc3NbTSSew1w,3621
 ocrd/workspace_bagger.py,sha256=yU8H3xR5WmQKvgQewac71ie-DUWcfLnMS01D55zsEHQ,11971
-ocrd/cli/__init__.py,sha256=xsWkQcbyHBkMEDrACbzlLNs4Wpwoxd96H1ZxRJwAw1g,2407
-ocrd/cli/bashlib.py,sha256=4IWPdVKa-xeNLUh15tvp37XuQ-zBxultK2P2yJptvZQ,4969
+ocrd/cli/__init__.py,sha256=XyYcbIuajaS2YM6HEWD4dfitdAzn111AWIaFPsTHoKQ,2621
+ocrd/cli/bashlib.py,sha256=XGcO-MmYM3xJBRkSCLEZcGs0hqbw2GR8oyijJPtKnYM,5888
 ocrd/cli/log.py,sha256=6_FrVmTKIIVNUaNLkuOJx8pvPhensHMuayJ0PA7T-XA,1562
 ocrd/cli/network.py,sha256=oWBHFEURxfUdb_t-F4svP_ri7o5mqBoNQnLZLbsZLTA,602
-ocrd/cli/ocrd_tool.py,sha256=B5D64t__2A6mETvIcXONfiWclXjGuem_nlIRmSRHtXA,6682
+ocrd/cli/ocrd_tool.py,sha256=Sqh9Q5-H3u5IPPovp9bpL-QaP01zAHKZDSsi5MhvnQ8,7028
 ocrd/cli/process.py,sha256=8KD0i7LT01H9u5CC1vktYMEVpS67da_rp_09_EOECmw,1233
 ocrd/cli/resmgr.py,sha256=bTE-MpF7RRCHhgAbknqZUFHgHScIK6FR3S4h4DEAets,10080
 ocrd/cli/validate.py,sha256=s5GtioCtO0UfRmYi_tdxNkKx0bJIzdAXGMCPA-PTbto,5563
-ocrd/cli/workspace.py,sha256=rDbU6oRBABoG2GzzU9eKfCVcUczFoVpouKfx4jlXzgA,40552
+ocrd/cli/workspace.py,sha256=ETx3qjqUIXJp-Addv8eYmI2T_Js4PJR5UuZ4O6H7mis,40640
 ocrd/cli/zip.py,sha256=MMJLw3OXWiJVfVtrdJcBkbB8vA1IzSautluazZRuCQ0,5910
-ocrd/decorators/__init__.py,sha256=UwzbQbCSoat0Apdh3baIMxifxBPGRBmCo5sSt7ar0qk,7421
+ocrd/decorators/__init__.py,sha256=IJlA1XcdVBO6Hxm9rNDya7QYcqeWcaXXuLtGjfjcen8,7596
 ocrd/decorators/loglevel_option.py,sha256=tgipROEu3t4hkwWvFssd80k2SbTBwBIC4WNE6Gc-XAg,798
 ocrd/decorators/mets_find_options.py,sha256=d4oATKMP6bFQHNqOK6nLqgUiWF2FYdkPvzkTVRMYpKo,635
 ocrd/decorators/ocrd_cli_options.py,sha256=-bpYOyHod3pMmbooyw_dIOqRnhCoZbdmE8vrnWbQRNA,2621
 ocrd/decorators/parameter_option.py,sha256=n8hYw7XVTd3i3tvpK8F1Jx_CqRp6EGF9qJVH95yj92Q,1076
 ocrd/processor/__init__.py,sha256=m2lYRvJogmt2Xb4UgqjCXWkfOtqpKW3h8OEWDnblwTQ,273
-ocrd/processor/base.py,sha256=6FjkUa2nc6D2JgI_g2S9iIgbu6gT5rX9PcBIDczKdw4,35220
-ocrd/processor/helpers.py,sha256=o4ECw2NmzdrbvbHMJfvD5YlZb0n9ivWs6zBPKiYKLK4,15858
-ocrd/processor/ocrd_page_result.py,sha256=FaTxGoqSGec5JxA4d7ae1Xi19KShmZc77WTbeqJIPS0,456
+ocrd/processor/base.py,sha256=EvzR-uN5fDH1jKRWnm4CpCVpqge4Z7aprzW2PeXMqxU,38521
+ocrd/processor/helpers.py,sha256=7TmhKRrgi-T_q8dJX6DIVEVZ3qmNABJEcz3S9RXSUjI,16484
+ocrd/processor/ocrd_page_result.py,sha256=AazEmnWyPEN47TxXVg0WUQpgFNV_mlIiExwwycUj0nQ,490
 ocrd/processor/builtin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ocrd/processor/builtin/dummy_processor.py,sha256=uWRirZkufclg7cYfB7hq3GSNRKO9tEoagpAn74xbbA8,3861
+ocrd/processor/builtin/dummy_processor.py,sha256=6ORike_59wb_UUivhA6Iw_Ldg0AaMzX37F7qL9R8S_A,3704
 ocrd/processor/builtin/dummy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ocrd/processor/builtin/dummy/ocrd-tool.json,sha256=aTA2FZRsRsrkbTctkazFeRu4xsTF6yCdeY07cMzOyt4,677
-ocrd_modelfactory/__init__.py,sha256=kqTxkccX7Wgau3PCkY_dvfCjGYbmsCnExgBkwIBay7E,4098
+ocrd_modelfactory/__init__.py,sha256=0baYSJXrOCTCguHkE6hBeqpGNVUe3aZUocv64A-DMDk,4094
 ocrd_models/__init__.py,sha256=A0aj0mOraNb-xfiUueACdoaqISnp0qH-F49nTJg2vCs,380
-ocrd_models/constants.py,sha256=7u68kGLnfnouXiS-yR_i4QoVf0Jxxo4Ds0j9EV0e0SY,2757
+ocrd_models/constants.py,sha256=fI6Qz4OPOm6UBLQ_P2dlpjcwB0XFJZ7AgxxKqgc75X0,2724
 ocrd_models/mets-empty.xml,sha256=dFixfbxSXrgjZx9BfdIKWHX-khNmp7dNYaFe2qQSwCY,1203
 ocrd_models/ocrd_agent.py,sha256=E9OtDhz9UfKb6ou2qvsuCL9NlO1V6zMb0s8nVq8dVos,5609
-ocrd_models/ocrd_exif.py,sha256=uhveyXOm5coLRaJa-OBwljBFgdDHnXiajl9V3KyJxyE,4595
-ocrd_models/ocrd_file.py,sha256=lAEihsCMfuVAymiPmUHqsJqWHa5XYoS7n0sfOeHAfQE,9649
-ocrd_models/ocrd_mets.py,sha256=7WVWdCgh9aCuYy4qJji-moJPC9kzeWAk98m8DmA-qh8,42613
-ocrd_models/ocrd_page.py,sha256=5J6uT1R1IDDYGwyTzeu-WcopiNl4DnrofMfDT2rdAtM,5424
+ocrd_models/ocrd_exif.py,sha256=5BRLjvB6jg36V68i8jvVnT2SSNnpqLbhLsaMuP51Scw,4583
+ocrd_models/ocrd_file.py,sha256=7lyHezuNnl2FEYV1lV35-QTCrgYAL-3wO2ulFUNq2Ak,9717
+ocrd_models/ocrd_mets.py,sha256=h3y_WI5fVLsbBoUIRNH2ebjuO1-_P6T3BMIULX-ZOIs,42514
+ocrd_models/ocrd_page.py,sha256=sVIvvMeBT8eZnOfW0DTjQUNyu62-llz0v_Ga5Xo-tUM,5393
 ocrd_models/ocrd_page_generateds.py,sha256=XpzRaJAvGc_N58Mb2_Sk42S59pDqMRFiplqce1pUubw,772504
-ocrd_models/ocrd_xml_base.py,sha256=3pDA0pjnSyLx63nbbiJnH3oKN8qmvBgL8Lo-WAzlSjY,1642
+ocrd_models/ocrd_xml_base.py,sha256=OW57mXLlwm1nH8CNefvXmwLRws9KL9zSrb-3vH--mX8,1641
 ocrd_models/report.py,sha256=luZxvzAAQyGYOlRNSJQUIUIANG81iGmBW5ag-uXxKCA,2026
 ocrd_models/utils.py,sha256=0_WHf5NEn1WC8MKJc6X_RK8gW-70Z09_mslkKOj7uF8,2369
 ocrd_network/__init__.py,sha256=gMejC614J5PPGgXDKBiQS0jt-Jx8qOrLbWH7zt8x8Gs,374
-ocrd_network/client.py,sha256=fXXphI5tLlkQolDlV8vX2ASQsEaDU0LH1KR61huZOSo,1628
+ocrd_network/client.py,sha256=j9PJ9QHI6qJ_qAxVlpTk5mLfq0Xemj_Br-0SX-09U5M,2834
+ocrd_network/client_utils.py,sha256=JDBzDOGY2G_bgS8fQ677CMHG9DWSvIuWTlEFzdsXr_Q,4527
 ocrd_network/constants.py,sha256=IeNtcU6dqonDE3Zw83_61auhS8X2b8wsjAxYg1zvK-M,1902
 ocrd_network/database.py,sha256=fcft7vdRDoR7vmPL1xNYTIeOg5DwRPcggwYDYxLy5ik,10706
 ocrd_network/logging_utils.py,sha256=bO9TQqBXw9CIZEKp8tHXbeE2NuJWMiaQDHzS05b4ajo,2153
 ocrd_network/param_validators.py,sha256=Jl1VwiPPKJ50k-xEHLdvW-1QDOkJHCiMz4k9Ipqm-Uc,1489
 ocrd_network/process_helpers.py,sha256=KpkInXsa5bgrxvTOouyMJ0NgJhaz0J9Gjs5sZHBcH64,2373
-ocrd_network/processing_server.py,sha256=77rP7X4pdr3G9smsmCUo23JgCKtAiXq0lkvmqChcfe4,41128
+ocrd_network/processing_server.py,sha256=8EFQIcjiQ-AEc4goaggxa-hYWhJW9fMzR768ZIX8vZE,41139
 ocrd_network/processing_worker.py,sha256=VV_pC5ljtjPpMY89MElAMZ-YUJdKk7IPugxFfDy8viA,12396
 ocrd_network/processor_server.py,sha256=RVX0MSzzayDdqHg7Kga7L4vOsjmQcoRYObh6Naxz-U4,9858
 ocrd_network/server_cache.py,sha256=GKX91SkVahgAk0nGWT0S-0qWp7a9ubxncjwwLTKs7JY,12829
-ocrd_network/server_utils.py,sha256=m43sqLqK111LxERpe1y1JVnOOc_txfdTaGxs1Hg8WOM,10903
+ocrd_network/server_utils.py,sha256=NBSZvLD7o43fMtSkqR70ougW-IWCW9J71GHqZIBeD0Q,10982
 ocrd_network/tcp_to_uds_mets_proxy.py,sha256=pNEl5jH09M-zuUIx25nog7IZ-fkXabi3724kQ_3iMTs,2894
 ocrd_network/utils.py,sha256=Vm8EiBBSKv5fAlkcb6nB8-duFN633ZIRAcPKfk7iyZY,6366
 ocrd_network/cli/__init__.py,sha256=F7YVqxw-9glz6-ghG0Kp5XXeV1-rL1emVSXLCWxdTF0,306
-ocrd_network/cli/client.py,sha256=OvEuXj9KpaWYfeZWsbbU7bjLs0DvcDsrywnHDj3V5QQ,2644
+ocrd_network/cli/client.py,sha256=4bpsDRwm3WVFHA6ITM-VKAFx-JQ6ldbBKFVYleWhiW8,7515
 ocrd_network/cli/processing_server.py,sha256=rAci6RsHlZ0c87GuLdfdCQCiGNcDEu4NEEQiwKJqVUo,796
 ocrd_network/cli/processing_worker.py,sha256=ZuaCkbKV_WKJV7cGOjZ6RLrjjppymnwNCiznFMlclAg,1897
 ocrd_network/cli/processor_server.py,sha256=Vto7UekFo_g83aHqwDmhge9bhPzk0b7O-L46dSfIpJc,1259
@@ -81,45 +82,45 @@ ocrd_network/rabbitmq_utils/publisher.py,sha256=mw4XQQhRE1xUQVgEUseyG845iIgVO-9G
 ocrd_network/runtime_data/__init__.py,sha256=3jYkmT4mxMUcpbDaSw7Ld0KTedGEx_5vUQPDjwUyJZc,367
 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/deployer.py,sha256=mtVHaJCxTzVUfhODHQFawd69QllR7-VeJ4uv43kn3I8,7943
+ocrd_network/runtime_data/deployer.py,sha256=W7SHn6XBC5fIaTJIMnHOMxEyp7dVqvHY4_cepaloMhQ,8315
 ocrd_network/runtime_data/hosts.py,sha256=ml19ptzH4TFofyJR-Qp_Mn3sZUFbWoNe__rRXZSj_WE,12185
 ocrd_network/runtime_data/network_agents.py,sha256=5p_zKLqECBIHLw-Ya6eKcKSZcUM4ESiipEIphVxHBEA,5192
 ocrd_network/runtime_data/network_services.py,sha256=xrPpFUU_Pa-XzGe2FEt5RmO17xqykIUmTr_9g6S7XSs,7892
-ocrd_utils/__init__.py,sha256=RkAiJSbD90kIOMWJkDSiJnP_XpWVO3FHR5pUY9LNTd0,5898
-ocrd_utils/config.py,sha256=q-xwUesiZTCX37L9eEMhgkxsNUoFUc15gr3pzIBOAbM,9436
+ocrd_utils/__init__.py,sha256=U_zAQJwxg_aJ4CR84CKMNAUP6Cob8Er8Ikj42JmnUKo,5977
+ocrd_utils/config.py,sha256=Zs7XXjfWa1oQ1tvnu6DR1WmfafohMPU9KR-Qx3qoC74,9818
 ocrd_utils/constants.py,sha256=ImbG1d8t2MW3uuFi-mN6aY90Zn74liAKZBKlfuKN86w,3278
 ocrd_utils/deprecate.py,sha256=4i50sZsA3Eevqn5D-SL5yGf9KEZfGCV4A5Anzn1GRMs,1026
-ocrd_utils/image.py,sha256=Df9QYSB0GvhSF9S1DyXetl9Qk038RL5yjGUVTUtFpWA,24531
+ocrd_utils/image.py,sha256=zNNX1cnRy6yvrxx8mnYQiqWraAh5-i4a1AOfCCg4SmI,24781
 ocrd_utils/introspect.py,sha256=gfBlmeEFuRmRUSgdSK0jOxRpYqDRXl2IAE6gv2MZ6as,1977
-ocrd_utils/logging.py,sha256=0FWmyeJ3c_8FzeEUfCH3pXSlJ8rNKulHxPf9-bdLziY,8135
+ocrd_utils/logging.py,sha256=Mw49E_JX3lGNi2TEOK3qXInQf5E2zg-Vbse5uFgxO9M,8156
 ocrd_utils/ocrd_logging.conf,sha256=kl9x9JS1d8h8F0QZabvrjZtW1iApIaChvkImYafKO5g,3623
-ocrd_utils/os.py,sha256=oi53XJ_k7CssPoK32OYGc3aXXPktOe_m-pRp2TMs-ao,9842
-ocrd_utils/str.py,sha256=eB0JRycz9wHTE4oXHOC8BiLuGPPw_TYb8dD36Izv4m4,9809
+ocrd_utils/os.py,sha256=acRRdDBI8L6BK0Mf773yKEzwdpZSFRBJEKB2crL4EjU,9865
+ocrd_utils/str.py,sha256=JIhsyWphqJuxJAzhRQJUqlZ44AGOeObEPJMFhfWhfhQ,10084
 ocrd_validators/__init__.py,sha256=ZFc-UqRVBk9o1YesZFmr9lOepttNJ_NKx1Zdb7g_YsU,972
 ocrd_validators/bagit-profile.yml,sha256=sdQJlSi7TOn1E9WYMOZ1shewJ-i_nPaKmsAFkh28TGY,1011
 ocrd_validators/constants.py,sha256=FLP57T3F39weka_XovG40RgVMW1GunnbK04QRQ9tmlE,1802
-ocrd_validators/json_validator.py,sha256=e-MBWGLOGIHXOF2JTc8gFuoNijvq-5kcza0So0AMkOU,2704
+ocrd_validators/json_validator.py,sha256=jkVYwBtXwoubcNbLFWy8kC-DRqdf-9ryoqEf5HHi3Ds,2651
 ocrd_validators/message_processing.schema.yml,sha256=HL7o96-7ejslVMXcp16sbo5IjfUcW0wH8rPXHXdTyyA,1947
 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=wi9n5Ooi3feic5D_xqygUhhPYEF1TMKg60cY8OmRf8c,9912
-ocrd_validators/ocrd_tool_validator.py,sha256=nnzW4fyTzY1jw8mJaLu0OB1KNhU6pvhDOpNRfTqk1eY,752
+ocrd_validators/ocrd_tool_validator.py,sha256=CvfUHC0vJsPnmFBNf4ndQMXX6pcERCjJMAWk2L-T_ww,747
 ocrd_validators/ocrd_zip_validator.py,sha256=udAImFFliJY3y1FcKwZ52rhpjYB2Iv491hWDxdet8w0,3685
 ocrd_validators/page.xsd,sha256=abQ8C3gRLPMFm8lH62aTCfvTIWI23TpgEDcaW9YCt7I,85770
-ocrd_validators/page_validator.py,sha256=X3h-kp7QzleD4DGkOYWto67umYQAooNCFiC9LQIGm6M,23172
-ocrd_validators/parameter_validator.py,sha256=clYO3HS4WCpAMXVuKhlcHj2PlRUNDW7rgbqEWkKUAzI,1413
+ocrd_validators/page_validator.py,sha256=0fI278TLTsrw6htcwk7d9WkTFcbHNip87VMS2uw4Bzc,21765
+ocrd_validators/parameter_validator.py,sha256=_5Y3IS24Sf_xHBkB3TE3jB9VTCbbjWO8bSwcQDP0ewI,1365
 ocrd_validators/processing_server_config.schema.yml,sha256=8NQbhSshm1exTvbdYiu694rZZ-Xe70_vQtsJ0nd7ZCM,5432
 ocrd_validators/processing_server_config_validator.py,sha256=lQ2-ZxsvbFki_SvE_N4_1ptBnBHcwOTJ5grtL2G9F8A,810
-ocrd_validators/resource_list_validator.py,sha256=Z0Iwqm7DmcXCKJPsw76FeM9_v_yWVLuVL9oGEjd_jY8,689
-ocrd_validators/workspace_validator.py,sha256=tbN_K2MDC-gavdn7uqO92LRBjK3Ias48YybOhjEsBOc,18038
+ocrd_validators/resource_list_validator.py,sha256=cFMj0n_x-tjhuNUpjgEvPP8iPVm7lme9TWAaqATasV0,776
+ocrd_validators/workspace_validator.py,sha256=rEXIwjtNpt8HcTv94fKed3vVlA3U4z7Xmm1ZL1VHC84,17892
 ocrd_validators/xlink.xsd,sha256=8fW7YAMWXN2PbB_MMvj9H5ZeFoEBDzuYBtlGC8_6ijw,3180
 ocrd_validators/xsd_mets_validator.py,sha256=4GWfLyqkmca0x7osDuXuExYuM0HWVrKoqn0S35sFhHU,467
 ocrd_validators/xsd_page_validator.py,sha256=BNz_9u-Ek4UCeyZu3KxSQoolfW9lvuaSR9nIu1XXxeE,467
-ocrd_validators/xsd_validator.py,sha256=dOFZ4fWSvnnrwRCgILTNpn5okZOnPKxy41KH1VgBZaw,2093
-ocrd-3.0.0a2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ocrd-3.0.0a2.dist-info/METADATA,sha256=HjSzMpUo0KfKVpZl2W0KHWEY9o9z4VEggaCEm0EE-SA,8785
-ocrd-3.0.0a2.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-ocrd-3.0.0a2.dist-info/entry_points.txt,sha256=tV_gAdO8cbnOjS0GmKfJKbN60xBAV2DQRX6hEjleSjE,94
-ocrd-3.0.0a2.dist-info/top_level.txt,sha256=pUgiN42t4KXC5rvpi6V8atza31XP4SCznXpXlVlvomM,75
-ocrd-3.0.0a2.dist-info/RECORD,,
+ocrd_validators/xsd_validator.py,sha256=6HrVAf6SzCvfUIuQdIzz9bOq4V-zhyii9yrUPoK2Uvo,2094
+ocrd-3.0.0b1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ocrd-3.0.0b1.dist-info/METADATA,sha256=NKl_vrDFcwK3ayhp9_fe_2gAPESgGghDz3QQcdJRSRw,8785
+ocrd-3.0.0b1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+ocrd-3.0.0b1.dist-info/entry_points.txt,sha256=tV_gAdO8cbnOjS0GmKfJKbN60xBAV2DQRX6hEjleSjE,94
+ocrd-3.0.0b1.dist-info/top_level.txt,sha256=pUgiN42t4KXC5rvpi6V8atza31XP4SCznXpXlVlvomM,75
+ocrd-3.0.0b1.dist-info/RECORD,,

ocrd_modelfactory/__init__.py

@@ -72,7 +72,7 @@ def page_from_image(input_file : Union[OcrdFile, ClientSideOcrdFile], **kwargs)
         ),
         pcGtsId=input_file.ID
     )
-    mapping = dict()
+    mapping = {}
     etree : ET._Element = pcgts.to_etree(mapping_=mapping)
     revmap = dict(((node, element) for element, node in mapping.items()))
     return OcrdPage(pcgts, etree, mapping, revmap)

ocrd_models/constants.py

@@ -44,7 +44,6 @@ NAMESPACES = {
     'ocrd': 'https://ocr-d.de',
 }
 
-# pylint: disable=bad-whitespace
 TAG_METS_AGENT            = '{%s}agent' % NAMESPACES['mets']
 TAG_METS_DIV              = '{%s}div' % NAMESPACES['mets']
 TAG_METS_FILE             = '{%s}file' % NAMESPACES['mets']

ocrd_models/ocrd_exif.py

@@ -102,7 +102,7 @@ class OcrdExif():
         Serialize all properties as XML string.
         """
         ret = '<exif>'
-        for k in self.__dict__:
-            ret += '<%s>%s</%s>' % (k, self.__dict__[k], k)
+        for k, v in self.__dict__.items():
+            ret += f'<{k}>{v}</{k}>'
         ret += '</exif>'
         return ret

ocrd_models/ocrd_file.py

@@ -230,12 +230,12 @@ class ClientSideOcrdFile:
 
     def __init__(
         self,
-        el,
+        el, # pylint: disable=unused-argument
         mimetype: str = '',
         pageId: str = '',
         loctype: str ='OTHER',
         local_filename: Optional[str] = None,
-        mets : Any = None,
+        mets : Any = None, # pylint: disable=unused-argument
         url: str = '',
         ID: str = '',
         fileGrp: str = ''

ocrd_models/ocrd_mets.py

@@ -75,7 +75,7 @@ class OcrdMets(OcrdXmlDocument):
     def __init__(self, **kwargs) -> None:
         """
         """
-        super(OcrdMets, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         # XXX If the environment variable OCRD_METS_CACHING is set to "true",
         # then enable caching, if "false", disable caching, overriding the
@@ -198,7 +198,7 @@ class OcrdMets(OcrdXmlDocument):
         """
         return [OcrdAgent(el_agent) for el_agent in self._tree.getroot().findall('mets:metsHdr/mets:agent', NS)]
 
-    def add_agent(self, *args, **kwargs) -> OcrdAgent:
+    def add_agent(self, **kwargs) -> OcrdAgent:
         """
         Add an :py:class:`ocrd_models.ocrd_agent.OcrdAgent` to the list of agents in the ``metsHdr``.
         """
@@ -213,7 +213,7 @@ class OcrdMets(OcrdXmlDocument):
             el_agent_last.addnext(el_agent)
         except StopIteration:
             el_metsHdr.insert(0, el_agent)
-        return OcrdAgent(el_agent, *args, **kwargs)
+        return OcrdAgent(el_agent, **kwargs)
 
     @property
     def file_groups(self) -> List[str]:
@@ -488,11 +488,12 @@ class OcrdMets(OcrdXmlDocument):
                         f"A file with ID=={ID} already exists {mets_file} but unrelated - cannot mitigate")
 
         # To get rid of Python's FutureWarning - checking if v is not None
-        kwargs = {k: v for k, v in locals().items() if
-                  k in ['url', 'ID', 'mimetype', 'pageId', 'local_filename'] and v is not None}
+        kwargs = {k: v for k, v in locals().items()
+                  if k in ['url', 'ID', 'mimetype', 'pageId', 'local_filename'] and v is not None}
         # This separation is needed to reuse the same el_mets_file element in the caching if block
         el_mets_file = ET.SubElement(el_fileGrp, TAG_METS_FILE)
         # The caching of the physical page is done in the OcrdFile constructor
+        # (which calls us back with set_physical_page_for_file)
         mets_file = OcrdFile(el_mets_file, mets=self, **kwargs)
 
         if self._cache_flag:
@@ -542,9 +543,9 @@ class OcrdMets(OcrdXmlDocument):
         # Delete the physical page ref
         fptrs = []
         if self._cache_flag:
-            for page in self._fptr_cache.keys():
-                if ID in self._fptr_cache[page]:
-                    fptrs.append(self._fptr_cache[page][ID])
+            for pageId, fptrdict in self._fptr_cache.items():
+                if ID in fptrdict:
+                    fptrs.append(fptrdict[ID])
         else:
             fptrs = self._tree.getroot().findall('.//mets:fptr[@FILEID="%s"]' % ID, namespaces=NS)
 
@@ -700,8 +701,8 @@ class OcrdMets(OcrdXmlDocument):
         assert for_fileIds # at this point we know for_fileIds is set, assert to convince pyright
         ret = [None] * len(for_fileIds)
         if self._cache_flag:
-            for pageId in self._fptr_cache.keys():
-                for fptr in self._fptr_cache[pageId].keys():
+            for pageId, fptrdict in self._fptr_cache.items():
+                for fptr in fptrdict:
                     if fptr in for_fileIds:
                         index = for_fileIds.index(fptr)
                         if return_divs:
@@ -737,10 +738,10 @@ class OcrdMets(OcrdXmlDocument):
         # delete any existing page mapping for this file.ID
         fptrs = []
         if self._cache_flag:
-            for page_id in self._fptr_cache.keys():
-                if ocrd_file.ID in self._fptr_cache[page_id].keys():
-                    if self._fptr_cache[page_id][ocrd_file.ID] is not None:
-                        fptrs.append(self._fptr_cache[page_id][ocrd_file.ID])
+            for page, fptrdict in self._fptr_cache.items():
+                if ocrd_file.ID in fptrdict:
+                    if fptrdict[ocrd_file.ID] is not None:
+                        fptrs.append(fptrdict[ocrd_file.ID])
         else:
             fptrs = self._tree.getroot().findall(
                 'mets:structMap[@TYPE="PHYSICAL"]/mets:div[@TYPE="physSequence"]/mets:div[@TYPE="page"]/mets:fptr[@FILEID="%s"]' %
@@ -791,7 +792,7 @@ class OcrdMets(OcrdXmlDocument):
             self._fptr_cache[pageId].update({ocrd_file.ID: el_fptr})
 
     def update_physical_page_attributes(self, page_id : str, **kwargs) -> None:
-        invalid_keys = list(k for k in kwargs.keys() if k not in METS_PAGE_DIV_ATTRIBUTE.names())
+        invalid_keys = list(k for k in kwargs if k not in METS_PAGE_DIV_ATTRIBUTE.names())
         if invalid_keys:
             raise ValueError(f"Invalid attribute {invalid_keys}. Allowed values: {METS_PAGE_DIV_ATTRIBUTE.names()}")
 
@@ -812,8 +813,8 @@ class OcrdMets(OcrdXmlDocument):
         corresponding to the ``mets:file`` :py:attr:`ocrd_file`.
         """
         if self._cache_flag:
-            for pageId in self._fptr_cache.keys():
-                if ocrd_file.ID in self._fptr_cache[pageId].keys():
+            for pageId, fptrdict in self._fptr_cache.items():
+                if ocrd_file.ID in fptrdict:
                     return pageId
         else:
             ret = self._tree.getroot().find(
@@ -828,7 +829,7 @@ class OcrdMets(OcrdXmlDocument):
         """
         mets_div = None
         if self._cache_flag:
-            if ID in self._page_cache[METS_PAGE_DIV_ATTRIBUTE.ID].keys():
+            if ID in self._page_cache[METS_PAGE_DIV_ATTRIBUTE.ID]:
                 mets_div = [self._page_cache[METS_PAGE_DIV_ATTRIBUTE.ID][ID]]
         else:
             mets_div = self._tree.getroot().xpath(
@@ -857,9 +858,9 @@ class OcrdMets(OcrdXmlDocument):
         # If that's the case then we do not need to iterate 2 loops, just one.
         mets_fptrs = []
         if self._cache_flag:
-            for page_id in self._fptr_cache.keys():
-                if fileId in self._fptr_cache[page_id].keys():
-                    mets_fptrs.append(self._fptr_cache[page_id][fileId])
+            for pageId, fptrdict in self._fptr_cache.items():
+                if fileId in fptrdict:
+                    mets_fptrs.append(fptrdict[fileId])
         else:
             mets_fptrs = self._tree.getroot().xpath(
                 'mets:structMap[@TYPE="PHYSICAL"]/mets:div[@TYPE="physSequence"]/mets:div[@TYPE="page"]/mets:fptr[@FILEID="%s"]' % fileId,
@@ -919,4 +920,3 @@ class OcrdMets(OcrdXmlDocument):
             # FIXME: merge structMap logical and structLink as well
             if after_add_cb:
                 after_add_cb(f_dest)
-

ocrd_models/ocrd_page.py

@@ -3,7 +3,6 @@ API to PAGE-XML, generated with generateDS from XML schema.
 """
 from io import StringIO
 from typing import Dict, Union
-from inspect import getmembers
 from lxml import etree as ET
 
 __all__ = [

ocrd_models/ocrd_xml_base.py

@@ -8,8 +8,8 @@ from .constants import NAMESPACES
 from .utils import xmllint_format
 
 
-for curie in NAMESPACES:
-    ET.register_namespace(curie, NAMESPACES[curie])
+for curie, url in NAMESPACES.items():
+    ET.register_namespace(curie, url)
 
 class OcrdXmlDocument():
     """

ocrd_network/cli/client.py

@@ -1,9 +1,11 @@
 import click
-from typing import Optional
-
-from ocrd.decorators import parameter_option
-from ocrd_network import Client
+from json import dumps
+from typing import List, Optional, Tuple
+from ocrd.decorators.parameter_option import parameter_option, parameter_override_option
 from ocrd_utils import DEFAULT_METS_BASENAME
+from ocrd_utils.introspect import set_json_key_value_overrides
+from ocrd_utils.str import parse_json_string_or_file
+from ..client import Client
 
 
 @click.group('client')
@@ -23,6 +25,34 @@ def discovery_cli():
     pass
 
 
+@discovery_cli.command('processors')
+@click.option('--address',
+              help='The address of the Processing Server. If not provided, '
+                   'the "OCRD_NETWORK_SERVER_ADDR_PROCESSING" env variable is used by default')
+def check_deployed_processors(address: Optional[str]):
+    """
+    Get a list of deployed processing workers/processor servers.
+    Each processor is shown only once regardless of the amount of deployed instances.
+    """
+    client = Client(server_addr_processing=address)
+    processors_list = client.check_deployed_processors()
+    print(dumps(processors_list, indent=4))
+
+
+@discovery_cli.command('processor')
+@click.option('--address',
+              help='The address of the Processing Server. If not provided, '
+                   'the "OCRD_NETWORK_SERVER_ADDR_PROCESSING" env variable is used by default')
+@click.argument('processor_name', required=True, type=click.STRING)
+def check_processor_ocrd_tool(address: Optional[str], processor_name: str):
+    """
+    Get the json tool of a deployed processor specified with `processor_name`
+    """
+    client = Client(server_addr_processing=address)
+    ocrd_tool = client.check_deployed_processor_ocrd_tool(processor_name=processor_name)
+    print(dumps(ocrd_tool, indent=4))
+
+
 @client_cli.group('processing')
 def processing_cli():
     """
@@ -31,56 +61,92 @@ def processing_cli():
     pass
 
 
-@processing_cli.command('processor')
+@processing_cli.command('check-log')
+@click.option('--address',
+              help='The address of the Processing Server. If not provided, '
+                   'the "OCRD_NETWORK_SERVER_ADDR_PROCESSING" env variable is used by default')
+@click.option('-j', '--processing-job-id', required=True)
+def check_processing_job_status(address: Optional[str], processing_job_id: str):
+    """
+    Check the log of a previously submitted processing job.
+    """
+    client = Client(server_addr_processing=address)
+    response = client.check_job_log(job_id=processing_job_id)
+    print(response._content.decode(encoding='utf-8'))
+
+
+@processing_cli.command('check-status')
+@click.option('--address',
+              help='The address of the Processing Server. If not provided, '
+                   'the "OCRD_NETWORK_SERVER_ADDR_PROCESSING" env variable is used by default')
+@click.option('-j', '--processing-job-id', required=True)
+def check_processing_job_status(address: Optional[str], processing_job_id: str):
+    """
+    Check the status of a previously submitted processing job.
+    """
+    client = Client(server_addr_processing=address)
+    job_status = client.check_job_status(processing_job_id)
+    assert job_status
+    print(f"Processing job status: {job_status}")
+
+
+@processing_cli.command('run')
 @click.argument('processor_name', required=True, type=click.STRING)
-@click.option('--address')
+@click.option('--address',
+              help='The address of the Processing Server. If not provided, '
+                   'the "OCRD_NETWORK_SERVER_ADDR_PROCESSING" env variable is used by default')
 @click.option('-m', '--mets', required=True, default=DEFAULT_METS_BASENAME)
 @click.option('-I', '--input-file-grp', default='OCR-D-INPUT')
 @click.option('-O', '--output-file-grp', default='OCR-D-OUTPUT')
 @click.option('-g', '--page-id')
 @parameter_option
+@parameter_override_option
 @click.option('--result-queue-name')
 @click.option('--callback-url')
 @click.option('--agent-type', default='worker')
-def send_processing_request(
-        address: Optional[str],
-        processor_name: str,
-        mets: str,
-        input_file_grp: str,
-        output_file_grp: Optional[str],
-        page_id: Optional[str],
-        parameter: Optional[dict],
-        result_queue_name: Optional[str],
-        callback_url: Optional[str],
-        # TODO: This is temporally available to toggle
-        #  between the ProcessingWorker/ProcessorServer
-        agent_type: Optional[str]
+@click.option('-b', '--block', default=False,
+              help='If set, the client will block till job timeout, fail or success.')
+def send_processing_job_request(
+    address: Optional[str],
+    processor_name: str,
+    mets: str,
+    input_file_grp: str,
+    output_file_grp: Optional[str],
+    page_id: Optional[str],
+    parameter: List[str],
+    parameter_override: List[Tuple[str, str]],
+    result_queue_name: Optional[str],
+    callback_url: Optional[str],
+    # TODO: This is temporally available to toggle
+    #  between the ProcessingWorker/ProcessorServer
+    agent_type: Optional[str],
+    block: Optional[bool]
 ):
+    """
+    Submit a processing job to the processing server.
+    """
     req_params = {
         "path_to_mets": mets,
         "description": "OCR-D Network client request",
         "input_file_grps": input_file_grp.split(','),
-        "parameters": parameter if parameter else {},
-        "agent_type": agent_type,
+        "agent_type": agent_type
     }
     if output_file_grp:
         req_params["output_file_grps"] = output_file_grp.split(',')
     if page_id:
         req_params["page_id"] = page_id
+    req_params["parameters"] = set_json_key_value_overrides(parse_json_string_or_file(*parameter), *parameter_override)
     if result_queue_name:
         req_params["result_queue_name"] = result_queue_name
     if callback_url:
         req_params["callback_url"] = callback_url
-
-    client = Client(
-        server_addr_processing=address
-    )
-    response = client.send_processing_request(
-        processor_name=processor_name,
-        req_params=req_params
-    )
-    processing_job_id = response.get('job_id', None)
+    client = Client(server_addr_processing=address)
+    processing_job_id = client.send_processing_job_request(
+        processor_name=processor_name, req_params=req_params)
+    assert processing_job_id
     print(f"Processing job id: {processing_job_id}")
+    if block:
+        client.poll_job_status(job_id=processing_job_id)
 
 
 @client_cli.group('workflow')
@@ -91,6 +157,44 @@ def workflow_cli():
     pass
 
 
+@workflow_cli.command('check-status')
+@click.option('--address', help='The address of the Processing Server. If not provided, '
+                                'the "OCRD_NETWORK_SERVER_ADDR_PROCESSING" env variable is used by default')
+@click.option('-j', '--workflow-job-id', required=True)
+def check_workflow_job_status(address: Optional[str], workflow_job_id: str):
+    """
+    Check the status of a previously submitted workflow job.
+    """
+    client = Client(server_addr_processing=address)
+    job_status = client.check_workflow_status(workflow_job_id)
+    assert job_status
+    print(f"Workflow job status: {job_status}")
+
+
+@workflow_cli.command('run')
+@click.option('--address', help='The address of the Processing Server. If not provided, '
+                                'the "OCRD_NETWORK_SERVER_ADDR_PROCESSING" env variable is used by default')
+@click.option('-m', '--path-to-mets', required=True)
+@click.option('-w', '--path-to-workflow', required=True)
+@click.option('-b', '--block', default=False,
+              help='If set, the client will block till job timeout, fail or success.')
+def send_workflow_job_request(
+    address: Optional[str],
+    path_to_mets: str,
+    path_to_workflow: str,
+    block: Optional[bool]
+):
+    """
+    Submit a workflow job to the processing server.
+    """
+    client = Client(server_addr_processing=address)
+    workflow_job_id = client.send_workflow_job_request(path_to_wf=path_to_workflow, path_to_mets=path_to_mets)
+    assert workflow_job_id
+    print(f"Workflow job id: {workflow_job_id}")
+    if block:
+        client.poll_workflow_status(job_id=workflow_job_id)
+
+
 @client_cli.group('workspace')
 def workspace_cli():
     """