Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2.4.2 #6030

Merged
merged 92 commits into from
Apr 14, 2023
Merged
Show file tree
Hide file tree
Changes from 90 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
7d8b552
Update version to v2.5.0.alpha (#5868)
azhavoro Mar 16, 2023
e5bf3ec
annotation with cuboids updated (#5861)
mdacoca Mar 16, 2023
dae6dcb
Supported React plugins (#5801)
bsekachev Mar 16, 2023
2749dc4
Fix webhook creation/filtering with invalid org (#5707)
zhiltsov-max Mar 16, 2023
ed567e8
[Snyk] Security upgrade setuptools from 39.0.1 to 65.5.1 (#5869)
snyk-bot Mar 16, 2023
41fb56f
[Admin page] Move email field to the main user creation form (#5854)
Marishka17 Mar 16, 2023
5af73a6
Fix warning `key` is undefined on project page (#5876)
klakhov Mar 17, 2023
3e4fb8d
Commit the API schema to the repository (#5865)
SpecLad Mar 17, 2023
2cbf951
Make analytics configs mutable (#5878)
azhavoro Mar 17, 2023
cb72be0
Synchronize the main and full workflows (#5875)
SpecLad Mar 17, 2023
b2bda85
Fix the schema check in the full workflow (#5886)
SpecLad Mar 18, 2023
5c56def
[Snyk] Fix for 5 vulnerabilities (#5884)
snyk-bot Mar 18, 2023
14ff86a
Clean up server-proxy.ts (#5873)
SpecLad Mar 20, 2023
aa8ea0b
Removed billing button & premium features notify from the public code…
bsekachev Mar 21, 2023
d7e7180
SDK: fix the list of supported versions (#5882)
azhavoro Mar 21, 2023
4ae8bdc
Add support for Azure Blob Storage connection string authentication (…
suzusuzu Mar 21, 2023
7f58bc6
[Analytics] added browser info (#5893)
azhavoro Mar 21, 2023
befe77c
Increase max length for webhooks url (#5856)
Mar 21, 2023
e81e3af
Fix invalid mask when running automatic annotation on a task (#5883)
yasakova-anastasia Mar 22, 2023
9e5668e
Stricted moving a task from a project (#5901)
bsekachev Mar 22, 2023
e089a05
Fix mask annotations in CVAT format (#5905)
yasakova-anastasia Mar 22, 2023
90ad0d1
Fixed export formats for empty project (#5899)
klakhov Mar 22, 2023
97461ea
Receive value for 'Reset zoom' option from settings saved by user (#5…
bsekachev Mar 23, 2023
9052168
Downgrade NumPy used by HRNet (#5574)
rodrigoberriel Mar 23, 2023
e0e2fe2
Unstable 3D test, last check (#5919)
bsekachev Mar 23, 2023
ccc7e34
Avoid extra request to shared storage, fixed extra re-renders (#5915)
bsekachev Mar 24, 2023
777ea3b
Make empty previews responsive to page resize (#5925)
klakhov Mar 24, 2023
1605a8d
Hide wrapping box for skeleton when not activated (#5911)
bsekachev Mar 24, 2023
4023285
Fixed typescript & webpack configs for canvas module (#5912)
bsekachev Mar 24, 2023
960b4c0
Cancel helm workflow if it duplicates (#5918)
Mar 24, 2023
7b7b5b4
Fix Nuclio function invocations when deployed via the Helm chart (#5917)
SpecLad Mar 24, 2023
921e0dc
Bump tensorflow from 2.10.1 to 2.11.1 in /cvat/requirements (#5933)
dependabot[bot] Mar 25, 2023
1b8463a
Add repo structure info (#5931)
zhiltsov-max Mar 25, 2023
c424682
Add python code formatting script (#5929)
zhiltsov-max Mar 25, 2023
9c76ae5
Bump the version of mod_wsgi (#5930)
SpecLad Mar 25, 2023
06a3009
Fix 2.2.0 upgrade commands in docs (#5906)
zhiltsov-max Mar 25, 2023
1ae7a34
Fix most discrepancies between the different ways of generating the A…
SpecLad Mar 27, 2023
23f946f
Update to `actions/setup-python` v4 (#5934)
SpecLad Mar 27, 2023
c60053d
Fix multiple GCS creation when GOOGLE_APPLICATION_CREDENTIALS is used…
Marishka17 Mar 27, 2023
a3cda6c
Git sync fix (#5776)
PMazarovich Mar 27, 2023
c156dc6
Bump Python dependency versions (#5938)
SpecLad Mar 27, 2023
79c3fbc
Resolve migration conflict (#5939)
SpecLad Mar 27, 2023
afe931c
Fix Yolov7 nuctl function deploy failure (#5731)
Bassileios Mar 27, 2023
0bbf587
CI: run ESLint on all files, not just changed ones (#5720)
SpecLad Mar 28, 2023
defb86c
Refactor import/export tests (#5782)
Marishka17 Mar 28, 2023
8f64f62
Fix empty model list after adding a model (#5947)
klakhov Mar 28, 2023
0a9881f
Fix formatting script (#5944)
zhiltsov-max Mar 28, 2023
c988357
minor documentation fixes (#5932)
mdacoca Mar 28, 2023
ce63565
Fix export of a job from a task with multiple jobs (#5928)
yasakova-anastasia Mar 28, 2023
409fac5
Remove support for redundant request media types in the API (#5874)
SpecLad Mar 29, 2023
a9e8225
Fix SDK documentation problems (#5903)
zhiltsov-max Mar 29, 2023
cbda853
URL-escape the filter in the generated URLs (#5941)
SpecLad Mar 29, 2023
5bd3013
Fix points missing when exporting tracked skeleton (#5914)
yasakova-anastasia Mar 30, 2023
dd10301
Synchronize the versions of jest and jest-config (#5957)
SpecLad Mar 31, 2023
dca6360
Add a test for mask conversion in lambda functions (#5950)
yasakova-anastasia Mar 31, 2023
2f873fa
Reduce deletion time of task and projects (#5926)
azhavoro Mar 31, 2023
956529c
Added silk into development configuration by default (#5958)
nmanovic Mar 31, 2023
c4c799b
Updated cypress command to return created org id (#5969)
bsekachev Apr 4, 2023
fe1b167
Fixed minor exception (#5967)
bsekachev Apr 4, 2023
8efeac8
Updated codeowners for CVAT repository (#5965)
nmanovic Apr 4, 2023
a20d631
Add descriptions to the tasks data API (#5945)
zhiltsov-max Apr 4, 2023
2709802
Fix cloud storage permissions (#5956)
zhiltsov-max Apr 4, 2023
a7fc12d
Added queue for notifications (#5964)
azhavoro Apr 5, 2023
2090a3c
Fix working time calculation (#5973)
azhavoro Apr 5, 2023
791d93f
Tried to optimize annotation fetching (#5974)
bsekachev Apr 5, 2023
c49ca71
Fixed rotation is lost during changing a mutable attribute (#5968)
bsekachev Apr 5, 2023
5203119
Bump the version of ts-jest to support TypeScript 5 (#5981)
SpecLad Apr 6, 2023
57b8766
Remove the tus chunk endpoints from the schema (#5961)
SpecLad Apr 6, 2023
b55471a
Remove default containers rebuild when running REST API tests (#5989)
yasakova-anastasia Apr 6, 2023
7c00f5e
Disable OPA container logs (#5988)
azhavoro Apr 6, 2023
14fa0c6
Merge branch 'master' into develop
nmanovic Apr 6, 2023
c04bd1d
Fix write once fields (#5975)
zhiltsov-max Apr 6, 2023
37427bb
Merge branch 'develop' of https://github.com/opencv/cvat into develop
nmanovic Apr 6, 2023
7cff867
Refactor webhooks (#5916)
Apr 7, 2023
7a7267d
Update REST API tests documentation (#5993)
yasakova-anastasia Apr 7, 2023
0c853b1
Fix version checks in SDK (#5991)
zhiltsov-max Apr 9, 2023
2505b31
SDK: fix urllib3 deprecation warnings (#6002)
SpecLad Apr 10, 2023
c5156f4
Verifying API schema before running tests (#5998)
Apr 10, 2023
14dc68e
Optimized jobs request (#5962)
nmanovic Apr 11, 2023
6852cae
Use PostgreSQL in debug mode (#5999)
nmanovic Apr 11, 2023
9cbd510
Added Segment Anything interactor for GPU/CPU (#6008)
bsekachev Apr 12, 2023
10fb2b4
Plugins updated in core app (#6000)
bsekachev Apr 12, 2023
61adec5
Make mild improvements to the main Dockerfile (#5994)
SpecLad Apr 12, 2023
1c753d5
Fix tus loading if multiple apache processes are used (#6006)
azhavoro Apr 13, 2023
dfcb154
Update CHANGELOG.md (#6024)
mdacoca Apr 14, 2023
d3bc72b
Update CHANGELOG.md (#6025)
mdacoca Apr 14, 2023
8a14ce8
Update base imege to ubuntu:22.04 (#6021)
azhavoro Apr 14, 2023
3717060
Added missed line to changelog (#6029)
azhavoro Apr 14, 2023
d764635
Add missing line CHANGELOG.md (#6027)
Apr 14, 2023
de704ff
Update vesrion
azhavoro Apr 14, 2023
883bb23
update schema version
azhavoro Apr 14, 2023
a40deb9
update schema version
azhavoro Apr 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module.exports = {
ignorePatterns: [
'.eslintrc.js',
'lint-staged.config.js',
'site/themes/**',
],
plugins: ['@typescript-eslint', 'security', 'no-unsanitized', 'import'],
extends: [
Expand Down
22 changes: 20 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,23 @@
# the global owner(s) will be requested for a review.

# Component: Server
/cvat/ @nmanovic
/cvat/ @Marishka17

# Component: CVAT SDK/CLI
/cvat-sdk/ @SpecLad
/cvat/schema.yml @SpecLad
/cvat-cli/ @SpecLad

# Component: Documentation
/site/ @mdacoca
/CHANGELOG.md @mdacoca
/README.md @mdacoca

# Component: CVAT UI
/cvat-ui/ @bsekachev
/cvat-data/ @azhavoro
/cvat-canvas/ @bsekachev
/cvat-canvas3d/ @bsekachev
/cvat-core/ @bsekachev

# Component: Datumaro
Expand All @@ -26,6 +37,12 @@
# Advanced components (e.g. analytics)
/components/ @azhavoro

# Component: Tests
/tests/ @yasakova-anastasia

# Component: Serverless functions
/serverless/ @yasakova-anastasia

# Infrastructure
Dockerfile* @azhavoro
docker-compose* @azhavoro
Expand All @@ -36,4 +53,5 @@ docker-compose* @azhavoro
/tests/ @azhavoro
/utils/ @azhavoro
/LICENSE @nmanovic
/.github/ @nmanovic
/.github/ @kirill-sizov
/helm-chart/ @azhavoro
2 changes: 1 addition & 1 deletion .github/workflows/cancel.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Cancelling Duplicates
on:
workflow_run:
workflows: ['CI']
workflows: ['CI', 'Helm']
types: ['requested']

jobs:
Expand Down
34 changes: 9 additions & 25 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,18 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: '16.x'
- id: files
uses: jitterbit/get-changed-files@v1
continue-on-error: true

- name: Run checks
env:
PR_FILES_AM: ${{ steps.files.outputs.added_modified }}
PR_FILES_RENAMED: ${{ steps.files.outputs.renamed }}
- name: Install dependencies
run: |
PR_FILES="$PR_FILES_AM $PR_FILES_RENAMED"
for FILE in $PR_FILES; do
EXTENSION="${FILE##*.}"
if [[ $EXTENSION == 'js' || $EXTENSION == 'ts' || $EXTENSION == 'jsx' || $EXTENSION == 'tsx' ]]; then
CHANGED_FILES+=" $FILE"
fi
done

if [[ ! -z $CHANGED_FILES ]]; then
yarn install --frozen-lockfile && cd tests && yarn install --frozen-lockfile && cd ..
yarn add eslint-detailed-reporter -D -W
mkdir -p eslint_report
yarn install --frozen-lockfile
(cd tests && yarn install --frozen-lockfile)
yarn add eslint-detailed-reporter -D -W

echo "ESLint version: "$(npx eslint --version)
echo "The files will be checked: "$(echo $CHANGED_FILES)
npx eslint $CHANGED_FILES -f node_modules/eslint-detailed-reporter/lib/detailed.js -o ./eslint_report/eslint_checks.html
else
echo "No files with the \"js|ts|jsx|tsx\" extension found"
fi
- name: Run checks
run: |
echo "ESLint version: "$(yarn run -s eslint --version)
mkdir -p eslint_report
yarn run eslint . -f node_modules/eslint-detailed-reporter/lib/detailed.js -o ./eslint_report/eslint_checks.html

- name: Upload artifacts
if: failure()
Expand Down
74 changes: 41 additions & 33 deletions .github/workflows/full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
env:
WORKFLOW_RUN_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
CYPRESS_VERIFY_TIMEOUT: 180000 # https://docs.cypress.io/guides/guides/command-line#cypress-verify
CVAT_VERSION: "local"

jobs:
search_cache:
Expand Down Expand Up @@ -41,10 +42,6 @@ jobs:

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
# we specify version of buildkit due to issue that occurs in latest version
# https://github.com/moby/buildkit/issues/2631
driver-opts: image=moby/buildkit:v0.10.0

- name: Create artifact directories
run: |
Expand Down Expand Up @@ -72,10 +69,6 @@ jobs:

- name: CVAT SDK. Build
run: |
docker load --input /tmp/cvat_server/image.tar
docker run --rm -v ${PWD}/cvat-sdk/schema/:/transfer \
--entrypoint /bin/bash -u root cvat/server \
-c 'python manage.py spectacular --file /transfer/schema.yml'
pip3 install --user -r cvat-sdk/gen/requirements.txt
./cvat-sdk/gen/generate.sh

Expand All @@ -99,21 +92,18 @@ jobs:
name: cvat_sdk
path: /tmp/cvat_sdk/

rest_api:
rest_api_testing:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
ref: ${{ inputs.ref }}

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: '3.8'

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@master

- name: Download CVAT server image
uses: actions/download-artifact@v3
with:
Expand All @@ -136,21 +126,44 @@ jobs:
run: |
docker load --input /tmp/cvat_server/image.tar
docker load --input /tmp/cvat_ui/image.tar
docker tag cvat/server:latest cvat/server:dev
docker tag cvat/ui:latest cvat/ui:dev
docker tag cvat/server:latest cvat/server:${CVAT_VERSION}
docker tag cvat/ui:latest cvat/ui:${CVAT_VERSION}
docker image ls -a

- name: Verify API schema
id: verify_schema
run: |
docker run --rm --entrypoint /bin/bash cvat/server:${CVAT_VERSION} \
-c 'python manage.py spectacular' > cvat/schema-expected.yml

if ! git diff --no-index cvat/schema.yml cvat/schema-expected.yml; then
echo
echo 'API schema has changed! Please update cvat/schema.yml:'
echo
echo ' docker run --rm --entrypoint /bin/bash cvat/server:dev \'
echo " -c 'python manage.py spectacular' > cvat/schema.yml"
exit 1
fi

- name: Upload expected schema as an artifact
if: failure() && steps.verify_schema.conclusion == 'failure'
uses: actions/upload-artifact@v3.1.2
with:
name: expected_schema
path: cvat/schema-expected.yml

- name: Running REST API and SDK tests
id: run_tests
run: |
pip3 install --user '/tmp/cvat_sdk/[pytorch]'
pip3 install --user cvat-cli/
pip3 install --user -r tests/python/requirements.txt
pytest tests/python -s -v
pytest tests/python/ -s -v

- name: Creating a log file from cvat containers
if: failure()
if: failure() && steps.run_tests.conclusion == 'failure'
env:
LOGS_DIR: "${{ github.workspace }}/rest_api"
LOGS_DIR: "${{ github.workspace }}/rest_api_testing"
run: |
mkdir $LOGS_DIR
docker logs test_cvat_server_1 > $LOGS_DIR/cvat_server.log
Expand All @@ -159,11 +172,11 @@ jobs:
docker logs test_cvat_opa_1 2> $LOGS_DIR/cvat_opa.log

- name: Uploading "cvat" container logs as an artifact
if: failure()
uses: actions/upload-artifact@v3.1.1
if: failure() && steps.run_tests.conclusion == 'failure'
uses: actions/upload-artifact@v3.1.2
with:
name: rest_api_container_logs
path: "${{ github.workspace }}/rest_api"
path: "${{ github.workspace }}/rest_api_testing"

unit_testing:
needs: build
Expand All @@ -173,19 +186,16 @@ jobs:
with:
ref: ${{ inputs.ref }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@master

- name: Download CVAT server image
uses: actions/download-artifact@v3
with:
name: cvat_server
path: /tmp/cvat_server/

- name: Load Docker images
- name: Load Docker server image
run: |
docker load --input /tmp/cvat_server/image.tar
docker tag cvat/server:latest cvat/server:dev
docker tag cvat/server:latest cvat/server:${CVAT_VERSION}
docker image ls -a

- name: Running OPA tests
Expand All @@ -202,7 +212,8 @@ jobs:
HOST_COVERAGE_DATA_DIR: ${{ github.workspace }}
CONTAINER_COVERAGE_DATA_DIR: "/coverage_data"
run: |
docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d cvat_opa cvat_server
docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d cvat_opa cvat_server cvat_db

max_tries=12
while [[ $(curl -s -o /dev/null -w "%{http_code}" localhost:8181/health?bundles) != "200" && max_tries -gt 0 ]]; do (( max_tries-- )); sleep 5; done

Expand Down Expand Up @@ -247,9 +258,6 @@ jobs:
with:
node-version: '16.x'

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@master

- name: Download CVAT server image
uses: actions/download-artifact@v3
with:
Expand All @@ -266,8 +274,8 @@ jobs:
run: |
docker load --input /tmp/cvat_server/image.tar
docker load --input /tmp/cvat_ui/image.tar
docker tag cvat/server:latest cvat/server:dev
docker tag cvat/ui:latest cvat/ui:dev
docker tag cvat/server:latest cvat/server:${CVAT_VERSION}
docker tag cvat/ui:latest cvat/ui:${CVAT_VERSION}
docker image ls -a

- name: Run CVAT instance
Expand All @@ -289,6 +297,7 @@ jobs:
do
echo Number of attempts left: $max_tries
echo Status code of response: $status_code

sleep 5
status_code=$(curl -s -o /tmp/server_response -w "%{http_code}" ${API_ABOUT_PAGE})
(( max_tries-- ))
Expand All @@ -304,7 +313,6 @@ jobs:
cd ./tests
yarn --frozen-lockfile

shopt -s extglob
if [[ ${{ matrix.specs }} == canvas3d_* ]]; then
npx cypress run \
--headed \
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,8 @@ jobs:
kubectl logs $(kubectl get pods -l component=server -o jsonpath='{.items[0].metadata.name}')


- name: Generate schema
- name: Generate SDK
run: |
mkdir cvat-sdk/schema
kubectl exec $(kubectl get pods -l component=server -o jsonpath='{.items[0].metadata.name}') -- /bin/bash -c "python manage.py spectacular --file /tmp/schema.yml"
kubectl cp $(kubectl get pods -l component=server -o jsonpath='{.items[0].metadata.name}'):/tmp/schema.yml cvat-sdk/schema/schema.yml
pip3 install --user -r cvat-sdk/gen/requirements.txt
./cvat-sdk/gen/generate.sh

Expand Down
Loading