Merge remote-tracking branch 'origin/master' into folder_structure

hovnatan · hovnatan · commit ea8f0a70c683 · 2021-02-18T13:10:28.000+04:00
diff --git a/superannotate/db/images.py b/superannotate/db/images.py
@@ -159,13 +159,18 @@ def get_image_metadata(project, image_names):
         json_req=json_req,
     )
 
-    metadata = response.json()
-    if len(metadata) == 0:
+    metadata_raw = response.json()
+    metadata_without_deleted = []
+    for im_metadata in metadata_raw:
+        if 'delete' in im_metadata and im_metadata['delete'] == 1:
+            continue
+        metadata_without_deleted.append(im_metadata)
+    if len(metadata_without_deleted) == 0:
         raise SABaseException(
             0,
             f"None of the images in {image_names} exist in the provided project"
         )
-    for item in metadata:
+    for item in metadata_without_deleted:
         item['annotation_status'] = common.annotation_status_int_to_str(
             item['annotation_status']
         )
@@ -178,9 +183,9 @@ def get_image_metadata(project, image_names):
                 item['segmentation_status']
             )
 
-    if len(metadata) == 1:
-        return metadata[0]
-    return metadata
+    if len(metadata_without_deleted) == 1:
+        return metadata_without_deleted[0]
+    return metadata_without_deleted
 
 
 def set_image_annotation_status(project, image_name, annotation_status):
diff --git a/superannotate/db/projects.py b/superannotate/db/projects.py
@@ -1890,15 +1890,15 @@ def get_project_workflow(project):
 def set_project_workflow(project, new_workflow):
     """Sets project's workflow.
 
-    new_workflow example: [{ "step" : <step_num>, "className" : <annotation_class>, "tool" : <tool_num>, ...},...]
+    new_workflow example: [{ "step" : <step_num>, "className" : <annotation_class>, "tool" : <tool_num>,
+                          "attribute":[{"attribute" : {"name" : <attribute_value>, "attribute_group" : {"name": <attribute_group>}}},
+                          ...]
+                          },...]
 
     :param project: project name or metadata
     :type project: str or dict
     :param project: new workflow list of dicts
     :type project: list of dicts
-
-    :return: updated part of project's workflow
-    :rtype: list of dicts
     """
     if not isinstance(project, dict):
         project = get_project_metadata_bare(project)
@@ -1917,33 +1917,74 @@ def set_project_workflow(project, new_workflow):
     for step in new_list:
         if "id" in step:
             del step["id"]
-        if "className" in step:
-            found = False
-            for an_class in annotation_classes:
-                if an_class["name"] == step["className"]:
-                    step["class_id"] = an_class["id"]
-                    del step["className"]
-                    found = True
+        if "className" not in step:
+            continue
+        for an_class in annotation_classes:
+            if an_class["name"] == step["className"]:
+                step["class_id"] = an_class["id"]
+                break
+        else:
+            raise SABaseException(
+                0, "Annotation class not found in set_project_workflow."
+            )
+        json_req = {"steps": [step]}
+        response = _api.send_request(
+            req_type='POST',
+            path=f'/project/{project_id}/workflow',
+            params=params,
+            json_req=json_req
+        )
+        if not response.ok:
+            raise SABaseException(
+                response.status_code,
+                "Couldn't set project workflow " + response.text
+            )
+        if "attribute" not in step:
+            continue
+        current_steps = get_project_workflow(project)
+        for step_in_response in current_steps:
+            if step_in_response["step"] == step["step"]:
+                workflow_id = step_in_response["id"]
+                break
+        else:
+            raise SABaseException(0, "Couldn't find step in workflow")
+        request_data = []
+        for attribute in step["attribute"]:
+            for att_class in an_class["attribute_groups"]:
+                if att_class["name"] == attribute["attribute"]["attribute_group"
+                                                              ]["name"]:
+                    break
+            else:
+                raise SABaseException(
+                    0, "Attribute group not found in set_project_workflow."
+                )
+            for att_value in att_class["attributes"]:
+                if att_value["name"] == attribute["attribute"]["name"]:
+                    attribute_id = att_value["id"]
                     break
