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.

Sign up for GitHub

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

Jump to bottom

Allow attribute default/permitted values to be blank #6454

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Allow attribute default/permitted values to be blank #6454

merged 2 commits into from
Jul 12, 2023

Conversation

SpecLad
Copy link
Contributor

@SpecLad SpecLad commented Jul 11, 2023 •
edited
Loading

Motivation and context

This is de facto already allowed when CVAT is accessed via the UI/API, even though the model/serializer configuration seem to prohibit it. That's because validation for attribute properties is effectively disabled on the server due to a bug. However, the SDK checks the schema, and thus doesn't allow such values.

I think blank default values make sense (particularly for "text" type attributes), so I updated the code to allow them.

Blank permitted values don't make quite as much sense, but I had to allow them too, because the UI always submits the default value as the first permitted value (even for freeform text attributes). This will let us fix the broken validation on the server side (which I'm planning to do soon) without removing the ability to set blank default attribute values via the UI.

(FWIW, I don't think that the UI should add a values property when serializing freeform text attributes at all, but it would take a more substantial change to fix that, which I don't have time for right now.)

How has this been tested?

Unit test.

Checklist

  • I submit my changes into the develop branch
  • I have added a description of my changes into the CHANGELOG file
  • [ ] 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.

@SpecLad
Allow attribute default/permitted values to be blank
715e9ad 
This is de facto already allowed when CVAT is accessed via the UI/API, even
though the model/serializer configuration seem to prohibit it. That's
because validation for attribute properties is effectively disabled on the
server due to a bug. However, the SDK checks the schema, and thus doesn't
allow such values.

I think blank default values make sense (particularly for "text" type
attributes), so I updated the code to allow them.

