Merge branch 'develop' into mk/fix_export_to_cloud_storage

cvat-ai · Jan 11, 2024 · 2e8764f · 2e8764f
2 parents 5e616f6 + 8c2db1d
commit 2e8764f
Show file tree

Hide file tree

Showing 24 changed files with 93 additions and 79 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,70 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-2.10.0'></a>
+## \[2.10.0\] - 2024-01-10
+
+### Changed
+
+- When the `ORG_INVITATION_CONFIRM` setting is enabled, organization invitations for existing users are no
+longer accepted automatically. Instead, the invitee can now review the invitation and choose to accept or decline it.
+  (<https://github.com/opencv/cvat/pull/7138>)
+
+- \[Compose, Helm\] Updated Clickhouse to version 23.11.*
+  (<https://github.com/opencv/cvat/pull/7268>)
+
+- Job queues are now stored in a dedicated Redis instance
+  (<https://github.com/opencv/cvat/pull/7245>)
+
+### Removed
+
+- PermissionDenied error thrown before OPA call in case if user is not a member of organization
+  (<https://github.com/opencv/cvat/pull/7259>)
+
+### Fixed
+
+- Can not input Chinese correctly in text attributes on objects sidebar
+  (<https://github.com/opencv/cvat/pull/6916>)
+
+- Restored Compose file compatibility with Docker Compose 2.17.0 and earlier
+  (<https://github.com/opencv/cvat/pull/7170>)
+
+- Attaching GCS and AWS S3 buckets with dots in name
+  (<https://github.com/opencv/cvat/pull/7227>)
+
+- Annotation actions are applied to the objects from a ground truth job
+  (<https://github.com/opencv/cvat/pull/7281>)
+- Ground truth objects removed together with annotation objects when press "Remove annotations" in menu
+  (<https://github.com/opencv/cvat/pull/7281>)
+- Frame search by a filter is affected by ground truth annotations
+  (<https://github.com/opencv/cvat/pull/7281>)
+
+- Creating duplicating annotations when nginx throws 504 timeout status (workaround)
+  (<https://github.com/opencv/cvat/pull/7286>)
+
+- `TIFF` images are saved as `JPEG` images with `.tif` extension in original chunks
+  (<https://github.com/opencv/cvat/pull/7100>)
+- EXIF rotated TIFF images are handled incorrectly
+  (<https://github.com/opencv/cvat/pull/7100>)
+
+- RQ Scheduler launch, broken in PR 7245
+  (<https://github.com/opencv/cvat/pull/7293>)
+
+- UI crashes if user highligts conflict related to annotations hidden by a filter
+  (<https://github.com/opencv/cvat/pull/7299>)
+- Annotations conflicts are not highligted properly on the first frame of a job
+  (<https://github.com/opencv/cvat/pull/7299>)
+
+- Error message `Edge's nodeFrom ${dataNodeFrom} or nodeTo ${dataNodeTo} do not to refer to any node`
+ when upload a file with some abscent skeleton nodes (<https://github.com/opencv/cvat/pull/7302>)
+- Wrong context menu position in skeleton configurator (Firefox only)
+ (<https://github.com/opencv/cvat/pull/7302>)
+- Fixed console error `(Error: <rect> attribute width: A negative value is not valid`
+ appearing when skeleton with all outside elements is created (<https://github.com/opencv/cvat/pull/7302>)
+
+- Updating cloud storage attached to CVAT using Azure connection string
+  (<https://github.com/opencv/cvat/pull/7336>)
+
 <a id='changelog-2.9.2'></a>
 ## \[2.9.2\] - 2023-12-11
 

diff --git a/README.md b/README.md
@@ -252,7 +252,7 @@ questions and get our support.
 [docker-server-image-url]: https://hub.docker.com/r/cvat/server
 [docker-ui-pulls-img]: https://img.shields.io/docker/pulls/cvat/ui.svg?style=flat-square&label=UI%20pulls
 [docker-ui-image-url]: https://hub.docker.com/r/cvat/ui
-[ci-img]: https://github.com/opencv/cvat/workflows/CI/badge.svg?branch=develop
+[ci-img]: https://github.com/opencv/cvat/actions/workflows/main.yml/badge.svg?branch=develop
 [ci-url]: https://github.com/opencv/cvat/actions
 [gitter-img]: https://img.shields.io/gitter/room/opencv-cvat/public?style=flat
 [gitter-url]: https://gitter.im/opencv-cvat/public

diff --git a/changelog.d/20231113_103300_yangxw_cn_input.md b/changelog.d/20231113_103300_yangxw_cn_input.md
diff --git a/changelog.d/20231120_134843_klakhov_improve_invite_users.md b/changelog.d/20231120_134843_klakhov_improve_invite_users.md
diff --git a/changelog.d/20231123_141337_roman_fix_docker_compose_compat.md b/changelog.d/20231123_141337_roman_fix_docker_compose_compat.md
diff --git a/changelog.d/20231205_204101_jootten_fix_validation.md b/changelog.d/20231205_204101_jootten_fix_validation.md
diff --git a/changelog.d/20231214_131931_klakhov_remove_opa_injection.md b/changelog.d/20231214_131931_klakhov_remove_opa_injection.md
diff --git a/changelog.d/20231214_203449_roman_update_clickhouse.md b/changelog.d/20231214_203449_roman_update_clickhouse.md
diff --git a/changelog.d/20231215_165536_roman_split_redis.md b/changelog.d/20231215_165536_roman_split_redis.md
diff --git a/changelog.d/20231220_131717_boris_fix_gt_1.md b/changelog.d/20231220_131717_boris_fix_gt_1.md
diff --git a/changelog.d/20231225_115001_boris_retry_if_504.md b/changelog.d/20231225_115001_boris_retry_if_504.md
diff --git a/changelog.d/20231227_100059_boris_update_pillow.md b/changelog.d/20231227_100059_boris_update_pillow.md
diff --git a/changelog.d/20231227_104741_maria_fix_rq_scheduler_launch.md b/changelog.d/20231227_104741_maria_fix_rq_scheduler_launch.md
diff --git a/changelog.d/20231228_131558_boris_fixed_couple_of_gt_bugs.md b/changelog.d/20231228_131558_boris_fixed_couple_of_gt_bugs.md
diff --git a/changelog.d/20240103_112843_boris_skeletons_autofill.md b/changelog.d/20240103_112843_boris_skeletons_autofill.md
diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt
@@ -1,3 +1,3 @@
-cvat-sdk~=2.10.0
+cvat-sdk~=2.11.0
 Pillow>=10.1.0
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/cvat-cli/src/cvat_cli/version.py b/cvat-cli/src/cvat_cli/version.py
@@ -1 +1 @@
-VERSION = "2.10.0"
+VERSION = "2.11.0"
diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh
@@ -8,7 +8,7 @@ set -e
 
 GENERATOR_VERSION="v6.0.1"
 
-VERSION="2.10.0"
+VERSION="2.11.0"
 LIB_NAME="cvat_sdk"
 LAYER1_LIB_NAME="${LIB_NAME}/api_client"
 DST_DIR="$(cd "$(dirname -- "$0")/.." && pwd)"

diff --git a/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx b/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx
@@ -430,7 +430,7 @@ export default function CreateCloudStorageForm(props: Props): JSX.Element {
                     {...internalCommonProps}
                 >
                     <Input.Password
-                        maxLength={440}
+                        maxLength={1024}
                         visibilityToggle={connectionStringVisibility}
                         onChange={() => setConnectionStringVisibility(true)}
                     />

diff --git a/cvat/__init__.py b/cvat/__init__.py
@@ -4,6 +4,6 @@
 
 from cvat.utils.version import get_version
 
-VERSION = (2, 10, 0, 'alpha', 0)
+VERSION = (2, 11, 0, 'alpha', 0)
 
 __version__ = get_version(VERSION)
diff --git a/cvat/apps/engine/migrations/0078_alter_cloudstorage_credentials.py b/cvat/apps/engine/migrations/0078_alter_cloudstorage_credentials.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.6 on 2024-01-09 09:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("engine", "0077_auto_20231121_1952"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="cloudstorage",
+            name="credentials",
+            field=models.CharField(blank=True, max_length=1024, null=True),
+        ),
+    ]
diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py
@@ -1092,7 +1092,7 @@ class CloudStorage(models.Model):
         on_delete=models.SET_NULL, related_name="cloud_storages")
     created_date = models.DateTimeField(auto_now_add=True)
     updated_date = models.DateTimeField(auto_now=True)
-    credentials = models.CharField(max_length=500, null=True, blank=True)
+    credentials = models.CharField(max_length=1024, null=True, blank=True)
     credentials_type = models.CharField(max_length=29, choices=CredentialsTypeChoice.choices())#auth_type
     specific_attributes = models.CharField(max_length=1024, blank=True)
     description = models.TextField(blank=True)

diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py
@@ -1765,7 +1765,7 @@ class CloudStorageWriteSerializer(serializers.ModelSerializer):
     key_file = serializers.FileField(required=False)
     account_name = serializers.CharField(max_length=24, allow_blank=True, required=False)
     manifests = ManifestSerializer(many=True, default=[])
-    connection_string = serializers.CharField(max_length=440, allow_blank=True, required=False)
+    connection_string = serializers.CharField(max_length=1024, allow_blank=True, required=False)
 
     class Meta:
         model = models.CloudStorage
@@ -1925,7 +1925,7 @@ def update(self, instance, validated_data):
         })
         credentials_dict = {k:v for k,v in validated_data.items() if k in {
             'key','secret_key', 'account_name', 'session_token', 'key_file_path',
-            'credentials_type'
+            'credentials_type', 'connection_string'
         }}
 
         key_file = validated_data.pop('key_file', None)

diff --git a/cvat/schema.yml b/cvat/schema.yml
@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: CVAT REST API
-  version: 2.10.0
+  version: 2.11.0
   description: REST API for Computer Vision Annotation Tool (CVAT)
   termsOfService: https://www.google.com/policies/terms/
   contact:
@@ -6584,7 +6584,7 @@ components:
           maxLength: 64
         connection_string:
           type: string
-          maxLength: 440
+          maxLength: 1024
         key_file:
           type: string
           format: binary
@@ -8570,7 +8570,7 @@ components:
           maxLength: 64
         connection_string:
           type: string
-          maxLength: 440
+          maxLength: 1024
         key_file:
           type: string
           format: binary