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

Handle task creation with unsupported data types from cloud storage with cache enabled #7087

Merged

Conversation

Marishka17
Copy link
Contributor

@Marishka17 Marishka17 commented Nov 1, 2023

Motivation and context

This PR ignores the use cache option on the server when creating tasks with cloud storage data (except images)

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have created a changelog fragment
    - [ ] I have updated the documentation accordingly
    - [ ] I have added tests to cover my changes
    - [ ] I have linked related issues (see GitHub docs)
    - [ ] I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

Copy link

codecov bot commented Nov 1, 2023

Codecov Report

Merging #7087 (aeb60c5) into develop (568f0cb) will increase coverage by 0.05%.
Report is 16 commits behind head on develop.
The diff coverage is 50.00%.

@@             Coverage Diff             @@
##           develop    #7087      +/-   ##
===========================================
+ Coverage    82.34%   82.39%   +0.05%     
===========================================
  Files          361      362       +1     
  Lines        39222    39408     +186     
  Branches      3588     3592       +4     
===========================================
+ Hits         32298    32471     +173     
- Misses        6924     6937      +13     
Components Coverage Δ
cvat-ui 77.40% <ø> (+0.03%) ⬆️
cvat-server 86.94% <50.00%> (+0.03%) ⬆️

media, task_mode = _validate_data(media, manifest_files)

if is_data_in_cloud:
# first we need to filter files and keep only supported ones
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like the comment is wrong. You just check that a list has non-images.

@@ -636,17 +642,28 @@ def _create_thread(
filtered_files.append(f)
data['server_files'] = filtered_files

# count and validate uploaded files
media = _count_files(data)
Copy link
Contributor

Choose a reason for hiding this comment

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

It is old code. But "_count_files" doesn't correspond to what the function does. It splits files by the media type. Let's keep as is for now.

Copy link
Contributor

@nmanovic nmanovic left a comment

Choose a reason for hiding this comment

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

LGTM

@nmanovic nmanovic merged commit 92f5181 into develop Nov 7, 2023
34 checks passed
@nmanovic nmanovic deleted the mk/handle_task_creation_withvideo_from_cs_and_cache branch November 7, 2023 16:42
This was referenced Nov 22, 2023
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.

2 participants