Merge branch 'master' of https://github.com/superannotateai/superannotate-python-sdk into public_links_dev

Author: ero1311

Makefile

@@ -3,6 +3,7 @@
 MAKEFLAGS += -j1
 
 PYTHON=python3
+PIP=pip3
 PYLINT=pylint
 PYTESTS=pytest
 COVERAGE=coverage
@@ -25,7 +26,7 @@ test_coverage: check_formatting
 	@echo "\033[95m\n\nCoverage successful! View the output at file://htmlcov/index.html.\n\033[0m"
 
 install:
-	pip install -e .
+	$(PIP) install -e .
 
 lint: check_formatting
 	-$(PYLINT) --output-format=json superannotate/ | pylint-json2html -o pylint.html
@@ -44,3 +45,22 @@ dist:
 
 check_formatting:
 	yapf -p -r --diff superannotate
+
+docker_run_dev_env: docker_pull_dev_env
+	docker run -it -p 8888:8888 \
+		-v ${HOME}/.superannotate:/root/.superannotate \
+		-v $(pwd):/root/superannotate-python-sdk \
+		superannotate/pythonsdk-dev-env
+
+docker_run_dev_env_local_copy: docker_build_dev_env_from_local_copy
+	docker run -it -p 8888:8888 \
+	    -v ${HOME}/.superannotate:/root/.superannotate \
+	    -v $(pwd):/root/superannotate-python-sdk \
+	    superannotate/pythonsdk-dev-env \
+	    bash -c "pip install -e superannotate-python-sdk && jupyter lab --allow-root --NotebookApp.token='' --NotebookApp.password='' --no-browser --ip 0.0.0.0"
+
+docker_build_dev_env_from_local_copy:
+	docker build -t superannotate/pythonsdk-dev-env:latest -f Dockerfile_dev_env .
+
+docker_pull_dev_env:
+	docker pull superannotate/pythonsdk-dev-env:latest

run_dev_env_in_container.sh

@@ -185,11 +185,12 @@ def _copy_images(
             )
             if annotations["annotation_json"] is not None:
                 if "annotation_mask" in annotations:
-                    upload_image_annotations(
-                        (destination_project, destination_project_folder),
-                        image_name, annotations["annotation_json"],
-                        annotations["annotation_mask"]
-                    )
+                    if annotations["annotation_mask"] is not None:
+                        upload_image_annotations(
+                            (destination_project, destination_project_folder),
+                            image_name, annotations["annotation_json"],
+                            annotations["annotation_mask"]
+                        )
                 else:
                     upload_image_annotations(
                         (destination_project, destination_project_folder),
@@ -409,11 +410,12 @@ def copy_image(
         )
         if annotations["annotation_json"] is not None:
             if "annotation_mask" in annotations:
-                upload_image_annotations(
-                    (destination_project, destination_project_folder), new_name,
-                    annotations["annotation_json"],
-                    annotations["annotation_mask"]
-                )
+                if annotations["annotation_mask"] is not None:
+                    upload_image_annotations(
+                        (destination_project, destination_project_folder),
+                        new_name, annotations["annotation_json"],
+                        annotations["annotation_mask"]
+                    )
             else:
                 upload_image_annotations(
                     (destination_project, destination_project_folder), new_name,

superannotate/db/project_images.py

@@ -1 +1 @@
-__version__ = "4.1.0b15"
+__version__ = "4.1.0b18"

superannotate/version.py

@@ -274,6 +274,32 @@ def test_copy_images3(tmpdir):
     assert num_images == 4
 
 
+def test_copy_images4(tmpdir):
+    PROJECT_NAME = "test copy4 folder images"
+    tmpdir = Path(tmpdir)
+
+    projects_found = sa.search_projects(PROJECT_NAME, return_metadata=True)
+    for pr in projects_found:
+        sa.delete_project(pr)
+
+    project = sa.create_project(PROJECT_NAME, 'test', 'Pixel')
+    sa.upload_images_from_folder_to_project(
+        project, FROM_FOLDER, annotation_status="InProgress"
+    )
+    sa.create_folder(project, "folder1")
+    project = PROJECT_NAME + "/folder1"
+
+    sa.copy_images(
+        PROJECT_NAME, ["example_image_2.jpg", "example_image_3.jpg"], project
+    )
+
+    num_images = sa.get_project_image_count(project)
+    assert num_images == 2
+
+    num_images = sa.get_project_image_count(PROJECT_NAME)
+    assert num_images == 4
+
+
 def test_copy_images(tmpdir):
     PROJECT_NAME = "test copy folder images"
     tmpdir = Path(tmpdir)