clone_project log fix

Author: VaghinakDev

src/superannotate/lib/app/interface/sdk_interface.py

@@ -477,6 +477,8 @@ def clone_project(
         else:
             project_copy.description = project.description
         project_copy.name = project_name
+        if project.type in (constants.ProjectType.VECTOR, constants.ProjectType.PIXEL):
+            project.upload_state = enums.UploadState.INITIAL
         create_response = self.controller.projects.create(project_copy)
         create_response.raise_for_status()
         new_project = create_response.data
@@ -494,14 +496,28 @@ def clone_project(
             )
             classes_response.raise_for_status()
             project.classes = classes_response.data
-            if copy_workflow:
+        if copy_workflow:
+            if copy_annotation_classes:
+                logger.info(f"Skipping the workflow clone from {from_project} to {project_name}.")
+            else:
                 logger.info(f"Cloning workflow from {from_project} to {project_name}.")
                 workflow_response = self.controller.projects.set_workflows(
                     new_project, project.workflows
                 )
                 workflow_response.raise_for_status()
                 project.workflows = self.controller.projects.list_workflow(project).data
-        return ProjectSerializer(new_project).serialize()
+        response = self.controller.projects.get_metadata(
+            new_project,
+            include_settings=copy_settings,
+            include_workflow=copy_workflow,
+            include_contributors=copy_contributors,
+            include_annotation_classes=copy_annotation_classes,
+            include_complete_image_count=True,
+        )
+
+        if response.errors:
+            raise AppException(response.errors)
+        return ProjectSerializer(response.data).serialize()
 
     def create_folder(self, project: NotEmptyStr, folder_name: NotEmptyStr):
         """Create a new folder in the project.
@@ -907,7 +923,7 @@ def assign_folder(
             raise AppException(response.errors)
 
         contributors = response.data.users
-        verified_users = [i["user_id"] for i in contributors]
+        verified_users = [i.user_id for i in contributors]
         verified_users = set(users).intersection(set(verified_users))
         unverified_contributor = set(users) - verified_users
 
@@ -2155,7 +2171,7 @@ def add_contributors_to_project(
         """
         project = self.controller.projects.get_by_name(project).data
         contributors = [
-            entities.ContributorEntity(email=email, user_role=constants.UserRole(role))
+            entities.ContributorEntity(user_id=email, user_role=constants.UserRole(role))
             for email in emails
         ]
         response = self.controller.projects.add_contributors(

src/superannotate/lib/core/entities/project.py

@@ -79,10 +79,9 @@ def __copy__(self):
 
 
 class ContributorEntity(BaseModel):
-    id: Optional[str]
     first_name: Optional[str]
     last_name: Optional[str]
-    email: str
+    user_id: str
     user_role: UserRole
 
     class Config:
@@ -103,7 +102,7 @@ class ProjectEntity(TimedBaseModel):
     folder_id: Optional[int]
     sync_status: Optional[int]
     upload_state: Optional[int]
-    users: Optional[List[Any]] = []
+    users: Optional[List[ContributorEntity]] = []
     unverified_users: Optional[List[Any]] = []
     contributors: List[ContributorEntity] = []
     settings: List[SettingEntity] = []
@@ -169,6 +168,6 @@ class TeamEntity(BaseModel):
     type: Optional[str]
     user_role: Optional[str]
     is_default: Optional[bool]
-    users: Optional[List[ContributorEntity]]
-    pending_invitations: Optional[List]
+    users: Optional[List[Any]]
+    pending_invitations: Optional[List[Any]]
     creator_id: Optional[str]

src/superannotate/lib/core/usecases/projects.py

@@ -296,7 +296,7 @@ def execute(self):
 
             logger.info(
                 f"Created project {entity.name} (ID {entity.id}) "
-                f"with type {constances.ProjectType.get_name(self._response.data.type)}"
+                f"with type {constances.ProjectType.get_name(self._response.data.type)}."
             )
         return self._response
 
@@ -691,7 +691,7 @@ def __init__(
     def validate_emails(self):
         email_entity_map = {}
         for c in self._contributors:
-            email_entity_map[c.email] = c
+            email_entity_map[c.user_id] = c
         len_unique, len_provided = len(email_entity_map), len(self._contributors)
         if len_unique < len_provided:
             logger.info(
@@ -702,10 +702,10 @@ def validate_emails(self):
     def execute(self):
         if self.is_valid():
             team_users = set()
-            project_users = {user["user_id"] for user in self._project.users}
+            project_users = {user.user_id for user in self._project.users}
             for user in self._team.users:
-                if user.user_role > constances.UserRole.ADMIN.value:
-                    team_users.add(user.email)
+                if user['user_role'] > constances.UserRole.ADMIN.value:
+                    team_users.add(user['email'])
             # collecting pending team users which is not admin
             for user in self._team.pending_invitations:
                 if user["user_role"] > constances.UserRole.ADMIN.value:
@@ -719,7 +719,7 @@ def execute(self):
             to_skip = []
             to_add = []
             for contributor in self._contributors:
-                role_email_map[contributor.user_role].append(contributor.email)
+                role_email_map[contributor.user_role].append(contributor.user_id)
             for role, emails in role_email_map.items():
                 _to_add = list(team_users.intersection(emails) - project_users)
                 to_add.extend(_to_add)

tests/integration/projects/test_clone_project.py

@@ -96,7 +96,7 @@ def test_clone_project(self):
             if setting["attribute"].lower() == "imageQuality".lower():
                 self.assertEqual(setting["value"], self.IMAGE_QUALITY)
                 break
-        self.assertEqual(new_project["description"], f"Copy of {self.PROJECT_NAME_1}.")
+        self.assertEqual(new_project["description"], self.PROJECT_DESCRIPTION)
         self.assertEqual(new_project["type"].lower(), "vector")
 
         ann_classes = sa.search_annotation_classes(self.PROJECT_NAME_2)