Merge pull request #837 from superannotateai/fix_methods

Fix methods

Author: VaghinakDev

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

@@ -150,9 +150,9 @@ def __init__(
         self.item = item
         self._annotation_adapter: Optional[BaseMultimodalAnnotationAdapter] = None
         self._overwrite = overwrite
-        self._annotation = None
+        self._annotation: Optional[dict] = None
 
-    def _set_small_annotation_adapter(self, annotation: dict = None):
+    def _set_small_annotation_adapter(self, annotation: Optional[dict] = None):
         self._annotation_adapter = MultimodalSmallAnnotationAdapter(
             project=self.project,
             folder=self.folder,
@@ -162,7 +162,7 @@ def _set_small_annotation_adapter(self, annotation: dict = None):
             annotation=annotation,
         )
 
-    def _set_large_annotation_adapter(self, annotation: dict = None):
+    def _set_large_annotation_adapter(self, annotation: Optional[dict] = None):
         self._annotation_adapter = MultimodalLargeAnnotationAdapter(
             project=self.project,
             folder=self.folder,
@@ -341,7 +341,7 @@ def get_item_by_id(
         self,
         project_id: int,
         item_id: int,
-        include: List[Literal["custom_metadata", "categories"]] = None,
+        include: Optional[List[Literal["custom_metadata", "categories"]]] = None,
     ):
         """Returns the item metadata
 
@@ -396,7 +396,7 @@ def get_item_by_id(
 
         return BaseSerializer(item).serialize(exclude={"url", "meta"}, by_alias=False)
 
-    def get_team_metadata(self, include: List[Literal["scores"]] = None):
+    def get_team_metadata(self, include: Optional[List[Literal["scores"]]] = None):
         """
         Returns team metadata, including optionally, scores.
 
@@ -421,7 +421,9 @@ def get_team_metadata(self, include: List[Literal["scores"]] = None):
         return TeamSerializer(team).serialize(exclude_unset=True)
 
     def get_user_metadata(
-        self, pk: Union[int, str], include: List[Literal["custom_fields"]] = None
+        self,
+        pk: Union[int, str],
+        include: Optional[List[Literal["custom_fields"]]] = None,
     ):
         """
         Returns user metadata including optionally, custom fields
@@ -514,8 +516,8 @@ def set_user_custom_field(
     def list_users(
         self,
         *,
-        project: Union[NotEmptyStr, int] = None,
-        include: List[Literal["custom_fields", "categories"]] = None,
+        project: Optional[Union[NotEmptyStr, int]] = None,
+        include: Optional[List[Literal["custom_fields", "categories"]]] = None,
         **filters,
     ):
         """
@@ -1074,9 +1076,9 @@ def retrieve_context(
 
     def search_team_contributors(
         self,
-        email: EmailStr = None,
-        first_name: NotEmptyStr = None,
-        last_name: NotEmptyStr = None,
+        email: Optional[EmailStr] = None,
+        first_name: Optional[NotEmptyStr] = None,
+        last_name: Optional[NotEmptyStr] = None,
         return_metadata: bool = True,
     ):
         """Search for contributors in the team
@@ -1184,9 +1186,9 @@ def create_project(
         project_name: NotEmptyStr,
         project_description: NotEmptyStr,
         project_type: PROJECT_TYPE,
-        settings: List[Setting] = None,
-        classes: List[AnnotationClassEntity] = None,
-        workflows: Any = None,
+        settings: Optional[List[Setting]] = None,
+        classes: Optional[List[AnnotationClassEntity]] = None,
+        workflows: Optional[Any] = None,
         instructions_link: Optional[str] = None,
         workflow: Optional[str] = None,
         form: Optional[dict] = None,
@@ -3250,7 +3252,7 @@ def set_project_steps(
         self,
         project: Union[NotEmptyStr, dict],
         steps: List[dict],
-        connections: List[List[int]] = None,
+        connections: Optional[List[List[int]]] = None,
     ):
         """Sets project's steps.
 
@@ -3545,7 +3547,7 @@ def upload_image_annotations(
         annotation_json: Union[str, Path, dict],
         mask: Optional[Union[str, Path, bytes]] = None,
         verbose: Optional[bool] = True,
-        keep_status: bool = None,
+        keep_status: Optional[bool] = None,
     ):
         """Upload annotations from JSON
         to the image.
@@ -3654,7 +3656,7 @@ def upload_image_to_project(
         img,
         image_name: Optional[NotEmptyStr] = None,
         annotation_status: Optional[str] = None,
-        from_s3_bucket=None,
+        from_s3_bucket: Optional[str] = None,
         image_quality_in_editor: Optional[NotEmptyStr] = None,
     ):
         """Uploads image (io.BytesIO() or filepath to image) to project.
@@ -4238,7 +4240,7 @@ def get_item_metadata(
     def search_items(
         self,
         project: Union[NotEmptyStr, int, Tuple[int, int], Tuple[str, str]],
-        name_contains: NotEmptyStr = None,
+        name_contains: Optional[NotEmptyStr] = None,
         annotation_status: Optional[str] = None,
         annotator_email: Optional[NotEmptyStr] = None,
         qa_email: Optional[NotEmptyStr] = None,
@@ -4362,7 +4364,7 @@ def list_items(
         project: Union[NotEmptyStr, int],
         folder: Optional[Union[NotEmptyStr, int]] = None,
         *,
-        include: List[Literal["custom_metadata", "categories"]] = None,
+        include: Optional[List[Literal["custom_metadata", "categories"]]] = None,
         **filters,
     ):
         """
@@ -4549,7 +4551,7 @@ def list_items(
     def list_projects(
         self,
         *,
-        include: List[Literal["custom_fields"]] = None,
+        include: Optional[List[Literal["custom_fields"]]] = None,
         **filters,
     ):
         """

tests/integration/projects/test_basic_project.py

@@ -52,22 +52,6 @@ def annotation_path(self):
     def test_search(self):
         projects = sa.search_projects(self.PROJECT_NAME, return_metadata=True)
         assert projects
-
-        sa.create_annotation_class(
-            self.PROJECT_NAME,
-            "class1",
-            "#FFAAFF",
-            [
-                {
-                    "name": "Human",
-                    "attributes": [{"name": "yes"}, {"name": "no"}],
-                },
-                {
-                    "name": "age",
-                    "attributes": [{"name": "young"}, {"name": "old"}],
-                },
-            ],
-        )
         sa.attach_items(self.PROJECT_NAME, attachments=[{"url": "", "name": "name"}])
         annotation = json.load(open(self.annotation_path))
         annotation["metadata"]["name"] = "name"

tests/integration/work_management/test_project_custom_fields.py

@@ -320,6 +320,7 @@ def test_list_projects_by_custom_fields(self):
             )
             == 1
         )
+        sa.delete_project(other_project_name)
 
     def test_list_projects_by_custom_invalid_field(self):
         with self.assertRaisesRegex(AppException, "Invalid filter param provided."):