Merge remote-tracking branch 'origin/re-design-sdk' into re-design-sdk

# Conflicts:
#	src/superannotate/lib/app/input_converters/conversion.py
#	src/superannotate/lib/app/interface/sdk_interface.py

Author: Vaghinak Basentsyan

.gitignore

@@ -4,6 +4,7 @@ __pycache__/
 *$py.class
 *mypy*
 *.egg*
+*DS_Store*
 
 # C extensions
 *.so
@@ -16,7 +17,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

src/superannotate/__init__.py

@@ -1,4 +1,3 @@
-from superannotate.lib.app.analytics.class_analytics import aggregate_annotations_as_df
 from superannotate.lib.app.analytics.class_analytics import attribute_distribution
 from superannotate.lib.app.analytics.class_analytics import class_distribution
 from superannotate.lib.app.annotation_helpers import add_annotation_bbox_to_json
@@ -38,6 +37,7 @@
 from superannotate.lib.app.interface.sdk_interface import (
     add_annotation_template_to_image,
 )
+from superannotate.lib.app.interface.sdk_interface import aggregate_annotations_as_df
 from superannotate.lib.app.interface.sdk_interface import assign_folder
 from superannotate.lib.app.interface.sdk_interface import assign_images
 from superannotate.lib.app.interface.sdk_interface import attach_image_urls_to_project

src/superannotate/lib/app/analytics/class_analytics.py

@@ -3,12 +3,14 @@
 
 import pandas as pd
 import plotly.express as px
+from superannotate.lib.app.mixp.decorators import Trackable
 
 from .common import aggregate_annotations_as_df
 
 logger = logging.getLogger("superannotate-python-sdk")
 
 
+@Trackable
 def class_distribution(export_root, project_names, visualize=False):
     """Aggregate distribution of classes across multiple projects.
 
@@ -57,6 +59,7 @@ def class_distribution(export_root, project_names, visualize=False):
     return df
 
 
+@Trackable
 def attribute_distribution(export_root, project_names, visualize=False):
     """Aggregate distribution of attributes across multiple projects.
 

src/superannotate/lib/app/convertors/df_converter.py

@@ -2,8 +2,10 @@
 from pathlib import Path
 
 import pandas as pd
+from superannotate.lib.app.mixp.decorators import Trackable
 
 
+@Trackable
 def df_to_annotations(df, output_dir):
     """Converts and saves pandas DataFrame annotation info (see aggregate_annotations_as_df)
     in output_dir.
@@ -129,6 +131,7 @@ def df_to_annotations(df, output_dir):
     )
 
 
+@Trackable
 def filter_annotation_instances(annotations_df, include=None, exclude=None):
     """Filter annotation instances from project annotations pandas DataFrame.
 
@@ -195,6 +198,7 @@ def filter_annotation_instances(annotations_df, include=None, exclude=None):
     return result
 
 
+@Trackable
 def filter_images_by_comments(
     annotations_df,
     include_unresolved_comments=True,
@@ -230,6 +234,7 @@ def filter_images_by_comments(
     return list(images)
 
 
+@Trackable
 def filter_images_by_tags(annotations_df, include=None, exclude=None):
     """Filter images on tags
 

src/superannotate/lib/app/convertors/dicom_converter.py

@@ -3,8 +3,10 @@
 import numpy as np
 import pydicom
 from PIL import Image
+from superannotate.lib.app.mixp.decorators import Trackable
 
 
+@Trackable
 def dicom_to_rgb_sequence(
     input_dicom_file, output_dir, output_image_quality="original"
 ):

src/superannotate/lib/app/input_converters/conversion.py

@@ -6,6 +6,7 @@
 
 from lib.app.exceptions import AppException
 from lib.core.exceptions import AppValidationException
+from lib.app.mixp.decorators import Trackable
 
 from .export_from_sa_conversions import export_from_sa
 from .import_to_sa_conversions import import_to_sa
@@ -133,7 +134,7 @@ def _passes_converter_sanity(args, direction):
         )
 
 
-#  @Trackable
+@Trackable
 def export_annotation(
     input_dir,
     output_dir,
@@ -219,7 +220,7 @@ def export_annotation(
     export_from_sa(args)
 
 
-#  @Trackable
+@Trackable
 def import_annotation(
     input_dir,
     output_dir,
@@ -403,7 +404,7 @@ def import_annotation(
     import_to_sa(args)
 
 
-#  @Trackable
+@Trackable
 def convert_project_type(input_dir, output_dir):
     """ Converts SuperAnnotate 'Vector' project type to 'Pixel' or reverse.
 
@@ -423,7 +424,7 @@ def convert_project_type(input_dir, output_dir):
     sa_convert_project_type(input_dir, output_dir)
 
 
-#  @Trackable
+@Trackable
 def coco_split_dataset(
     coco_json_path, image_dir, output_dir, dataset_list_name, ratio_list
 ):
@@ -474,7 +475,7 @@ def coco_split_dataset(
     split_coco(coco_json_path, image_dir, output_dir, dataset_list_name, ratio_list)
 
 
-#  @Trackable
+@Trackable
 def convert_json_version(input_dir, output_dir, version=2):
     """
     Converts SuperAnnotate JSON versions. Newest JSON version is 2.