Consensus simple merging #8953
Consensus simple merging #8953
Conversation
zhiltsov-max
requested review from
azhavoro,
bsekachev and
Marishka17
as code owners
| QualitySettingsFilter, SerializedAsset, | ||
| ConsensusSettingsFilter, |
There was a problem hiding this comment.
| QualitySettingsFilter, SerializedAsset, | |
| ConsensusSettingsFilter, | |
| QualitySettingsFilter, SerializedAsset, ConsensusSettingsFilter, |
| @@ -46,6 +47,7 @@ import { convertDescriptions, getServerAPISchema } from './server-schema'; | |||
| import { JobType } from './enums'; | |||
| import { PaginatedResource } from './core-types'; | |||
| import CVATCore from '.'; | |||
| import ConsensusSettings from './consensus-settings'; | |||
There was a problem hiding this comment.
We should place it before annotation-actions
| ), | ||
| }; | ||
|
|
||
| export const mergeTaskConsensusJobsAsync = ( |
There was a problem hiding this comment.
It feels like having two functions for the same action is redundant since both task and job instance have .mergeConsensusJobs method
| let taskInstance = null; | ||
| try { | ||
| [taskInstance] = await core.tasks.get({ id }); | ||
| } catch (error: unknown) { | ||
| throw new Error('The task was not found on the server'); | ||
| } |
There was a problem hiding this comment.
Seems like this part can be extracted into hook and re-used on quality page
| const onViewConsensusManagement = (): void => { | ||
| history.push(`/tasks/${taskInstance.id}/consensus`); | ||
| }; |
There was a problem hiding this comment.
As those onView... functions are duplicated, it seems we can extract them and re-use as callbacks
| @@ -36,6 +38,7 @@ interface DispatchToProps { | |||
| openRunModelWindow: (taskInstance: any) => void; | |||
| deleteTask: (taskInstance: any) => void; | |||
| openMoveTaskToProjectWindow: (taskInstance: any) => void; | |||
| mergeConsensusJobs: (taskInstance: any) => void; | |||
There was a problem hiding this comment.
| mergeConsensusJobs: (taskInstance: any) => void; | |
| mergeConsensusJobs: (taskInstance: Task) => void; |
| jobInstance: null, | ||
| fetching: true, | ||
| consensusSettings: null, | ||
| mergingConsensus: {}, |
There was a problem hiding this comment.
Usually we do activities: { action: {} } merging in our case
| mergingConsensus: {}, | ||
| }; | ||
|
|
||
| function makeKey(id: number, instance: string): string { |
There was a problem hiding this comment.
Better to pass instance itself here
| taskInstance: Task | null; | ||
| jobInstance: Job | null; | ||
| mergingConsensus: { | ||
| [taskId: string]: boolean; |
There was a problem hiding this comment.
| [taskId: string]: boolean; | |
| [instanceId: string]: boolean; |
|
There was a problem hiding this comment.
Do we really need another worker for this? Can't an existing worker, like the quality report worker, handle this?
| schema: | ||
| type: string | ||
| description: | | ||
| The consensus merge request id. Can be specified to check operation status. |
There was a problem hiding this comment.
We should be using the request API for status checking.
|
|
||
| @property | ||
| def organization_id(self): | ||
| return getattr(self.task.organization, "id", None) |
There was a problem hiding this comment.
| return getattr(self.task.organization, "id", None) | |
| return self.task.organization_id |
| @@ -453,7 +453,7 @@ def get_tmp_dirname(self) -> str: | |||
|
|
|||
|
|
|||
| @transaction.atomic(savepoint=False) | |||
| def clear_annotations_in_jobs(job_ids): | |||
| def clear_annotations_in_jobs(job_ids: Iterable[int] | Iterator[int]): | |||
There was a problem hiding this comment.
Iterator is a subclass of Iterable, so this is equivalent to Iterable[int].
| @@ -14,7 +14,7 @@ | |||
| from collections.abc import Collection, Sequence | |||
| from enum import Enum | |||
| from functools import cached_property | |||
| from typing import Any, ClassVar, Optional | |||
| from typing import Any, ClassVar, Iterable, Iterator, Optional | |||
There was a problem hiding this comment.
Please use collections.abc.
Motivation and context
Depends on #8939, #9026
A part of #8434
consensusRQ queue and workerLimitations:
How has this been tested?
Checklist
developbranch(cvat-canvas,
cvat-core,
cvat-data and
cvat-ui)
License
Feel free to contact the maintainers if that's a concern.