Code

V2.70.0 backport to v3#22

Code

Open

kba wants to merge 139 commits intobertsky:new-processor-apibertsky/core:new-processor-apifrom OCR-D:v2.70.0-backport-to-v3OCR-D/core:v2.70.0-backport-to-v3Copy head branch name to clipboard

+406-176

Commits

Commits on Sep 12, 2024

• Fix typos (most of them found by codespell)

  Show description for dfeddbd
  stweil

  committed
  dfeddbd

  Copy full SHA for dfeddbd

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

• Added space after %U in imagemagick identify format prameter.

  mexthecat

  committed
  372f725

  Copy full SHA for 372f725

• ocrd_exif: add multi-frame TIFF example

  bertsky

  committed
  44deb80

  Copy full SHA for 44deb80

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

• update assets

  kba

  committed
  4d25fcf

  Copy full SHA for 4d25fcf

• test_exif: add example provided by @mexthecat

  kba

  committed
  bdfb410

  Copy full SHA for bdfb410

• Merge branch 'mexthecat-master'

  kba

  committed
  c744dc8

  Copy full SHA for c744dc8

• 📝 changelog

  kba

  committed
  e6d1f85

  Copy full SHA for e6d1f85

• 📦 v2.69.0

  kba

  committed
  ff81c6b

  Copy full SHA for ff81c6b

Commits on Oct 1, 2024

• introduce: OCRD_NETWORK_CLIENT_POLLING_PRINT

  MehmedGIT

  committed
  f44e28b

  Copy full SHA for f44e28b

• fix: config value description

  MehmedGIT

  committed
  7177eb1

  Copy full SHA for 7177eb1

• add default value param to preserver backwards compatibility

  MehmedGIT

  committed
  df8e8ee

  Copy full SHA for df8e8ee

• make -b/--block as flags

  MehmedGIT

  committed
  b183cfc

  Copy full SHA for b183cfc

• implement feedback

  MehmedGIT

  committed
  342ef3a

  Copy full SHA for 342ef3a

• fix: missed params

  MehmedGIT

  committed
  0e80a7c

  Copy full SHA for 0e80a7c

• fix: integration client tests

  MehmedGIT

  committed
  d7df200

  Copy full SHA for d7df200

• post_ps_workflow_request: pagewise configurable

  kba

  committed
  0bfef64

  Copy full SHA for 0bfef64

• Merge remote-tracking branch 'github/network_client_block_prints' into page-wise-param

  Show description for 19aad83
  kba

  committed
  19aad83

  Copy full SHA for 19aad83

• Dockerfile.cuda-torch: do NOT rm /build/core

  Show description for 1f5c4bb
  bertsky

  authored
  1f5c4bb

  Copy full SHA for 1f5c4bb

• deployer: Remove any pre-existing socket file before starting the server (again)

  kba

  committed
  611b6b5

  Copy full SHA for 611b6b5

• Merge pull request #1280 from OCR-D/fix-docker-cuda-torch

  Show description for a68782d
  kba

  authored
  a68782d

  Copy full SHA for a68782d

Commits on Oct 2, 2024

• remove UDS socket files

  MehmedGIT

  committed
  9a71d04

  Copy full SHA for 9a71d04

• remove shortcuts for page-wise

  MehmedGIT

  committed
  854403d

  Copy full SHA for 854403d

• fix: pass page-wise argument to relevant methods

  MehmedGIT

  committed
  4d01e66

  Copy full SHA for 4d01e66

• Update src/ocrd_network/client_utils.py

  Show description for 97427e0
  

  MehmedGIT

  and

  kba

  authored
  97427e0

  Copy full SHA for 97427e0

• add endpoint DELETE /workflow/kill-mets-server-zombies to kill -SIGTERM METS servers with ctime > 60mins ago

  kba

  committed
  7454845

  Copy full SHA for 7454845

• move mets-zombie killer to / and return list of killed PIDs

  kba

  committed
  0506e9d

  Copy full SHA for 0506e9d

• /kill_mets_server_zombies use underscores not slashes

  kba

  committed
  ad81356

  Copy full SHA for ad81356

• Merge pull request #1278 from OCR-D/page-wise-param

  Show description for 7a3be1e
  kba

  authored
  7a3be1e

  Copy full SHA for 7a3be1e

• use 3.8 compatible typing

  kba

  committed
  4862d72

  Copy full SHA for 4862d72

