Make serverless function naming and Docker image naming consistent (#6140)

For function names, take the relative path, lowercase, join with dashes and replace underscores with dashes. For image names, take the relative path, lowercase and join with dots. In a couple cases, rename the function directory instead of fixing the config.

Make serverless function naming and Docker image naming consistent (#6140)
For function names, take the relative path, lowercase, join with dashes and replace underscores with dashes. For image names, take the relative path, lowercase and join with dots. In a couple cases, rename the function directory instead of fixing the config.
a5cbd1a7 · Roman Donchenko · GitHub · 36d8913f · a5cbd1a7 · a5cbd1a7
15 changed file
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,9 +15,10 @@ without use_cache option (<https://github.com/opencv/cvat/pull/6074>)

 ### Changed
 - Cloud storage manifest file is optional (<https://github.com/opencv/cvat/pull/6074>)
-
-### Changed
 - Updated Django to 4.2.x version (<https://github.com/opencv/cvat/pull/6122>)
+- Some Nuclio functions' names were changed to follow a common convention:
+  `onnx-yolov7` -> `onnx-wongkinyiu-yolov7`, `ultralytics-yolov5` -> `pth-ultralytics-yolov5`
+  (<https://github.com/opencv/cvat/pull/6140>)

 ### Deprecated
 - The endpoint /cloudstorages/{id}/content was deprecated (<https://github.com/opencv/cvat/pull/6074>)

--- a/README.md
+++ b/README.md
@@ -186,11 +186,11 @@ up to 10x. Here is a list of the algorithms we support, and the platforms they c
 | ------------------------------------------------------------------------------------------------------- | ---------- | ---------- | --- | --- |
 | [Segment Anything](/serverless/pytorch/facebookresearch/sam/nuclio/)                                    | interactor | PyTorch    | ✔️  | ✔️ |
 | [Deep Extreme Cut](/serverless/openvino/dextr/nuclio)                                                   | interactor | OpenVINO   | ✔️  |     |
-| [Faster RCNN](/serverless/openvino/omz/public/faster_rcnn_inception_v2_coco/nuclio)                     | detector   | OpenVINO   | ✔️  |     |
+| [Faster RCNN](/serverless/openvino/omz/public/faster_rcnn_inception_resnet_v2_atrous_coco/nuclio)       | detector   | OpenVINO   | ✔️  |     |
 | [Mask RCNN](/serverless/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio)           | detector   | OpenVINO   | ✔️  |     |
 | [YOLO v3](/serverless/openvino/omz/public/yolo-v3-tf/nuclio)                                            | detector   | OpenVINO   | ✔️  |     |
 | [YOLO v7](/serverless/onnx/WongKinYiu/yolov7/nuclio)                                                    | detector   | ONNX       | ✔️  | ✔️  |
-| [Object reidentification](/serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio)     | reid       | OpenVINO   | ✔️  |     |
+| [Object reidentification](/serverless/openvino/omz/intel/person-reidentification-retail-0277/nuclio)    | reid       | OpenVINO   | ✔️  |     |
 | [Semantic segmentation for ADAS](/serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio) | detector   | OpenVINO   | ✔️  |     |
 | [Text detection v4](/serverless/openvino/omz/intel/text-detection-0004/nuclio)                          | detector   | OpenVINO   | ✔️  |     |
 | [YOLO v5](/serverless/pytorch/ultralytics/yolov5/nuclio)                                                | detector   | PyTorch    | ✔️  |     |
@@ -201,7 +201,7 @@ up to 10x. Here is a list of the algorithms we support, and the platforms they c
 | [Inside-Outside Guidance](/serverless/pytorch/shiyinzhang/iog/nuclio)                                   | interactor | PyTorch    | ✔️  |     |
 | [Faster RCNN](/serverless/tensorflow/faster_rcnn_inception_v2_coco/nuclio)                              | detector   | TensorFlow | ✔️  | ✔️  |
 | [Mask RCNN](/serverless/tensorflow/matterport/mask_rcnn/nuclio)                                         | detector   | TensorFlow | ✔️  | ✔️  |
-| [RetinaNet](serverless/pytorch/facebookresearch/detectron2/retinanet/nuclio)                            | detector   | PyTorch    | ✔️  | ✔️  |
+| [RetinaNet](serverless/pytorch/facebookresearch/detectron2/retinanet_r101/nuclio)                       | detector   | PyTorch    | ✔️  | ✔️  |
 | [Face Detection](/serverless/openvino/omz/intel/face-detection-0205/nuclio)                             | detector   | OpenVINO   | ✔️  |     |

 <!--lint enable maximum-line-length-->

--- a/serverless/onnx/WongKinYiu/yolov7/nuclio/function-gpu.yaml
+++ b/serverless/onnx/WongKinYiu/yolov7/nuclio/function-gpu.yaml
 metadata:
-  name: onnx-yolov7
+  name: onnx-wongkinyiu-yolov7
  namespace: cvat
  annotations:
    name: YOLO v7
@@ -95,7 +95,7 @@ spec:
  handler: main:handler
  eventTimeout: 30s
  build:
-    image: cvat/onnx-yolov7
+    image: cvat.onnx.wongkinyiu.yolov7
    baseImage: ultralytics/yolov5:latest

    directives:

--- a/serverless/onnx/WongKinYiu/yolov7/nuclio/function.yaml
+++ b/serverless/onnx/WongKinYiu/yolov7/nuclio/function.yaml
 metadata:
-  name: onnx-yolov7
+  name: onnx-wongkinyiu-yolov7
  namespace: cvat
  annotations:
    name: YOLO v7
@@ -94,7 +94,7 @@ spec:
  handler: main:handler
  eventTimeout: 30s
  build:
-    image: cvat/onnx-yolov7
+    image: cvat.onnx.wongkinyiu.yolov7
    baseImage: ultralytics/yolov5:latest-cpu

    directives:

--- a/serverless/pytorch/dschoerk/transt/nuclio/function-gpu.yaml
+++ b/serverless/pytorch/dschoerk/transt/nuclio/function-gpu.yaml
@@ -17,7 +17,7 @@ spec:
      value: /opt/nuclio/trans-t

  build:
-    image: cvat/pth.dschoerk.transt
+    image: cvat.pth.dschoerk.transt
    baseImage: nvidia/cuda:11.7.0-devel-ubuntu20.04

    directives:

--- a/serverless/pytorch/dschoerk/transt/nuclio/function.yaml
+++ b/serverless/pytorch/dschoerk/transt/nuclio/function.yaml
@@ -17,7 +17,7 @@ spec:
      value: /opt/nuclio/trans-t

  build:
-    image: cvat/pth.dschoerk.transt
+    image: cvat.pth.dschoerk.transt
    baseImage: ubuntu:20.04

    directives:

--- a/serverless/pytorch/facebookresearch/detectron2/retinanet/nuclio/function-gpu.yaml
+++ b/serverless/pytorch/facebookresearch/detectron2/retinanet/nuclio/function-gpu.yaml
--- a/serverless/pytorch/facebookresearch/detectron2/retinanet/nuclio/function.yaml
+++ b/serverless/pytorch/facebookresearch/detectron2/retinanet/nuclio/function.yaml
--- a/serverless/pytorch/facebookresearch/detectron2/retinanet/nuclio/main.py
+++ b/serverless/pytorch/facebookresearch/detectron2/retinanet/nuclio/main.py
--- a/serverless/pytorch/saic-vul/hrnet/nuclio/function-gpu.yaml
+++ b/serverless/pytorch/saic-vul/hrnet/nuclio/function-gpu.yaml
@@ -22,7 +22,7 @@ spec:
      value: /opt/nuclio/hrnet

  build:
-    image: cvat-pth.saic-vul.hrnet
+    image: cvat.pth.saic-vul.hrnet
    baseImage: ubuntu:20.04

    directives:

--- a/serverless/pytorch/saic-vul/hrnet/nuclio/function.yaml
+++ b/serverless/pytorch/saic-vul/hrnet/nuclio/function.yaml
@@ -22,7 +22,7 @@ spec:
      value: /opt/nuclio/hrnet

  build:
-    image: cvat-pth.saic-vul.hrnet
+    image: cvat.pth.saic-vul.hrnet
    baseImage: ubuntu:20.04

    directives:

--- a/serverless/pytorch/ultralytics/yolov5/nuclio/function-gpu.yaml
+++ b/serverless/pytorch/ultralytics/yolov5/nuclio/function-gpu.yaml
 metadata:
-  name: ultralytics-yolov5
+  name: pth-ultralytics-yolov5
  namespace: cvat
  annotations:
    name: YOLO v5
@@ -95,7 +95,7 @@ spec:
  handler: main:handler
  eventTimeout: 30s
  build:
-    image: cvat/ultralytics-yolov5
+    image: cvat.pth.ultralytics.yolov5
    baseImage: ultralytics/yolov5:latest

    directives:

--- a/serverless/pytorch/ultralytics/yolov5/nuclio/function.yaml
+++ b/serverless/pytorch/ultralytics/yolov5/nuclio/function.yaml
 metadata:
-  name: ultralytics-yolov5
+  name: pth-ultralytics-yolov5
  namespace: cvat
  annotations:
    name: YOLO v5
@@ -95,7 +95,7 @@ spec:
  handler: main:handler
  eventTimeout: 30s
  build:
-    image: cvat.ultralytics-yolov5
+    image: cvat.pth.ultralytics.yolov5
    baseImage: ultralytics/yolov5:latest-cpu

    directives:

--- a/site/content/en/docs/administration/advanced/installation_automatic_annotation.md
+++ b/site/content/en/docs/administration/advanced/installation_automatic_annotation.md
@@ -98,16 +98,16 @@ description: 'Information about the installation of components needed for semi-a
  cat << EOF > /tmp/input.json
  {"image": "$image"}
  EOF
-  cat /tmp/input.json | nuctl invoke openvino.omz.public.yolo-v3-tf -c 'application/json'
+  cat /tmp/input.json | nuctl invoke openvino-omz-public-yolo-v3-tf -c 'application/json'
  ```

  <details>

  ```bash
-  20.07.17 12:07:44.519    nuctl.platform.invoker (I) Executing function {"method": "POST", "url": "http://:57308", "headers": {"Content-Type":["application/json"],"X-Nuclio-Log-Level":["info"],"X-Nuclio-Target":["openvino.omz.public.yolo-v3-tf"]}}
+  20.07.17 12:07:44.519    nuctl.platform.invoker (I) Executing function {"method": "POST", "url": "http://:57308", "headers": {"Content-Type":["application/json"],"X-Nuclio-Log-Level":["info"],"X-Nuclio-Target":["openvino-omz-public-yolo-v3-tf"]}}
  20.07.17 12:07:45.275    nuctl.platform.invoker (I) Got response {"status": "200 OK"}
  20.07.17 12:07:45.275                     nuctl (I) >>> Start of function logs
-  20.07.17 12:07:45.275 ino.omz.public.yolo-v3-tf (I) Run yolo-v3-tf model {"worker_id": "0", "time": 1594976864570.9353}
+  20.07.17 12:07:45.275 ino-omz-public-yolo-v3-tf (I) Run yolo-v3-tf model {"worker_id": "0", "time": 1594976864570.9353}
  20.07.17 12:07:45.275                     nuctl (I) <<< End of function logs

  > Response headers:

--- a/site/content/en/docs/contributing/setup-additional-components.md
+++ b/site/content/en/docs/contributing/setup-additional-components.md
@@ -34,8 +34,8 @@ nuctl get function

 ```
  NAMESPACE |                             NAME                              | PROJECT | STATE | NODE PORT | REPLICAS
-  nuclio    | openvino.dextr                                                | cvat    | ready |     55274 | 1/1
-  nuclio    | openvino.omz.public.yolo-v3-tf                                | cvat    | ready |     57308 | 1/1
+  nuclio    | openvino-dextr                                                | cvat    | ready |     55274 | 1/1
+  nuclio    | openvino-omz-public-yolo-v3-tf                                | cvat    | ready |     57308 | 1/1
 ```

 </details>