#1240 backports for v2

.pylintrc

@@ -1,19 +1,22 @@
 [MASTER]
-extension-pkg-whitelist=lxml
-ignored-modules=cv2,tesserocr,ocrd.model
+extension-pkg-whitelist=lxml,pydantic
+ignored-modules=cv2,tesserocr,ocrd_models.ocrd_page_generateds
+ignore-paths=ocrd_page_generateds.py
+ignore-patterns=.*generateds.*
 
 [MESSAGES CONTROL]
-ignore-patterns='.*generateds.*'
 disable =
     fixme,
-    E501,
+    line-too-long,
+    consider-using-f-string,
+    logging-fstring-interpolation,
     trailing-whitespace,
     logging-not-lazy,
     inconsistent-return-statements,
+    disallowed-name,
     invalid-name,
     line-too-long,
     missing-docstring,
-    no-self-use,
     wrong-import-order,
     too-many-nested-blocks,
     superfluous-parens,
@@ -25,13 +28,9 @@ disable =
     ungrouped-imports,
     useless-object-inheritance,
     useless-import-alias,
-    bad-continuation,
     no-else-return,
     logging-not-lazy
 
-[FORMAT]
-no-space-check=empty-line
-
 [DESIGN]
 # Maximum number of arguments for function / method
 max-args=12
@@ -40,7 +39,7 @@ max-locals=30
 # Maximum number of return / yield for function / method body
 max-returns=12
 # Maximum number of branch for function / method body
-max-branchs=30
+max-branches=30
 # Maximum number of statements in function / method body
 max-statements=60
 # Maximum number of parents for a class (see R0901).

CHANGELOG.md

@@ -5,6 +5,36 @@ Versioned according to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## [2.69.0] - 2024-09-30
+
+Fixed:
+  - tests: ensure `ocrd_utils.config` gets reset whenever changing it globally
+  - `ocrd.cli.workspace`: consistently pass on `--mets-server-url` and `--backup`
+  - `ocrd.cli.workspace`: make `list-page` work w/ METS Server
+  - `ocrd.cli.validate "tasks"`: pass on `--mets-server-url`
+  - `lib.bash`: fix `errexit` handling
+  - actually apply CLI `--log-filename`, and show in `--help`
+  - adapt to Pillow changes
+  - `ocrd workspace clone`: do pass on `--file-grp` (for download filtering)
+  - `OcrdMetsServer.add_file`: pass on `force` kwarg
+  - `Workspace.reload_mets`: handle ClientSideOcrdMets as well
+  - `OcrdMets.get_physical_pages`: cover `return_divs` w/o `for_fileIds` and `for_pageIds`
+  - `disableLogging`: also re-instate root logger to Python defaults
+
+Changed:
+  - `run_processor`: be robust if `ocrd_tool` is missing `steps`
+  - `PcGtsType.PageType.id` via `make_xml_id`: replace `/` with `_`
+  - `ClientSideOcrdMets`: use same logger name prefix as METS Server
+  - `Processor.zip_input_files`: when `--page-id` yields empty list, just log instead of raise
+
+Added:
+  - `OcrdPage`: new `PageType.get_ReadingOrderGroups()` to retrieve recursive RO as dict
+  - METS Server: export and delegate `physical_pages`
+  - ocrd.cli.workspace `server`: add subcommands `reload` and `save`
+  - processor CLI: delegate `--resolve-resource`, too
+  - `OcrdConfig.reset_defaults` to reset config variables to their defaults
+  - `ocrd_utils.scale_coordinates` for resizing images
+
 ## [2.68.0] - 2024-08-23
 
 Changed:
@@ -2164,6 +2194,7 @@ Fixed
 Initial Release
 
 <!-- link-labels -->
+[2.69.0]: ../../compare/v2.69.0..v2.68.0
 [2.68.0]: ../../compare/v2.68.0..v2.67.2
 [2.67.2]: ../../compare/v2.67.2..v2.67.1
 [2.67.1]: ../../compare/v2.67.1..v2.67.0

Makefile

@@ -273,7 +273,7 @@ test-logging: assets
 	cp src/ocrd_utils/ocrd_logging.conf $$tempdir; \
 	cd $$tempdir; \
 	$(PYTHON) -m pytest --continue-on-collection-errors -k TestLogging -k TestDecorators $(TESTDIR); \
-	rm -r $$tempdir/ocrd_logging.conf $$tempdir/.benchmarks; \
+	rm -r $$tempdir/ocrd_logging.conf $$tempdir/ocrd.log $$tempdir/.benchmarks; \
 	rm -rf $$tempdir/.coverage; \
 	rmdir $$tempdir
 

src/ocrd/cli/ocrd_tool.py

@@ -29,6 +29,8 @@ def __init__(self, filename):
         self.filename = filename
         with codecs.open(filename, encoding='utf-8') as f:
             self.content = f.read()
+            # perhaps the validator should _always_ run (for default expansion)
+            # so validate command only for the report?
             self.json = loads(self.content)
 
 pass_ocrd_tool = click.make_pass_decorator(OcrdToolCtx)

src/ocrd/cli/validate.py

@@ -102,16 +102,19 @@ def validate_page(page, **kwargs):
 @validate_cli.command('tasks')
 @click.option('--workspace', nargs=1, required=False, help='Workspace directory these tasks are to be run. If omitted, only validate syntax')
 @click.option('-M', '--mets-basename', nargs=1, default=DEFAULT_METS_BASENAME, help='Basename of the METS file, used in conjunction with --workspace')
+@click.option('-U', '--mets-server-url', help='TCP host URI or UDS path of METS server')
 @click.option('--overwrite', is_flag=True, default=False, help='When checking against a concrete workspace, simulate overwriting output or page range.')
 @click.option('-g', '--page-id', help="ID(s) of the pages to process")
 @click.argument('tasks', nargs=-1, required=True)
-def validate_process(tasks, workspace, mets_basename, overwrite, page_id):
+def validate_process(tasks, workspace, mets_basename, mets_server_url, overwrite, page_id):
     '''
     Validate a sequence of tasks passable to 'ocrd process'
     '''
     if workspace:
-        _inform_of_result(validate_tasks([ProcessorTask.parse(t) for t in tasks],
-            Workspace(Resolver(), directory=workspace, mets_basename=mets_basename), page_id=page_id, overwrite=overwrite))
+        _inform_of_result(validate_tasks(
+            [ProcessorTask.parse(t) for t in tasks],
+            Workspace(Resolver(), directory=workspace, mets_basename=mets_basename, mets_server_url=mets_server_url),
+            page_id=page_id, overwrite=overwrite))
     else:
         for t in [ProcessorTask.parse(t) for t in tasks]:
             _inform_of_result(t.validate())