cvat-ai
diff --git a/‎.codacy.yml
+1 b/‎.codacy.yml
+1
diff --git a/‎.dockerignore
+1-2 b/‎.dockerignore
+1-2
diff --git a/‎.editorconfig
+17 b/‎.editorconfig
+17
diff --git a/‎.gitignore
+1-1 b/‎.gitignore
+1-1
diff --git a/‎.travis.yml
+5-4 b/‎.travis.yml
+5-4
diff --git a/‎.vscode/launch.json
+19-1 b/‎.vscode/launch.json
+19-1
diff --git a/‎.vscode/python.env
+1 b/‎.vscode/python.env
+1
diff --git a/‎.vscode/settings.json
+16-2 b/‎.vscode/settings.json
+16-2
diff --git a/‎CHANGELOG.md
+33 b/‎CHANGELOG.md
+33
diff --git a/‎CONTRIBUTING.md
+101-18 b/‎CONTRIBUTING.md
+101-18
@@ -1,3 +1,4 @@
 exclude_paths:
  - '**/3rdparty/**'
  - '**/engine/js/cvat-core.min.js'
+ - CHANGELOG.md
@@ -7,5 +7,4 @@
 /db.sqlite3
 /keys
 **/node_modules
-cvat-ui
-cvat-canvas
+
@@ -0,0 +1,17 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
@@ -12,7 +12,7 @@
 /ssh/*
 !/ssh/README.md
 node_modules
-
+/Mask_RCNN/
 
 # Ignore temporary files
 docker-compose.override.yml
 
@@ -7,10 +7,11 @@ python:
 
 services:
   - docker
-  
+
 before_script:
-  - docker-compose -f docker-compose.yml -f docker-compose.ci.yml up --build -d
+  - docker-compose -f docker-compose.yml -f docker-compose.ci.yml build
 
 script:
-  - docker exec -it cvat /bin/bash -c 'python3 manage.py test cvat/apps/engine'
-  - docker exec -it cvat /bin/bash -c 'cd cvat-core && npm install && npm run test && npm run coveralls'
+  - docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'python3 manage.py test cvat/apps utils/cli'
+  - docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'python3 manage.py test datumaro/'
+  - docker-compose -f docker-compose.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd cvat-core && npm install && npm run test && npm run coveralls'
@@ -71,6 +71,22 @@
             "env": {},
             "console": "internalConsole"
         },
+        {
+            "name": "server: RQ - scheduler",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "justMyCode": false,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceRoot}/manage.py",
+            "args": [
+                "rqscheduler",
+            ],
+            "django": true,
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "console": "internalConsole"
+        },
         {
             "name": "server: RQ - low",
             "type": "python",
@@ -134,7 +150,8 @@
                 "test",
                 "--settings",
                 "cvat.settings.testing",
-                "cvat/apps/engine",
+                "cvat/apps",
+                "utils/cli"
             ],
             "django": true,
             "cwd": "${workspaceFolder}",
@@ -176,6 +193,7 @@
                 "server: django",
                 "server: RQ - default",
                 "server: RQ - low",
+                "server: RQ - scheduler",
                 "server: git",
             ]
         }
 
@@ -0,0 +1 @@
+PYTHONPATH="datumaro/:$PYTHONPATH"
@@ -3,7 +3,8 @@
     "eslint.enable": true,
     "eslint.validate": [
         "javascript",
-        "typescript"
+        "typescript",
+        "typescriptreact",
     ],
     "eslint.workingDirectories": [
         {
@@ -14,10 +15,23 @@
             "directory":  "./cvat-canvas",
             "changeProcessCWD": true
         },
+        {
+            "directory":  "./cvat-ui",
+            "changeProcessCWD": true
+        },
         {
             "directory":  ".",
             "changeProcessCWD": true
         }
     ],
-    "python.linting.pylintEnabled": true
+    "python.linting.pylintEnabled": true,
+    "python.envFile": "${workspaceFolder}/.vscode/python.env",
+    "python.testing.unittestEnabled": true,
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        "./datumaro",
+    ],
+    "licenser.license": "Custom",
+    "licenser.customHeader": "Copyright (C) @YEAR@ Intel Corporation\n\nSPDX-License-Identifier: MIT"
 }
@@ -4,6 +4,38 @@ 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).
 
+## [0.6.0] - 2020-03-15
+### Added
+- Server only support for projects. Extend REST API v1 (/api/v1/projects*)
+- Ability to get basic information about users without admin permissions ([#750](https://github.com/opencv/cvat/issues/750))
+- Changed REST API: removed PUT and added DELETE methods for /api/v1/users/ID
+- Mask-RCNN Auto Annotation Script in OpenVINO format
+- Yolo Auto Annotation Script
+- Auto segmentation using Mask_RCNN component (Keras+Tensorflow Mask R-CNN Segmentation)
+- REST API to export an annotation task (images + annotations)
+- [Datumaro](https://github.com/opencv/cvat/tree/develop/datumaro) - a framework to build, analyze, debug and visualize datasets
+- Text Detection Auto Annotation Script in OpenVINO format for version 4
+- Added in OpenVINO Semantic Segmentation for roads
+- Ability to visualize labels when using Auto Annotation runner
+- MOT CSV format support ([#830](https://github.com/opencv/cvat/pull/830))
+- LabelMe format support ([#844](https://github.com/opencv/cvat/pull/844))
+- Segmentation MASK format import (as polygons) ([#1163](https://github.com/opencv/cvat/pull/1163))
+- Git repositories can be specified with IPv4 address ([#827](https://github.com/opencv/cvat/pull/827))
+
+### Changed
+- page_size parameter for all REST API methods
+- React & Redux & Antd based dashboard
+- Yolov3 interpretation script fix and changes to mapping.json
+- YOLO format support ([#1151](https://github.com/opencv/cvat/pull/1151))
+
+### Fixed
+- Exception in Git plugin [#826](https://github.com/opencv/cvat/issues/826)
+- Label ids in TFrecord format now start from 1 [#866](https://github.com/opencv/cvat/issues/866)
+- Mask problem in COCO JSON style [#718](https://github.com/opencv/cvat/issues/718)
+- Datasets (or tasks) can be joined and split to subsets with Datumaro [#791](https://github.com/opencv/cvat/issues/791)
+- Output labels for VOC format can be specified with Datumaro [#942](https://github.com/opencv/cvat/issues/942)
+- Annotations can be filtered before dumping with Datumaro [#994](https://github.com/opencv/cvat/issues/994)
+
 ## [0.5.2] - 2019-12-15
 ### Fixed
 - Frozen version of scikit-image==0.15 in requirements.txt because next releases don't support Python 3.5
@@ -29,6 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Ability to dump/load annotations in several formats from UI (CVAT, Pascal VOC, YOLO, MS COCO, png mask, TFRecord)
 - Auth for REST API (api/v1/auth/): login, logout, register, ...
 - Preview for the new CVAT UI (dashboard only) is available: http://localhost:9080/
+- Added command line tool for performing common task operations (/utils/cli/)
 
 ### Changed
 - Outside and keyframe buttons in the side panel for all interpolation shapes (they were only for boxes before)
 
@@ -15,22 +15,24 @@ Next steps should work on clear Ubuntu 18.04.
 - Install necessary dependencies:
 
 ```sh
-$ sudo apt-get install -y curl redis-server python3-dev python3-pip python3-venv libldap2-dev libsasl2-dev
+$ sudo apt update && apt install -y nodejs npm curl redis-server python3-dev python3-pip python3-venv libldap2-dev libsasl2-dev
 ```
 
-- Install [Visual Studio Code](https://code.visualstudio.com/docs/setup/linux#_debian-and-ubuntu-based-distributions) for development
+-   Install [Visual Studio Code](https://code.visualstudio.com/docs/setup/linux#_debian-and-ubuntu-based-distributions)
+for development
 
-- Install CVAT on your local host:
+-   Install CVAT on your local host:
 
 ```sh
-$ git clone https://github.com/opencv/cvat
-$ cd cvat && mkdir logs keys
-$ python3 -m venv .env
-$ . .env/bin/activate
-$ pip install -U pip wheel
-$ pip install -r cvat/requirements/development.txt
-$ python manage.py migrate
-$ python manage.py collectstatic
+git clone https://github.com/opencv/cvat
+cd cvat && mkdir logs keys
+python3 -m venv .env
+. .env/bin/activate
+pip install -U pip wheel
+pip install -r cvat/requirements/development.txt
+pip install -r datumaro/requirements.txt
+python manage.py migrate
+python manage.py collectstatic
 ```
 
 - Create a super user for CVAT:
@@ -43,21 +45,102 @@ Password: ***
 Password (again): ***
 ```
 
-- Run Visual Studio Code from the virtual environment
-
+- Install npm packages for UI and start UI debug server (run the following command from CVAT root directory):
+```sh
+npm install && \
+cd cvat-core && npm install && \
+cd ../cvat-canvas && npm install && \
+cd ../cvat-ui && npm install && npm start
 ```
-$ code .
+
+- Open new terminal (Ctrl + Shift + T), run Visual Studio Code from the virtual environment
+
+```sh
+ cd .. && source .env/bin/activate && code
 ```
 
-- Inside Visual Studio Code install [Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome) and [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python) extensions
+-   Install followig vscode extensions:
+    - [Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome)
+    - [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python)
+    - [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+    - [vscode-remark-lint](https://marketplace.visualstudio.com/items?itemName=drewbourne.vscode-remark-lint)
+    - [licenser](https://marketplace.visualstudio.com/items?itemName=ymotongpoo.licenser)
 
-- Reload Visual Studio Code
+-   Reload Visual Studio Code from virtual environment
 
-- Select `server: debug` configuration and start debugging (F5)
+-   Select `server: debug` configuration and start it (F5) to run REST server and its workers
 
 You have done! Now it is possible to insert breakpoints and debug server and client of the tool.
 
-## JavaScript coding style
+## How to setup additional components in development environment
+
+### Automatic annotation
+- Install OpenVINO on your host machine according to instructions from
+[OpenVINO website](https://docs.openvinotoolkit.org/latest/index.html)
+- Add some environment variables (copy code below to the end of ``.env/bin/activate`` file):
+```sh
+    source /opt/intel/openvino/bin/setupvars.sh
+
+    export OPENVINO_TOOLKIT="yes"
+    export IE_PLUGINS_PATH="/opt/intel/openvino/deployment_tools/inference_engine/lib/intel64"
+    export OpenCV_DIR="/usr/local/lib/cmake/opencv4"
+    export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/intel/openvino/inference_engine/lib/intel64"
+```
+
+Notice 1: be sure that these paths actually exist. Some of them can differ in different OpenVINO versions.
+
+Notice 2: you need to deactivate, activate again and restart vs code
+to changes in ``.env/bin/activate`` file are active.
+
+### ReID algorithm
+- Perform all steps in the automatic annotation section
+- Download ReID model and save it somewhere:
+```sh
+    curl https://download.01.org/openvinotoolkit/2018_R5/open_model_zoo/person-reidentification-retail-0079/FP32/person-reidentification-retail-0079.xml -o reid.xml
+    curl https://download.01.org/openvinotoolkit/2018_R5/open_model_zoo/person-reidentification-retail-0079/FP32/person-reidentification-retail-0079.bin -o reid.bin
+```
+- Add next line to ``.env/bin/activate``:
+```sh
+    export REID_MODEL_DIR="/path/to/dir" # dir must contain .xml and .bin files
+```
+
+### Deep Extreme Cut
+- Perform all steps in the automatic annotation section
+- Download Deep Extreme Cut model, unpack it, and save somewhere:
+```sh
+curl https://download.01.org/openvinotoolkit/models_contrib/cvat/dextr_model_v1.zip -o dextr.zip
+unzip dextr.zip
+```
+- Add next lines to ``.env/bin/activate``:
+```sh
+    export WITH_DEXTR="yes"
+    export DEXTR_MODEL_DIR="/path/to/dir" # dir must contain .xml and .bin files
+```
+
+### Tensorflow RCNN
+- Download RCNN model, unpack it, and save it somewhere:
+```sh
+curl http://download.tensorflow.org/models/object_detection/faster_rcnn_inception_resnet_v2_atrous_coco_2018_01_28.tar.gz -o model.tar.gz && \
+tar -xzf model.tar.gz
+```
+- Add next lines to ``.env/bin/activate``:
+```sh
+    export TF_ANNOTATION="yes"
+    export TF_ANNOTATION_MODEL_PATH="/path/to/the/model/graph" # truncate .pb extension
+```
+
+### Tensorflow Mask RCNN
+- Download Mask RCNN model, and save it somewhere:
+```sh
+curl https://github.com/matterport/Mask_RCNN/releases/download/v2.0/mask_rcnn_coco.h5 -o mask_rcnn_coco.h5
+```
+- Add next lines to ``.env/bin/activate``:
+```sh
+    export AUTO_SEGMENTATION="yes"
+    export AUTO_SEGMENTATION_PATH="/path/to/dir" # dir must contain mask_rcnn_coco.h5 file
+```
+
+## JavaScript/Typescript coding style
 
 We use the [Airbnb JavaScript Style Guide](https://github.com/airbnb/javascript) for JavaScript code with a
 litle exception - we prefere 4 spaces for indentation of nested blocks and statements.