Merge pull request #30 from superannotateai/develop

release

Author: dshabin

.vscode/settings.json

@@ -1,12 +1,13 @@
 {
+    "editor.formatOnSave": true,
     "python.formatting.provider": "yapf",
-    "python.linting.pylintPath": "venv_sa_conv/bin/pylint",
-    "python.linting.pylintEnabled": true,
-    "python.testing.pytestArgs": [
-        "tests"
-    ],
-    "python.testing.unittestEnabled": false,
-    "python.testing.nosetestsEnabled": false,
-    "python.testing.pytestEnabled": true,
-    "python.pythonPath": "venv_sa_conv/bin/python"
+    // "python.linting.pylintPath": "venv_sa_conv/bin/pylint",
+    // "python.linting.pylintEnabled": true,
+    // "python.testing.pytestArgs": [
+    //     "tests"
+    // ],
+    // "python.testing.unittestEnabled": false,
+    // "python.testing.nosetestsEnabled": false,
+    // "python.testing.pytestEnabled": true,
+    // "python.pythonPath": "venv_sa_conv/bin/python"
 }

requirements.txt

@@ -15,4 +15,5 @@ pandas>=1.1.2
 plotly>=4.1.0
 ffmpeg-python>=0.2.0
 google-cloud-storage>=1.33.0
-azure-storage-blob>=12.6.0
+azure-storage-blob>=12.6.0
+mixpanel>=4.8.3

superannotate/__init__.py

@@ -50,7 +50,8 @@ def consensus(*args, **kwargs):
     download_image_preannotations, get_image_annotations, get_image_bytes,
     get_image_metadata, get_image_preannotations, search_images,
     search_images_all_folders, set_image_annotation_status,
-    set_images_annotation_statuses, upload_image_annotations, get_project_root_folder_id
+    set_images_annotation_statuses, upload_image_annotations,
+    get_project_root_folder_id
 )
 from .db.project_api import (
     create_folder, delete_folders, get_folder_metadata,

superannotate/analytics/class_analytics.py

@@ -8,10 +8,12 @@
 from plotly.subplots import make_subplots
 
 from .common import aggregate_annotations_as_df
+from ..mixp.decorators import Trackable
 
 logger = logging.getLogger("superannotate-python-sdk")
 
 
+@Trackable
 def class_distribution(export_root, project_names, visualize=False):
     """Aggregate distribution of classes across multiple projects.
 
@@ -63,6 +65,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.
 

superannotate/analytics/common.py

@@ -6,10 +6,12 @@
 import pandas as pd
 
 from ..exceptions import SABaseException
+from ..mixp.decorators import Trackable
 
 logger = logging.getLogger("superannotate-python-sdk")
 
 
+@Trackable
 def df_to_annotations(df, output_dir):
     """Converts and saves pandas DataFrame annotation info (see aggregate_annotations_as_df)
     in output_dir.
@@ -148,6 +150,7 @@ def df_to_annotations(df, output_dir):
     )
 
 
