Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/zm/update-datumaro-dep' into zm/…
Browse files Browse the repository at this point in the history
…update-datumaro-dep
  • Loading branch information
zhiltsov-max committed Apr 3, 2024
2 parents ecf2612 + 1f95dfc commit 3d73625
Show file tree
Hide file tree
Showing 95 changed files with 436 additions and 356 deletions.
69 changes: 69 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,75 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- scriv-insert-here -->

<a id='changelog-2.11.3'></a>
## \[2.11.3\] - 2024-04-02

### Added

- Tooltips for long names on cards (projects, tasks, cloud storages, and models)
(<https://github.com/opencv/cvat/pull/7550>)

### Removed

- The `POST /api/tasks/{id}/data` endpoint no longer accepts several
parameters that didn't have any useful function: `size`,
`compressed_chunk_type`, `original_chunk_type`
(<https://github.com/opencv/cvat/pull/7663>)

### Fixed

- Duplicated notifications for automatic annotation
(<https://github.com/opencv/cvat/pull/7595>)

- Made quality report update job scheduling more efficient
(<https://github.com/opencv/cvat/pull/7596>)

- Incorrect file name usage when importing annotations from a cloud storage
(<https://github.com/opencv/cvat/pull/7599>)

- Using single shape annotation mode with multiple labels
(<https://github.com/opencv/cvat/pull/7606>)

- Part of sidebar not visible in attribute annotation mode when there are a lot of attribute values
(<https://github.com/opencv/cvat/pull/7610>)

- Changed interpolation behavior in `annotation.py`, now correctly keep the last frame
- Insert last frame if it is key to the track, fixes data corruption when tracks crossing more than 1 jobs
(<https://github.com/opencv/cvat/pull/7615>)

- Label constructor validation of empty label names
(<https://github.com/opencv/cvat/pull/7627>)

- Incorrect alignment of empty job list component
(<https://github.com/opencv/cvat/pull/7621>)

- Remove underlying pixels feature is not applied immediately
(<https://github.com/opencv/cvat/pull/7637>)

- Corrected the formula for per-class accuracy in quality reports;
the old formula is now exposed as the `jaccard_index` key
(<https://github.com/opencv/cvat/pull/7640>)

- Sending `/events` request from logged-out user (<https://github.com/opencv/cvat/pull/7608>)

- Fixed accuracy being displayed incorrectly on the task analytics page
(<https://github.com/opencv/cvat/pull/7652>)

- Fixed an invalid default overlap size being selected for video tasks
with small segments
(<https://github.com/opencv/cvat/pull/7681>)

- Fixed redundant jobs being created for tasks with non-zero overlap
in certain cases
(<https://github.com/opencv/cvat/pull/7681>)

- Accumulation of confusion matrix across all jobs in a task when creating a quality report
(<https://github.com/opencv/cvat/pull/7604>)

- 90 deg-rotated video was added with "Prefer Zip Chunks" disabled
was warped, fixed using the static cropImage function.
(<https://github.com/opencv/cvat/pull/7583>)

<a id='changelog-2.11.2'></a>
## \[2.11.2\] - 2024-03-11

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions changelog.d/20240314_105752_boris_fixed_ssa.md

This file was deleted.

4 changes: 0 additions & 4 deletions changelog.d/20240314_162039_boris_added_scroll_aam.md

This file was deleted.

5 changes: 0 additions & 5 deletions changelog.d/20240315_183623_avaicode.md

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions changelog.d/20240318_203856_kavikumarceo.md

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions changelog.d/20240319_183656_roman_accuracy_jaccard.md

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions changelog.d/20240321_153828_roman_fix_accuracy_display.md

This file was deleted.

9 changes: 0 additions & 9 deletions changelog.d/20240326_133323_roman_segmentation_fix.md

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions changelog.d/20240326_195957_tahamukhtar20.md

This file was deleted.

2 changes: 1 addition & 1 deletion cvat/apps/engine/backup.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def serialize_custom_file_mapping(db_segment: models.Segment):
def serialize_data():
data_serializer = DataSerializer(self._db_data)
data = data_serializer.data
data['chunk_type'] = data.pop('compressed_chunk_type')
data['chunk_type'] = self._db_data.compressed_chunk_type

# There are no deleted frames in DataSerializer so we need to pick it
data['deleted_frames'] = self._db_data.deleted_frames
Expand Down
4 changes: 1 addition & 3 deletions cvat/apps/engine/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -942,8 +942,7 @@ class DataSerializer(serializers.ModelSerializer):
class Meta:
model = models.Data
fields = (
'chunk_size', 'size', 'image_quality', 'start_frame', 'stop_frame', 'frame_filter',
'compressed_chunk_type', 'original_chunk_type',
'chunk_size', 'image_quality', 'start_frame', 'stop_frame', 'frame_filter',
'client_files', 'server_files', 'remote_files',
'use_zip_chunks', 'server_files_exclude',
'cloud_storage_id', 'use_cache', 'copy_data', 'storage_method',
Expand All @@ -952,7 +951,6 @@ class Meta:
)
extra_kwargs = {
'chunk_size': { 'help_text': "Maximum number of frames per chunk" },
'size': { 'help_text': "The number of frames" },
'start_frame': { 'help_text': "First frame index" },
'stop_frame': { 'help_text': "Last frame index" },
'frame_filter': { 'help_text': "Frame filter. The only supported syntax is: 'step=N'" },
Expand Down
9 changes: 0 additions & 9 deletions cvat/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6738,11 +6738,6 @@ components:
minimum: 0
nullable: true
description: Maximum number of frames per chunk
size:
type: integer
maximum: 2147483647
minimum: 0
description: The number of frames
image_quality:
type: integer
maximum: 100
Expand All @@ -6762,10 +6757,6 @@ components:
type: string
description: 'Frame filter. The only supported syntax is: ''step=N'''
maxLength: 256
compressed_chunk_type:
$ref: '#/components/schemas/ChunkType'
original_chunk_type:
$ref: '#/components/schemas/ChunkType'
client_files:
type: array
items:
Expand Down
3 changes: 1 addition & 2 deletions site/build_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ def git_checkout(ref: str, temp_repo: git.Repo, temp_dir: Path):
# We need to checkout with submodules, recursively

subdirs = [
"site/content/en/docs",
"site/content/en/images",
"site/content",
"site/assets",
"site/layouts/partials",
"site/layouts/shortcodes",
Expand Down
5 changes: 3 additions & 2 deletions site/content/en/docs/administration/advanced/analytics.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ The CVAT analytics is based on Vector, ClickHouse, and Grafana.
CVAT and its analytics module can be set up locally, for
self-hosted solution analytics are enabled by default.

> For detailed instructions for CVAT installation, see [Installation Guide](https://opencv.github.io/cvat/docs/administration/basics/installation/)
> For detailed CVAT installation instructions, see
> {{< ilink "/docs/administration/basics/installation" "Installation Guide" >}}
> or refer to the [CVAT Course](https://www.youtube.com/playlist?list=PL0to7Ng4PuuYQT4eXlHb_oIlq_RPeuasN)
> for installation videos.
Expand All @@ -64,7 +65,7 @@ docker compose up -d

If you cannot access analytics on
development environnement,
see [Analytics Ports](/docs/contributing/development-environment/#cvat-analytics-ports)
see {{< ilink "/docs/contributing/development-environment#cvat-analytics-ports" "Analytics Ports" >}}

### Events log structure

Expand Down
6 changes: 4 additions & 2 deletions site/content/en/docs/administration/advanced/backup_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ Docker volumes are used to store all CVAT data:
- `cvat_logs`: used to store logs of CVAT backend processes managed by supevisord.
Mounted into `cvat` container by `/home/django/logs` path.

- `cvat_events`: this is an optional volume that is used only when [Analytics component](/docs/administration/advanced/analytics/)
- `cvat_events`: this is an optional volume that is used only when
{{< ilink "/docs/administration/advanced/analytics" "Analytics component" >}}
is enabled and is used to store Elasticsearch database files.
Mounted into `cvat_elasticsearch` container by `/usr/share/elasticsearch/data` path.

Expand Down Expand Up @@ -62,7 +63,8 @@ it will not work because between CVAT releases the layout of DB can be
changed. You always can upgrade CVAT later. It will take care to migrate
your data properly internally.**

Note: CVAT containers must exist (if no, please follow the [installation guide](/docs/administration/basics/installation/#quick-installation-guide)).
Note: CVAT containers must exist (if no, please follow the
{{< ilink "/docs/administration/basics/installation#quick-installation-guide" "installation guide" >}}).
Stop all CVAT containers:

```shell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ description: 'Information about the installation of components needed for semi-a
- The number of GPU deployed functions will be limited to your GPU memory.
- See [deploy_gpu.sh](https://github.com/cvat-ai/cvat/blob/develop/serverless/deploy_gpu.sh)
script for more examples.
- For some models (namely [SiamMask](/docs/manual/advanced/ai-tools#trackers)) you need an [Nvidia driver](https://www.nvidia.com/en-us/drivers/unix/)
- For some models (namely {{< ilink "/docs/manual/advanced/ai-tools#trackers" "SiamMask" >}}) you need an [Nvidia driver](https://www.nvidia.com/en-us/drivers/unix/)
version greater than or equal to 450.80.02.

**Note for Windows users:**
Expand Down
17 changes: 10 additions & 7 deletions site/content/en/docs/administration/advanced/upgrade_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ upgrading PostgreSQL base image major version. See details [here](#how-to-upgrad
To upgrade CVAT, follow these steps:

- It is highly recommended backup all CVAT data before updating, follow the
[backup guide](/docs/administration/advanced/backup_guide/) and backup all CVAT volumes.
{{< ilink "/docs/administration/advanced/backup_guide" "backup guide" >}} and backup all CVAT volumes.

- Go to the previously cloned CVAT directory and stop all CVAT containers with:
```shell
docker compose down
```
If you have included [additional components](/docs/administration/basics/installation/#additional-components),
If you have included
{{< ilink "/docs/administration/basics/installation#additional-components" "additional components" >}},
include all compose configuration files that are used, e.g.:
```shell
docker compose -f docker-compose.yml -f components/serverless/docker-compose.serverless.yml down
Expand All @@ -30,16 +31,17 @@ To upgrade CVAT, follow these steps:
- Update CVAT source code by any preferable way: clone with git or download zip file from GitHub.
Note that you need to download the entire source code, not just the Docker Compose configuration file.
Check the
[installation guide](/docs/administration/basics/installation/#how-to-get-cvat-source-code) for details.
{{< ilink "/docs/administration/basics/installation#how-to-get-cvat-source-code" "installation guide" >}} for details.

- Verify settings:
The installation process is changed/modified from version to version and
you may need to export some environment variables, for example
[CVAT_HOST](/docs/administration/basics/installation/#use-your-own-domain).
{{< ilink "/docs/administration/basics/installation#use-your-own-domain" "CVAT_HOST" >}}.

- Update local CVAT images.
Pull or build new CVAT images, see
[How to pull/build/update CVAT images section](/docs/administration/basics/installation/#how-to-pullbuildupdate-cvat-images)
{{< ilink "/docs/administration/basics/installation#how-to-pullbuildupdate-cvat-images"
"How to pull/build/update CVAT images section" >}}
for details.

- Start CVAT with:
Expand Down Expand Up @@ -101,7 +103,7 @@ docker compose up -d
## How to upgrade PostgreSQL database base image

1. It is highly recommended backup all CVAT data before updating, follow the
[backup guide](/docs/administration/advanced/backup_guide/) and backup CVAT database volume.
{{< ilink "/docs/administration/advanced/backup_guide" "backup guide" >}} and backup CVAT database volume.

1. Run previously used CVAT version as usual

Expand All @@ -122,7 +124,8 @@ docker compose up -d

1. Update CVAT source code by any preferable way: clone with git or download zip file from GitHub.
Check the
[installation guide](/docs/administration/basics/installation/#how-to-get-cvat-source-code) for details.
{{< ilink "/docs/administration/basics/installation#how-to-get-cvat-source-code" "installation guide" >}}
for details.

1. Start database container only:
```shell
Expand Down
4 changes: 2 additions & 2 deletions site/content/en/docs/administration/advanced/webhooks.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ See:

To create a webhook for **Project**, do the following:

1. [Create a Project](/docs/manual/advanced/projects/).
1. {{< ilink "/docs/manual/advanced/projects" "Create a Project" >}}.
2. Go to the **Projects** and click on the project's widget.
3. In the top right corner, click **Actions** > **Setup Webhooks**.
4. In the top right corner click **+**
Expand All @@ -60,7 +60,7 @@ To create a webhook for **Project**, do the following:

To create a webhook for **Organization**, do the following:

1. [Create Organization](/docs/manual/advanced/organization/)
1. {{< ilink "/docs/manual/advanced/organization" "Create Organization" >}}
2. Go to the **Organization** > **Settings** > **Actions** > **Setup Webhooks**.
3. In the top right corner click **+**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ There are two ways of deploying the CVAT.
link.

2. **On Any other AWS Machine:** We can follow the same instruction guide mentioned in the
[installation instructions](/docs/administration/basics/installation/).
{{< ilink "/docs/administration/basics/installation" "installation instructions" >}}.
The additional step is to add a [security group and rule to allow incoming connections](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html).

For any of above, don't forget to set the `CVAT_HOST` environment variable to the exposed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ to assign groups (roles) to other users.
### Prerequisites

Before you register an admin account (superuser), you need to install CVAT locally,
see [Installation Guide](/docs/administration/basics/installation/).
see {{< ilink "/docs/administration/basics/installation" "Installation Guide" >}}.

Steps of installation are partly different, depending on the type of operation system (OS).

Expand Down
Loading

0 comments on commit 3d73625

Please sign in to comment.