-            if not found:
+            else:
                 raise SABaseException(
-                    0, "Annotation class not found in set_project_workflow."
+                    0, "Attribute value not found in set_project_workflow."
                 )
 
-    json_req = {"steps": new_list}
-    response = _api.send_request(
-        req_type='POST',
-        path=f'/project/{project_id}/workflow',
-        params=params,
-        json_req=json_req
-    )
-    if not response.ok:
-        raise SABaseException(
-            response.status_code,
-            "Couldn't set project workflow " + response.text
+            request_data.append(
+                {
+                    "workflow_id": workflow_id,
+                    "attribute_id": attribute_id
+                }
+            )
+
+        response = _api.send_request(
+            req_type='POST',
+            path=f'/project/{project_id}/workflow_attribute',
+            params=params,
+            json_req={"data": request_data}
         )
-    res = response.json()
-    return res
+        if not response.ok:
+            raise SABaseException(
+                response.status_code,
+                "Couldn't set project workflow " + response.text
+            )
 
 
 def get_project_settings(project):
diff --git a/superannotate/version.py b/superannotate/version.py
@@ -1 +1 @@
-__version__ = "3.2.2"
+__version__ = "3.2.6"
diff --git a/tests/test_clone_project.py b/tests/test_clone_project.py
@@ -15,7 +15,27 @@ def test_create_like_project(tmpdir):
         sa.delete_project(project)
 
     sa.create_project(PROJECT_NAME, "tt", "Vector")
-    sa.create_annotation_class(PROJECT_NAME, "rrr", "#FFAAFF")
+    sa.create_annotation_class(
+        PROJECT_NAME, "rrr", "#FFAAFF", [
+            {
+                "name": "tall",
+                "is_multiselect": 0,
+                "attributes": [{
+                    "name": "yes"
+                }, {
+                    "name": "no"
+                }]
+            }, {
+                "name": "age",
+                "is_multiselect": 0,
+                "attributes": [{
+                    "name": "young"
+                }, {
+                    "name": "old"
+                }]
+            }
+        ]
+    )
 
     old_settings = sa.get_project_settings(PROJECT_NAME)
     for setting in old_settings:
@@ -29,11 +49,36 @@ def test_create_like_project(tmpdir):
         }]
     )
     sa.set_project_workflow(
-        PROJECT_NAME, [{
-            "step": 1,
-            "className": "rrr",
-            "tool": 3
-        }]
+        PROJECT_NAME, [
+            {
+                "step":
+                    1,
+                "className":
+                    "rrr",
+                "tool":
+                    3,
+                "attribute":
+                    [
+                        {
+                            "attribute":
+                                {
+                                    "name": "young",
+                                    "attribute_group": {
+                                        "name": "age"
+                                    }
+                                }
+                        }, {
+                            "attribute":
+                                {
+                                    "name": "yes",
+                                    "attribute_group": {
+                                        "name": "tall"
+                                    }
+                                }
+                        }
+                    ]
+            }
+        ]
     )
     users = sa.search_team_contributors()
     sa.share_project(PROJECT_NAME, users[1], "QA")
@@ -65,6 +110,13 @@ def test_create_like_project(tmpdir):
     assert len(new_workflow) == 1
     assert new_workflow[0]["className"] == "rrr"
     assert new_workflow[0]["tool"] == 3
+    assert len(new_workflow[0]["attribute"]) == 2
+    assert new_workflow[0]["attribute"][0]["attribute"]["name"] == "young"
+    assert new_workflow[0]["attribute"][0]["attribute"]["attribute_group"][
+        "name"] == "age"
+    assert new_workflow[0]["attribute"][1]["attribute"]["name"] == "yes"
+    assert new_workflow[0]["attribute"][1]["attribute"]["attribute_group"][
+        "name"] == "tall"
 
     new_project = sa.get_project_metadata(
         new_project["name"], include_contributors=True

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "3.2.2"`
	`1`	`+__version__ = "3.2.6"`