correct EOF

Author: maaferna

.vscode/settings.json

@@ -29,15 +29,6 @@
             "database": "${workspaceFolder:cvat}/db.sqlite3"
         }
     ],
-    "python.analysis.exclude": [
-        // VS Code defaults
-        "**/node_modules",
-        "**/__pycache__",
-        ".git",
-
-        "cvat-cli/build",
-        "cvat-sdk/build",
-    ],
     "python.defaultInterpreterPath": "${workspaceFolder}/.env/",
     "python.testing.pytestArgs": [
         "--rootdir","${workspaceFolder}/tests/"

CHANGELOG.md

@@ -87,7 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (<https://github.com/cvat-ai/cvat/pull/8586>)
 
 - Tags in ground truth job couldn't be deleted via `x` button
-  (<https://github.com/cvat-ai/cvat/pull/8586>)
+ (<https://github.com/cvat-ai/cvat/pull/8586>)
 
 - Exception 'Canvas is busy' when change frame during drag/resize a track
   (<https://github.com/cvat-ai/cvat/pull/8598>)
@@ -377,7 +377,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 
 - Client events `upload:annotations`, `lock:object`, `change:attribute`, `change:label`
-  (<https://github.com/cvat-ai/cvat/pull/8304>)
+ (<https://github.com/cvat-ai/cvat/pull/8304>)
 
 ### Removed
 
@@ -404,8 +404,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (<https://github.com/cvat-ai/cvat/pull/8216>)
 
 - Sometimes it is not possible to switch workspace because active control broken after
-  trying to create a tag with a shortcut
-  (<https://github.com/cvat-ai/cvat/pull/8334>)
+trying to create a tag with a shortcut (<https://github.com/cvat-ai/cvat/pull/8334>)
 
 <a id='changelog-2.16.3'></a>
 ## \[2.16.3\] - 2024-08-13
@@ -446,14 +445,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Copy/paste annotation guide with assets did not work, showing the message
-  **Asset is already related to another guide**
-  (<https://github.com/cvat-ai/cvat/pull/7989>)
+**Asset is already related to another guide** (<https://github.com/cvat-ai/cvat/pull/7989>)
 
 - Undo can't be done when a shape is rotated
   (<https://github.com/cvat-ai/cvat/pull/8129>)
 
 - Exporting a skeleton track in a format defined for shapes raises error
-  `operands could not be broadcast together with shapes (X, ) (Y, )`
+`operands could not be broadcast together with shapes (X, ) (Y, )`
   (<https://github.com/cvat-ai/cvat/pull/8179>)
 
 - Delete label modal window does not have cancellation button
@@ -472,11 +470,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (<https://github.com/cvat-ai/cvat/pull/8206>)
 
 - API call to run automatic annotations fails on a model with attributes
-  when mapping not provided in the request
-  (<https://github.com/cvat-ai/cvat/pull/8250>)
+ when mapping not provided in the request (<https://github.com/cvat-ai/cvat/pull/8250>)
 
 - Fixed a label collision issue where labels with similar prefixes
-  and numeric suffixes could conflict, causing error on export.
+and numeric suffixes could conflict, causing error on export.
   (<https://github.com/cvat-ai/cvat/pull/8262>)
 
 <a id='changelog-2.16.1'></a>
@@ -513,9 +510,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Set of features to track background activities: importing/exporting datasets, annotations or backups, creating tasks.
-  Now you may find these processes on Requests page, it allows a user to understand current status of these activities
-  and enhances user experience, not losing progress when the browser tab is closed
-  (<https://github.com/cvat-ai/cvat/pull/7537>)
+Now you may find these processes on Requests page, it allows a user to understand current status of these activities
+and enhances user experience, not losing progress when the browser tab is closed
+(<https://github.com/cvat-ai/cvat/pull/7537>)
 
 - User now may update a job state from the corresponding task page
   (<https://github.com/cvat-ai/cvat/pull/8102>)
@@ -526,8 +523,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - "Finish the job" button on annotation view now only sets state to 'completed'.
-  The job stage keeps unchanged
-  (<https://github.com/cvat-ai/cvat/pull/8102>)
+ The job stage keeps unchanged (<https://github.com/cvat-ai/cvat/pull/8102>)
 
 - Log files for individual backend processes are now stored in ephemeral
   storage of each backend container rather than in the `cvat_logs` volume
@@ -539,7 +535,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 - Renew the job button in annotation menu was removed
-  (<https://github.com/cvat-ai/cvat/pull/8102>)
+ (<https://github.com/cvat-ai/cvat/pull/8102>)
 
 ### Fixed
 
@@ -587,12 +583,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (<https://github.com/cvat-ai/cvat/pull/8039>)
 
 - Exception 'this.el.node.getScreenCTM() is null' occuring in Firefox when
-  a user resizes window during skeleton dragging/resizing
-  (<https://github.com/cvat-ai/cvat/pull/8067>)
+a user resizes window during skeleton dragging/resizing (<https://github.com/cvat-ai/cvat/pull/8067>)
 
 - Exception 'Edge's nodeFrom M or nodeTo N do not to refer to any node'
-  occuring when a user resizes window during skeleton dragging/resizing
-  (<https://github.com/cvat-ai/cvat/pull/8067>)
+occuring when a user resizes window during skeleton dragging/resizing (<https://github.com/cvat-ai/cvat/pull/8067>)
 
 - Slightly broken layout when running attributed face detection model
   (<https://github.com/cvat-ai/cvat/pull/8072>)
@@ -650,8 +644,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (<https://github.com/cvat-ai/cvat/pull/7997>)
 
 - When use route `/auth/login-with-token/<token>` without `next` query parameter
-  the page reloads infinitely
-  (<https://github.com/cvat-ai/cvat/pull/7999>)
+the page reloads infinitely (<https://github.com/cvat-ai/cvat/pull/7999>)
 
 - Fixed kvrocks port naming for istio
   (<https://github.com/cvat-ai/cvat/pull/8010>)
@@ -822,7 +815,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Opening update CS page sends infinite requests when CS id does not exist
   (<https://github.com/cvat-ai/cvat/pull/7828>)
 
-- Uploading files with TUS immediately failed when one of the requests failed
+Uploading files with TUS immediately failed when one of the requests failed
   (<https://github.com/cvat-ai/cvat/pull/7830>)
 
 - Longer analytics report calculation because of inefficient requests to analytics db
@@ -992,7 +985,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (<https://github.com/opencv/cvat/pull/7604>)
 
 - 90 deg-rotated video was added with "Prefer Zip Chunks" disabled
-  was warped, fixed using the static cropImage function.
+was warped, fixed using the static cropImage function.
   (<https://github.com/opencv/cvat/pull/7583>)
 
 <a id='changelog-2.11.2'></a>
@@ -1030,7 +1023,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Single shape annotation mode allowing to easily annotate scenarious where a user
-  only needs to draw one object on one image (<https://github.com/opencv/cvat/pull/7486>)
+only needs to draw one object on one image (<https://github.com/opencv/cvat/pull/7486>)
 
 ### Fixed
 
@@ -1158,7 +1151,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### 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.
+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.*
@@ -1207,11 +1200,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (<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>)
+ 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>)
+ (<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>)
+ 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>)
@@ -1222,7 +1215,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Introduced CVAT actions. Actions allow performing different
-  predefined scenarios on annotations automatically (e.g. shape converters)
+ predefined scenarios on annotations automatically (e.g. shape converters)
   (<https://github.com/opencv/cvat/pull/7172>)
 
 - The UI will now retry requests that were rejected due to rate limiting

components/serverless/README.md

@@ -6,6 +6,3 @@
 # From project root directory
 docker compose -f docker-compose.yml -f components/serverless/docker-compose.serverless.yml up -d
 ```
-
-### Own model for CVAT auto-annotation
-https://medium.com/@eng.fadishaar/automating-object-annotation-in-cvat-using-a-custom-yolov5-model-cfd36fb40a97

cvat-canvas/src/typescript/canvasView.ts

@@ -2877,9 +2877,6 @@ export class CanvasViewImpl implements CanvasView, Listener {
             const shapeView = window.document.getElementById(`cvat_canvas_shape_${clientID}`);
             if (shapeView) shapeView.classList.remove(this.getHighlightClassname());
         });
-        const redrawMasks = (highlightedElements.elementsIDs.length !== 0 ||
-            this.highlightedElements.elementsIDs.length !== 0);
-
         if (highlightedElements.elementsIDs.length) {
             this.highlightedElements = { ...highlightedElements };
             this.canvas.classList.add('cvat-canvas-highlight-enabled');
@@ -2894,11 +2891,9 @@ export class CanvasViewImpl implements CanvasView, Listener {
             };
             this.canvas.classList.remove('cvat-canvas-highlight-enabled');
         }
-        if (redrawMasks) {
-            const masks = Object.values(this.drawnStates).filter((state) => state.shapeType === 'mask');
-            this.deleteObjects(masks);
-            this.addObjects(masks);
-        }
+        const masks = Object.values(this.drawnStates).filter((state) => state.shapeType === 'mask');
+        this.deleteObjects(masks);
+        this.addObjects(masks);
         if (this.highlightedElements.elementsIDs.length) {
             this.deactivate();
             const clientID = this.highlightedElements.elementsIDs[0];

cvat-canvas/src/typescript/masksHandler.ts

@@ -404,10 +404,6 @@ export class MasksHandlerImpl implements MasksHandler {
                 rle.push(wrappingBbox.left, wrappingBbox.top, wrappingBbox.right, wrappingBbox.bottom);
 
                 this.onDrawDone({
-                    occluded: this.drawData.initialState.occluded,
-                    attributes: { ...this.drawData.initialState.attributes },
-                    color: this.drawData.initialState.color,
-                    objectType: this.drawData.initialState.objectType,
                     shapeType: this.drawData.shapeType,
                     points: rle,
                     label: this.drawData.initialState.label,

cvat-cli/requirements/base.txt

@@ -1,3 +1,3 @@
-cvat-sdk~=2.22.1
+cvat-sdk~=2.22.0
 Pillow>=10.3.0
 setuptools>=70.0.0 # not directly required, pinned by Snyk to avoid a vulnerability

cvat-cli/src/cvat_cli/_internal/commands.py

@@ -20,13 +20,7 @@
 from cvat_sdk.core.proxies.tasks import ResourceType
 
 from .command_base import CommandGroup
-from .parsers import (
-    BuildDictAction,
-    parse_function_parameter,
-    parse_label_arg,
-    parse_resource_type,
-    parse_threshold,
-)
+from .parsers import BuildDictAction, parse_function_parameter, parse_label_arg, parse_resource_type
 
 COMMANDS = CommandGroup(description="Perform common operations related to CVAT tasks.")
 
@@ -469,19 +463,6 @@ def configure_parser(self, parser: argparse.ArgumentParser) -> None:
             help="Allow the function to declare labels not configured in the task",
         )
 
-        parser.add_argument(
-            "--conf-threshold",
-            type=parse_threshold,
-            help="Confidence threshold for filtering detections",
-            default=None,
-        )
-
-        parser.add_argument(
-            "--conv-mask-to-poly",
-            action="store_true",
-            help="Convert mask shapes to polygon shapes",
-        )
-
     def execute(
         self,
         client: Client,
@@ -492,8 +473,6 @@ def execute(
         function_parameters: dict[str, Any],
         clear_existing: bool = False,
         allow_unmatched_labels: bool = False,
-        conf_threshold: Optional[float],
-        conv_mask_to_poly: bool,
     ) -> None:
         if function_module is not None:
             function = importlib.import_module(function_module)
@@ -518,6 +497,4 @@ def execute(
             pbar=DeferredTqdmProgressReporter(),
             clear_existing=clear_existing,
             allow_unmatched_labels=allow_unmatched_labels,
-            conf_threshold=conf_threshold,
-            conv_mask_to_poly=conv_mask_to_poly,
         )

cvat-cli/src/cvat_cli/_internal/parsers.py

@@ -53,17 +53,6 @@ def parse_function_parameter(s: str) -> tuple[str, Any]:
     return (key, value)
 
 
-def parse_threshold(s: str) -> float:
-    try:
-        value = float(s)
-    except ValueError as e:
-        raise argparse.ArgumentTypeError("must be a number") from e
-
-    if not 0 <= value <= 1:
-        raise argparse.ArgumentTypeError("must be between 0 and 1")
-    return value
-
-
 class BuildDictAction(argparse.Action):
     def __init__(self, option_strings, dest, default=None, **kwargs):
         super().__init__(option_strings, dest, default=default or {}, **kwargs)

cvat-cli/src/cvat_cli/version.py

@@ -1 +1 @@
-VERSION = "2.22.1"
+VERSION = "2.22.0"

cvat-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-core",
-  "version": "15.3.0",
+  "version": "15.2.1",
   "type": "module",
   "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
   "main": "src/api.ts",