ocrd 3.0.0b3__py3-none-any.whl → 3.0.0b4__py3-none-any.whl

ocrd/processor/base.py

@@ -166,11 +166,14 @@ class Processor():
 
         (Override if ``ocrd-tool.json`` is not distributed with the Python package.)
         """
-        # XXX HACK
-        module_tokens = self.__module__.split('.')
-        if module_tokens[0] == 'src':
-            module_tokens.pop(0)
-        return resource_filename(module_tokens[0], self.metadata_filename)
+        module = inspect.getmodule(self)
+        module_tokens = module.__package__.split('.')
+        # for namespace packages, we cannot just use the first token
+        for i in range(len(module_tokens)):
+            prefix = '.'.join(module_tokens[:i + 1])
+            if sys.modules[prefix].__spec__.has_location:
+                return resource_filename(prefix, self.metadata_filename)
+        raise Exception("cannot find top-level module prefix for %s", module.__package__)
 
     @cached_property
     def metadata_rawdict(self) -> dict:
@@ -455,17 +458,17 @@ class Processor():
                 nr_copied = 0
 
                 # set up multithreading
-                if self.max_workers <= 0:
-                    max_workers = max(0, config.OCRD_MAX_PARALLEL_PAGES)
-                else:
-                    max_workers = max(0, min(config.OCRD_MAX_PARALLEL_PAGES, self.max_workers))
+                max_workers = max(0, config.OCRD_MAX_PARALLEL_PAGES)
+                if self.max_workers > 0 and self.max_workers < config.OCRD_MAX_PARALLEL_PAGES:
+                    self._base_logger.info("limiting number of threads from %d to %d", max_workers, self.max_workers)
+                    max_workers = self.max_workers
                 if max_workers > 1:
                     assert isinstance(workspace.mets, ClientSideOcrdMets), \
                         "OCRD_MAX_PARALLEL_PAGES>1 requires also using --mets-server-url"
-                if self.max_page_seconds <= 0:
-                    max_seconds = max(0, config.OCRD_PROCESSING_PAGE_TIMEOUT)
-                else:
-                    max_seconds = max(0, min(config.OCRD_PROCESSING_PAGE_TIMEOUT, self.max_page_seconds))
+                max_seconds = max(0, config.OCRD_PROCESSING_PAGE_TIMEOUT)
+                if self.max_page_seconds > 0 and self.max_page_seconds < config.OCRD_PROCESSING_PAGE_TIMEOUT:
+                    self._base_logger.info("limiting page timeout from %d to %d sec", max_seconds, self.max_page_seconds)
+                    max_seconds = self.max_page_seconds
                 executor = ThreadPoolExecutor(
                     max_workers=max_workers or 1,
                     thread_name_prefix=f"pagetask.{workspace.mets.unique_identifier}"

ocrd/workspace.py

@@ -121,7 +121,10 @@ class Workspace():
         """
         Reload METS from the filesystem.
         """
-        self.mets = OcrdMets(filename=self.mets_target)
+        if self.is_remote:
+            self.mets.reload()
+        else:
+            self.mets = OcrdMets(filename=self.mets_target)
 
     @deprecated_alias(pageId="page_id")
     @deprecated_alias(ID="file_id")

{ocrd-3.0.0b3.dist-info → ocrd-3.0.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocrd
-Version: 3.0.0b3
+Version: 3.0.0b4
 Summary: OCR-D framework
 Author-email: Konstantin Baierer <unixprog@gmail.com>
 License: Apache License 2.0

{ocrd-3.0.0b3.dist-info → ocrd-3.0.0b4.dist-info}/RECORD

@@ -7,7 +7,7 @@ ocrd/resolver.py,sha256=Ba9ALQbTXz6_mla4VqN9tAfHoj6aKuNJAU4tIDnjcHE,14952
 ocrd/resource_list.yml,sha256=82-PiqkZnka1kTj3MQqNn4wXWKHHtoFchsQuetWuqFs,2633
 ocrd/resource_manager.py,sha256=8BMVKJq8J56hugi8vtGn9Ffuk7oRkbs197aG74aKbCY,16733
 ocrd/task_sequence.py,sha256=spiaUQaMM7M8WdBDoQGmLuTPm7tOugYXD6rcJ2UXzxw,6991
-ocrd/workspace.py,sha256=4s0qscEosS7rQ0jfn1qJeT9B3eC31YippAX-RUjXghA,65608
+ocrd/workspace.py,sha256=V-7w3mRc0l8XmUOpdbsUPE2BfqWS8K8106pQPrDHbN4,65684
 ocrd/workspace_backup.py,sha256=iab_JjZ_mMP-G8NIUk4PZmfpNlQuGRoqc3NbTSSew1w,3621
 ocrd/workspace_bagger.py,sha256=yU8H3xR5WmQKvgQewac71ie-DUWcfLnMS01D55zsEHQ,11971
 ocrd/cli/__init__.py,sha256=lNR6wMf7JhQ8Jf33tUkowJr0mB3423OMY0_6dkMRLvU,2672
@@ -26,7 +26,7 @@ ocrd/decorators/mets_find_options.py,sha256=d4oATKMP6bFQHNqOK6nLqgUiWF2FYdkPvzkT
 ocrd/decorators/ocrd_cli_options.py,sha256=4pcBLAFPSpYZLj6r9Yj1GZOQl4r_RWU00pyA4mHwFQk,2621
 ocrd/decorators/parameter_option.py,sha256=n8hYw7XVTd3i3tvpK8F1Jx_CqRp6EGF9qJVH95yj92Q,1076
 ocrd/processor/__init__.py,sha256=39ymNwYRdc-b_OJzzKmWCvo2ga3KdsGSYDHE1Hzkn_w,274
-ocrd/processor/base.py,sha256=341APZGx6zCbuxgX-XTkKhPfeQkqblykmC9zSMPH3ss,48843
+ocrd/processor/base.py,sha256=Q3dJn_I7iXi9wNKzbIsHp3LQ8_qp5yqu5CGJ8z17Xgc,49318
 ocrd/processor/helpers.py,sha256=Lp9zbHYCLpT3GnPzl-p7UCSFU5Nx99gYEYXwW04v0RI,10157
 ocrd/processor/ocrd_page_result.py,sha256=AazEmnWyPEN47TxXVg0WUQpgFNV_mlIiExwwycUj0nQ,490
 ocrd/processor/builtin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -118,9 +118,9 @@ ocrd_validators/xlink.xsd,sha256=8fW7YAMWXN2PbB_MMvj9H5ZeFoEBDzuYBtlGC8_6ijw,318
 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=6HrVAf6SzCvfUIuQdIzz9bOq4V-zhyii9yrUPoK2Uvo,2094
-ocrd-3.0.0b3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ocrd-3.0.0b3.dist-info/METADATA,sha256=WZhPkJV0F8A5k-0IVK8HZ5zGWVWwYSa6FuDlpkuh4Xc,10397
-ocrd-3.0.0b3.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-ocrd-3.0.0b3.dist-info/entry_points.txt,sha256=tV_gAdO8cbnOjS0GmKfJKbN60xBAV2DQRX6hEjleSjE,94
-ocrd-3.0.0b3.dist-info/top_level.txt,sha256=pUgiN42t4KXC5rvpi6V8atza31XP4SCznXpXlVlvomM,75
-ocrd-3.0.0b3.dist-info/RECORD,,
+ocrd-3.0.0b4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ocrd-3.0.0b4.dist-info/METADATA,sha256=akkVQvrp5FNEvuD1FsH9mxW9SmpYRR3ZyeTns1jCja8,10397
+ocrd-3.0.0b4.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+ocrd-3.0.0b4.dist-info/entry_points.txt,sha256=tV_gAdO8cbnOjS0GmKfJKbN60xBAV2DQRX6hEjleSjE,94
+ocrd-3.0.0b4.dist-info/top_level.txt,sha256=pUgiN42t4KXC5rvpi6V8atza31XP4SCznXpXlVlvomM,75
+ocrd-3.0.0b4.dist-info/RECORD,,