Merge branch 'develop' into kl/data-processing

.github/workflows/helm.yml

@@ -86,6 +86,7 @@ jobs:
       # They are still tested without Helm
       run: |
         kubectl cp tests/mounted_file_share/images $(kubectl get pods -l component=server -o jsonpath='{.items[0].metadata.name}'):/home/django/share
+        kubectl cp tests/mounted_file_share/videos $(kubectl get pods -l component=server -o jsonpath='{.items[0].metadata.name}'):/home/django/share
         pytest --timeout 30 --platform=kube -m "not with_external_services" tests/python --log-cli-level DEBUG
 
     - name: Creating a log file from "cvat" container logs

changelog.d/20240508_144202_mzhiltso_fix_dataset_downloading.md

@@ -0,0 +1,5 @@
+### Fixed
+
+- The 500 / "The result file does not exist in export cache" error
+  on dataset export request
+  (<https://github.com/cvat-ai/cvat/pull/7864>)

changelog.d/20240521_151421_nlerche_fix_missing_serviceName.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Fix missing serviceName field in kvrocks (issue #7741)
+  (<https://github.com/cvat-ai/cvat/pull/7924>)

changelog.d/20240524_130047_maria_fix_issue_with_login_when_email_domain_contains_capital_symbols.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Login when the domain of a user email contains capital symbols and a user was created after being invited to an org
+  (<https://github.com/cvat-ai/cvat/pull/7906>)

cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/styles.scss

@@ -479,17 +479,11 @@
 
 .cvat-objects-sidebar-state-item-elements {
     padding: $grid-unit-size * 0.5;
-    border: 1px solid $object-item-border-color;
-    border-bottom: 0;
-
-    &:last-child {
-        border-bottom: 1px solid $object-item-border-color;
-    }
+    border: 1px solid rgba($color: white, $alpha: 0%);
 }
 
 .cvat-objects-sidebar-state-item-elements.cvat-objects-sidebar-state-active-element {
-    border: 2px dashed $object-item-border-color;
-    padding: 0;
+    border: 1px dashed $object-item-border-color;
 }
 
 .cvat-objects-sidebar-show-ground-truth-active {

cvat-ui/src/components/annotation-page/styles.scss

@@ -522,4 +522,8 @@
     span.anticon {
         margin-left: $grid-unit-size * 2;
     }
+
+    .ant-modal-footer {
+        margin: 0;
+    }
 }

cvat-ui/src/components/annotation-page/top-bar/left-group.tsx

@@ -91,17 +91,18 @@ function LeftGroup(props: Props): JSX.Element {
     return (
         <>
             <GlobalHotKeys keyMap={subKeyMap} handlers={handlers} />
-            <Modal
-                destroyOnClose
-                className='cvat-saving-job-modal'
-                title='Saving changes on the server'
-                open={saving}
-                footer={[]}
-                closable={false}
-            >
-                <Text>CVAT is saving your annotations, please wait </Text>
-                <LoadingOutlined />
-            </Modal>
+            { saving && (
+                <Modal
+                    open
+                    destroyOnClose
+                    className='cvat-saving-job-modal'
+                    closable={false}
+                    footer={[]}
+                >
+                    <Text>CVAT is saving your annotations, please wait </Text>
+                    <LoadingOutlined />
+                </Modal>
+            )}
             <Col className='cvat-annotation-header-left-group'>
                 <AnnotationMenuContainer />
                 <SaveButtonComponent

cvat-ui/src/components/models-page/styles.scss

@@ -15,12 +15,6 @@
     .cvat-models-page-top-bar {
         padding-bottom: $grid-unit-size;
     }
-
-    >div:nth-child(2) {
-        &:not(.cvat-empty-models-list) {
-            height: 90%;
-        }
-    }
 }
 
 .cvat-empty-models-list {

cvat/apps/dataset_manager/apps.py

@@ -0,0 +1,18 @@
+# Copyright (C) 2024 CVAT.ai Corporation
+#
+# SPDX-License-Identifier: MIT
+
+from django.apps import AppConfig
+
+
+class DatasetManagerConfig(AppConfig):
+    name = "cvat.apps.dataset_manager"
+
+    def ready(self) -> None:
+        from django.conf import settings
+
+        from . import default_settings
+
+        for key in dir(default_settings):
+            if key.isupper() and not hasattr(settings, key):
+                setattr(settings, key, getattr(default_settings, key))

cvat/apps/dataset_manager/default_settings.py

@@ -0,0 +1,14 @@
+# Copyright (C) 2024 CVAT.ai Corporation
+#
+# SPDX-License-Identifier: MIT
+
+import os
+
+DATASET_CACHE_TTL = int(os.getenv("CVAT_DATASET_CACHE_TTL", 60 * 60 * 10))
+"Base lifetime for cached exported datasets, in seconds"
+
+DATASET_CACHE_LOCK_TIMEOUT = int(os.getenv("CVAT_DATASET_CACHE_LOCK_TIMEOUT", 10))
+"Timeout for cache lock acquiring, in seconds"
+
+DATASET_EXPORT_LOCKED_RETRY_INTERVAL = int(os.getenv("CVAT_DATASET_EXPORT_LOCKED_RETRY_INTERVAL", 60))
+"Retry interval for cases the export cache lock was unavailable, in seconds"