Merge branch 'develop' into bs/fixed_issue_3216

cvat-ai · Jun 5, 2021 · b4d2379 · b4d2379
2 parents c3fa1d6 + 6abe39e
commit b4d2379
Show file tree

Hide file tree

Showing 6 changed files with 449 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed Python 3.6 support (<https://github.com/openvinotoolkit/cvat/pull/3258>)
 - Incorrect attribute import in tracks (<https://github.com/openvinotoolkit/cvat/pull/3229>)
 - Issue "is not a constructor" when create object, save, undo, save, redo save (<https://github.com/openvinotoolkit/cvat/pull/3292>)
+- Fix CLI create an infinite loop if git repository responds with failure (<https://github.com/openvinotoolkit/cvat/pull/3267>)
 
 ### Security
 

diff --git a/cvat/apps/dataset_manager/tests/assets/annotations.json b/cvat/apps/dataset_manager/tests/assets/annotations.json
@@ -0,0 +1,75 @@
+{
+  "CVAT for video 1.1 polygon": {
+    "version": 0,
+    "tags": [],
+    "shapes": [],
+    "tracks": [
+      {
+        "frame": 0,
+        "label_id": null,
+        "group": 1,
+        "source": "manual",
+        "shapes": [
+          {
+            "type": "polygon",
+            "occluded": false,
+            "z_order": 0,
+            "points": [24.62, 13.01, 34.88, 20.03, 18.14, 18.08],
+            "frame": 0,
+            "outside": false,
+            "attributes": []
+          },
+          {
+            "type": "polygon",
+            "occluded": false,
+            "z_order": 0,
+            "points": [24.62, 13.01, 34.88, 20.03, 18.14, 18.08],
+            "frame": 1,
+            "outside": true,
+            "attributes": []
+          },
+          {
+            "type": "polygon",
+            "occluded": false,
+            "z_order": 0,
+            "points": [24.62, 13.01, 34.88, 20.03, 18.14, 18.08],
+            "frame": 2,
+            "outside": false,
+            "keyframe": true,
+            "attributes": []
+          }
+        ],
+        "attributes": []
+      }
+    ]
+  },
+  "WiderFace 1.0": {
+    "version": 0,
+    "tags": [],
+    "shapes": [
+      {
+        "type": "rectangle",
+        "occluded": false,
+        "z_order": 0,
+        "points": [7.55, 9.75, 16.44, 15.85],
+        "frame": 0,
+        "label_id": null,
+        "group": 0,
+        "source": "manual",
+        "attributes": []
+      },
+      {
+        "type": "rectangle",
+        "occluded": true,
+        "z_order": 0,
+        "points": [3.55, 27.75, 11.33, 33.71],
+        "frame": 1,
+        "label_id": null,
+        "group": 0,
+        "source": "manual",
+        "attributes": []
+      }
+    ],
+    "tracks": []
+  }
+}
diff --git a/cvat/apps/dataset_manager/tests/assets/tasks.json b/cvat/apps/dataset_manager/tests/assets/tasks.json
@@ -0,0 +1,101 @@
+{
+  "main": {
+    "name": "main task",
+    "overlap": 0,
+    "segment_size": 100,
+    "owner_id": 1,
+    "assignee_id": 2,
+    "labels": [
+      {
+        "name": "car",
+        "color": "#2080c0",
+        "attributes": [
+          {
+            "name": "select_name",
+            "mutable": false,
+            "input_type": "select",
+            "default_value": "bmw",
+            "values": ["bmw", "mazda", "renault"]
+          },
+          {
+            "name": "radio_name",
+            "mutable": false,
+            "input_type": "radio",
+            "default_value": "x1",
+            "values": ["x1", "x2", "x3"]
+          },
+          {
+            "name": "check_name",
+            "mutable": true,
+            "input_type": "checkbox",
+            "default_value": "false",
+            "values": ["false"]
+          },
+          {
+            "name": "text_name",
+            "mutable": false,
+            "input_type": "text",
+            "default_value": "qwerty",
+            "values": ["qwerty"]
+          },
+          {
+            "name": "number_name",
+            "mutable": false,
+            "input_type": "number",
+            "default_value": "-4",
+            "values": ["-4", "4", "1"]
+          }
+        ]
+      },
+      {
+        "name": "person",
+        "color": "#c06060",
+        "attributes": []
+      }
+    ]
+  },
+  "widerface with all attributes": {
+    "name": "widerface task",
+    "overlap": 0,
+    "segment_size": 100,
+    "owner_id": 1,
+    "assignee_id": 2,
+    "labels": [
+      {
+        "name": "face",
+        "attributes": [
+          {
+            "name": "blur",
+            "mutable": false,
+            "input_type": "select",
+            "values": ["0", "1", "2"]
+          },
+          {
+            "name": "expression",
+            "mutable": false,
+            "input_type": "select",
+            "values": ["0", "1"]
+          },
+          {
+            "name": "illumination",
+            "mutable": false,
+            "input_type": "select",
+            "values": ["0", "1"]
+          },
+          {
+            "name": "pose",
+            "mutable": false,
+            "input_type": "select",
+            "values": ["0", "1"]
+          },
+          {
+            "name": "invalid",
+            "mutable": false,
+            "input_type": "select",
+            "values": ["0", "1"]
+          }
+        ]
+      }
+    ]
+  }
+}