Stop editing when n key pressed #7922
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Important Review skippedAuto incremental reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the WalkthroughThe recent changes to the Changes
Sequence Diagram(s) (Beta)sequenceDiagram
participant User
participant ControlsSideBar
participant Canvas
participant CanvasController
participant CanvasModel
participant EditHandler
User->>ControlsSideBar: Initiates editing
ControlsSideBar->>Canvas: Calls edit method
Canvas->>CanvasController: Passes editData
CanvasController->>CanvasModel: Updates editData
CanvasModel->>EditHandler: Enables editing
EditHandler->>CanvasModel: Sets isEditing
CanvasModel->>CanvasController: Returns updated state
CanvasController->>Canvas: Updates canvas with new state
Canvas->>ControlsSideBar: Confirms editing state
ControlsSideBar->>User: Editing enabled
Assessment against linked issues
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files ignored due to path filters (1)
yarn.lockis excluded by!**/*.lock
Files selected for processing (1)
- cvat-canvas/src/typescript/editHandler.ts (4 hunks)
Additional comments not posted (4)
cvat-canvas/src/typescript/editHandler.ts (4)
34-34: Initialization ofcircleproperty.This line correctly initializes the
circleproperty tonull. This is a good practice as it explicitly sets the initial state of the property.
37-37: UpdatedsetupTrailingPointmethod to handleclickevents.The method now correctly assigns the
circleparameter to thethis.circleproperty and sets up event listeners formouseenter,mouseleave, andclickevents. The logic within theclickevent handler properly checks the button pressed and performs the necessary actions if the conditions are met.Also applies to: 52-52
388-398: New methodonNKeyUpto handle 'n' key press.This method is well-implemented to handle the 'n' key press specifically for polylines. It creates a new
MouseEventand dispatches it to thecircleelement, which is a clean and effective way to simulate the click event programmatically.
417-417: Event listener registration in the constructor.The registration of the
onNKeyUpmethod as an event listener forkeyupevents is done correctly in the constructor. This ensures that the event listener is set up as soon as an instance of the class is created.
There was a problem hiding this comment.
Actionable comments posted: 1
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (1)
- changelog.d/20240521_132410_krishavrajsingh_endPolyline.md (1 hunks)
Additional comments not posted (1)
changelog.d/20240521_132410_krishavrajsingh_endPolyline.md (1)
1-4: Changelog entry correctly summarizes the fix.
| @@ -0,0 +1,4 @@ | |||
| ### Fixed | |||
|
|
|||
| - Stop editing polyline when n key pressed | |||
There was a problem hiding this comment.
Remove trailing spaces.
- - Stop editing polyline when n key pressed
+ - Stop editing polyline when n key pressedCommittable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
Suggested change
| - Stop editing polyline when n key pressed | |
| - Stop editing polyline when n key pressed |
bsekachev
reviewed
May 21, 2024
| @@ -383,6 +385,18 @@ export class EditHandlerImpl implements EditHandler { | |||
| this.release(); | |||
| } | |||
|
|
|||
| private onNKeyUp = (e: KeyboardEvent): void => { | |||
There was a problem hiding this comment.
It must be handled on cvat-ui level with mousetrap.
Otherwise it cannot be configured.
- When shortcut caught in cvat-ui, it should call
canvasInstance.edit({enabled: false}). - Canvas should handle correctly editing finish and trigger
canvas.editedevent.
Please, see how it works for masks in this file: cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/controls-side-bar.tsx
Try to edit mask and press N after finish editing.
There was a problem hiding this comment.
Actionable comments posted: 2
Outside diff range and nitpick comments (5)
cvat-canvas/src/typescript/canvasModel.ts (1)
Line range hint
726-732: Consider simplifying the control flow by removing unnecessary else clauses.- } else if (disableInternalSVGDrawing(editData, this.data.editData)) { - this.notify(UpdateReasons.EDIT); - return; - } else { + } else if (!disableInternalSVGDrawing(editData, this.data.editData)) { this.data.editData = { enabled: false }; } this.notify(UpdateReasons.EDIT);cvat-canvas/src/typescript/canvasView.ts (4)
Line range hint
289-289: Replace.map().flat()with.flatMap()for better performance and readability.- const points = data.points || elements.map((el: any) => el.points).flat(); + const points = data.points || elements.flatMap((el: any) => el.points);
Line range hint
437-443: Consider usingfor...ofinstead offorEachfor better performance and readability.- states.forEach((state: any): void => { - if (state.shapeType === 'skeleton') { - this.deleteObjects(state.elements); - } - }); + for (const state of states) { + if (state.shapeType === 'skeleton') { + this.deleteObjects(state.elements); + } + }
Line range hint
670-672: Consider usingfor...ofinstead offorEachfor better performance and readability.- states.forEach((state: any): void => { - if (state.shapeType === 'skeleton') { - this.deleteObjects(state.elements); - } - }); + for (const state of states) { + if (state.shapeType === 'skeleton') { + this.deleteObjects(state.elements); + } + }
Line range hint
127-127: Replaceanytype with more specific types to improve type safety and code maintainability.- private onError = (exception: unknown, domain?: string): void => { + private onError = (exception: Error | string, domain?: string): void => {Also applies to: 163-163, 274-274, 288-288, 289-289, 292-292, 335-335, 355-355, 379-379, 397-397, 418-418, 476-476, 622-622, 624-624, 656-656, 657-657, 754-754
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (6)
- cvat-canvas/src/typescript/canvas.ts (3 hunks)
- cvat-canvas/src/typescript/canvasController.ts (5 hunks)
- cvat-canvas/src/typescript/canvasModel.ts (6 hunks)
- cvat-canvas/src/typescript/canvasView.ts (1 hunks)
- cvat-canvas/src/typescript/editHandler.ts (6 hunks)
- cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/controls-side-bar.tsx (1 hunks)
Additional Context Used
Biome (95)
cvat-canvas/src/typescript/canvas.ts (10)
27-27: Unexpected any. Specify a different type.
27-27: Unexpected any. Specify a different type.
45-45: Unexpected any. Specify a different type.
77-77: Unexpected any. Specify a different type.
77-77: Unexpected any. Specify a different type.
165-165: Unexpected any. Specify a different type.
5-15: Some named imports are only used as types.
15-16: All these imports are only used as types.
16-17: Some named imports are only used as types.
17-18: Some named imports are only used as types.
cvat-canvas/src/typescript/canvasController.ts (5)
27-27: Unexpected any. Specify a different type.
41-41: Unexpected any. Specify a different type.
120-120: Unexpected any. Specify a different type.
168-168: Unexpected any. Specify a different type.
5-24: All these imports are only used as types.
cvat-canvas/src/typescript/canvasModel.ts (20)
117-117: Unexpected any. Specify a different type.
150-150: Unexpected any. Specify a different type.
156-156: Unexpected any. Specify a different type.
180-180: Unexpected any. Specify a different type.
245-245: Unexpected any. Specify a different type.
260-260: Unexpected any. Specify a different type.
268-268: Unexpected any. Specify a different type.
268-268: Unexpected any. Specify a different type.
284-284: Unexpected any. Specify a different type.
329-329: Unexpected any. Specify a different type.
364-364: Unexpected any. Specify a different type.
379-379: Unexpected any. Specify a different type.
540-540: Unexpected any. Specify a different type.
540-540: Unexpected any. Specify a different type.
639-639: Unexpected any. Specify a different type.
726-732: This else clause can be omitted because previous branches break early.
729-731: This else clause can be omitted because previous branches break early.
737-737: Unexpected any. Specify a different type.
805-807: This else clause can be omitted because previous branches break early.
896-896: Unexpected any. Specify a different type.
cvat-canvas/src/typescript/canvasView.ts (20)
127-127: Unexpected any. Specify a different type.
163-163: Unexpected any. Specify a different type.
274-274: Unexpected any. Specify a different type.
288-288: Unexpected any. Specify a different type.
289-289: The call chain .map().flat() can be replaced with a single .flatMap() call.
289-289: Unexpected any. Specify a different type.
292-292: Unexpected any. Specify a different type.
335-335: Unexpected any. Specify a different type.
355-355: Unexpected any. Specify a different type.
379-379: Unexpected any. Specify a different type.
397-397: Unexpected any. Specify a different type.
418-418: Unexpected any. Specify a different type.
437-443: Prefer for...of instead of forEach.
476-476: Unexpected any. Specify a different type.
622-622: Unexpected any. Specify a different type.
624-624: Unexpected any. Specify a different type.
656-656: Unexpected any. Specify a different type.
657-657: Unexpected any. Specify a different type.
670-672: Prefer for...of instead of forEach.
754-754: Unexpected any. Specify a different type.
cvat-canvas/src/typescript/editHandler.ts (20)
23-23: Unexpected any. Specify a different type.
61-61: Unexpected any. Specify a different type.
87-87: Unexpected any. Specify a different type.
94-94: Unexpected any. Specify a different type.
100-100: Unexpected any. Specify a different type.
102-102: Unexpected any. Specify a different type.
103-103: Unexpected any. Specify a different type.
108-108: Unexpected any. Specify a different type.
128-128: Unexpected any. Specify a different type.
140-140: Unexpected any. Specify a different type.
143-143: Unexpected any. Specify a different type.
251-251: Unexpected any. Specify a different type.
292-292: Unexpected any. Specify a different type.
328-328: Unexpected any. Specify a different type.
346-346: Unexpected any. Specify a different type.
409-409: Unexpected any. Specify a different type.
463-463: Unexpected any. Specify a different type.
472-472: Unexpected any. Specify a different type.
5-6: All these imports are only used as types.
10-11: All these imports are only used as types.
cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/controls-side-bar.tsx (20)
47-47: Unexpected any. Specify a different type.
98-98: Unexpected any. Specify a different type.
108-117: Prefer for...of instead of forEach.
125-125: Unexpected any. Specify a different type.
130-130: Unexpected any. Specify a different type.
177-177: Change to an optional chain.
8-11: Some named imports are only used as types.
11-12: Some named imports are only used as types.
12-13: Some named imports are only used as types.
16-17: Some named imports are only used as types.
17-18: Some named imports are only used as types.
18-19: Some named imports are only used as types.
19-20: Some named imports are only used as types.
20-21: Some named imports are only used as types.
23-24: Some named imports are only used as types.
24-25: Some named imports are only used as types.
25-26: Some named imports are only used as types.
26-27: Some named imports are only used as types.
27-28: Some named imports are only used as types.
28-29: Some named imports are only used as types.
Additional comments not posted (16)
cvat-canvas/src/typescript/canvasController.ts (4)
34-34: The update to alloweditDatato be eitherMasksEditDataorPolyEditDataaligns with the PR's objective to enhance polyline editing capabilities.
48-48: The method signature change ineditto accept bothMasksEditDataandPolyEditDatais a good enhancement for flexibility.
140-140: The getter foreditDatanow correctly reflects the possible types of edit data, enhancing the system's flexibility.
100-100: Ensure that theeditmethod inCanvasControllerImplcorrectly handles the new dual data type foreditData.cvat-canvas/src/typescript/canvas.ts (3)
14-14: The import ofPolyEditDatais essential for supporting the new editing features described in the PR.
39-39: The update to theeditmethod in theCanvasinterface to accept bothMasksEditDataandPolyEditDatais a crucial enhancement for supporting more flexible editing operations.
141-141: The implementation of theeditmethod inCanvasImplnow correctly handles the new data types, ensuring that the editing functionality is robust and flexible.cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/controls-side-bar.tsx (1)
168-168: The comment update inControlsSideBarComponentto include "or polyline" reflects the expanded editing capabilities introduced in this PR.cvat-canvas/src/typescript/editHandler.ts (4)
19-19: Adding anenabledproperty to theEditHandlerinterface is a good step towards more explicit control over the editing state.
35-35: The introduction of theisEditingproperty inEditHandlerImplprovides a clear way to track whether editing is currently active, which is crucial for the new functionality.
52-54: The method to stop editing when the 'n' key is pressed, as described in the PR, is implemented here by settingenabledtofalse. This is a direct implementation of the proposed solution in the issue linked to the PR.
373-385: ThecloseEditingmethod now properly handles the transition from an editing state, ensuring that all resources are cleaned up and the editing state is correctly updated.cvat-canvas/src/typescript/canvasModel.ts (4)
252-252: The change to alloweditDatato be eitherMasksEditDataorPolyEditDataincreases flexibility in handling different edit types.
372-372: The internal stateeditDatanow supports bothMasksEditDataandPolyEditData, aligning with the changes in the method signatures.
770-770: Getter foreditDatacorrectly reflects the updated type. This is crucial for ensuring that the rest of the application can interact with the updated data structure.
278-278: Ensure that all usages of theeditmethod are updated to handle the new union type foreditData.
Comment on lines
+150
to
+151
| state?: any; | ||
| pointID?: number; |
There was a problem hiding this comment.
Refactor to avoid using any type for better type safety.
- state?: any;
+ state?: StateType; // Define StateType appropriately based on the expected structureCommittable suggestion was skipped due low confidence.
| @@ -20,6 +20,7 @@ import { | |||
| Configuration, | |||
| MasksEditData, | |||
| HighlightedElements, | |||
| PolyEditData, | |||
There was a problem hiding this comment.
Consider specifying a more precise type than any for objects in CanvasController.
- readonly objects: any[];
+ readonly objects: ObjectType[]; // Replace 'ObjectType' with the actual type used for objects.Committable suggestion was skipped due low confidence.
|
@bsekachev You may review it now. |
bsekachev
reviewed
Jun 3, 2024
| } | ||
|
|
||
| public edit(editData: any): void { | ||
| if (editData.enabled) { | ||
| if (editData.state.shapeType !== 'rectangle') { | ||
| this.editData = editData; | ||
| this.isEditing = true; |
There was a problem hiding this comment.
I will suggest:
- Update condition as:
['polygon', 'polyline', 'points'].includes(editData.state.shapeType)just to make code clearer as this handler only works with these types. - Set
isEditingafterthis.initEditingas this is more reliable (in case ifthis.initEditingthrows an exception)
Comment on lines
52
to
54
| this.edit({ | ||
| enabled: false, | ||
| }); |
There was a problem hiding this comment.
Suggested change
| this.edit({ | |
| enabled: false, | |
| }); | |
| this.edit({ enabled: false }); |
Comment on lines
385
to
386
| this.isEditing = false; | ||
| this.release(); |
There was a problem hiding this comment.
Shall we put these two lines under the condition?
There was a problem hiding this comment.
Since the polygon editing was affected, i am thinking to add checktype for shape, something like this
`
-
if (this.isEditing && this.editData.state.shapeType === 'polyline') { ... } else { this.onEditDone(null, null); } this.isEditing = false; this.release();
`
So I think I shall keep it outside.
I am open to suggestions.
|
I see a problem here. Polygon editing is also affected. It finishes when pressing N (what is incorrect because polygon must be closed first) |
|
One more thing, wanted to run tests but I am not able to generate the cvat-sdk package code, this is giving me errors after I ran ./cvat-sdk/gen/generate.sh |
|
You may to install sdk of necessary version using pip, you do not need to generate it |
|
Hello, There is still minor problem that does not exist in current develop branch. That may make some users to lose their progress when they accidentally click N button. |
bsekachev
reviewed
Jun 12, 2024
| } else { | ||
| this.onEditDone(null, null); | ||
| } | ||
| this.isEditing = false; |
There was a problem hiding this comment.
- I believe we should set
this.isEditing = falseinreleasemethod - I believe we should set
this.isEditing = trueininitEditingmethod
| } else { | ||
| this.onEditDone(null, null); | ||
| } | ||
| this.isEditing = false; |
There was a problem hiding this comment.
Probably release shall be called inside the condition. Otherwise it leads to the issue, I described in the pull request with polygons
There was a problem hiding this comment.
Release method needs to be called whenever a polyline is edited, so i think it should be outside.
As for the issue, I fixed it by cheking the shapeType of the editHandler and pass {enabled: false} only if the shapetype is polyline in canvasview.ts. It shall work fine now.
|
|
Alright, thanks for the contribution! |
bsekachev
approved these changes
Jun 19, 2024
Merged
fahadb-kt
added a commit
to fahadb-kt/cvat
that referenced
this pull request
Aug 21, 2024
* Move rego files into their respective apps (#7806)
This is the promised sequel to #7734. After this change, the `iam` app
will no longer contain any code specific to other apps.
To make this work, the `/api/auth/rules` endpoint will now construct the
OPA bundle from a set of paths, which will be populated by
`load_app_permissions`.
Move OPA test files accordingly. Fortunately, `opa test` accepts
multiple directories, so it is trivial to adapt the testing
instructions.
Make the necessary adaptations to `generate_tests.py` to search for test
generators in every app. The original parameters of `generate_tests.py`
don't really make sense when there are multiple `rules` directory, so
remove them.
Instead, add a new `--apps-dir` parameter. This parameter isn't really
needed to test the open source version of CVAT, but I expect it to be
useful for testing the Enterprise version.
In addition, add some safety checks to `generate_tests.py`:
* Make sure that we find at least one test generator.
* Propagate exceptions from `call_generator` into the main thread.
### How has this been tested?
I tested the updated commands from the documentation manually, and
examined the rules bundle returned by `/api/auth/rules` to ensure that
it still contains all the `.rego` files.
* Fixed incorrect Cloud Storage request by ID (#7823)
* Opening update CS page sends infinite requests when CS id does not exist (#7828)
=
* Fixed duration of 'change:frame' event (#7817)
* Save video if test failed (#7807)
* Modernize Rego syntax (#7824)
Open Policy Agent v0.59 introduced a new directive (`import rego.v1`)
that ensures that the file is compatible with OPA v1 (to be released in
the future).
Add this directive to all Rego files and update the syntax accordingly.
Which involves the following:
* Rewrite all rules to use the `if` keyword, which is now mandatory.
* Where appropriate, use the `in` keyword, which is now available
without a future import. It's not mandatory, but it looks much nicer.
In addition, update Regal to the latest version, which now enforces the
use of `import rego.v1` by default.
* Optimized analytics requests to ClickHouse (#7804)
* Update the Nuclio version (#7787)
Old verison of Nuclio has some vulnerabilities and it needs to be
updated. Function dependencies have also been updated.
The `mask_rcnn` function has been removed because `mask_rcnn` using
python 3.6. In new version of Nuclio python3.6 is no longer supported.
Nuclio officially recommends using python3.9. Running `mask_rcnn` on
python3.9 causes errors within the function and package conflicts.
* Fixed: Cannot read properties of undefined (reading 'addClass') (#7834)
* fix[security]: Disable nginx server signature by default (#7814)
* Enhanced uploading files with tus protocol, enabled retries (#7830)
* Fixed exception when copy/paste a skeleton point (#7843)
* Added ability to call analytics report manually (#7805)
* Use CPU PyTorch for testing the SDK (#7825)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
Not only is the GPU version of PyTorch much bigger than the CPU version,
but it also pulls in CUDA, which is enormous. We don't (and can't) use
any GPU features in our tests, so we don't need the GPU version.
Using the CPU version saves ~4GB of disk space, which is a lot, because
the standard GitHub runners only offer 14 GB.
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- ~~[ ] I have created a changelog fragment~~ <!-- see top comment in
CHANGELOG.md -->
- ~~[ ] I have updated the documentation accordingly~~
- ~~[ ] I have added tests to cover my changes~~
- ~~[ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))~~
- ~~[ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))~~
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Chores**
- Enhanced the installation process by adding an extra index URL for
PyTorch CPU wheels to improve SDK setup reliability.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Update server dependencies (#7845)
* Bump tqdm from 4.60.0 to 4.66.3 in /utils/dicom_converter (#7848)
* Do not allow to remove latest keyframe from UI (#7844)
* Optimized requests to analytics DB, using timestamps, to avoid going trough the whole table (#7833)
* Fix task creation with video file when there are no valid keyframes (#7838)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Bug Fixes**
- Fixed an issue where task creation from videos without valid keyframes
could cause errors.
- **New Features**
- Enhanced video stream handling to support videos without keyframes.
- Improved manifest management with new checks for empty states and
better index handling.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* [GSoC2024] Added feature to show tags corresponding to GT job and manual job in a separate row (#7774)
Fixes #7773 and #7749
Added feature to show tags corresponding to GT job and manual job in a
separate row. Along with the tags of the GT job have a mark of '(GT)' in
them.
### How has this been tested?
When we want to see both manual annotations and GT annotations:
<img width="1217" alt="image loading..."
src="https://github.com/cvat-ai/cvat/assets/72168180/362a1728-24f3-43cb-ac4d-1571ebc5faaf">
When we only want to see the annotations for the manual annotations job:
<img width="1217" alt="image loading..."
src="https://github.com/cvat-ai/cvat/assets/72168180/443fbf56-cd86-404b-bd6d-28351738dddf">
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
~- [ ] I have updated the documentation accordingly~
~- [ ] I have added tests to cover my changes~
- [x] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
~- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))~
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **New Features**
- Introduced display tags for Ground Truth (GT) and manual jobs in a
separate row, with GT tags marked for easy identification.
- Enhanced tag highlighting in the annotation interface to better
indicate conflicts.
- **Style**
- Implemented new styles for frame tags to improve visual distinction
when highlighted.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---------
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Kirill Lakhov <kirill.9992@gmail.com>
Co-authored-by: Maxim Zhiltsov <zhiltsov.max35@gmail.com>
* Fixed vertical polylines difficult to select (#7860)
* Make `generate_tests.py` work with relative `--apps-dir` values (#7851)
In #7806 I goofed and made the `--apps-dir` option work only with
absolute paths. This patch fixes that.
* Fixed cannot read property 'annotations' of null (#7857)
* [GSoC2024] Added quality reporting for Tag annotations (#7582)
Fixes #7424
This PR adds quality computations for Tag annotations.
* Avoid fetching a list of shapes/tags from db, optimized fetching tracks (#7852)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [ ] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [x] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Refactor**
- Updated the method for counting objects in analytics reports to
improve accuracy.
- Made internal methods for initializing tags, shapes, and tracks
publicly accessible, enhancing external usability.
- **Bug Fixes**
- Fixed import paths for better module integration and reliability.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Prevent losing tracked attributes when moving to a project (#7863)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **New Features**
- Improved object tracking by adding a new model
`TrackedShapeAttributeVal` for enhanced performance and accuracy.
- Resolved issue of lost tracked attribute values when moving tasks to
projects.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Prepare release v2.13.0
* Update develop after v2.13.0
* Remove tasks by projectId from state after deleting project (#7854)
* helm-chart: prevent Traefik from ignoring the backend ingress rule (#7859)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
There is a condition that may occur during Kubernetes deployment, where
the frontend service already has an endpoint (i.e. the frontend pod),
but the backend service does not. For example, the backend pod may not
have started yet or the service controller may not have had time to
react to the backend pod.
In this case, when Traefik serves a request with an `/api/...` path, it
will see that it matches the `/api` rule, but since the corresponding
service has no endpoints, it will _skip_ that rule and try other rules.
And since the `/` rule matches everything, it will then route the
request to the frontend.
This is confusing and unhelpful, and more importantly, it makes health
checks return the wrong result. Since the frontend will serve
`index.html` to every request, a request to `/api/server/health/` or
`/api/server/about` will return a 200 code, even though the server isn't
actually up.
Because of this bug, I have observed weird failures in the Helm
workflow, where the "Wait for CVAT to be ready" step completes, but CVAT
is not actually ready. (FYI: The failures I've seen are actually in a
private repo, but the failure condition could occur in this repo too.
It's just more likely in a private repo, because GitHub uses smaller
runners in private repos.)
The fix is simple: use the `allowEmptyServices` Traefik setting, which
disables the rule skipping behavior. With this setting on, Traefik will
return a 503 response for backend URLs until the backend service gains
an endpoint.
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
I deployed the Helm chart, then ran a `kubectl delete deployments.apps
cvat-backend-server` to simulate the server being unavailable. Then I
curled the `/api/server/health/` endpoint.
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [ ] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- ~~[ ] I have updated the documentation accordingly~~
- ~~[ ] I have added tests to cover my changes~~
- ~~[ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))~~
- ~~[ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))~~
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Bug Fixes**
- Fixed an issue to prevent incorrect 200 OK responses from API
endpoints before backend readiness.
- **New Features**
- Updated Helm chart to support configurations that allow empty services
in the Kubernetes Ingress provider.
- **Documentation**
- Updated version in Helm chart documentation from `0.12.0` to `0.12.1`.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Fixed calculation of metrics for analytics reports (#7144)
* Check UI does not crash if to activate an object while frame fetching (#7873)
* Fix creating chunks with original quality from png images (#7899)
* Update helm (#7894)
Added ability to specify ServiceAccount for backend pods
Removed passing of DJANGO_MODWSGI_EXTRA_ARGS env variable to server pod
Do not set database host and port env variables if they are empty
* fixed server for duplicate attribute names (#7890)
* Fixed object count in analytics for skeletons and tracks (#7883)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Bug Fixes**
- Corrected an issue where analytics reported an incorrect count of
objects for skeleton tracks/shapes.
- Fixed a bug where the analytic report consistently showed one less
object for tracks than the actual count.
- **Improvements**
- Enhanced filtering logic for shapes and tracks in analytics, improving
the accuracy of annotation speed metrics.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Fix CI-nightly tests and refactoring cypress config (#7908)
* Fixed analytics report: working time rounding to minimal 1 hour is not applied to annotation speed anymore (#7898)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
Depends on #https://github.com/cvat-ai/cvat/pull/7883
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Bug Fixes**
- Corrected an issue where analytic reports showed an incorrect count of
objects for skeleton tracks and shapes.
- **Improvements**
- Renamed metrics related to annotation speed from total to average for
jobs, tasks, and projects.
- Updated descriptions for annotation speed metrics to specify the
number of objects per hour.
- Removed unnecessary clamping function for working time statistics.
These changes enhance the accuracy and clarity of analytic reports,
providing more meaningful insights into annotation speeds and object
counts.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---------
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* Fixed exception: Cannot read properties of undefined (reading 'onBloc… (#7913)
* Fixed one way to create an empty mask (#7915)
* check creating task with video without valid keyframes
* fix before commands
* remove extra check
* Fixed updating job/task status after changing job state (#7901)
* Array.toReversed replaced by Array.reduceRight because of better comp… (#7916)
* [GSoC2024] Added additional security headers (#7752)
Added security headers for Referrer-Policy, X-Content-Type-Options.
Referring to Issue https://github.com/cvat-ai/cvat/issues/7398, Added
additional security headers. Added to address the deduction in security
score rating third party scanners.
- Referrer-Policy "strict-origin-when-cross-origin";: Limit the referrer
information sent when a user navigates away from the website
- X-Content-Type-Options "nosniff";: Prevent browsers from attempting to
MIME-sniff the content type of a response to reduce risk of XSS and
Content Injection
Co-authored-by: Roman Donchenko <rdonchen@outlook.com>
* Fixed skeleton selection algorithm (#7921)
* add rest api test
* remove extra video file
* remove unused task
* fix video file path
* Ignore ground truth jobs when compute analytics report for a task/project (#7919)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
* Prepare release v2.14.0
* Update develop after v2.14.0
* replace test video
* formatted code
* add copy videos folder
* Update cypress version (#7929)
* Upgrade React and Antd till the latest version (#7466)
* Fixed conflicts highlight crash in case of hidden by `zOrder` objects (#7917)
* Fixed couple of not stable Cypress tests (#7937)
* Fix missing serviceName field in kvrocks (issue #7741) (#7924)
Add the serviceName field to the kvrocks StatefulSet as per the
Kubernetes specification. This change ensures that the service name is
correctly associated with the StatefulSet pods, allowing for proper DNS
resolution and service discovery within the cluster.
Fixes #7741
### Motivation and context
The Helm installation is currently failing as reported in issue #7741
### How has this been tested?
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Bug Fixes**
- Resolved the issue of a missing `serviceName` field in `kvrocks`,
ensuring proper configuration and improved stability.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Fix login when email domain contains capital symbols and user was created after invitation to some org (#7906)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [ ] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Bug Fixes**
- Improved email creation process to ensure the use of the normalized
email from the user object, enhancing data consistency and reducing
errors.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Fixed .ant-modal-wrapper kept after closing saving modal (#7948)
* use other method to get path
* Fix dataset downloading (#7864)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
This PR addresses several problems:
- when requesting a dataset download, it's possible to get the 500 error
with the message "The result file does not exist in export cache", which
isn't expected for this request
- when downloading the dataset the same error can be obtained if the
file is requested right before the cache expiration
- there are several
[TOCTOU](https://en.wikipedia.org/wiki/Time-of-check_to_time-of-use)
bugs related to dataset cache file existence checks
- under some conditions, it's possible that the export job is never
started
- the finished RQ jobs were removed automatically on result reporting
(after the client requested the result). This made it hard to debug
problems for admins, as the jobs were often removed already
This PR fixes the problems by the following:
- introduced dataset cache file locking (via redis) during reading,
writing, and removal
- the 500 error is changed to automatic reexporting attempt on export
status request
- the 500 error is changed to 404 when the file is not available for
downloading
- the exported files are now have different names for each instance
update time
- the lifetime of the exported files is now automatically prolonged on
each export request for the file (given the export is still valid)
- the deferred export jobs are now checked to have ghost dependencies.
If so, the requested job is restarted
- added several environment variables for configuration
- <s>finished RQ export jobs are not removed automatically on result
retrieval. Now, they just use the export cache lifetime instead (should
be continued in another PR)</s>
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [ ] I submit my changes into the `develop` branch
- [ ] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [ ] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **New Features**
- Improved reliability of file handling during export and cleanup
processes.
- Introduced new functionality for managing export cache locks and
directories.
- **Bug Fixes**
- Addressed race conditions in concurrent export and cleanup operations.
- **Dependencies**
- Updated multiple packages to their latest versions for enhanced
security and performance:
- `cryptography` to `42.0.7`
- `django` to `4.2.13`
- `django-health-check` to `3.18.2`
- `freezegun` to `1.5.1`
- `jinja2` to `3.1.4`
- `limits` to `3.12.0`
- `lxml` to `5.2.2`
- `orjson` to `3.10.3`
- Added `pottery` version `3.0.0`
- Updated `tqdm` to `4.66.4`
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Fixed working time lost in click:element events (#7942)
* Aborted enabling black linter onsave in vscode (#7956)
* Delete extra comma (#7957)
* Fix a non-deterministic webhook test (#7952)
`test_two_project_webhooks_intersection` is supposed to trigger each
webhook once. However, the first one of these webhooks actually gets
triggered twice, because creating a task causes the project's
`updated_date` to be bumped, which triggers an `update:project` event.
The test still passes a lot of the time (I guess because the second
delivery doesn't appear immediately?), but sometimes it fails. It's very
easy to make it fail consistently, though - just add a `sleep(5)` before
the `get_deliveries` calls.
Fix this by changing the first webhook's second event to something that
will not be triggered.
* Improved `DatasetNotFound` error message (#7923)
The recent changes enhance the dataset import functionality across various dataset formats in the CVAT application by integrating specific importers from the Datumaro library. The updates streamline the detection of datasets, improve error handling, and introduce new tests to ensure robustness against incorrect file structures during import operations.
* Fix automatic `tag` annotation support (#7839)
* Update packages with vulnerability (#7951)
* Cannot set properties of undefined (setting 'serverID') (#7949)
* Fixed some deprecation warnings (#7970)
* Added license information regarding '/serverless' directory (#7967)
* Stabilized the cypress test for fix CI-nightly runs (#7966)
* Squashed `zoom:image` and `send:exception` client events (#7953)
* Fix memory consumption when exporting to azure blob storage (#7960)
Fix memory consumption when exporting to azure blob storage
* Fixed several issues related to creating tasks with cloud data (#7969)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
@coderabbitai summary
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [x] I have added tests to cover my changes (*partially*)
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **New Features**
- Improved media download performance with parallel downloading.
- Enhanced file handling with the new `NamedBytesIO` class.
- Added support for specifying stop frames in task manifest generation.
- Enhanced `DatasetImagesReader` to handle generator sources.
- **Performance Improvements**
- Optimized image download methods to use threading for faster
processing.
- **Configuration**
- Introduced new settings for maximum threads and files per thread in
cloud data downloading.
These updates enhance the flexibility, performance, and configurability
of media handling and downloading in the application.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Using dedicated event to store working time (#7958)
- Parsing JSON payloads to get `working_time` in general leads to low
performance in Clickhouse requests. This patch will not fix it right
now, but with this patch, after a period of time we may switch to new
quick approach to calculate working time.
- There will not be a lot of `send:working_time` events, we may store
this scope of events for a longer time (e.g. 5 years instead of one by
default).
- Finally storing working time in such events like `click:element` or
`send:exception`, or `debug:info` seems not logical.
- Also, the history showed, that as result in different bugs, these
events may sometime lose information about `job_id`, `task_id`, etc.
Resolved #7884
* Update README.md (#7980)
* Check non-existent cloud storage update page (#7972)
* Annotation interface documentation updated (#7947)
* Bump requests from 2.31.0 to 2.32.2 in /tests/python (#7954)
* Updated icon (#7981)
* Fixed layout on create cloud storage page (#7985)
* Prepare release v2.14.1
* Update develop after v2.14.1
* Fixed: Queued jobs are not considered in deferring logic (#7907)
* Stabilized the cypress test for fix CI-nightly runs 2 (#7971)
* Update datumaro format description (#7992)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
Skeletons are not supported in this format
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [ ] I submit my changes into the `develop` branch
- [ ] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [ ] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Documentation**
- Updated the `Datumaro 1.0` format to support `Tags` instead of
`Tracks`.
- Expanded documentation to include support for additional annotation
types like Polylines, Masks, Points, Cuboids, and Tags in both export
and import operations.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Fixed ImageBitmap memory leak (#7995)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
Resolved #7909
Resolved #7850
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [x] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Bug Fixes**
- Addressed a significant memory leak issue by ensuring `ImageBitmap`
objects are properly closed after use.
- Updated various components to handle cleanup and termination of
workers and instances correctly, preventing potential resource leaks.
- **Version Updates**
- Updated `cvat-canvas` to version 2.20.3.
- Updated `cvat-core` to version 15.0.6.
- Updated `cvat-data` to version 2.1.0.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Updated documentation (one item was missing in the list of events saving triggers) (#8001)
* Prepare release v2.14.2
* Update develop after v2.14.2
* Rename kvrocks port (#8010)
Fix connection error issue in case of istio usage:
https://istio.io/v1.0/docs/setup/kubernetes/spec-requirements/#:~:text=Named%20ports%3A%20Service%20ports%20must,but%20name%3A%20http2foo%20is%20not.
* Fixed login with token without next parameter (#7999)
* Increased server health check timeout (#7993)
* Fixed: Cannot read properties of null (reading 'draw') (#7997)
* Remove unnecessary fields from the `/api/lambda/functions` response (#8004)
Remove several fields that haven't been used for one reason or another:
* `labels` and `attributes` have been replaced by `labels_v2`. Keeping
them around nearly triples the response length.
* `framework` hasn't been used by the UI since #5635, and IMO was never
useful to begin with. There are no decisions that the UI can take based
on this field, so it's essentially just a freeform text field, and we
already have a freeform text field - `description`. (Which... the UI
doesn't display either. But it could!)
Remove the `framework` field from the function descriptions as well,
since it has no other purpose.
* `state` has, as far I could determine, never been used by the UI. I
could see a field like this potentially being useful (e.g. the UI could
still display a function, but prevent it from being used if it's
unavailable), but since none of that is implemented right now, I see no
reason to have this field in the API.
* Fixed exception: State cannot be updated during editing, need to finish current editing first (#8019)
* Check creating cloud storage without manifest file (#7984)
* Number of Org Members (#8015)
Updated number of members
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [ ] I submit my changes into the `develop` branch
- [ ] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))
- [ ] I have increased versions of npm packages if it is necessary
([cvat-canvas](https://github.com/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),
[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),
[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and
[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))
### License
- [ ] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
Feel free to contact the maintainers if that's a concern.
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
- **Documentation**
- Updated details for the Solo and Team plans on CVAT.ai:
- Solo Plan: Adjusted the number of members allowed from "up to 3
members" to "up to 2 members".
- Team Plan: Adjusted the number of members required to pay for from "4
seats (3 annotators + 1 organization owner)" to "3 seats (2 annotators +
1 organization owner)".
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
* Merge pull request from GHSA-q684-4jjh-83g6
S3 storages support user-specified endpoint URLs, and Azure storages support
user-specified connection strings (which can contain endpoint URLs), so they
are susceptible to SSRF. Make S3 and Azure requests go through smokescreen
to fix this.
AFAIK, there is no way to configure a custom URL for Google Cloud storages,
so those aren't vulnerable.
Co-authored-by: Nikita Manovich <nikita@cvat.ai>
* Merge pull request from GHSA-jpf9-646h-4px7
* Mitigate a CSRF vulnerability in export and backup-related endpoints
While Django has built-in CSRF protection (which we use), it does not cover
GET requests, and AFAICS, there is no way to force it to do that.
Unfortunately, the many endpoints that initiate dataset exports and backups
do accept GET requests _and_ initiate side effects, making them susceptible.
The proper fix for this issue would be to redesign those endpoints to use
POST requests, but a) that's more complicated, and b) we should still keep
the old endpoints for backwards compatibility.
So apply a less proper fix, which is to disable session authentication for
the affected endpoints. It's a bit complex, because in some cases
(particularly when `action=download`) we _need_ session authentication to
work, because the UI redirects the user to such endpoints.
In addition, modify the handling logic for these endpoints in order to
ensure that when `action=download`, no side effects are triggered.
Previously, `action=download` would still queue an RQ job if none existed.
Even after this, `action=download` will still have two small side effects:
* An existing RQ job will be deleted if its results are out of date.
I don't think this is a problem, because such a job cannot be used anyway.
* A completed RQ job will be deleted too. This is a problematic design,
but I don't think an attacker can achieve anything by exploiting this. If
an attacker maliciously redirects the user to an `action=download` URL,
then they'll just download the export/backup as usual.
Some tests were making export requests incorrectly, so fix them.
* Add test for the CSRF workaround
* Prepare release v2.14.3
* Update develop after v2.14.3
* Remove `ModelKind.CLASSIFIER` (#8011)
I'd like the "kind" field in the API to identify the function's
"signature", or the types of values it receives as input and produces as
output. Classifiers have the same signature as detectors, so
`classifier` is a redundant value.
Besides improving semantic purity, removing this redundant value
simplifies the UI code.
The only meaningful difference between how the UI handles classifiers,
as compared to detectors, is that it shows the word "classifier" in the
model modal, which can be helpful. But we can achieve the same thing by
examining the function's `return_type` field. This lets us give a
special label to segmentation functions, as well.
"classifier" can't actually be returned by `/api/lambda/functions`, but
it _can_ be returned by the RoboFlow/Hugging Face function API in CVAT
Enterprise. So we'll need a small compatibility shim to transform this
value to "detector" until I fix that API to stop returning it too.
* Change minio host server definition (#8032)
* Stop editing when n key pressed (#7922)
* Allowed editing in single shape annotation mode (#8017)
* Fix server cache cleanup for backups and events (#8040)
In #7864 the cache cleanup function was updated. The function was not
supposed to be called for anything except datasets, but it was called
for backups and events. This PR changes these clients to use their own
functions.
- Fixed `ValueError: Couldn't parse filename components in
'c71eba87-0914-4ccb-b883-a1bf1612fbf8.csv'` errors
* CVAT Architecture documentation update (#8031)
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution guide](https://docs.cvat.ai/docs/contributing/).
-->
<!-- Provide a general summary of your changes in the Title above -->
### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->
### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [ ] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] I have linked related issues (see [GitHub docs](
https://help.githu…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5823
When updating a polyline, one has to specifically click on the circle to end it.
Changes made:
clickevent is dispatched to the circle element to stop the polyline editing.Checklist
developbranch(cvat-canvas,
cvat-core,
cvat-data and
cvat-ui)
License
Feel free to contact the maintainers if that's a concern.
Summary by CodeRabbit
New Features
Improvements
Documentation