• Merge branch 'network_client_block_prints' into mets-server-kill-zombies

  kba

  committed
  2cb3e2a

  Copy full SHA for 2cb3e2a

• Merge pull request #1282 from OCR-D/mets-server-rm-socket

  Show description for 8b6a49c
  kba

  authored
  8b6a49c

  Copy full SHA for 8b6a49c

• Merge branch 'network_client_block_prints' into mets-server-kill-zombies

  kba

  committed
  0d297e7

  Copy full SHA for 0d297e7

• OcrdMetsServer.kill_process: try the easy way (SIGINT) then the hard way (SIGKILL)

  kba

  authored
  4f6775f

  Copy full SHA for 4f6775f

• fix: add default to page_wise param

  MehmedGIT

  committed
  3882e7a

  Copy full SHA for 3882e7a

• Merge branch 'network_client_block_prints' into mets-server-kill-zombies

  kba

  committed
  a8bfbe4

  Copy full SHA for a8bfbe4

• Merge pull request #1283 from OCR-D/mets-server-kill-zombies

  Show description for c5fd843
  kba

  authored
  c5fd843

  Copy full SHA for c5fd843

Commits on Oct 4, 2024

• previous state

  MehmedGIT

  committed
  7b6552b

  Copy full SHA for 7b6552b

• Merge branch 'network_client_block_prints' into fix_mets_server_zombies

  MehmedGIT

  committed
  e3f5949

  Copy full SHA for e3f5949

• do not use pid killing

  MehmedGIT

  committed
  637a40e

  Copy full SHA for 637a40e

• add logger param to stop mets server

  MehmedGIT

  committed
  387dc30

  Copy full SHA for 387dc30

• add extensive logging to mets proxy

  MehmedGIT

  committed
  07953f7

  Copy full SHA for 07953f7

• return empty response type earlier

  MehmedGIT

  committed
  3a9e147

  Copy full SHA for 3a9e147

• fix: change UDS file deletion place

  MehmedGIT

  committed
  00655b8

  Copy full SHA for 00655b8

• return response from mets server before dying

  MehmedGIT

  committed
  810f811

  Copy full SHA for 810f811

• fix: remove UDS file correctly

  MehmedGIT

  committed
  4970e62

  Copy full SHA for 4970e62

• comment out irrelevant code

  MehmedGIT

  committed
  906766d

  Copy full SHA for 906766d

• fix: no more zombies, yay!

  MehmedGIT

  committed
  a87a2e1

  Copy full SHA for a87a2e1

• add: extensive logging of mets server to file

  MehmedGIT

  committed
  e0ff4eb

  Copy full SHA for e0ff4eb

• change cache debug -> info for extensive logging to file

  MehmedGIT

  committed
  53c8f3f

  Copy full SHA for 53c8f3f

• set log from info to debug

  MehmedGIT

  committed
  fe41223

  Copy full SHA for fe41223

• fix: typo

  MehmedGIT

  committed
  55c2f63

  Copy full SHA for 55c2f63

• improve: delete socket file more appropriately

  MehmedGIT

  committed
  bf6616f

  Copy full SHA for bf6616f

• remove: unnecessary code

  MehmedGIT

  committed
  bc8a03b

  Copy full SHA for bc8a03b

• fix: .__dict__ of {}

  MehmedGIT

  committed
  303488a

  Copy full SHA for 303488a

Commits on Oct 8, 2024

• Update src/ocrd/mets_server.py

  Show description for c8e0c73
  

  MehmedGIT

  and

  kba

  authored
  c8e0c73

  Copy full SHA for c8e0c73

• Update src/ocrd/mets_server.py

  Show description for 2cd4a64
  

  MehmedGIT

  and

  kba

  authored
  2cd4a64

  Copy full SHA for 2cd4a64

• Update src/ocrd/mets_server.py

  Show description for 44a8ceb
  

  MehmedGIT

  and

  kba

  authored
  44a8ceb

  Copy full SHA for 44a8ceb

• Update src/ocrd_network/runtime_data/deployer.py

  Show description for 61c683f
  

  MehmedGIT

  and

  kba

  authored
  61c683f

  Copy full SHA for 61c683f

• remove unnecessary method

  MehmedGIT

  committed
  5055309

  Copy full SHA for 5055309

• fix: make stop() and ..reload..() sync

  MehmedGIT

  committed
  34bfbf4

  Copy full SHA for 34bfbf4

• fix: stop mets server when no cached requests

  MehmedGIT

  committed
  ab660fb

  Copy full SHA for ab660fb

