Nuclio as a plugin in CVAT, improved system to check installed plugins #2192

dmitryagapov · 2020-09-17T10:02:30Z

Motivation and context

How has this been tested?

Checklist

I submit my changes into the develop branch
I have added description of my changes into CHANGELOG file
I have updated the documentation accordingly
I have added tests to cover my changes
I have linked related issues (read github docs)
I have increased versions of npm packages if it is necessary (cvat-canvas,
cvat-core, cvat-data and cvat-ui)

License

I submit my code changes under the same MIT License that covers the project.
Feel free to contact the maintainers if that's a concern.
I have updated the license header for each file (see an example below)

# Copyright (C) 2020 Intel Corporation
#
# SPDX-License-Identifier: MIT

cvat-core/src/server-proxy.js

cvat-ui/src/actions/meta-action.ts

cvat-core/src/api.js

cvat-ui/src/reducers/meta-reducer.ts

cvat-ui/src/components/header/header.tsx

bsekachev · 2020-09-18T06:56:18Z

Why have you decided to hide Models button when optionally?

We are still able to go manually to /models
Early CVAT showed instruction to deploy a new model if no models available. So, user understood that CVAT is able to work with models.
There are other components (like button Automatic Annotation (and probably others)) which we should hide in this case.

dmitryagapov · 2020-09-18T08:43:14Z

This solution based on explanation of @nmanovic.

bsekachev · 2020-09-21T10:28:32Z

@zhiltsov-max @nmanovic Hey guys, could you please look at server part of the patch?

coveralls · 2020-09-21T10:41:24Z

Coverage decreased (-0.04%) to 65.311% when pulling 842b34e on da/allow_to_run_cvat_without_nuclio into a93b460 on develop.

…ore, updated ui version, updated changelog

nmanovic · 2020-09-21T12:20:17Z

cvat/apps/plugins/views.py

+        }
+        if apps.is_installed('cvat.apps.git'):
+            result['GIT_INTEGRATION'] = True
+        if os.environ.get("CVAT_ANALYTICS", '0') == '1':


Let's use https://docs.python.org/3/distutils/apiref.html#distutils.util.strtobool

nmanovic · 2020-09-21T12:33:49Z

components/analytics/docker-compose.analytics.yml

@@ -26,18 +26,18 @@ services:
      context: ./components/analytics/kibana
      args:
        ELK_VERSION: 6.4.0
-    depends_on: ['cvat_elasticsearch']
+    depends_on: [ 'cvat_elasticsearch' ]


What is the reason to add extra spaces here?

nmanovic · 2020-09-21T12:34:11Z

components/analytics/docker-compose.analytics.yml

