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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocrd
-Version: 3.5.0
+Version: 3.6.0
 Summary: OCR-D framework
 Author-email: Konstantin Baierer <unixprog@gmail.com>
 License: Apache License 2.0
@@ -41,11 +41,12 @@ Requires-Dist: python-multipart
 Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: requests-unixsocket2
-Requires-Dist: shapely
 Requires-Dist: uvicorn
 Requires-Dist: uvicorn>=0.17.6
 Requires-Dist: importlib-resources; python_version < "3.10"
 Requires-Dist: importlib-metadata; python_version < "3.8"
+Requires-Dist: shapely<2.0.2; python_version < "3.9"
+Requires-Dist: shapely>=2; python_version >= "3.9"
 
 # OCR-D/core
 

ocrd-3.6.0.dist-info/RECORD

@@ -0,0 +1,125 @@
+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/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/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/ocrd_tool.py,sha256=kB3Y3tj7Fpz6Ts4KgVlznhXpAx8gCDvJTnO39j8SGL4,7679
+ocrd/cli/process.py,sha256=yfhBSYmuY5k2AccKwiNvG9hCDx1coYyWjq9BBwYaL3Y,1234
+ocrd/cli/resmgr.py,sha256=b1TMZ3D0d50RR9XjQdPil3sfaoTVAso8LjHXZ9P7WfI,10109
+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
+ocrd/decorators/__init__.py,sha256=gU7WDp2re8BF8DU4PVRRqgQpp7TR5wMOnoafcbMAjws,6324
+ocrd/decorators/loglevel_option.py,sha256=QHVZ_72rkt2hqGSP9vuIXUYo5YhBxLsldUsaVVpb_YY,802
+ocrd/decorators/mets_find_options.py,sha256=8fiSdk-415o6-iBPB2T9He_v52qE8cTj3cCnH4y08Ag,635
+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/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/dummy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ocrd/processor/builtin/dummy/ocrd-tool.json,sha256=NgMAXN1AQpGk4Ss73ThDY4QyFPKhj54qcrdeCGwTb10,2339
+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_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
+ocrd_models/ocrd_page.py,sha256=SRInM4HgcfDzbJH4ZO5B53ST2lAO7pgTXluwi0yzkf0,6211
+ocrd_models/ocrd_page_generateds.py,sha256=IWoN3V-v3C4JgyPaFh9OQC87ob__wUP1Q6ELBxhLA1w,841794
+ocrd_models/ocrd_xml_base.py,sha256=iOnDl2zBNhN-Q4moLWiFkSqXvfRzxE5wbp5Tjsu1W6A,1642
+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/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/database.py,sha256=-SddvaMLKn0pjdONyvWmjxfPJd6viedAIp6Lj1sU1Zs,10705
+ocrd_network/logging_utils.py,sha256=Ez5f_BRp0SiW2sP71yTT7zOJmuMzHYPLNWObq5fBLCw,2188
+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/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/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/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/workflow.py,sha256=GL8q7RX9fGdXG3iVyJpCeLXbWa-2qI_SIxqhzxs9VK8,189
+ocrd_network/models/workspace.py,sha256=7kjCTY0ixqcyJP9eHnptkrJnPTCD3zFNfhApZz9w6OU,1568
+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
+ocrd_network/rabbitmq_utils/consumer.py,sha256=3WeryDmo0dSD9U0eLODbDElscvhEYjNeCBIewQHYfws,2488
+ocrd_network/rabbitmq_utils/helpers.py,sha256=5G0wrBlDtmCItzp-fMZjYr1oeaqDUcii5qeyjXI-ilM,5372
+ocrd_network/rabbitmq_utils/ocrd_messages.py,sha256=wwzfMWbXmOFo_nd32_XySCso91_Ul-aGm_GhGncNxD4,4419
+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/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/network_services.py,sha256=5aH3RNGCi1fBuSdRp_Xz0MzyD_FmnvPnaBYAiYY3gp4,7891
+ocrd_utils/__init__.py,sha256=gcO26xJ6dIUtJIvAr8wOe3CM4b7Revn07-DwEureoEc,5973
+ocrd_utils/config.py,sha256=Oe8JBGb8r4z274XNWcdMV-GApzxmAYO8hHmbAV5bXf8,12609
+ocrd_utils/constants.py,sha256=ImbG1d8t2MW3uuFi-mN6aY90Zn74liAKZBKlfuKN86w,3278
+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/ocrd_logging.conf,sha256=JlWmA_5vg6HnjPGjTC4mA5vFHqmnEinwllSTiOw5CCo,3473
+ocrd_utils/os.py,sha256=GstXB4i3kDBy7PXU-TaPYV4BI-lkqd_cYKl6uDkVMkw,9829
+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
+ocrd_validators/constants.py,sha256=FLP57T3F39weka_XovG40RgVMW1GunnbK04QRQ9tmlE,1802
+ocrd_validators/json_validator.py,sha256=rdsd7n2XxwL8Ow2fZvQ9cTv4tLG7JFRiInwylO9rabg,2655
+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=BQkRIRDbn9B8gFeVxz_EpNdleh_x2dCtIpJEC4HqFHw,10125
+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
+ocrd_validators/page_validator.py,sha256=-xPlQb0WRv_wkpGdFFYRJFBoW2if3IYztu-7zeUKs_0,21813
+ocrd_validators/parameter_validator.py,sha256=kZes2sl35iEjcewvyeW2aSXJC9tbMDLqVurH2IOYChU,1366
+ocrd_validators/processing_server_config.schema.yml,sha256=s-cFCKxSNdxbtbuOhmATDrL1W-12CjhXq1n4PIAC_r8,4417
+ocrd_validators/processing_server_config_validator.py,sha256=lQ2-ZxsvbFki_SvE_N4_1ptBnBHcwOTJ5grtL2G9F8A,810
+ocrd_validators/resource_list_validator.py,sha256=vs6xOE8HFK6ha0UnEGMLRf29A2ODmS0b8QBeUhHQ8Qo,808
+ocrd_validators/workspace_validator.py,sha256=h9SLNQKA7-BZJIWknM0FuaULXZtiRv2uqEVJV_6J9zI,20628
+ocrd_validators/xlink.xsd,sha256=8fW7YAMWXN2PbB_MMvj9H5ZeFoEBDzuYBtlGC8_6ijw,3180
+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_modelfactory/__init__.py

