Code

Consensus simple merging#8953

Code

Draft

zhiltsov-max wants to merge 109 commits intodevelopcvat-ai/cvat:developfrom zm/consensus-simple-mergingcvat-ai/cvat:zm/consensus-simple-mergingCopy head branch name to clipboard

+4,890-140

Commits

Commits on Jan 13, 2025

• Port server changes

  zhiltsov-max

  committed
  3f1feb1

  Copy full SHA for 3f1feb1

• Port ui changes

  zhiltsov-max

  committed
  00993e5

  Copy full SHA for 00993e5

• Rename task Consensus tag

  zhiltsov-max

  committed
  389611f

  Copy full SHA for 389611f

• Move consensus tag to parent jobs

  zhiltsov-max

  committed
  7d05dfd

  Copy full SHA for 7d05dfd

• Fix job item column width

  zhiltsov-max

  committed
  1138992

  Copy full SHA for 1138992

• Rename consensus jobs per job to consensus replicas field

  zhiltsov-max

  committed
  2dc777c

  Copy full SHA for 2dc777c

• Move to per job replica counts

  zhiltsov-max

  committed
  b7f5f8e

  Copy full SHA for b7f5f8e

• Revert some changes

  zhiltsov-max

  committed
  68c51a3

  Copy full SHA for 68c51a3

• Update changelog

  zhiltsov-max

  committed
  0329596

  Copy full SHA for 0329596

Commits on Jan 14, 2025

• Apply isort

  zhiltsov-max

  committed
  ab04a6d

  Copy full SHA for ab04a6d

• Fix double assignment

  zhiltsov-max

  committed
  3d7c1a2

  Copy full SHA for 3d7c1a2

• Refactor

  zhiltsov-max

  committed
  3226dd7

  Copy full SHA for 3226dd7

• Fix backups

  zhiltsov-max

  committed
  824cf82

  Copy full SHA for 824cf82

• Merge branch 'develop' into zm/consensus-task-creation

  zhiltsov-max

  authored
  a866667

  Copy full SHA for a866667

• Fix field sending

  zhiltsov-max

  committed
  02d78b9

  Copy full SHA for 02d78b9

• Add task creation and data access tests

  zhiltsov-max

  committed
  b8b096c

  Copy full SHA for b8b096c

• Update test assets

  zhiltsov-max

  committed
  8f8a406

  Copy full SHA for 8f8a406

• Add backup tests

  zhiltsov-max

  committed
  35b7ef1

  Copy full SHA for 35b7ef1

• Merge branch 'develop' into zm/consensus-task-creation

  zhiltsov-max

  authored
  4ea54b4

  Copy full SHA for 4ea54b4

Commits on Jan 15, 2025

• Fix python 3.9 compatibility

  zhiltsov-max

  committed
  4c41c2a

  Copy full SHA for 4c41c2a

• Add annotations test for consensus task

  zhiltsov-max

  committed
  2879010

  Copy full SHA for 2879010

• Fix project backup import

  zhiltsov-max

  committed
  f3de175

  Copy full SHA for f3de175

• Fix honeypot task selection

  zhiltsov-max

  committed
  f92a3c3

  Copy full SHA for f92a3c3

• Add ui

  zhiltsov-max

  committed
  7bd100d

  Copy full SHA for 7bd100d

Commits on Jan 16, 2025

• Merge branch 'develop' into zm/consensus-task-creation

  zhiltsov-max

  authored
  5b7e2c2

  Copy full SHA for 5b7e2c2

• Add server

  zhiltsov-max

  committed
  2eaddc3

  Copy full SHA for 2eaddc3

• Fixes

  zhiltsov-max

  committed
  9fa8dcb

  Copy full SHA for 9fa8dcb

Commits on Jan 17, 2025

• Increase timeouts

  zhiltsov-max

  committed
  0e36b7d

  Copy full SHA for 0e36b7d

• Fix invalid inheritance in tests

  zhiltsov-max

  committed
  16a1570

  Copy full SHA for 16a1570

• Merge branch 'zm/fix-test-inheritance' into zm/consensus-task-creation

  zhiltsov-max

  committed
  5d62dce

  Copy full SHA for 5d62dce

Commits on Jan 20, 2025

• Merge branch 'develop' into zm/consensus-task-creation

  zhiltsov-max

  committed
  781150a

  Copy full SHA for 781150a

• Revert extra change

  zhiltsov-max

  committed
  587d802

  Copy full SHA for 587d802

• Update cvat-ui/src/components/jobs-page/jobs-filter-configuration.ts

  Show description for 259a23f
  

  zhiltsov-max

  and

  klakhov

  authored
  259a23f

  Copy full SHA for 259a23f

• Merge branch 'develop' into zm/consensus-task-creation

  zhiltsov-max

  committed
  083e60c

  Copy full SHA for 083e60c

