From f2d0b71b7247b11e0a2c8d62190abce8acc44246 Mon Sep 17 00:00:00 2001 From: Maria Khrustaleva Date: Sat, 14 Nov 2020 09:37:11 +0300 Subject: [PATCH 1/3] Fixed saving of relative paths in dummy chunks instead of absolute (#2424) * Fixed saving of relative paths in dummy chunks instead of absolute * Updated CHANGELOG --- CHANGELOG.md | 1 + cvat/apps/engine/task.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb9c68ec..23f3fa16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Django templates for email and user guide () +- Saving relative paths in dummy chunks instead of absolute() ### Security diff --git a/cvat/apps/engine/task.py b/cvat/apps/engine/task.py index e724d242..ca3a88d4 100644 --- a/cvat/apps/engine/task.py +++ b/cvat/apps/engine/task.py @@ -354,7 +354,7 @@ def _create_thread(tid, data): img_sizes = [] with open(db_data.get_dummy_chunk_path(chunk_number), 'w') as dummy_chunk: for path, frame_id in chunk_paths: - dummy_chunk.write(path + '\n') + dummy_chunk.write(os.path.relpath(path, upload_dir) + '\n') img_sizes.append(extractor.get_image_size(frame_id)) db_images.extend([ From b540c4c79e197aac81610381dfb687e911637f1f Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Sat, 14 Nov 2020 08:42:30 +0200 Subject: [PATCH 2/3] fix: upgrade axios from 0.20.0 to 0.21.0 (#2425) Snyk has created this PR to upgrade axios from 0.20.0 to 0.21.0. See this package in npm: https://www.npmjs.com/package/axios See this project in Snyk: https://app.snyk.io/org/cvat/project/6ec290d2-fdd9-480b-aeef-3552213525dd?utm_source=github&utm_medium=upgrade-pr --- cvat-core/package-lock.json | 6 +++--- cvat-core/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cvat-core/package-lock.json b/cvat-core/package-lock.json index 52e1e138..1d6edfb7 100644 --- a/cvat-core/package-lock.json +++ b/cvat-core/package-lock.json @@ -1867,9 +1867,9 @@ "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==" }, "axios": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz", - "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz", + "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==", "requires": { "follow-redirects": "^1.10.0" } diff --git a/cvat-core/package.json b/cvat-core/package.json index 84140dde..2319fa1c 100644 --- a/cvat-core/package.json +++ b/cvat-core/package.json @@ -33,7 +33,7 @@ "webpack-cli": "^3.3.2" }, "dependencies": { - "axios": "^0.20.0", + "axios": "^0.21.0", "browser-or-node": "^1.2.1", "cvat-data": "../cvat-data", "detect-browser": "^5.2.0", From a9b28175626768305811a63fcbebd3d9baf6553a Mon Sep 17 00:00:00 2001 From: xuchen Date: Sat, 14 Nov 2020 14:45:02 +0800 Subject: [PATCH 3/3] fix for kubrenetes name (DNS-1123) (#2415) --- serverless/openvino/dextr/nuclio/function.yaml | 2 +- .../person-reidentification-retail-300/nuclio/function.yaml | 2 +- .../intel/semantic-segmentation-adas-0001/nuclio/function.yaml | 2 +- .../openvino/omz/intel/text-detection-0004/nuclio/function.yaml | 2 +- .../public/faster_rcnn_inception_v2_coco/nuclio/function.yaml | 2 +- .../nuclio/function.yaml | 2 +- serverless/openvino/omz/public/yolo-v3-tf/nuclio/function.yaml | 2 +- serverless/pytorch/foolwood/siammask/nuclio/function.yaml | 2 +- serverless/pytorch/saic-vul/fbrs/nuclio/function.yaml | 2 +- .../faster_rcnn_inception_v2_coco/nuclio/function.yaml | 2 +- serverless/tensorflow/matterport/mask_rcnn/nuclio/function.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/serverless/openvino/dextr/nuclio/function.yaml b/serverless/openvino/dextr/nuclio/function.yaml index 47106242..6faa753e 100644 --- a/serverless/openvino/dextr/nuclio/function.yaml +++ b/serverless/openvino/dextr/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: openvino.dextr + name: openvino-dextr namespace: cvat annotations: name: DEXTR diff --git a/serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio/function.yaml b/serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio/function.yaml index 44075bbf..ab8845e4 100644 --- a/serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio/function.yaml +++ b/serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: openvino.omz.intel.person-reidentification-retail-0300 + name: openvino-omz-intel-person-reidentification-retail-0300 namespace: cvat annotations: name: Person reidentification diff --git a/serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio/function.yaml b/serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio/function.yaml index f78a9258..b871a01c 100644 --- a/serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio/function.yaml +++ b/serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: openvino.omz.semantic-segmentation-adas-0001 + name: openvino-omz-semantic-segmentation-adas-0001 namespace: cvat annotations: name: Semantic segmentation for ADAS diff --git a/serverless/openvino/omz/intel/text-detection-0004/nuclio/function.yaml b/serverless/openvino/omz/intel/text-detection-0004/nuclio/function.yaml index de273e34..7625933d 100644 --- a/serverless/openvino/omz/intel/text-detection-0004/nuclio/function.yaml +++ b/serverless/openvino/omz/intel/text-detection-0004/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: openvino.omz.intel.text-detection-0004 + name: openvino-omz-intel-text-detection-0004 namespace: cvat annotations: name: Text detection v4 diff --git a/serverless/openvino/omz/public/faster_rcnn_inception_v2_coco/nuclio/function.yaml b/serverless/openvino/omz/public/faster_rcnn_inception_v2_coco/nuclio/function.yaml index 546fe400..47c3f2fe 100644 --- a/serverless/openvino/omz/public/faster_rcnn_inception_v2_coco/nuclio/function.yaml +++ b/serverless/openvino/omz/public/faster_rcnn_inception_v2_coco/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: openvino.omz.public.faster_rcnn_inception_v2_coco + name: openvino-omz-public-faster_rcnn_inception_v2_coco namespace: cvat annotations: name: Faster RCNN diff --git a/serverless/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio/function.yaml b/serverless/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio/function.yaml index 56f04ea7..88a1a817 100644 --- a/serverless/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio/function.yaml +++ b/serverless/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio/function.yaml @@ -2,7 +2,7 @@ # have enough memory (more than 4GB). Look here how to do that # https://stackoverflow.com/questions/44417159/docker-process-killed-with-cryptic-killed-message metadata: - name: openvino.omz.public.mask_rcnn_inception_resnet_v2_atrous_coco + name: openvino-mask-rcnn-inception-resnet-v2-atrous-coco namespace: cvat annotations: name: Mask RCNN diff --git a/serverless/openvino/omz/public/yolo-v3-tf/nuclio/function.yaml b/serverless/openvino/omz/public/yolo-v3-tf/nuclio/function.yaml index 13574c9b..793f2616 100644 --- a/serverless/openvino/omz/public/yolo-v3-tf/nuclio/function.yaml +++ b/serverless/openvino/omz/public/yolo-v3-tf/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: openvino.omz.public.yolo-v3-tf + name: openvino-omz-public-yolo-v3-tf namespace: cvat annotations: name: YOLO v3 diff --git a/serverless/pytorch/foolwood/siammask/nuclio/function.yaml b/serverless/pytorch/foolwood/siammask/nuclio/function.yaml index cad33810..a19fdb52 100644 --- a/serverless/pytorch/foolwood/siammask/nuclio/function.yaml +++ b/serverless/pytorch/foolwood/siammask/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: pth.foolwood.siammask + name: pth-foolwood-siammask namespace: cvat annotations: name: SiamMask diff --git a/serverless/pytorch/saic-vul/fbrs/nuclio/function.yaml b/serverless/pytorch/saic-vul/fbrs/nuclio/function.yaml index b0ef0b96..4d36482a 100644 --- a/serverless/pytorch/saic-vul/fbrs/nuclio/function.yaml +++ b/serverless/pytorch/saic-vul/fbrs/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: pth.saic-vul.fbrs + name: pth-saic-vul-fbrs namespace: cvat annotations: name: f-BRS diff --git a/serverless/tensorflow/faster_rcnn_inception_v2_coco/nuclio/function.yaml b/serverless/tensorflow/faster_rcnn_inception_v2_coco/nuclio/function.yaml index 26ad2348..4e2cf02f 100644 --- a/serverless/tensorflow/faster_rcnn_inception_v2_coco/nuclio/function.yaml +++ b/serverless/tensorflow/faster_rcnn_inception_v2_coco/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: tf.faster_rcnn_inception_v2_coco + name: tf-faster-rcnn-inception-v2-coco namespace: cvat annotations: name: Faster RCNN via Tensorflow diff --git a/serverless/tensorflow/matterport/mask_rcnn/nuclio/function.yaml b/serverless/tensorflow/matterport/mask_rcnn/nuclio/function.yaml index eef8fd79..ef0bf20c 100644 --- a/serverless/tensorflow/matterport/mask_rcnn/nuclio/function.yaml +++ b/serverless/tensorflow/matterport/mask_rcnn/nuclio/function.yaml @@ -1,5 +1,5 @@ metadata: - name: tf.matterport.mask_rcnn + name: tf-matterport-mask-rcnn namespace: cvat annotations: name: Mask RCNN via Tensorflow