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

CVAT v2.4 support #2903

Merged
merged 8 commits into from
May 10, 2023
Merged

CVAT v2.4 support #2903

merged 8 commits into from
May 10, 2023

Conversation

allenleetc
Copy link
Contributor

@allenleetc allenleetc commented Apr 18, 2023

What changes are proposed in this pull request?

CVAT integration: support CVAT server v2.4

How is this patch tested? If it is not, please explain why.

tests/intensive/cvat.py; quick manual smoketest

Release Notes

CVAT integration: support CVAT server v2.4

Is this a user-facing change that should be mentioned in the release notes?

  • No. You can skip the rest of this section.
  • Yes. Give a description of this change to be included in the release
    notes for FiftyOne users.

What areas of FiftyOne does this PR affect?

  • App: FiftyOne application changes
  • Build: Build and test infrastructure changes
  • Core: Core fiftyone Python library changes
  • Documentation: FiftyOne documentation changes
  • Other

Tests passing with cvat v2.4 but backwards compat with v2.3 still todo
added branching to support cvat server versions < v2.4
@codecov
Copy link

codecov bot commented Apr 18, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.14 🎉

Comparison is base (80785a4) 62.05% compared to head (6413b0e) 62.20%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2903      +/-   ##
===========================================
+ Coverage    62.05%   62.20%   +0.14%     
===========================================
  Files          259      250       -9     
  Lines        43974    45488    +1514     
  Branches       350      319      -31     
===========================================
+ Hits         27288    28294    +1006     
- Misses       16686    17194     +508     
Flag Coverage Δ
app 48.52% <100.00%> (-0.08%) ⬇️
python 99.41% <ø> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
app/packages/state/src/recoil/sidebar.ts 50.53% <100.00%> (+2.00%) ⬆️

... and 90 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@renanwille renanwille mentioned this pull request May 8, 2023
ehofesmann and others added 2 commits May 9, 2023 12:49
* merge _get_paginated_results_2, parse versions

* version

* remove print

* fix v2.4 login issue

* trigger job id check less frequently

* nit
to avoid hitting limit on number of open filehandles
@allenleetc allenleetc requested a review from brimoor May 9, 2023 17:05
@allenleetc
Copy link
Contributor Author

@brimoor merged @ehofesmann 's changes and added a small change per @renanwille #2959 (comment)

Checked in requests and change looks right; hand-tested once and ran unittests. But uncertain on all implications

Copy link
Member

@ehofesmann ehofesmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's looking good to me! Tests passed both on CVAT v2.3 and v2.4 servers 🚀

Copy link
Contributor

@brimoor brimoor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @allenleetc 💪

@allenleetc allenleetc merged commit 207c0b0 into develop May 10, 2023
@allenleetc allenleetc deleted the feature/cvat24 branch May 10, 2023 00:40
lanzhenw pushed a commit that referenced this pull request May 10, 2023
* wip: tests passing with cvat v2.4, backwards compat with v2.3 todo

* wip: added branching to support cvat server versions < v2.4

* CVAT v2.4 updates (#2959)

* merge _get_paginated_results_2, parse versions

* version

* remove print

* fix v2.4 login issue

* trigger job id check less frequently

* nit

* Read file contents before passing to requests.post
to avoid hitting limit on number of open filehandles

* linting

* more linting

---------

Co-authored-by: Eric Hofesmann <[email protected]>
Co-authored-by: brimoor <[email protected]>
@democat3457
Copy link
Contributor

When will this be included in a release?

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.

4 participants