Code

#1240 backports for v2#1275

Code

Merged

kba merged 46 commits intoOCR-D:masterOCR-D/core:masterfrom bertsky:new-processor-api-backportsbertsky/core:new-processor-api-backportsCopy head branch name to clipboardSep 30, 2024

+494-235

Commits

Commits on Sep 24, 2024

• processor CLI: delegate --resolve-resource, too

  bertsky

  committed
  5663f48

  Copy full SHA for 5663f48

• test_mets_server: fix arg vs kwarg

  bertsky

  committed
  853bdb5

  Copy full SHA for 853bdb5

• mets_server: ClientSideOcrdMets needs OcrdMets-like kwargs (without deprecation)

  bertsky

  committed
  33c7386

  Copy full SHA for 33c7386

• use up-to-date kwargs (avoiding old deprecations)

  bertsky

  committed
  37f7cda

  Copy full SHA for 37f7cda

• hide/test expected deprecation warnings

  bertsky

  committed
  44946ba

  Copy full SHA for 44946ba

• improve output in case of assertion failures

  bertsky

  committed
  d0962d6

  Copy full SHA for d0962d6

• allow "from ocrd_models import OcrdPage

  

  kba

  authored and

  bertsky

  committed
  061f023

  Copy full SHA for 061f023

• ocrd_utils: forgot to export scale_coordinates at toplvl

  bertsky

  committed
  d2f92d1

  Copy full SHA for d2f92d1

• fix imports

  bertsky

  committed
  c6c5c42

  Copy full SHA for c6c5c42

• Processor.zip_input_files: warning instead of exception for missing input files

  bertsky

  committed
  245778c

  Copy full SHA for 245778c

• Processor.zip_input_files: more verbose log msg

  Show description for 1f7b57f
  

  bertsky

  and

  kba

  committed
  1f7b57f

  Copy full SHA for 1f7b57f

• tests report.is_valid: improve output on failure

  bertsky

  committed
  35bdb39

  Copy full SHA for 35bdb39

• fix --log-filename (6fc6060): apply in ocrd_cli_wrap_processor

  bertsky

  committed
  e595996

  Copy full SHA for e595996

• fix exception

  bertsky

  committed
  f21b8d2

  Copy full SHA for f21b8d2

• adapt to PIL.Image moved constants

  bertsky

  committed
  0cbd3ea

  Copy full SHA for 0cbd3ea

• cli.workspace: pass fileGrp as well, improve description

  bertsky

  committed
  8f8912c

  Copy full SHA for 8f8912c

• OcrdMets.add_agent: does not have positional args

  bertsky

  committed
  6dccfb3

  Copy full SHA for 6dccfb3

• update pylintrc

  bertsky

  committed
  2d85f14

  Copy full SHA for 2d85f14

• pylint: try ignoring generateds (again)

  bertsky

  committed
  ea68370

  Copy full SHA for ea68370

• ClientSideOcrdMets: use same logger name prefix as server

  bertsky

  committed
  18ac2c0

  Copy full SHA for 18ac2c0

• test_mets_server: use tmpdir to avoid side effects between suites

  bertsky

  committed
  da37967

  Copy full SHA for da37967

• disableLogging: re-instate root logger, to

  bertsky

  committed
  ccb416b

  Copy full SHA for ccb416b

• test-logging: also remove ocrd.log from tempdir

  bertsky

  committed
  7e3cdf4

  Copy full SHA for 7e3cdf4

• bashlib: re-add --log-filename, implement as stderr redirect

  bertsky

  committed
  4f45b12

  Copy full SHA for 4f45b12

• ocrd_utils.config: add reset_defaults()

  bertsky

  committed
  7b70c90

  Copy full SHA for 7b70c90

• add test for OcrdEnvConfig.reset_defaults()

  bertsky

  committed
  48bb3c2

  Copy full SHA for 48bb3c2

• Workspace.reload_mets: fix for METS server case

  bertsky

  committed
  ed92403

  Copy full SHA for ed92403

• OcrdMetsServer.add_file: pass on 'force' kwarg, too

  bertsky

  committed
  9c3c399

  Copy full SHA for 9c3c399

• test_mets_server: add test for force (overwrite)

  bertsky

  committed
  c077e95

  Copy full SHA for c077e95

• PcGts.Page.id / make_xml_id: replace '/' with '_'

  bertsky

  committed
  4492168

  Copy full SHA for 4492168

• METS Server: also export+delegate physical_pages

  bertsky

  committed
  83d52d8

  Copy full SHA for 83d52d8

• ocrd.cli.workspace: consistently pass on --mets-server-url and --backup (also, simplify)

  bertsky

  committed
  4eccefc

  Copy full SHA for 4eccefc

• ocrd.cli.workspace server: add 'reload' and 'save'

  bertsky

  committed
  083df27

  Copy full SHA for 083df27

• ocrd.cli.validate tasks: pass on --mets-server-url, too

  bertsky

  committed
  b2c0161

  Copy full SHA for b2c0161

• run_processor: be robust if ocrd_tool is missing steps

  bertsky

  committed
  203a06a

  Copy full SHA for 203a06a

• lib.bash: fix errexit

  bertsky

  committed
  4fbdd00

  Copy full SHA for 4fbdd00

• tests: make sure ocrd_utils.config gets reset whenever changing it globally

  bertsky

  committed
  c865079

  Copy full SHA for c865079

• ocrd.cli.workspace: assert non-server in cmds mutating METS

  bertsky

  committed
  1a13cd3

  Copy full SHA for 1a13cd3

• OcrdPage: add PageType.get_ReadingOrderGroups()

  bertsky

  committed
  bba597e

  Copy full SHA for bba597e

• update OcrdPage from generateds

  bertsky

  committed
  fa0fada

  Copy full SHA for fa0fada

Commits on Sep 27, 2024

• OcrdMets.get_physical_pages: cover return_divs w/o for_fileIds for_pageIds

  bertsky

  committed
  9641d4a

  Copy full SHA for 9641d4a

• ocrd.cli.workspace: use physical_pages if possible, fix default output_field

  bertsky

  committed
  19ce7d9

  Copy full SHA for 19ce7d9

Commits on Sep 30, 2024

• disableLogging: clearer comment

  Show description for 606915b
  

  bertsky

  and

  kba

  authored
  606915b

  Copy full SHA for 606915b

• 📝 changelog

  kba

  committed
  3b908a6

  Copy full SHA for 3b908a6

• 📝 changelog: remove spurious entries

  kba

  committed
  343a66a

  Copy full SHA for 343a66a

• 📝 update changelog again

  bertsky

  authored
  f808b72

  Copy full SHA for f808b72