From 30678f9726166f953ad289bb57e194895f566ba0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Wed, 27 Jan 2021 19:42:50 +0300 Subject: [PATCH] Fixed lambda project labels (#2725) * Fixed lambda project labels * Added CHANGELOG Co-authored-by: Nikita Manovich --- CHANGELOG.md | 1 + cvat/apps/lambda_manager/views.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b340b4a..fbf9afb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The cursor jumps to the end of the line when renaming a task () - SSLCertVerificationError when remote source is used () - Fixed filters select overflow () +- Fixed tasks in project autoannotation () - Cuboids are missed in annotations statistics () - The list of files attached to the task is not displayed () diff --git a/cvat/apps/lambda_manager/views.py b/cvat/apps/lambda_manager/views.py index 4e5ede35..bd248581 100644 --- a/cvat/apps/lambda_manager/views.py +++ b/cvat/apps/lambda_manager/views.py @@ -137,7 +137,9 @@ class LambdaFunction: quality = data.get("quality") mapping = data.get("mapping") mapping_by_default = {db_label.name:db_label.name - for db_label in db_task.label_set.all()} + for db_label in ( + db_task.project.label_set if db_task.project_id else db_task.label_set + ).all()} if not mapping: # use mapping by default to avoid labels in mapping which # don't exist in the task @@ -477,7 +479,7 @@ class LambdaJob: db_task = TaskModel.objects.get(pk=task) if cleanup: dm.task.delete_task_data(db_task.id) - db_labels = db_task.label_set.prefetch_related("attributespec_set").all() + db_labels = (db_task.project.label_set if db_task.project_id else db_task.label_set).prefetch_related("attributespec_set").all() labels = {db_label.name:db_label.id for db_label in db_labels} if function.kind == LambdaType.DETECTOR: