Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2.7.6 #7005

Merged
merged 27 commits into from
Oct 16, 2023
Merged

Release v2.7.6 #7005

merged 27 commits into from
Oct 16, 2023

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 13, 2023

Changed

Removed

Fixed

Security

azhavoro and others added 25 commits October 9, 2023 15:57
<!-- Raise an issue to propose your change
(https://github.com/opencv/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://opencv.github.io/cvat/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/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))

### License

- [ ] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
….78 (#6931)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Roman Donchenko <roman@cvat.ai>
This automates the first half of the current release process. The second
half will be implemented by another workflow.

The reason why it can't all be done in a single workflow is that it's
useful to let developers inspect what'll go into the release before
actually publishing it, and to apply any last-minute fixes, if
necessary. It also allows CI to complete for the release PR.

To support the new workflow, add a `--set` option to `update_version.py`
that sets the version to a custom value.
```python
"Exception caught in handler - \"not enough values to unpack (expected 3, got 2)\": Traceback (most recent call last):
 File \"/opt/nuclio/_nuclio_wrapper.py\", line 143, in serve_requests
 await self._handle_event(event)
 File \"/opt/nuclio/_nuclio_wrapper.py\", line 397, in _handle_event
 entrypoint_output = self._entrypoint(self._context, event)
 File \"/opt/nuclio/main.py\", line 29, in handler
 shape, state = context.user_data.model.infer(image, shape, states[i] if i < len(states) else None)
 File \"/opt/nuclio/model_handler.py\", line 56, in infer
 self.config['hp'], device=self.device)
 File \"/opt/nuclio/SiamMask/tools/test.py\", line 152, in siamese_init
 z_crop = get_subwindow_tracking(im, target_pos, p.exemplar_size, s_z, avg_chans)
 File \"/opt/nuclio/SiamMask/tools/test.py\", line 88, in get_subwindow_tracking
 r, c, k = im.shape
ValueError: not enough values to unpack (expected 3, got 2)
```
I realized that I was fighting my editor, because we indent YAML files
with 2 spaces, but `.editorconfig` specifies 4 spaces for all files.
Align the config with reality.
When uploading annotations for the whole task that has few jobs our
server splits tracks. Each track we divide into a few tracks in that way
that each track corresponds to only one job and all shapes of the track
do not extend beyond the frame range corresponding to that job.

It mainly works, but we have a problem with skeleton tracks. Due to this
problem we if upload skeleton tracks for the whole task all our tracks
will be duplicated for each job but not split, it means that we will
have tracks that extend beyond the frame range of jobs and it leads to
bad side effects, in this case, our exported annotations from such task
could be incorrect or we won't be able to export annotations at all.

And the reason for this problem is this small bug, which this PR fixes.
Our code really slices sub-tracks for the skeleton track, but after this
slicing server doesn't save the result.
This PR resolves the following problems:

1. During import we ignore track_id attribute for annotations if these
annotations do not come from one of these formats `('cvat', 'datumaro',
'sly_pointcloud')` this prevents to import tracks in coco format -> this
PR extends the list of "track formats"
2. When we convert a dataset from CVAT representation to Datumaro
Dataset in all possible situations only the first shape of the skeleton
track is a keyframe, all other shapes will be as marked as not keyframes
it leads to problems when we try to import such tracks that were
exported from CVAT -> this PR adds the following line of code: set
`keyframe = True` for skeletons if at least one point of this skeleton
is keyframe
3. During import skeleton tracks our code always expects to see a
"keyframe" attribute for the skeleton's element, but not all formats
support attributes for skeleton points (for example COCO Keypoints
doesn't allow to have attributes for each skeleton's point). And if the
server doesn't see this attribute for some element we ignore this
element -> this PR adds the following logic for skeleton track: if
skeleton's elements don't have a keyframe attribute at all then consider
such skeleton elements as keyframes = True
Helm: set memory request for keydb
SUpervisord configs:

- Added `autorestart=true` option for all workers
- Unified program names to use dashes as delimiter instead of mixed '_'
and '-'
- Minor improvements to supervisor configurations
…tories (#6997)

<!-- Raise an issue to propose your change
(https://github.com/opencv/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://opencv.github.io/cvat/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 fixes retrieving cloud storage content for an AWS S3 bucket
containing manually created "directories" (AWS ListObjectsV2 API returns
such objects within the content).

![image](https://github.com/opencv/cvat/assets/49038720/af956beb-9a88-4391-aa17-2a9a0629e16c)

A similar problem can be found
[here](https://stackoverflow.com/questions/75620230/aws-s3-listobjectsv2-returns-folder-as-an-object).
In this case, I prefer to simply filter keys from keys with a trailing
slash, rather than filter from objects with 0 size.
### How has this been tested?
Manually
### 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/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))~~

### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
CHANGELOG.md Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Oct 13, 2023

Codecov Report

Merging #7005 (3c05e84) into master (e699848) will decrease coverage by 0.05%.
Report is 6 commits behind head on master.
The diff coverage is 89.54%.

@@            Coverage Diff             @@
##           master    #7005      +/-   ##
==========================================
- Coverage   82.58%   82.54%   -0.05%     
==========================================
  Files         360      360              
  Lines       38914    38977      +63     
  Branches     3570     3577       +7     
==========================================
+ Hits        32137    32172      +35     
- Misses       6777     6805      +28     
Components Coverage Δ
cvat-ui 77.51% <88.73%> (-0.10%) ⬇️
cvat-server 87.16% <100.00%> (+0.01%) ⬆️

@nmanovic nmanovic merged commit 56f527a into master Oct 16, 2023
33 checks passed
@azhavoro azhavoro deleted the release-2.7.6 branch July 5, 2024 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants