Merge remote-tracking branch 'upstream/develop' into develop_new_repo

.editorconfig

@@ -15,3 +15,7 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.{yml,yaml}]
+
+indent_size = 2

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@ If an item isn't applicable for some reason, then ~~explicitly strikethrough~~ t
 line. If you don't do that, GitHub will show incorrect progress for the pull request.
 If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 - [ ] I submit my changes into the `develop` branch
-- [ ] I have added a description of my changes into the [CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md) file
+- [ ] I have created a changelog fragment <!-- see top comment in CHANGELOG.md -->
 - [ ] I have updated the documentation accordingly
 - [ ] I have added tests to cover my changes
 - [ ] I have linked related issues (see [GitHub docs](

.github/workflows/prepare-release.yml

@@ -0,0 +1,59 @@
+name: Prepare release
+on:
+  workflow_dispatch:
+    inputs:
+      newVersion:
+        description: "Version number for the new release"
+        required: true
+        default: X.Y.Z
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate version number
+        env:
+          NEW_VERSION: "${{ inputs.newVersion }}"
+        run: |
+          if ! [[ "$NEW_VERSION" =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
+            echo "Invalid version number"
+            exit 1
+          fi
+
+      - uses: actions/checkout@v4
+
+      - name: Verify that the release is new
+        run: |
+          if git ls-remote --exit-code origin refs/tags/v${{ inputs.newVersion }} > /dev/null; then
+            echo "Release v${{ inputs.newVersion }} already exists"
+            exit 1
+          fi
+
+      - name: Create release branch
+        run:
+          git checkout -b "release-${{ inputs.newVersion }}"
+
+      - name: Collect changelog
+        run:
+          pipx run scriv collect --version="${{ inputs.newVersion }}"
+
+      - name: Set the new version
+        run:
+          ./dev/update_version.py --set="${{ inputs.newVersion }}"
+
+      - name: Commit release preparation changes
+        run: |
+          git -c user.name='github-actions[bot]' -c user.email='github-actions[bot]@users.noreply.github.com' \
+            commit -a -m "Prepare release v${{ inputs.newVersion }}"
+
+      - name: Push release branch
+        run:
+          git push -u origin "release-${{ inputs.newVersion }}"
+
+      - name: Create release pull request
+        env:
+          GH_TOKEN: "${{ github.token }}"
+        run: |
+          gh pr create \
+            --base=master \
+            --title="Release v${{ inputs.newVersion }}" \
+            --body="$(awk '/^## / { hn += 1; next } hn == 1 && !/^</' CHANGELOG.md)"

CHANGELOG.md

@@ -5,27 +5,35 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## \[Unreleased\]
+<!--
+  Developers: this project uses scriv (<https://scriv.readthedocs.io/en/stable/index.html>)
+  to maintain the changelog. To add an entry, create a fragment:
 
-### Added
+    $ scriv create --edit
 
-- TDB
+  Fragments will be merged into this file whenever a release is made.
+-->
 
-### Changed
+<!-- scriv-insert-here -->
 
-- TDB
+<a id='changelog-2.7.5'></a>
+## \[2.7.5\] - 2023-10-09
 
-### Deprecated
+### Added
 
-- TDB
+- Temporary workaround to fix corrupted zip file
+  (<https://github.com/opencv/cvat/pull/6965>)
 
-### Removed
+<a id='changelog-2.7.4'></a>
+## \[2.7.4\] - 2023-10-06
 
-- TDB
+### Added
+
+- The latest comment displayed in issues sidebar (<https://github.com/opencv/cvat/pull/6937>)
 
 ### Fixed
 
-- TDB
+- It was not possible to copy issue comment from issue dialog (<https://github.com/opencv/cvat/pull/6937>)
 
 ### Security
 
@@ -44,6 +52,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- PCD files with nan values could not be opened on 3D workspace
+ (<https://github.com/opencv/cvat/pull/6862>)
+- Fixed direct navigation to neightbour chunk on 3D workspace
+ (<https://github.com/opencv/cvat/pull/6862>)
+- Intencity level from .bin lidar data ignored when converting .bin -> .pcd
+ (<https://github.com/opencv/cvat/pull/6862>)
 - Incorrectly determined video frame count when the video contains an MP4 edit list
   (<https://github.com/opencv/cvat/pull/6929>)
 - Internal server error when retrieving data from CS and cache=True
@@ -68,9 +82,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Downloading additional data from cloud storage if use_cache=true and job_file_mapping are specified
   (<https://github.com/opencv/cvat/pull/6879>)
 - Leaving an organization (<https://github.com/opencv/cvat/pull/6422>)
+- Order of images in annotation file when dumping project in CVAT format (<https://github.com/opencv/cvat/pull/6927>)
 - Validation on Cloud Storage form / error message on create task form (<https://github.com/opencv/cvat/pull/6890>)
 
-
 ## \[2.7.1\] - 2023-09-15
 
 ### Fixed
@@ -1766,26 +1780,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Initial version
-
-## Template
-
-```
-## \[Unreleased]
-### Added
-- TDB
-
-### Changed
-- TDB
-
-### Deprecated
-- TDB
-
-### Removed
-- TDB
-
-### Fixed
-- TDB
-
-### Security
-- TDB
-```

changelog.d/20231006_155231_persist_image_filters.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Persist image filters across jobs
+  (<https://github.com/opencv/cvat/pull/6953>)

changelog.d/20231009_165414_roman_snyk_fix_7429062f3bf9ab5eb080c5cceabd5d6a.md

@@ -0,0 +1,4 @@
+### Security
+
+- Security upgrade opencv-python-headless from 4.5.5.62 to 4.8.1.78
+  (<https://github.com/opencv/cvat/pull/6931>)

changelog.d/20231010_113810_sizow.k.d_fix_tracks_splitting.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Splitting skeleton tracks on jobs
+  (<https://github.com/opencv/cvat/pull/6968>)

changelog.d/20231011_153117_sizow.k.d_fix_coco_tracks_uploading.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Uploading skeleton tracks in COCO Keypoints format
+  (<https://github.com/opencv/cvat/pull/6969>)

changelog.d/20231011_153251_andrey_fix_siammask.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Fixed Siammask tracker error on grayscale images
+  (<https://github.com/opencv/cvat/pull/6982>)

changelog.d/20231012_095633_klakhov_fix_memory.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Fixed memory leak on client side when event listener was not removed together with its context
+  (<https://github.com/opencv/cvat/pull/6984>)

changelog.d/20231012_105902_sekachev.bs_fixed_crash.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Fixed crash related to issue tries to mount to not existing parent
+  (<https://github.com/opencv/cvat/pull/6977>)

changelog.d/20231012_113210_andrey_update_nginx_config.md

@@ -0,0 +1,4 @@
+### Changed
+
+- Enabled nginx proxy buffering
+  (<https://github.com/opencv/cvat/pull/6991>)

changelog.d/20231012_123219_andrey_x_frame_options.md

@@ -0,0 +1,4 @@
+### Security
+
+- Added X-Frame-Options: deny
+  (<https://github.com/opencv/cvat/pull/6992>)

changelog.d/20231012_131418_sekachev.bs_fixed_google_translator.md

@@ -0,0 +1,4 @@
+### Fixed
+
+- Added 'notranslate' markers to avoid issues caused by extension translators
+  (<https://github.com/opencv/cvat/pull/6993>)

changelog.d/20231012_181301_andrey_fix_worker_restart.md

@@ -0,0 +1,8 @@
+### Changed
+
+- Helm: set memory request for keydb
+- Supervisord:
+  - added `autorestart=true` option for all workers
+  - unified program names to use dashes as delimiter instead of mixed '_' and '-'
+  - minor improvements to supervisor configurations
+  (<https://github.com/opencv/cvat/pull/6945>)

changelog.d/fragment.j2

@@ -0,0 +1,4 @@
+### {{ config.categories | join('|') }} <!-- pick one -->
+
+- Describe your change here...
+  (<https://github.com/opencv/cvat/pull/XXXX>)

changelog.d/scriv.ini

@@ -0,0 +1,6 @@
+[scriv]
+categories = Added, Changed, Deprecated, Removed, Fixed, Security
+entry_title_template = \[{{ version }}\] - {{ date.strftime('%%Y-%%m-%%d') }}
+format = md
+md_header_level = 2
+new_fragment_template = file: fragment.j2

cvat-canvas/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "2.17.5",
+  "version": "2.17.6",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",
   "scripts": {

cvat-canvas/src/typescript/canvasView.ts

@@ -1258,13 +1258,11 @@ export class CanvasViewImpl implements CanvasView, Listener {
         window.document.addEventListener('keydown', this.onShiftKeyDown);
         window.document.addEventListener('keyup', this.onShiftKeyUp);
 
-        this.attachmentBoard.addEventListener('wheel', (event) => {
-            event.stopPropagation();
-        });
-
-        this.attachmentBoard.addEventListener('mousemove', (event) => {
-            event.stopPropagation();
-        });
+        for (const eventName of ['wheel', 'mousedown', 'dblclick', 'contextmenu']) {
+            this.attachmentBoard.addEventListener(eventName, (event) => {
+                event.stopPropagation();
+            });
+        }
 
         this.canvas.addEventListener('wheel', (event): void => {
             if (event.ctrlKey) return;

cvat-canvas3d/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas3d",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas3D library",
   "main": "src/canvas3d.ts",
   "scripts": {
@@ -17,8 +17,8 @@
   "devDependencies": {},
   "dependencies": {
     "cvat-core": "link:./../cvat-core",
-    "@types/three": "^0.125.3",
+    "@types/three": "^0.156.0",
     "camera-controls": "^1.25.3",
-    "three": "^0.126.1"
+    "three": "^0.156.1"
   }
 }

cvat-canvas3d/src/typescript/canvas3dModel.ts

@@ -31,7 +31,7 @@ export interface SplitData {
 export interface Image {
     renderWidth: number;
     renderHeight: number;
-    imageData: ImageData | CanvasImageSource;
+    imageData: Blob;
 }
 
 export interface DrawData {
@@ -102,7 +102,7 @@ export enum Mode {
 export interface Canvas3dDataModel {
     activeElement: ActiveElement;
     canvasSize: Size;
-    image: Image | null;
+    image: { imageData: Blob } | null;
     imageID: number | null;
     imageOffset: number;
     imageSize: Size;
@@ -236,7 +236,7 @@ export class Canvas3dModelImpl extends MasterImpl implements Canvas3dModel {
                 this.data.image = null;
                 this.notify(UpdateReasons.IMAGE_CHANGED);
             })
-            .then((data: Image): void => {
+            .then((data: { imageData: Blob }): void => {
                 this.data.imageSize = {
                     height: frameData.height as number,
                     width: frameData.width as number,