Blank permitted values don't make quite as much sense, but I had to allow
them too, because the UI always submits the default value as the first
permitted value (even for freeform text attributes). This will let us fix
the broken validation on the server side (which I'm planning to do soon)
without removing the ability to set blank default attribute values via the
UI.

(FWIW, I don't think that the UI should add a `values` property when
serializing freeform text attributes at all, but it would take a more
substantial change to fix that, which I don't have time for right now.)
@SpecLad
Update changelog
5e29a99
@SpecLad SpecLad marked this pull request as ready for review July 11, 2023 10:16
@SpecLad SpecLad merged commit 1e18713 into cvat-ai:develop Jul 12, 2023
@SpecLad SpecLad deleted the empty-default-value branch July 12, 2023 09:26
@azhavoro azhavoro mentioned this pull request Jul 27, 2023
Merged
bsekachev added a commit that referenced this pull request Jul 27, 2023
@azhavoro @yasakova-anastasia
@SpecLad @dependabot @bsekachev @zhiltsov-max @nmanovic @mdacoca @klakhov @Keramblock
Release v2.5.2 (#6570)
636dc6a 
## \[2.5.2\] - 2023-07-27

### Added

- We've added support for multi-line text attributes
(<#6458>)
- You can now set a default attribute value for SELECT, RADIO types on
UI
  (<#6474>)
- \[SDK\] `cvat_sdk.datasets`, is now available, providing a
framework-agnostic alternative to `cvat_sdk.pytorch`
  (<#6428>)
- We've introduced analytics for Jobs, Tasks, and Project
(<#6371>)

### Changed

- \[Helm\] In Helm, we've added a configurable default storage option to
the chart (<#6137>)

### Removed

- \[Helm\] In Helm, we've eliminated the obligatory use of hardcoded
traefik ingress (<#6137>)

### Fixed

- Fixed an issue with calculating the number of objects on the
annotation view when frames are deleted
  (<#6493>)
- \[SDK\] In SDK, we've fixed the issue with creating attributes with
blank default values
  (<#6454>)
- \[SDK\] We've corrected a problem in SDK where it was altering input
data in models (<#6455>)
- Fixed exporting of hash for shapes and tags in a specific corner case
(<#6517>)
- Resolved the issue where 3D jobs couldn't be opened in validation mode
(<#6507>)
- Fixed SAM plugin (403 code for workers in organizations)
(<#6514>)
- Fixed the issue where initial frame from query parameter was not
opening specific frame in a job
  (<#6506>)
- Corrected the issue with the removal of the first keyframe
(<#6494>)
- Fixed the display of project previews on small screens and updated
stylelint & rules (<#6551>)
- Implemented server-side validation for attribute specifications
  (<#6447>)
- \[API\] Fixed API issue related to file downloading failures for
filenames with special characters
(<#6492>)
- \[Helm\] In Helm, we've resolved an issue with multiple caches
in the same RWX volume, which was preventing db migration from starting
(<#6137>)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Anastasia Yasakova <yasakova.an@gmail.com>
Co-authored-by: yasakova-anastasia <anastasia@cvat.ai>
Co-authored-by: Roman Donchenko <roman@cvat.ai>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Boris Sekachev <boris.sekachev@yandex.ru>
Co-authored-by: Maxim Zhiltsov <zhiltsov.max35@gmail.com>
Co-authored-by: Kirill Sizov <kirill.sizov@cvat.ai>
Co-authored-by: Nikita Manovich <nikita@cvat.ai>
Co-authored-by: Mariia Acoca <39969264+mdacoca@users.noreply.github.com>
Co-authored-by: Kirill Lakhov <kirill.9992@gmail.com>
Co-authored-by: Michael Kirpichev <mkirpic+github@gmail.com>
Co-authored-by: Michael Kirpichev <m.kirpichev@haut.ai>
Co-authored-by: Boris Sekachev <boris@cvat.ai>
PMazarovich pushed a commit to PMazarovich/cvat that referenced this pull request Aug 15, 2023
@azhavoro @yasakova-anastasia
@SpecLad @dependabot @bsekachev @zhiltsov-max @nmanovic @mdacoca @klakhov @Keramblock @PMazarovich
Release v2.5.2 (cvat-ai#6570)
dc701dd 
## \[2.5.2\] - 2023-07-27

### Added

- We've added support for multi-line text attributes
(<cvat-ai#6458>)
- You can now set a default attribute value for SELECT, RADIO types on
UI
  (<cvat-ai#6474>)
- \[SDK\] `cvat_sdk.datasets`, is now available, providing a
framework-agnostic alternative to `cvat_sdk.pytorch`
  (<cvat-ai#6428>)
- We've introduced analytics for Jobs, Tasks, and Project
(<cvat-ai#6371>)

### Changed

- \[Helm\] In Helm, we've added a configurable default storage option to
the chart (<cvat-ai#6137>)

### Removed

- \[Helm\] In Helm, we've eliminated the obligatory use of hardcoded
traefik ingress (<cvat-ai#6137>)

### Fixed

- Fixed an issue with calculating the number of objects on the
annotation view when frames are deleted
  (<cvat-ai#6493>)
- \[SDK\] In SDK, we've fixed the issue with creating attributes with
blank default values
  (<cvat-ai#6454>)
- \[SDK\] We've corrected a problem in SDK where it was altering input
data in models (<cvat-ai#6455>)
- Fixed exporting of hash for shapes and tags in a specific corner case
(<cvat-ai#6517>)
- Resolved the issue where 3D jobs couldn't be opened in validation mode
(<cvat-ai#6507>)
- Fixed SAM plugin (403 code for workers in organizations)
(<cvat-ai#6514>)
- Fixed the issue where initial frame from query parameter was not
opening specific frame in a job
  (<cvat-ai#6506>)
- Corrected the issue with the removal of the first keyframe
(<cvat-ai#6494>)
- Fixed the display of project previews on small screens and updated
stylelint & rules (<cvat-ai#6551>)
- Implemented server-side validation for attribute specifications
  (<cvat-ai#6447>)
- \[API\] Fixed API issue related to file downloading failures for
filenames with special characters
(<cvat-ai#6492>)
- \[Helm\] In Helm, we've resolved an issue with multiple caches
in the same RWX volume, which was preventing db migration from starting
(<cvat-ai#6137>)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Anastasia Yasakova <yasakova.an@gmail.com>
Co-authored-by: yasakova-anastasia <anastasia@cvat.ai>
Co-authored-by: Roman Donchenko <roman@cvat.ai>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Boris Sekachev <boris.sekachev@yandex.ru>
Co-authored-by: Maxim Zhiltsov <zhiltsov.max35@gmail.com>
Co-authored-by: Kirill Sizov <kirill.sizov@cvat.ai>
Co-authored-by: Nikita Manovich <nikita@cvat.ai>
Co-authored-by: Mariia Acoca <39969264+mdacoca@users.noreply.github.com>
Co-authored-by: Kirill Lakhov <kirill.9992@gmail.com>
Co-authored-by: Michael Kirpichev <mkirpic+github@gmail.com>
Co-authored-by: Michael Kirpichev <m.kirpichev@haut.ai>
Co-authored-by: Boris Sekachev <boris@cvat.ai>
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Oct 25, 2023
@SpecLad @mikhail-treskin
Allow attribute default/permitted values to be blank (cvat-ai#6454)
e4c7be9 
This is de facto already allowed when CVAT is accessed via the UI/API,
even though the model/serializer configuration seem to prohibit it.
That's because validation for attribute properties is effectively
disabled on the server due to a bug. However, the SDK checks the schema,
and thus doesn't allow such values.

I think blank default values make sense (particularly for "text" type
attributes), so I updated the code to allow them.

Blank permitted values don't make quite as much sense, but I had to
allow them too, because the UI always submits the default value as the
first permitted value (even for freeform text attributes). This will let
us fix the broken validation on the server side (which I'm planning to
do soon) without removing the ability to set blank default attribute
values via the UI.

(FWIW, I don't think that the UI should add a `values` property when
serializing freeform text attributes at all, but it would take a more
substantial change to fix that, which I don't have time for right now.)
mikhail-treskin pushed a commit to retailnext/cvat that referenced this pull request Oct 25, 2023
@azhavoro @yasakova-anastasia
@SpecLad @dependabot @bsekachev @zhiltsov-max @nmanovic @mdacoca @klakhov @Keramblock @mikhail-treskin
Release v2.5.2 (cvat-ai#6570)
02fe1b3 
- We've added support for multi-line text attributes
(<cvat-ai#6458>)
- You can now set a default attribute value for SELECT, RADIO types on
UI
  (<cvat-ai#6474>)
- \[SDK\] `cvat_sdk.datasets`, is now available, providing a
framework-agnostic alternative to `cvat_sdk.pytorch`
  (<cvat-ai#6428>)
- We've introduced analytics for Jobs, Tasks, and Project
(<cvat-ai#6371>)

- \[Helm\] In Helm, we've added a configurable default storage option to
the chart (<cvat-ai#6137>)

- \[Helm\] In Helm, we've eliminated the obligatory use of hardcoded
traefik ingress (<cvat-ai#6137>)

- Fixed an issue with calculating the number of objects on the
annotation view when frames are deleted
  (<cvat-ai#6493>)
- \[SDK\] In SDK, we've fixed the issue with creating attributes with
blank default values
  (<cvat-ai#6454>)
- \[SDK\] We've corrected a problem in SDK where it was altering input
data in models (<cvat-ai#6455>)
- Fixed exporting of hash for shapes and tags in a specific corner case
(<cvat-ai#6517>)
- Resolved the issue where 3D jobs couldn't be opened in validation mode
(<cvat-ai#6507>)
- Fixed SAM plugin (403 code for workers in organizations)
(<cvat-ai#6514>)
- Fixed the issue where initial frame from query parameter was not
opening specific frame in a job
  (<cvat-ai#6506>)
- Corrected the issue with the removal of the first keyframe
(<cvat-ai#6494>)
- Fixed the display of project previews on small screens and updated
stylelint & rules (<cvat-ai#6551>)
- Implemented server-side validation for attribute specifications
  (<cvat-ai#6447>)
- \[API\] Fixed API issue related to file downloading failures for
filenames with special characters
(<cvat-ai#6492>)
- \[Helm\] In Helm, we've resolved an issue with multiple caches
in the same RWX volume, which was preventing db migration from starting
(<cvat-ai#6137>)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Anastasia Yasakova <yasakova.an@gmail.com>
Co-authored-by: yasakova-anastasia <anastasia@cvat.ai>
Co-authored-by: Roman Donchenko <roman@cvat.ai>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Boris Sekachev <boris.sekachev@yandex.ru>
Co-authored-by: Maxim Zhiltsov <zhiltsov.max35@gmail.com>
Co-authored-by: Kirill Sizov <kirill.sizov@cvat.ai>
Co-authored-by: Nikita Manovich <nikita@cvat.ai>
Co-authored-by: Mariia Acoca <39969264+mdacoca@users.noreply.github.com>
Co-authored-by: Kirill Lakhov <kirill.9992@gmail.com>
Co-authored-by: Michael Kirpichev <mkirpic+github@gmail.com>
Co-authored-by: Michael Kirpichev <m.kirpichev@haut.ai>
Co-authored-by: Boris Sekachev <boris@cvat.ai>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhiltsov-max zhiltsov-max zhiltsov-max approved these changes

@azhavoro azhavoro Awaiting requested review from azhavoro azhavoro is a code owner

@mdacoca mdacoca Awaiting requested review from mdacoca

@Marishka17 Marishka17 Awaiting requested review from Marishka17 Marishka17 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SpecLad @zhiltsov-max