fix: UTC-22: Validation error when updating task data via API (#7644)

Co-authored-by: mcanu <[email protected]>

Author: mcanu

label_studio/tasks/serializers.py

@@ -176,7 +176,10 @@ def project(self, task=None):
 
     def validate(self, task):
         instance = self.instance if hasattr(self, 'instance') else None
-        validator = TaskValidator(self.project(), instance)
+        validator = TaskValidator(
+            self.project(task=instance),
+            instance=instance if 'data' not in task else None,
+        )
         return validator.validate(task)
 
     def to_representation(self, instance):

label_studio/tasks/tests/test_api.py

@@ -0,0 +1,95 @@
+from organizations.tests.factories import OrganizationFactory
+from projects.tests.factories import ProjectFactory
+from rest_framework.test import APITestCase
+from tasks.tests.factories import TaskFactory
+
+
+class TestTaskAPI(APITestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.organization = OrganizationFactory()
+        cls.project = ProjectFactory(organization=cls.organization)
+        cls.user = cls.organization.created_by
+
+    def test_get_task(self):
+        task = TaskFactory(project=self.project, data={'text': 'test'})
+
+        self.client.force_authenticate(user=self.user)
+        response = self.client.get(f'/api/tasks/{task.id}/')
+        assert response.status_code == 200
+
+        assert response.json() == {
+            'id': task.id,
+            'project': self.project.id,
+            'created_at': task.created_at.isoformat().replace('+00:00', 'Z'),
+            'updated_at': task.updated_at.isoformat().replace('+00:00', 'Z'),
+            'annotations': [],
+            'predictions': [],
+            'drafts': [],
+            'data': {'text': 'test'},
+            'meta': {},
+            'updated_by': [],
+            'is_labeled': False,
+            'overlap': 1,
+            'file_upload': None,
+            'annotations_ids': '',
+            'annotations_results': '',
+            'annotators': [],
+            'completed_at': None,
+            'predictions_model_versions': '',
+            'draft_exists': False,
+            'predictions_results': '',
+            'predictions_score': None,
+            'total_annotations': 0,
+            'total_predictions': 0,
+            'avg_lead_time': None,
+            'cancelled_annotations': 0,
+            'inner_id': task.inner_id,
+            'storage_filename': None,
+            'comment_authors': [],
+            'comment_count': 0,
+            'last_comment_updated_at': None,
+            'unresolved_comment_count': 0,
+        }
+
+    def test_patch_task(self):
+        task = TaskFactory(project=self.project, data={'text': 'test'})
+
+        payload = {
+            'annotations': [],
+            'predictions': [],
+            'data': {'text': 'changed test'},
+            'meta': {},
+            'created_at': '',
+            'updated_at': '',
+            'updated_by': None,
+            'is_labeled': False,
+            'file_upload': None,
+        }
+
+        self.client.force_authenticate(user=self.user)
+        response = self.client.patch(f'/api/tasks/{task.id}/', data=payload, format='json')
+        assert response.status_code == 200
+        task.refresh_from_db()
+        assert response.json() == {
+            'id': task.id,
+            'project': self.project.id,
+            'created_at': task.created_at.isoformat().replace('+00:00', 'Z'),
+            'updated_at': task.updated_at.isoformat().replace('+00:00', 'Z'),
+            'annotations': [],
+            'predictions': [],
+            'data': {'text': 'changed test'},
+            'meta': {},
+            'updated_by': None,
+            'is_labeled': False,
+            'overlap': 1,
+            'file_upload': None,
+            'total_annotations': 0,
+            'total_predictions': 0,
+            'cancelled_annotations': 0,
+            'inner_id': task.inner_id,
+            'comment_authors': [],
+            'comment_count': 0,
+            'last_comment_updated_at': None,
+            'unresolved_comment_count': 0,
+        }

label_studio/tests/test_api.py

@@ -271,130 +271,3 @@ def test_creating_activating_new_ml_backend(
 def test_delete_annotations(business_client, configured_project):
     business_client.delete(f'/api/projects/{configured_project.id}/annotations/')
     assert not Annotation.objects.filter(task__project=configured_project.id).exists()
-
-
-# --- TaskAPI ---
-
-
-@pytest.mark.parametrize(
-    'response, status_code',
-    [
-        # status OK
-        (
-            {
-                'annotations': [],
-                'predictions': [],
-                'drafts': [],
-                'data': {'text': 'text B', 'meta_info': 'meta info B'},
-                'meta': {},
-                'created_at': '',
-                'updated_at': '',
-                'updated_by': [],
-                'is_labeled': False,
-                'project': 0,
-                'overlap': 1,
-                'file_upload': None,
-                'annotations_ids': '',
-                'annotations_results': '',
-                'annotators': [],
-                'completed_at': None,
-                'predictions_model_versions': '',
-                'draft_exists': False,
-                'predictions_results': '',
-                'predictions_score': None,
-                'total_annotations': 0,
-                'total_predictions': 0,
-                'avg_lead_time': None,
-                'cancelled_annotations': 0,
-                'inner_id': 0,
-                'storage_filename': None,
-                'comment_authors': [],
-                'comment_count': 0,
-                'last_comment_updated_at': None,
-                'unresolved_comment_count': 0,
-            },
-            200,
-        )
-    ],
-)
-@pytest.mark.django_db
-def test_get_task(client_and_token, configured_project, response, status_code):
-    client, token = client_and_token
-    task = configured_project.tasks.order_by('-id').all()[0]
-    response['project'] = configured_project.id
-    response['created_at'] = task.created_at.isoformat().replace('+00:00', 'Z')
-    response['updated_at'] = task.updated_at.isoformat().replace('+00:00', 'Z')
-    response['id'] = task.id
-    r = client.get(
-        f'/api/tasks/{task.id}/', content_type='application/json', headers={'Authorization': f'Token {token}'}
-    )
-    assert r.status_code == status_code
-    if response:
-        assert r.json() == response
-
-
-@pytest.mark.parametrize(
-    'payload, response, status_code',
-    [
-        # status OK
-        (
-            {
-                'annotations': [],
-                'predictions': [],
-                'data': {'text': 'TEST1', 'meta_info': 'TEST2'},
-                'meta': {},
-                'created_at': '',
-                'updated_at': '',
-                'updated_by': None,
-                'is_labeled': False,
-                'project': 0,
-                'file_upload': None,
-            },
-            {
-                'id': 0,
-                'annotations': [],
-                'predictions': [],
-                'data': {'text': 'TEST1', 'meta_info': 'TEST2'},
-                'meta': {},
-                'created_at': '',
-                'updated_at': '',
-                'updated_by': None,
-                'is_labeled': False,
-                'project': 0,
-                'overlap': 1,
-                'file_upload': None,
-                'inner_id': 1,
-                'comment_authors': [],
-                'comment_count': 0,
-                'last_comment_updated_at': None,
-                'unresolved_comment_count': 0,
-            },
-            200,
-        )
-    ],
-)
-@pytest.mark.django_db
-def test_patch_task(client_and_token, configured_project, payload, response, status_code):
-    client, token = client_and_token
-    task = configured_project.tasks.order_by('-updated_at').all()[0]
-    payload['project'] = configured_project.id
-
-    r = client.patch(
-        f'/api/tasks/{task.id}/',
-        data=json.dumps(payload),
-        content_type='application/json',
-        headers={'Authorization': f'Token {token}'},
-    )
-
-    task = configured_project.tasks.order_by('-updated_at').all()[0]  # call DB again after update
-    response['project'] = configured_project.id
-    response['created_at'] = task.created_at.isoformat().replace('+00:00', 'Z')
-    response['updated_at'] = task.updated_at.isoformat().replace('+00:00', 'Z')
-    response['id'] = task.id
-    response['total_annotations'] = 0
-    response['cancelled_annotations'] = 0
-    response['total_predictions'] = 0
-
-    assert r.status_code == status_code
-    if response:
-        assert r.json() == response