• clean: remove pid kill flag in stop mets server

  MehmedGIT

  committed
  148f8d4

  Copy full SHA for 148f8d4

• extend log: server cache requests

  MehmedGIT

  committed
  dacd325

  Copy full SHA for dacd325

• improve: sleep no longer needed

  MehmedGIT

  committed
  05ded73

  Copy full SHA for 05ded73

Commits on Oct 9, 2024

• add new env: OCRD_NETWORK_RABBITMQ_HEARTBEAT

  MehmedGIT

  committed
  5d755a8

  Copy full SHA for 5d755a8

• deps-torch: also install torchvision

  bertsky

  authored
  a295b0c

  Copy full SHA for a295b0c

• fix: empty -> text

  MehmedGIT

  committed
  c5c60fd

  Copy full SHA for c5c60fd

• deployer: remove METS Server path and url from their resp. caches on stopping

  kba

  committed
  e1b9784

  Copy full SHA for e1b9784

Commits on Oct 10, 2024

• Merge branch 'fix_mets_server_zombies' into deployer-mets-caching

  Show description for 47c9acf
  kba

  committed
  47c9acf

  Copy full SHA for 47c9acf

• Merge pull request #1287 from OCR-D/deployer-mets-caching

  Show description for 926cb97
  kba

  authored
  926cb97

  Copy full SHA for 926cb97

• kill_mets_server_zombies: actually return List[int]

  kba

  committed
  d39c3d7

  Copy full SHA for d39c3d7

• kill_mets_server_zombies: allow dry_run to test

  kba

  committed
  7512bd6

  Copy full SHA for 7512bd6

• Merge branch 'network_client_block_prints'

  kba

  committed
  252fb4d

  Copy full SHA for 252fb4d

• 📝 changelog

  kba

  committed
  e40ed79

  Copy full SHA for e40ed79

• Simplify description for OCRD_NETWORK_RABBITMQ_HEARTBEAT

  kba

  authored
  7f60559

  Copy full SHA for 7f60559

• Merge pull request #1285 from OCR-D/rabbitmq_heartbeat_env

  Show description for 3e736a7
  kba

  authored
  3e736a7

  Copy full SHA for 3e736a7

• Merge remote-tracking branch 'github/deps-torch-torchvision'

  kba

  committed
  4e6551b

  Copy full SHA for 4e6551b

• 📝 changelog

  kba

  committed
  02c6eff

  Copy full SHA for 02c6eff

• Merge remote-tracking branch 'github/fix_mets_server_zombies'

  kba

  committed
  9391f49

  Copy full SHA for 9391f49

• 📝 changelog

  kba

  committed
  88707ca

  Copy full SHA for 88707ca

• CLI decorator: only import ocrd_network when needed

  bertsky

  committed
  cb8d787

  Copy full SHA for cb8d787

• Merge pull request #1274 from stweil/typos

  Show description for 03018f7
  kba

  authored
  03018f7

  Copy full SHA for 03018f7

• 📝 changelog

  kba

  committed
  94e6d2c

  Copy full SHA for 94e6d2c

• Merge branch 'master' of https://github.com/OCR-D/core

  kba

  committed
  d29c029

  Copy full SHA for d29c029

• deps-cuda: retry if micromamba is unresponsive

  bertsky

  authored
  e5cdbe9

  Copy full SHA for e5cdbe9

• Merge remote-tracking branch 'github/cli-decorator-import-network'

  kba

  committed
  539f5d7

  Copy full SHA for 539f5d7

• 📝 changelog

  kba

  committed
  80c0c6f

  Copy full SHA for 80c0c6f

• create PyPI CD

  bertsky

  authored
  7b1d172

  Copy full SHA for 7b1d172

• 📝 changelog

  kba

  committed
  7750f3f

  Copy full SHA for 7750f3f

• 📦 v2.70.0

  kba

  committed
  012ccf6

  Copy full SHA for 012ccf6

• deps-cuda: retry micro.mamba.pm even more

  bertsky

  authored
  a8e2c64

  Copy full SHA for a8e2c64

• PyPI: do not upload deprecated distribution aliases anymore

  bertsky

  authored
  85bde15

  Copy full SHA for 85bde15

Commits on Oct 17, 2024

• Merge branch 'master' into v2.70.0-backport-to-v3

  Show description for 7129ced
  kba

  committed
  7129ced

  Copy full SHA for 7129ced