Fix tests - folder assign - unassign

Author: dshabin

superannotate/__init__.py

@@ -33,7 +33,6 @@ def consensus(*args, **kwargs):
     filter_annotation_instances, filter_images_by_comments,
     filter_images_by_tags
 )
-from .db.utils import _search_folders
 from .db.annotation_classes import (
     create_annotation_class, create_annotation_classes_from_classes_json,
     delete_annotation_class, download_annotation_classes_json,

superannotate/db/project_images.py

@@ -570,15 +570,19 @@ def assign_images(project, image_names, user):
         return
 
     project, folder = get_project_and_folder_metadata(project)
+
+    project_users = get_team_metadata()["users"]
+    project_users = [i['id'] for i in project_users]
+    if user not in project_users:
+        logging.warn(
+            f'Skipping {user}. {user} is not a verified contributor for the {project["name"]}'
+        )
+
     folder_name = 'root'
     if folder:
         folder_name = folder['name']
 
-    project_meta = get_project_metadata(project)
-    params = {
-        "project_id": project_meta['id'],
-        "team_id": project_meta["team_id"]
-    }
+    params = {"project_id": project['id'], "team_id": project["team_id"]}
     json_req = {
         "image_names": image_names,
         "assign_user_id": user,
@@ -613,22 +617,21 @@ def assign_folder(project, folder_name, users):
     project_users = get_team_metadata()["users"]
     project_name = project_meta['name']
     project_users = [i['id'] for i in project_users]
-    verified_contributor = []
+    unverified_contributor = set(project_users) - set(users)
+    verified_contributor = set(users) - set(unverified_contributor)
 
-    for user in users:
-        if user not in project_users:
-            logging.warn(
-                f'Skipping {user} from assignees. {user} is not a verified contributor for the {project_name}'
-            )
-            continue
-        verified_contributor.append(user)
+    for user in unverified_contributor:
+        logging.warn(
+            f'Skipping {user} from assignees. {user} is not a verified contributor for the {project_name}'
+        )
+        continue
 
     params = {
         "project_id": project_meta['id'],
         "team_id": project_meta["team_id"]
     }
     json_req = {
-        "assign_user_ids": verified_contributor,
+        "assign_user_ids": list(verified_contributor),
         "folder_name": folder_name
     }
     response = _api.send_request(
@@ -673,7 +676,6 @@ def unassign_folder(project, folder_name):
         raise SABaseException(
             response.status_code, "Couldn't unassign folder " + response.text
         )
-    print('unassign_folder>>>>>>', response.text)
 
 
 def unassign_images(project, image_names):
@@ -712,5 +714,3 @@ def unassign_images(project, image_names):
         raise SABaseException(
             response.status_code, "Couldn't unassign images " + response.text
         )
-
-    print('unassign_images>>>>>>', response.text)

superannotate/db/utils.py

@@ -732,25 +732,3 @@ def __attach_image_urls_to_project_thread(
         logger.warning(e)
     else:
         uploaded[thread_id] += uploaded_imgs
-
-
-def _search_folders(project, folder_name=None, includeUsers=False):
-    if not isinstance(project, dict):
-        project = get_project_metadata_bare(project)
-    team_id, project_id = project["team_id"], project["id"]
-    params = {
-        'team_id': team_id,
-        'project_id': project_id,
-        'offset': 0,
-        'name': folder_name,
-        'is_root': 0,
-        'includeUsers': includeUsers
-    }
-
-    response = _api.send_request(req_type='GET', path='/folders', params=params)
-    if not response.ok:
-        raise SABaseException(
-            response.status_code, "Couldn't search folders " + response.text
-        )
-    response = response.json()
-    return response

tests/test_assign_images.py

@@ -1,9 +1,10 @@
 from pathlib import Path
 import time
-
 import pytest
-
 import superannotate as sa
+from superannotate.api import API
+
+_api = API.get_instance()
 
 PROJECT_NAME_VECTOR1 = "test assign images1"
 PROJECT_NAME_VECTOR2 = "test assign images2"
@@ -160,7 +161,7 @@ def test_assign_folder(tmpdir):
     email = sa.get_team_metadata()["users"][1]["email"]
     sa.share_project(project, email, "QA")
     sa.assign_folder(project, folder_name, [email])
-    folders = sa._search_folders(PROJECT_NAME_VECTOR1, includeUsers=True)
+    folders = _search_folders(project, includeUsers=True)
     assert len(folders["data"][0]['folder_users']) > 0
 
 
@@ -176,8 +177,24 @@ def test_unassign_folder(tmpdir):
     email = sa.get_team_metadata()["users"][1]["email"]
     sa.share_project(project, email, "QA")
     sa.assign_folder(project, folder_name, [email])
-    folders = sa._search_folders(PROJECT_NAME_VECTOR1, includeUsers=True)
+    folders = _search_folders(project, includeUsers=True)
     assert len(folders["data"][0]['folder_users']) > 0
     sa.unassign_folder(project, folder_name)
-    folders = sa._search_folders(PROJECT_NAME_VECTOR1, includeUsers=True)
+    folders = _search_folders(project, includeUsers=True)
     assert len(folders["data"][0]['folder_users']) == 0
+
+
+def _search_folders(project, folder_name=None, includeUsers=False):
+    team_id, project_id = project["team_id"], project["id"]
+    params = {
+        'team_id': team_id,
+        'project_id': project_id,
+        'offset': 0,
+        'name': folder_name,
+        'is_root': 0,
+        'includeUsers': includeUsers
+    }
+
+    response = _api.send_request(req_type='GET', path='/folders', params=params)
+    response = response.json()
+    return response