+@Trackable
 def aggregate_annotations_as_df(
     project_root,
     include_classes_wo_annotations=False,

superannotate/api.py

@@ -1,6 +1,7 @@
 import os
 import json
 import logging
+import sys
 from pathlib import Path
 
 import requests
@@ -9,6 +10,7 @@
 
 from .exceptions import SABaseException
 from .version import __version__
+from .mixp.app import mp, get_default
 
 logger = logging.getLogger("superannotate-python-sdk")
 
@@ -24,10 +26,13 @@ def __init__(self):
         self._default_headers = None
         self._main_endpoint = None
         self.team_id = None
+        self.user_id = None
+        self.team_name = None
         if API.__instance is not None:
             raise SABaseException(0, "API class is a singleton!")
         API.__instance = self
         self._authenticated = False
+        self.init()
 
     def init(self, config_location=None):
         if config_location is None:
@@ -78,15 +83,15 @@ def init(self, config_location=None):
                 self._verify = self._api_config["ssl_verify"]
             self._session = None
             self._authenticated = True
+
             response = self.send_request(
                 req_type='GET',
-                path='/projects',
-                params={
-                    'team_id': str(self.team_id),
-                    'offset': 0,
-                    'limit': 1
-                }
+                path=f'/team/{self.team_id}',
             )
+
+            self.user_id = response.json().get('creator_id', None)
+            self.team_name = response.json().get('name', None)
+
             if not self._verify:
                 urllib3.disable_warnings(
                     urllib3.exceptions.InsecureRequestWarning
@@ -102,6 +107,11 @@ def init(self, config_location=None):
                 raise SABaseException(
                     0, "Couldn't reach superannotate " + response.text
                 )
+            if "pytest" not in sys.modules:
+                mp.track(
+                    self.user_id, "SDK init",
+                    get_default(self.team_name, self.user_id)
+                )
         except SABaseException:
             self._authenticated = False
             self._session = None

superannotate/common.py

@@ -52,11 +52,11 @@
 }
 
 _MODEL_TRAINING_TASKS = {
-    "Instance Segmentation for Pixel Projects" : "instance_segmentation_pixel",
-    "Instance Segmentation for Vector Projects" : "instance_segmentation_vector",
-    "Keypoint Detection for Vector Projects" : "keypoint_detection_vector",
-    "Object Detection for Vector Projects" : "object_detection_vector",
-    "Semantic Segmentation for Pixel Projects" : "semantic_segmentation_pixel"
+    "Instance Segmentation for Pixel Projects": "instance_segmentation_pixel",
+    "Instance Segmentation for Vector Projects": "instance_segmentation_vector",
+    "Keypoint Detection for Vector Projects": "keypoint_detection_vector",
+    "Object Detection for Vector Projects": "object_detection_vector",
+    "Semantic Segmentation for Pixel Projects": "semantic_segmentation_pixel"
 }
 
 

superannotate/consensus_benchmark/benchmark.py

@@ -9,10 +9,12 @@
 from .helpers import image_consensus, consensus_plot
 from ..db.exports import prepare_export, download_export
 from ..analytics.common import aggregate_annotations_as_df
+from ..mixp.decorators import Trackable
 
 logger = logging.getLogger("superannotate-python-sdk")
 
 
+@Trackable
 def benchmark(
     project,
     gt_folder,

superannotate/consensus_benchmark/consensus.py

@@ -9,10 +9,12 @@
 from .helpers import image_consensus, consensus_plot
 from ..db.exports import prepare_export, download_export
 from ..analytics.common import aggregate_annotations_as_df
+from ..mixp.decorators import Trackable
 
 logger = logging.getLogger("superannotate-python-sdk")
 
 
+@Trackable
 def consensus(
     project,
     folder_names,

superannotate/consensus_benchmark/helpers.py

@@ -80,32 +80,43 @@ def image_consensus(df, image_name, annot_type):
                 "Invalid %s instance occured, skipping to the next one.",
                 annot_type
             )
+    visited_instances = {}
+    for proj, instances in projects_shaply_objs.items():
+        visited_instances[proj] = [False] * len(instances)
 
     # match instances
     for curr_proj, curr_proj_instances in projects_shaply_objs.items():
-        for curr_inst_data in curr_proj_instances:
+        for curr_id, curr_inst_data in enumerate(curr_proj_instances):
             curr_inst, curr_class, _, _ = curr_inst_data
+            if visited_instances[curr_proj][curr_id] == True:
+                continue
             max_instances = []
             for other_proj, other_proj_instances in projects_shaply_objs.items(
             ):
                 if curr_proj == other_proj:
                     max_instances.append((curr_proj, *curr_inst_data))
-                    projects_shaply_objs[curr_proj].remove(curr_inst_data)
+                    visited_instances[curr_proj][curr_id] = True
                 else:
                     if annot_type in ['polygon', 'bbox']:
                         max_score = 0
                     else:
                         max_score = float('-inf')
                     max_inst_data = None
-                    for other_inst_data in other_proj_instances:
+                    max_inst_id = -1
+                    for other_id, other_inst_data in enumerate(
+                        other_proj_instances
+                    ):
                         other_inst, other_class, _, _ = other_inst_data
+                        if visited_instances[other_proj][other_id] == True:
+                            continue
                         score = instance_consensus(curr_inst, other_inst)
                         if score > max_score and other_class == curr_class:
                             max_score = score
                             max_inst_data = other_inst_data
+                            max_inst_id = other_id
                     if max_inst_data is not None:
                         max_instances.append((other_proj, *max_inst_data))
-                        projects_shaply_objs[other_proj].remove(max_inst_data)
+                        visited_instances[other_proj][max_inst_id] = True
             if len(max_instances) == 1:
                 image_data["creatorEmail"].append(max_instances[0][3])
                 image_data["attributes"].append(max_instances[0][4])