ocrd 3.3.0__tar.gz → 3.3.2__tar.gz

{ocrd-3.3.0/src/ocrd.egg-info → ocrd-3.3.2}/PKG-INFO

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

ocrd-3.3.2/VERSION

@@ -0,0 +1 @@
+3.3.2

{ocrd-3.3.0 → ocrd-3.3.2}/src/ocrd/decorators/__init__.py

@@ -107,10 +107,10 @@ def ocrd_cli_wrap_processor(
     if 'parameter_override' in kwargs:
         set_json_key_value_overrides(kwargs['parameter'], *kwargs.pop('parameter_override'))
     # Assert -I / -O
-    if not kwargs['input_file_grp']:
+    if not kwargs.get('input_file_grp', None):
         raise ValueError('-I/--input-file-grp is required')
-    if not kwargs['output_file_grp']:
-        raise ValueError('-O/--output-file-grp is required')
+    if 'output_file_grp' not in kwargs:
+        raise ValueError('-O/--output-file-grp is required') # actually, it may be None
     resolver = Resolver()
     working_dir, mets, _, mets_server_url = \
             resolver.resolve_mets_arguments(working_dir, mets, None, mets_server_url)

{ocrd-3.3.0 → ocrd-3.3.2}/src/ocrd/mets_server.py

@@ -131,7 +131,7 @@ class ClientSideOcrdMets:
     def __init__(self, url, workspace_path: Optional[str] = None):
         self.protocol = "tcp" if url.startswith("http://") else "uds"
         self.log = getLogger(f"ocrd.models.ocrd_mets.client.{url}")
-        self.url = url if self.protocol == "tcp" else f'http+unix://{url.replace("/", "%2F")}'
+        self.url = url if self.protocol == "tcp" else f'http+unix://{url.replace("/", "%2F").replace(".", "%2E")}'
         self.ws_dir_path = workspace_path if workspace_path else None
 
         if self.protocol == "tcp" and "tcp_mets" in self.url:

{ocrd-3.3.0 → ocrd-3.3.2}/src/ocrd/processor/base.py

@@ -1112,7 +1112,7 @@ class Processor():
                 if not ifiles[i]:
                     # could be from non-unique with on_error=skip or from true gap
                     self._base_logger.error(f'Found no file for page {page} in file group {ifg}')
-                    if config.OCRD_MISSING_INPUT == 'abort':
+                    if config.OCRD_MISSING_INPUT == 'ABORT':
                         raise MissingInputFile(ifg, page, mimetype)
             if not any(ifiles):
                 # must be from non-unique with on_error=skip

{ocrd-3.3.0 → ocrd-3.3.2}/src/ocrd/processor/builtin/dummy/ocrd-tool.json

@@ -1,6 +1,7 @@
 {
   "version": "1.0.0",
   "git_url": "https://github.com/OCR-D/core",
+  "dockerhub": "ocrd/core",
   "tools": {
     "ocrd-dummy": {
       "executable": "ocrd-dummy",

{ocrd-3.3.0 → ocrd-3.3.2}/src/ocrd/processor/helpers.py

@@ -276,7 +276,7 @@ def get_processor(
         # set current processing parameters
         processor.workspace = workspace
         processor.page_id = page_id
-        processor.input_file_grp = input_file_grp
-        processor.output_file_grp = output_file_grp
+        processor.input_file_grp = input_file_grp or ''
+        processor.output_file_grp = output_file_grp or ''
         return processor
     raise ValueError("Processor class is not known")

{ocrd-3.3.0 → ocrd-3.3.2}/src/ocrd/resolver.py

@@ -308,4 +308,8 @@ class Resolver():
                     if not is_file_in_directory(directory, mets_url):
                         raise ValueError("--mets '%s' has a directory part inconsistent with --directory '%s'" % (mets_url, directory))
 
+        if mets_server_url and not mets_server_url.startswith('http://'):
+            # UDS socket
+            mets_server_url = str(Path(mets_server_url).resolve())
+
         return str(Path(directory).resolve()), str(mets_url), str(mets_basename), mets_server_url

{ocrd-3.3.0 → ocrd-3.3.2/src/ocrd.egg-info}/PKG-INFO

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

{ocrd-3.3.0 → ocrd-3.3.2}/tests/test_mets_server.py

@@ -181,7 +181,7 @@ def test_mets_server_str(start_mets_server):
     assert str(f) == '<ClientSideOcrdFile fileGrp=OCR-D-IMG, ID=FILE_0001_IMAGE, mimetype=image/tiff, url=---, local_filename=OCR-D-IMG/FILE_0001_IMAGE.tif]/>'
     a = workspace_server.mets.agents[0]
     assert str(a) == '<ClientSideOcrdAgent [type=OTHER, othertype=SOFTWARE, role=CREATOR, otherrole=---, name=DFG-Koordinierungsprojekt zur Weiterentwicklung von Verfahren der Optical Character Recognition (OCR-D)]/>'
-    assert str(workspace_server.mets) == '<ClientSideOcrdMets[url=%s]>' % ('http+unix://%2Ftmp%2Focrd-mets-server.sock' if mets_server_url == TRANSPORTS[0] else TRANSPORTS[1])
+    assert str(workspace_server.mets) == '<ClientSideOcrdMets[url=%s]>' % ('http+unix://%2Ftmp%2Focrd-mets-server%2Esock' if mets_server_url == TRANSPORTS[0] else TRANSPORTS[1])
 
 def test_mets_test_unimplemented(start_mets_server):
     _, workspace_server = start_mets_server

ocrd-3.3.0/VERSION

@@ -1 +0,0 @@
-3.3.0