-    entrypoint: ['bash', 'wait-for-it.sh', 'elasticsearch:9200', '-t', '0', '--',
-      '/bin/bash', 'wait-for-it.sh', 'kibana:5601', '-t', '0', '--',
-      '/usr/bin/python3', 'kibana/setup.py', 'kibana/export.json']
+    entrypoint: [ 'bash', 'wait-for-it.sh', 'elasticsearch:9200', '-t', '0', '--',


Could you please keep indentation as is?

nmanovic · 2020-09-21T12:51:26Z

cvat-ui/src/components/cvat-app.tsx

@@ -316,7 +319,8 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
                                        <Route exact path='/tasks/create' component={CreateTaskPageContainer} />
                                        <Route exact path='/tasks/:id' component={TaskPageContainer} />
                                        <Route exact path='/tasks/:tid/jobs/:jid' component={AnnotationPageContainer} />
-                                        <Route exact path='/models' component={ModelsPageContainer} />
+                                        { isModelPluginActive


I agree with Boris. It is better to show instructions how to enable the feature in UI.

I think it better to do in separate PR.

nmanovic · 2020-09-21T12:52:27Z

cvat-ui/src/components/header/header.tsx

-                            event.preventDefault();
-                            history.push('/models');
+
+                {isModelsPluginActive && (


Show instructions if models plugin isn't available.

nmanovic · 2020-09-21T12:52:41Z

cvat-ui/src/components/header/header.tsx

+                        Models
+                    </Button>
+                )}
+                {isAnalyticsPluginActive && (


Show instructions if analytics plugin isn't available.

nmanovic · 2020-09-21T12:59:51Z

cvat/apps/plugins/views.py

+
+# Create your views here.
+
+class Plugins(viewsets.ViewSet):


Let's implement it not as a separate app but as a part of the engine app (/api/v1/server/plugins). In this case the feature is so tiny feature that I don't think we need a separate django app.

zhiltsov-max · 2020-09-22T08:10:09Z

cvat/apps/lambda_manager/urls.py

@@ -2,9 +2,10 @@
 #
 # SPDX-License-Identifier: MIT

+from django.urls import include


import include, path

bsekachev · 2020-09-25T12:06:46Z

Let's merge the PR and then add some instructions to activate analytics and models if they are disabled.
I will create an issue in advance and assign it to @dmitryagapov

dmitryagapov requested review from vnishukov, bsekachev, nmanovic and azhavoro September 17, 2020 10:02

dmitryagapov added 2 commits September 17, 2020 15:25

allow to run cvat without nuclio

f71dbba

fix new line

9cbfe23

bsekachev requested changes Sep 18, 2020

View reviewed changes

dmitryagapov and others added 2 commits September 18, 2020 14:24

fix comments

57aaf41

Updated core version

339c3c5

bsekachev changed the title ~~allow to run cvat without nuclio~~ Nuclio as a plugin in CVAT, improved system to check installed plugins Sep 21, 2020

Merged develop

c8a37d1

bsekachev previously approved these changes Sep 21, 2020

View reviewed changes

dmitryagapov and others added 2 commits September 21, 2020 14:21

refactoring

fd7ccb9

minor refactoring, fixed eslint issues, added documentation to cvat-c…

44fef1f

…ore, updated ui version, updated changelog

nmanovic reviewed Sep 21, 2020

View reviewed changes

zhiltsov-max reviewed Sep 22, 2020

View reviewed changes

dmitryagapov dismissed bsekachev’s stale review via 842b34e September 22, 2020 09:26

move plugins to serverViewSet

842b34e

bsekachev merged commit f2c84a2 into develop Sep 25, 2020

bsekachev deleted the da/allow_to_run_cvat_without_nuclio branch September 25, 2020 12:07

bsekachev mentioned this pull request Sep 25, 2020

Additional instructions to enable analytics and models #2225

Open

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Nuclio as a plugin in CVAT, improved system to check installed plugins #2192

Nuclio as a plugin in CVAT, improved system to check installed plugins #2192

dmitryagapov commented Sep 17, 2020 •

edited by bsekachev

bsekachev commented Sep 18, 2020 •

edited

dmitryagapov commented Sep 18, 2020

bsekachev commented Sep 21, 2020

coveralls commented Sep 21, 2020 •

edited

nmanovic Sep 21, 2020

nmanovic Sep 21, 2020

nmanovic Sep 21, 2020

nmanovic Sep 21, 2020

dmitryagapov Sep 22, 2020

nmanovic Sep 21, 2020

nmanovic Sep 21, 2020

nmanovic Sep 21, 2020

zhiltsov-max Sep 22, 2020

bsekachev commented Sep 25, 2020

Nuclio as a plugin in CVAT, improved system to check installed plugins #2192

Nuclio as a plugin in CVAT, improved system to check installed plugins #2192

Conversation

dmitryagapov commented Sep 17, 2020 • edited by bsekachev

Motivation and context

How has this been tested?

Checklist

License

bsekachev commented Sep 18, 2020 • edited

dmitryagapov commented Sep 18, 2020

bsekachev commented Sep 21, 2020

coveralls commented Sep 21, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bsekachev commented Sep 25, 2020

dmitryagapov commented Sep 17, 2020 •

edited by bsekachev

bsekachev commented Sep 18, 2020 •

edited

coveralls commented Sep 21, 2020 •

edited