Merge branch 'folder_structure2'

Author: hovnatan

.coveragerc

@@ -1,8 +1,5 @@
 [run]
 branch = True
-omit =
-    # copied pycocotools module from github
-    superannotate/pycocotools_sa/*
 
 
 [report]

.gitignore

@@ -140,3 +140,4 @@ pylint.html
 _mask.c
 tags
 temp
+debug_*

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "python.formatting.provider": "yapf",
-    "python.linting.pylintPath": "~/miniconda3/bin/pylint",
+    "python.linting.pylintPath": "venv_sa_conv/bin/pylint",
     "python.linting.pylintEnabled": true,
     "python.testing.pytestArgs": [
         "tests"

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 SuperAnnotate AI
+Copyright (c) 2021 SuperAnnotate AI
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -8,7 +8,7 @@ PYTESTS=pytest
 COVERAGE=coverage
 
 tests: check_formatting docs
-	$(PYTESTS) -n 8 --full-trace tests
+	$(PYTESTS) -n auto --full-trace tests
 
 stress-tests: SA_STRESS_TESTS=1
 stress-tests: tests

docs/source/cli.rst

@@ -49,6 +49,17 @@ To create a new project:
 
 ----------
 
+Creating a folder in a project
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To create a new folder:
+
+.. code-block:: bash
+
+   superannotatecli create-folder --project <project_name> --name <folder_name>
+
+----------
+
 .. _ref_upload_images:
 
 Uploading images

docs/source/superannotate.sdk.rst

@@ -30,6 +30,10 @@ ________
 .. _ref_get_project_metadata:
 .. autofunction:: superannotate.get_project_metadata
 .. autofunction:: superannotate.get_project_image_count
+.. autofunction:: superannotate.get_project_and_folder_metadata
+.. autofunction:: superannotate.create_folder
+.. autofunction:: superannotate.delete_folders
+.. autofunction:: superannotate.rename_folder
 .. autofunction:: superannotate.upload_images_to_project
 .. autofunction:: superannotate.upload_images_from_public_urls_to_project
 .. autofunction:: superannotate.upload_images_from_google_cloud_to_project
@@ -73,16 +77,20 @@ ______
 .. autofunction:: superannotate.get_image_bytes
 .. autofunction:: superannotate.download_image
 .. autofunction:: superannotate.set_image_annotation_status
+.. autofunction:: superannotate.set_images_annotation_statuses
 .. autofunction:: superannotate.get_image_annotations
 .. autofunction:: superannotate.get_image_preannotations
 .. autofunction:: superannotate.download_image_annotations
 .. autofunction:: superannotate.download_image_preannotations
 .. autofunction:: superannotate.upload_image_annotations
 .. autofunction:: superannotate.copy_image
+.. autofunction:: superannotate.copy_images
 .. autofunction:: superannotate.move_image
+.. autofunction:: superannotate.move_images
 .. autofunction:: superannotate.pin_image
 .. autofunction:: superannotate.assign_images
 .. autofunction:: superannotate.delete_image
+.. autofunction:: superannotate.delete_images
 .. autofunction:: superannotate.add_annotation_bbox_to_image
 .. autofunction:: superannotate.add_annotation_polygon_to_image
 .. autofunction:: superannotate.add_annotation_polyline_to_image

install.sh

@@ -17,14 +17,17 @@ pip install -e .
 # pip install superannotate
 
 # for testing
-pip install pytest pytest-xdist
+pip install pytest pytest-xdist pytest-timeout
 
 # for coverage
 pip install coverage pytest-cov
 
 # for linting
 pip install pylint pylint-json2html pylint-pytest
 
+# for formatting
+pip install yapf
+
 # for docs
 pip install sphinx sphinx_rtd_theme
 

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+timeout = 300
+timeout_method=thread

superannotate/__init__.py

@@ -1,6 +1,4 @@
-import json
 import logging
-from pathlib import Path
 
 import packaging.version
 import requests
@@ -54,8 +52,14 @@ def consensus(*args, **kwargs):
     get_image_metadata, get_image_preannotations, search_images,
     set_image_annotation_status, upload_image_annotations
 )
+from .db.project_api import (
+    create_folder, delete_folders, get_folder_metadata,
+    get_project_and_folder_metadata, rename_folder, search_folders,
+    set_images_annotation_statuses
+)
 from .db.project_images import (
-    assign_images, copy_image, move_image, pin_image, upload_image_to_project
+    assign_images, copy_image, copy_images, delete_images, move_image,
+    move_images, pin_image, upload_image_to_project
 )
 from .db.project_metadata import get_project_metadata
 from .db.projects import (
@@ -86,15 +90,14 @@ def consensus(*args, **kwargs):
     SANonExistingProjectNameException
 )
 from .input_converters.conversion import (
-    coco_split_dataset, convert_project_type, export_annotation,
-    import_annotation, convert_json_version
+    coco_split_dataset, convert_json_version, convert_project_type,
+    export_annotation, import_annotation
 )
 from .ml.ml_funcs import (
     delete_model, download_model, plot_model_metrics, run_prediction,
     run_segmentation, run_training, stop_model_training
 )
 from .ml.ml_models import search_models
-
 from .old_to_new_format_convertor import update_json_format
 from .version import __version__