• Merge remote-tracking branch 'origin/zm/consensus-task-creation' into zm/consensus-task-creation

  zhiltsov-max

  committed
  489b8ee

  Copy full SHA for 489b8ee

• Extend job filter tests

  zhiltsov-max

  committed
  b0615d4

  Copy full SHA for b0615d4

Commits on Jan 21, 2025

• Merge branch 'zm/consensus-task-creation' into zm/consensus-simple-merging

  zhiltsov-max

  committed
  1ecd6cf

  Copy full SHA for 1ecd6cf

Commits on Jan 22, 2025

• Merge branch 'develop' into zm/consensus-task-creation

  klakhov

  authored
  d7db85c

  Copy full SHA for d7db85c

• Refactor some code

  zhiltsov-max

  committed
  14bd5d2

  Copy full SHA for 14bd5d2

• Fix consensus settings saves in ui

  zhiltsov-max

  committed
  607df7e

  Copy full SHA for 607df7e

Commits on Jan 23, 2025

• applied ui changes

  klakhov

  committed
  eef091a

  Copy full SHA for eef091a

• Merge branch 'develop' into zm/consensus-task-creation

  klakhov

  committed
  34d9515

  Copy full SHA for 34d9515

• revert not necessary change

  klakhov

  committed
  fb9b1aa

  Copy full SHA for fb9b1aa

• Merge branch 'develop' into zm/consensus-task-creation

  klakhov

  authored
  60bf620

  Copy full SHA for 60bf620

• Refactor merging

  zhiltsov-max

  committed
  6c069a3

  Copy full SHA for 6c069a3

Commits on Jan 24, 2025

• Refactor

  zhiltsov-max

  committed
  815b45e

  Copy full SHA for 815b45e

Commits on Jan 27, 2025

• Update server schema

  zhiltsov-max

  committed
  00c3af2

  Copy full SHA for 00c3af2

• Include deferred rq jobs in 202 response

  zhiltsov-max

  committed
  3066452

  Copy full SHA for 3066452

• Create settings only for tasks with at least 1 consensus job

  zhiltsov-max

  committed
  fe5ef04

  Copy full SHA for fe5ef04

• Update test assets

  zhiltsov-max

  committed
  4983082

  Copy full SHA for 4983082

• Add debug task for consensus worker

  zhiltsov-max

  committed
  651f94a

  Copy full SHA for 651f94a

• Add tests

  zhiltsov-max

  committed
  b89ea7b

  Copy full SHA for b89ea7b

Commits on Jan 28, 2025

• Disallow null value in task consensus_replicas

  zhiltsov-max

  committed
  8fee320

  Copy full SHA for 8fee320

• Rename related field

  zhiltsov-max

  committed
  aa62db5

  Copy full SHA for aa62db5

• Rename job type to consensus_replica

  zhiltsov-max

  committed
  78a816e

  Copy full SHA for 78a816e

• Format code

  zhiltsov-max

  committed
  9c59005

  Copy full SHA for 9c59005

• Finalize job type renaming

  zhiltsov-max

  committed
  9bc2494

  Copy full SHA for 9bc2494

• Fix job cards on jobs page

  zhiltsov-max

  committed
  6e20db0

  Copy full SHA for 6e20db0

• Revert extra change

  zhiltsov-max

  committed
  9e60289

  Copy full SHA for 9e60289

• Fix job type filter name

  zhiltsov-max

  committed
  054e262

  Copy full SHA for 054e262

• Merge branch 'develop' into zm/consensus-task-creation

  zhiltsov-max

  committed
  37400e9

  Copy full SHA for 37400e9

• Update migration

  zhiltsov-max

  committed
  1075e0e

  Copy full SHA for 1075e0e

• Add related query name

  zhiltsov-max

  committed
  5e9acb2

  Copy full SHA for 5e9acb2

Commits on Jan 30, 2025

• Merge branch 'develop' into zm/consensus-task-creation

  zhiltsov-max

  committed
  d3f9e1e

  Copy full SHA for d3f9e1e

• Merge branch 'zm/consensus-task-creation' into zm/consensus-simple-merging

  zhiltsov-max

  committed
  7ce6904

  Copy full SHA for 7ce6904

• Update migration

  zhiltsov-max

  committed
  98907bf

  Copy full SHA for 98907bf

• Update test data

  zhiltsov-max

  committed
  bd6268c

  Copy full SHA for bd6268c

• Merge branch 'develop' into zm/consensus-task-creation

  zhiltsov-max

  committed
  deeac24

  Copy full SHA for deeac24

• Merge branch 'zm/consensus-task-creation' into zm/consensus-simple-merging

  zhiltsov-max

  committed
  6d168b3

  Copy full SHA for 6d168b3

• Refactor some code

  zhiltsov-max

  committed
  9c98cb1

  Copy full SHA for 9c98cb1

• Rename action

  zhiltsov-max

  committed
  59050e3

  Copy full SHA for 59050e3