@@ -40,7 +40,8 @@ def exif_from_filename(image_filename):
         ocrd_exif = OcrdExif(pil_img)
     return ocrd_exif
 
-def page_from_image(input_file : Union[OcrdFile, ClientSideOcrdFile], **kwargs) -> OcrdPage:
+
+def page_from_image(input_file: Union[OcrdFile, ClientSideOcrdFile], **kwargs) -> OcrdPage:
     """
     Create :py:class:`~ocrd_models.ocrd_page.OcrdPage`
     from an :py:class:`~ocrd_models.ocrd_file.OcrdFile`
@@ -73,10 +74,11 @@ def page_from_image(input_file : Union[OcrdFile, ClientSideOcrdFile], **kwargs)
         pcGtsId=input_file.ID
     )
     mapping = {}
-    etree : ET._Element = pcgts.to_etree(mapping_=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)
 
+
 def page_from_file(input_file, **kwargs) -> OcrdPage:
     """
     Create :py:class:`~ocrd_models.ocrd_page.OcrdPage`

ocrd_models/constants.py

@@ -5,7 +5,7 @@ from re import Pattern
 from enum import Enum, auto
 from dataclasses import dataclass, field
 from abc import ABC, abstractmethod
-from typing import Any, List, Optional, Union
+from typing import Any, List, Union
 from ocrd_utils import resource_string
 
 __all__ = [
@@ -107,14 +107,17 @@ class METS_PAGE_DIV_ATTRIBUTE(Enum):
     @classmethod
     def names(cls):
         return [x.name for x in cls]
+
     @classmethod
     def type_prefix(cls):
         """disambiguation prefix to use for all subtypes"""
         return "physical:"
+
     def prefix(self):
         """disambiguation prefix to use for this attribute type"""
         return self.type_prefix() + self.name.lower() + ":"
 
+
 class METS_STRUCT_DIV_ATTRIBUTE(Enum):
     """page selection attributes of LOGICAL mets:structMap//mets:div"""
     ID = auto()
@@ -125,14 +128,17 @@ class METS_STRUCT_DIV_ATTRIBUTE(Enum):
     @classmethod
     def names(cls):
         return [x.name for x in cls]
+
     @classmethod
     def type_prefix(cls):
         """disambiguation prefix to use for all subtypes"""
         return "logical:"
+
     def prefix(self):
         """disambiguation prefix to use for this attribute type"""
         return self.type_prefix() + self.name.lower() + ":"
 
+
 @dataclass
 class METS_DIV_ATTRIBUTE_PATTERN(ABC):
     """page selection pattern (abstract supertype)"""
@@ -161,22 +167,27 @@ class METS_DIV_ATTRIBUTE_PATTERN(ABC):
     @abstractmethod
     def _matches(self, input) -> bool:
         return
+
     def matches(self, input) -> bool:
         """does the selection pattern match on the given attribute value?"""
         if (matched := self._matches(input)):
             self.has_matched = True
         return matched
 
+
 @dataclass
 class METS_DIV_ATTRIBUTE_ATOM_PATTERN(METS_DIV_ATTRIBUTE_PATTERN):
     """page selection pattern for literal (single value) matching"""
 
     expr: str
+
     def __repr__(self):
         return "%s%s" % (self.attr_prefix(), self.expr)
+
     def _matches(self, input):
         return input == self.expr
 
+
 @dataclass
 class METS_DIV_ATTRIBUTE_RANGE_PATTERN(METS_DIV_ATTRIBUTE_PATTERN):
     """page selection pattern for interval (list expansion) matching"""
@@ -186,20 +197,26 @@ class METS_DIV_ATTRIBUTE_RANGE_PATTERN(METS_DIV_ATTRIBUTE_PATTERN):
     """first value of the range after expansion, before matching-exhausting"""
     stop: str = field(init=False)
     """last value of the range after expansion, before matching-exhausting"""
+
     def __post_init__(self):
         self.start = self.expr[0]
         self.stop = self.expr[-1]
+
     def __repr__(self):
         return "%s%s..%s" % (self.attr_prefix(), self.start, self.stop)
+
     def _matches(self, input):
         return input in self.expr
 
+
 @dataclass
 class METS_DIV_ATTRIBUTE_REGEX_PATTERN(METS_DIV_ATTRIBUTE_PATTERN):
     """page selection pattern for regular expression matching"""
 
     expr: Pattern
+
     def __repr__(self):
         return "%s//%s" % (self.attr_prefix(), self.expr.pattern)
+
     def _matches(self, input):
         return bool(self.expr.fullmatch(input))

ocrd_models/ocrd_agent.py

@@ -5,6 +5,7 @@ API to ``mets:agent``
 from .constants import NAMESPACES as NS, TAG_METS_AGENT, TAG_METS_NAME, TAG_METS_NOTE
 from .ocrd_xml_base import ET
 
+
 class OcrdAgent():
     """
     Represents a <mets:agent>
@@ -195,4 +196,3 @@ class ClientSideOcrdAgent():
             for k in ['type', 'othertype', 'role', 'otherrole', 'name']
         ])
         return '<ClientSideOcrdAgent [' + props + ']/>'
-

ocrd_models/ocrd_exif.py

@@ -8,6 +8,7 @@ from subprocess import run, PIPE
 from shutil import which
 from ocrd_utils import getLogger
 
+
 class OcrdExif():
     """Represents technical image metadata.
 
@@ -42,18 +43,21 @@ class OcrdExif():
         if which('identify'):
             self.run_identify(img)
         else:
-            getLogger('ocrd.exif').warning("ImageMagick 'identify' not available, Consider installing ImageMagick for more robust pixel density estimation")
+            getLogger('ocrd.exif').warning("ImageMagick 'identify' not available, "
+                                           "Consider installing ImageMagick for more robust pixel density estimation")
             self.run_pil(img)
 
     def run_identify(self, img):
         for prop in ['compression', 'photometric_interpretation']:
             setattr(self, prop, img.info[prop] if prop in img.info else None)
         if img.filename:
-            ret = run(['identify', '-format', r'%[resolution.x] %[resolution.y] %U ', img.filename], check=False, stderr=PIPE, stdout=PIPE)
+            ret = run(['identify', '-format', r'%[resolution.x] %[resolution.y] %U ', img.filename],
+                      check=False, stderr=PIPE, stdout=PIPE)
         else:
             with BytesIO() as bio:
                 img.save(bio, format=img.format)
-                ret = run(['identify', '-format', r'%[resolution.x] %[resolution.y] %U ', '/dev/stdin'], check=False, stderr=PIPE, stdout=PIPE, input=bio.getvalue())
+                ret = run(['identify', '-format', r'%[resolution.x] %[resolution.y] %U ', '/dev/stdin'],
+                          check=False, stderr=PIPE, stdout=PIPE, input=bio.getvalue())
         if ret.returncode:
             stderr = ret.stderr.decode('utf-8')
             if 'no decode delegate for this image format' in stderr:

ocrd_models/ocrd_file.py

@@ -6,9 +6,10 @@ from typing import Any, List, Optional, Union
 
 from ocrd_utils import deprecation_warning
 
-from .ocrd_xml_base import ET # type: ignore
+from .ocrd_xml_base import ET  # type: ignore
 from .constants import NAMESPACES as NS, TAG_METS_FLOCAT
 
+
 class OcrdFile():
     """
     Represents a single ``mets:file/mets:FLocat`` (METS file entry).
@@ -62,11 +63,12 @@ class OcrdFile():
         return '<OcrdFile fileGrp=%s %s]/> ' % (fileGrp, props)
 
     def __eq__(self, other):
-        return self.ID == other.ID \
-           and self.url == other.url \
-           and self.local_filename == other.local_filename
-               # EXT_TO_MIME[MIME_TO_EXT[self.mimetype]] == EXT_TO_MIME[MIME_TO_EXT[other.mimetype]] and \
-               # self.fileGrp == other.fileGrp
+        return (self.ID == other.ID and
+                self.url == other.url and
+                self.local_filename == other.local_filename  # and
+                # EXT_TO_MIME[MIME_TO_EXT[self.mimetype]] == EXT_TO_MIME[MIME_TO_EXT[other.mimetype]] and
+                # self.fileGrp == other.fileGrp
+                )
 
     @property
     def basename(self) -> str:
@@ -100,7 +102,7 @@ class OcrdFile():
         return self._el.get('ID')
 
     @ID.setter
-    def ID(self, ID : Optional[str]) -> None:
+    def ID(self, ID: Optional[str]) -> None:
         """
         Set the ``@ID`` of the ``mets:file`` to :py:attr:`ID`.
         """
@@ -117,16 +119,18 @@ class OcrdFile():
     @property
     def pageId(self) -> str:
         """
-        Get the ``@ID`` of the physical ``mets:structMap`` entry corresponding to this ``mets:file`` (physical page manifestation).
+        Get the ``@ID`` of the physical ``mets:structMap`` entry corresponding to this ``mets:file``
+        (physical page manifestation).
         """
         if self.mets is None:
             raise Exception("OcrdFile %s has no member 'mets' pointing to parent OcrdMets" % self)
         return self.mets.get_physical_page_for_file(self)
 
     @pageId.setter
-    def pageId(self, pageId : Optional[str]) -> None:
+    def pageId(self, pageId: Optional[str]) -> None:
         """
-        Get the ``@ID`` of the physical ``mets:structMap`` entry corresponding to this ``mets:file`` (physical page manifestation) to :py:attr:`pageId`.
+        Get the ``@ID`` of the physical ``mets:structMap`` entry corresponding to this ``mets:file``
+        (physical page manifestation) to :py:attr:`pageId`.
         """
         if pageId is None:
             return
@@ -139,7 +143,7 @@ class OcrdFile():
         """
         Get the ``@LOCTYPE``s of the ``mets:file``.
         """
-        return [x.get('LOCTYPE') for x in  self._el.findall('mets:FLocat', NS)]
+        return [x.get('LOCTYPE') for x in self._el.findall('mets:FLocat', NS)]
 
     @property
     def mimetype(self) -> str:
@@ -149,7 +153,7 @@ class OcrdFile():
         return self._el.get('MIMETYPE')
 
     @mimetype.setter
-    def mimetype(self, mimetype : Optional[str]) -> None:
+    def mimetype(self, mimetype: Optional[str]) -> None:
         """
         Set the ``@MIMETYPE`` of the ``mets:file`` to :py:attr:`mimetype`.
         """
@@ -178,7 +182,7 @@ class OcrdFile():
         return ''
 
     @url.setter
-    def url(self, url : Optional[str]) -> None:
+    def url(self, url: Optional[str]) -> None:
         """
         Set the remote/original URL ``@xlink:href`` of this ``mets:file`` to :py:attr:`url`.
         """
@@ -203,7 +207,7 @@ class OcrdFile():
         return None
 
     @local_filename.setter
-    def local_filename(self, fname : Optional[Union[Path, str]]):
+    def local_filename(self, fname: Optional[Union[Path, str]]):
         """
         Set the local/cached ``@xlink:href`` of this ``mets:file`` to :py:attr:`local_filename`.
         """
@@ -230,12 +234,12 @@ class ClientSideOcrdFile:
 
     def __init__(
         self,
-        el, # pylint: disable=unused-argument
+        el,  # pylint: disable=unused-argument
         mimetype: str = '',
         pageId: str = '',
-        loctype: str ='OTHER',
+        loctype: str = 'OTHER',
         local_filename: Optional[str] = None,
-        mets : Any = None, # pylint: disable=unused-argument
+        mets: Any = None,  # pylint: disable=unused-argument
         url: str = '',
         ID: str = '',
         fileGrp: str = ''
@@ -248,8 +252,8 @@ class ClientSideOcrdFile:
             mimetype (string): ``@MIMETYPE`` of this ``mets:file``
             pageId (string): ``@ID`` of the physical ``mets:structMap`` entry corresponding to this ``mets:file``
             loctype (string): ``@LOCTYPE`` of this ``mets:file``
-            url (string): ignored XXX the remote/original file once we have proper mets:FLocat bookkeeping 
-            local_filename (): ``@xlink:href`` of this ``mets:file`` - XXX the local file once we have proper mets:FLocat bookkeeping
+            url (string):  ``@xlink:href`` of this ``mets:file`` (if ``@LOCTYPE==URL``)
+            local_filename (): ``@xlink:href`` of this ``mets:file`` (if ``@LOCTYPE==FILE @OTHERLOCTYPE==FILE``)
             ID (string): ``@ID`` of this ``mets:file``
         """
         self.ID = ID
@@ -267,4 +271,5 @@ class ClientSideOcrdFile:
         ])
         return '<ClientSideOcrdFile %s]/>' % (props)
 
+
 OcrdFileType = Union[OcrdFile, ClientSideOcrdFile]