Added email regex

Author: Vaghinak Basentsyan

docs/source/cli.rst

@@ -148,7 +148,6 @@ Only when COCO format is specified *dataset-name* and *task* arguments are requi
 *task* specifies the COCO task for conversion. Please see 
 :ref:`import_annotation_format <ref_import_annotation_format>` for more details.
 
-The annotation classes will be created during the execution of this command.
 
 ----------
 
@@ -176,8 +175,6 @@ Only when COCO format is specified *dataset-name* and *task* arguments are requi
 *task* specifies the COCO task for conversion. Please see 
 :ref:`import_annotation_format <ref_import_annotation_format>` for more details.
 
-The annotation classes will be created during the execution of this command.
-
 ----------
 
 .. _ref_export_project:

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.0
 log_cli=true
 python_files = test_*.py
-addopts = -n auto --dist=loadscope
+;addopts = -n auto --dist=lo adscope

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

@@ -144,7 +144,7 @@ def export_project(
         sys.exit(0)
 
     def upload_preannotations(
-        self, project, folder, data_set_name=None, task=None, format=None
+        self, project, folder, dataset_name=None, task=None, format=None
     ):
         """
         To upload preannotations from folder to project use
@@ -153,20 +153,19 @@ def upload_preannotations(
         Only when COCO format is specified dataset-name and task arguments are required.
         dataset-name specifies JSON filename (without extension) in <folder_path>.
         task specifies the COCO task for conversion. Please see import_annotation_format for more details.
-        The annotation classes will be created during the execution of this command.
         """
         self._upload_annotations(
             project=project,
             folder=folder,
             format=format,
-            data_set_name=data_set_name,
+            dataset_name=dataset_name,
             task=task,
             pre=True,
         )
         sys.exit(0)
 
     def upload_annotations(
-        self, project, folder, data_set_name=None, task=None, format=None
+        self, project, folder, dataset_name=None, task=None, format=None
     ):
         """
         To upload annotations from folder to project use
@@ -175,29 +174,28 @@ def upload_annotations(
         Only when COCO format is specified dataset-name and task arguments are required.
         dataset-name specifies JSON filename (without extension) in <folder_path>.
         task specifies the COCO task for conversion. Please see import_annotation_format for more details.
-        The annotation classes will be created during the execution of this command.
         """
         self._upload_annotations(
             project=project,
             folder=folder,
             format=format,
-            data_set_name=data_set_name,
+            dataset_name=dataset_name,
             task=task,
             pre=False,
         )
         sys.exit(0)
 
     def _upload_annotations(
-        self, project, folder, format, data_set_name, task, pre=True
+        self, project, folder, format, dataset_name, task, pre=True
     ):
         project_name, folder_name = split_project_path(project)
         project = self.controller.get_project_metadata(project_name=project_name).data
         if not format:
             format = "SuperAnnotate"
-        if not data_set_name and format == "COCO":
+        if not dataset_name and format == "COCO":
             raise Exception("Data-set name is required")
-        elif not data_set_name:
-            data_set_name = ""
+        elif not dataset_name:
+            dataset_name = ""
         if not task:
             task = "object_detection"
         annotations_path = folder
@@ -207,7 +205,7 @@ def _upload_annotations(
                     input_dir=folder,
                     output_dir=temp_dir,
                     dataset_format=format,
-                    dataset_name=data_set_name,
+                    dataset_name=dataset_name,
                     project_type=constances.ProjectType.get_name(
                         project["project"].project_type
                     ),

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

@@ -25,6 +25,7 @@
 from lib.app.interface.types import NotEmptyStr
 from lib.app.interface.types import ProjectTypes
 from lib.app.interface.types import validate_arguments
+from lib.app.interface.types import EmailStr
 from lib.app.mixp.decorators import Trackable
 from lib.app.serializers import BaseSerializers
 from lib.app.serializers import ImageSerializer
@@ -40,7 +41,6 @@
 from lib.core.types import MLModel
 from lib.core.types import Project
 from lib.infrastructure.controller import Controller
-from pydantic import EmailStr
 from pydantic import parse_obj_as
 from pydantic import StrictBool
 from tqdm import tqdm

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

@@ -10,10 +10,24 @@
 from pydantic import StrictStr
 from pydantic import validate_arguments as pydantic_validate_arguments
 from pydantic import ValidationError
+from pydantic.errors import StrRegexError
+
 
 NotEmptyStr = constr(strict=True, min_length=1)
 
 
+class EmailStr(StrictStr):
+    @classmethod
+    def validate(cls, value: Union[str]) -> Union[str]:
+        try:
+            constr(
+                regex=r"^(?=.{1,254}$)(?=.{1,64}@)[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
+            ).validate(value)
+        except StrRegexError:
+            raise ValueError("Invalid email")
+        return value
+
+
 class Status(StrictStr):
     @classmethod
     def validate(cls, value: Union[str]) -> Union[str]:

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

@@ -1039,7 +1039,7 @@ def execute(self):
         emails = set(self._emails)
 
         to_skip = emails.intersection(team_users)
-        to_add = emails.difference(to_skip)
+        to_add = list(emails.difference(to_skip))
 
         if to_skip:
             self.reporter.log_warning(

tests/integration/test_cli.py

@@ -96,8 +96,8 @@ def _create_project(self, project_type="Vector"):
             shell=True,
         )
 
-    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_create_folder(self):
         self._create_project()
         subprocess.run(
@@ -110,8 +110,8 @@ def test_create_folder(self):
         )
         self.assertEqual(self.FOLDER_NAME, folder["name"])
 
-    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_upload_images(self):
         self._create_project()
         subprocess.run(
@@ -124,8 +124,8 @@ def test_upload_images(self):
         )
         self.assertEqual(1, len(sa.search_images(self.PROJECT_NAME)))
 
-    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_upload_export(self):
         self._create_project()
         with tempfile.TemporaryDirectory() as temp_dir:
@@ -140,8 +140,8 @@ def test_upload_export(self):
             self.assertEqual(len(list(test_dir.glob("*.jpg"))), 0)
             self.assertEqual(len(list(test_dir.glob("*.png"))), 0)
 
-    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_vector_pre_annotation_folder_upload_download_cli(self):
         self._create_project()
 
@@ -169,8 +169,8 @@ def test_vector_pre_annotation_folder_upload_download_cli(self):
         )
         # tod add test
 
-    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_vector_annotation_folder_upload_download_cli(self):
         self._create_project()
         sa.create_annotation_classes_from_classes_json(
@@ -194,18 +194,18 @@ def test_vector_annotation_folder_upload_download_cli(self):
             check=True,
             shell=True,
         )
-        # from src.superannotate.lib.app.interface.cli_interface import CLIFacade
-        # # self, project, folder, data_set_name = None, task = None, format = None
-        # cli_facade = CLIFacade().upload_annotations(self.PROJECT_NAME,self.convertor_data_path,"instances_test",None,"COCO")
+        from src.superannotate.lib.app.interface.cli_interface import CLIFacade
+        # self, project, folder, dataset_name = None, task = None, format = None
+        cli_facade = CLIFacade().upload_annotations(self.PROJECT_NAME,self.convertor_data_path,"instances_test",None,"COCO")
         count_in = len(list(self.vector_folder_path.glob("*.json")))
         with tempfile.TemporaryDirectory() as temp_dir:
             for image_name in sa.search_images(self.PROJECT_NAME):
                 sa.download_image_annotations(self.PROJECT_NAME, image_name, temp_dir)
             count_out = len(list(Path(temp_dir).glob("*.json")))
             self.assertEqual(count_in, count_out)
 
-    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_attach_image_urls(self):
         self._create_project()
         subprocess.run(
@@ -218,8 +218,8 @@ def test_attach_image_urls(self):
 
         self.assertEqual(3, len(sa.search_images(self.PROJECT_NAME)))
 
-    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_attach_video_urls(self):
         self._create_project("Video")
         subprocess.run(
@@ -231,8 +231,8 @@ def test_attach_video_urls(self):
         )
         # self.assertEqual(3, len(sa.search_images(self.PROJECT_NAME)))
 
-    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_upload_videos(self):
         self._create_project()
         subprocess.run(
@@ -245,8 +245,8 @@ def test_upload_videos(self):
         )
         self.assertEqual(5, len(sa.search_images(self.PROJECT_NAME)))
 
-    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_attach_document_urls(self):
             self._create_project("Document")
             subprocess.run(