• Remove extra file

  zhiltsov-max

  committed
  433cc20

  Copy full SHA for 433cc20

• Update consensus job type uses

  zhiltsov-max

  committed
  386d801

  Copy full SHA for 386d801

• Refactor job actions menu, add modal on parent job merge

  zhiltsov-max

  committed
  7bfa9c6

  Copy full SHA for 7bfa9c6

• Remove extra code

  zhiltsov-max

  committed
  97f8813

  Copy full SHA for 97f8813

• Remove extra changes

  zhiltsov-max

  committed
  ddc7c58

  Copy full SHA for ddc7c58

• Remove unused method

  zhiltsov-max

  committed
  8b2f709

  Copy full SHA for 8b2f709

• Make symbols public

  zhiltsov-max

  committed
  e5492a3

  Copy full SHA for e5492a3

• Update rq job status handling

  zhiltsov-max

  committed
  5f42a3a

  Copy full SHA for 5f42a3a

• Update field name

  zhiltsov-max

  committed
  2d37ee2

  Copy full SHA for 2d37ee2

• Add type annotations

  zhiltsov-max

  committed
  0217037

  Copy full SHA for 0217037

• Update test

  zhiltsov-max

  committed
  06434b8

  Copy full SHA for 06434b8

• Merge branch 'develop' into zm/refactor-quality-reports-impl

  zhiltsov-max

  committed
  9c6b747

  Copy full SHA for 9c6b747

• Add helm chart for consensus worker

  zhiltsov-max

  committed
  2a1c126

  Copy full SHA for 2a1c126

• Fix .gitignore

  zhiltsov-max

  committed
  fc829b1

  Copy full SHA for fc829b1

• Merge branch 'zm/refactor-quality-reports-impl' into zm/consensus-simple-merging

  zhiltsov-max

  committed
  10019b8

  Copy full SHA for 10019b8

• Fix merge

  zhiltsov-max

  committed
  ba65cfb

  Copy full SHA for ba65cfb

• Merge branch 'zm/refactor-quality-reports-impl' into zm/consensus-simple-merging

  zhiltsov-max

  committed
  d951f1a

  Copy full SHA for d951f1a

Commits on Jan 31, 2025

• Use fully qualified symbol name for internal datumaro symbols

  zhiltsov-max

  committed
  08d8421

  Copy full SHA for 08d8421

• Merge branch 'zm/refactor-quality-reports-impl' into zm/consensus-simple-merging

  zhiltsov-max

  committed
  5c2c10d

  Copy full SHA for 5c2c10d

• Fix some type references

  zhiltsov-max

  committed
  25fb6c3

  Copy full SHA for 25fb6c3

• Refactor segment matching

  zhiltsov-max

  committed
  b94d430

  Copy full SHA for b94d430

• Merge branch 'zm/refactor-quality-reports-impl' into zm/consensus-simple-merging

  zhiltsov-max

  committed
  abe9823

  Copy full SHA for abe9823

• Fix skeleton cluster distance computation in merging

  zhiltsov-max

  committed
  8b7c83f

  Copy full SHA for 8b7c83f

• Update merging call to the recent datumaro api

  zhiltsov-max

  committed
  d3dea88

  Copy full SHA for d3dea88

• t

  zhiltsov-max

  committed
  d8b9837

  Copy full SHA for d8b9837

• Refactor, improve code reuse

  zhiltsov-max

  committed
  bdb81aa

  Copy full SHA for bdb81aa

• Refactor

  zhiltsov-max

  committed
  f618be4

  Copy full SHA for f618be4

• Merge branch 'develop' into zm/refactor-quality-reports-impl

  zhiltsov-max

  authored
  95ad74c

  Copy full SHA for 95ad74c

• Fix warning

  zhiltsov-max

  committed
  66a74de

  Copy full SHA for 66a74de

• Merge branch 'zm/refactor-quality-reports-impl' into zm/consensus-simple-merging

  zhiltsov-max

  committed
  616be3a

  Copy full SHA for 616be3a

• Fix warning

  zhiltsov-max

  committed
  bcbe859

  Copy full SHA for bcbe859

• Reduce code duplication

  zhiltsov-max

  committed
  879d05e

  Copy full SHA for 879d05e

• Update license headers

  zhiltsov-max

  committed
  c0b1f31

  Copy full SHA for c0b1f31

• Fix warning

  zhiltsov-max

  committed
  41cd670

  Copy full SHA for 41cd670

• Fix warning

  zhiltsov-max

  committed
  a2e9fc8

  Copy full SHA for a2e9fc8

• Fix warning

  zhiltsov-max

  committed
  b1383bd

  Copy full SHA for b1383bd

• Merge branch 'zm/refactor-quality-reports-impl' into zm/consensus-simple-merging

  zhiltsov-max

  committed
  8002a7a

  Copy full SHA for 8002a7a

• Refactor

  zhiltsov-max

  committed
  1b6ce43

  Copy full SHA for 1b6ce43