Merge pull request #594 from superannotateai/develop

Develop

Author: VaghinakDev

.github/workflows/release.yml

@@ -7,13 +7,13 @@ on:
 jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
-        python-version: "3.7"
+        python-version: "3.8"
     - name: Upgrade pip
       run: >-
         python -m
@@ -36,7 +36,7 @@ jobs:
         .
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@master
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.pypi_password }}
         verbose: true

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 All release highlights of this project will be documented in this file.
+## 4.4.11 - April 2, 2023
+### Added
+- `SAClient.set_project_status()` method.
+- `SAClient.set_folder_status()` method.
+### Updated
+-  `SAClient.create_annotation_class()` added OCR type attribute group support in the vector projects.
+-  `SAClient.create_annotation_classes_from_classes_json()` added OCR type attribute group support in the vector projects.
 ## 4.4.10 - March 12, 2023
 ### Updated
 - Configuration file creation flow

docs/source/api_reference/api_client.rst

@@ -9,6 +9,7 @@ Contents
     :maxdepth: 8
 
     api_project
+    api_folder
     api_item
     api_annotation
     api_annotation_class

docs/source/api_reference/api_folder.rst

@@ -0,0 +1,11 @@
+=======
+Folders
+=======
+
+.. automethod:: superannotate.SAClient.search_folders
+.. automethod:: superannotate.SAClient.assign_folder
+.. automethod:: superannotate.SAClient.unassign_folder
+.. automethod:: superannotate.SAClient.get_folder_by_id
+.. automethod:: superannotate.SAClient.get_folder_metadata
+.. automethod:: superannotate.SAClient.create_folder
+.. automethod:: superannotate.SAClient.delete_folders

docs/source/api_reference/api_image.rst

@@ -1,6 +1,6 @@
-==========
+======
 Images
-==========
+======
 
 
 .. _ref_search_images:

docs/source/api_reference/api_project.rst

@@ -1,25 +1,19 @@
-==========
+========
 Projects
-==========
+========
 .. _ref_projects:
 .. _ref_search_projects:
-.. automethod:: superannotate.SAClient.search_projects
 .. automethod:: superannotate.SAClient.create_project
+.. automethod:: superannotate.SAClient.search_projects
 .. automethod:: superannotate.SAClient.create_project_from_metadata
 .. automethod:: superannotate.SAClient.clone_project
-.. automethod:: superannotate.SAClient.delete_project
 .. automethod:: superannotate.SAClient.rename_project
+.. automethod:: superannotate.SAClient.delete_project
 .. _ref_get_project_metadata:
 .. automethod:: superannotate.SAClient.get_project_by_id
+.. automethod:: superannotate.SAClient.set_project_status
 .. automethod:: superannotate.SAClient.get_project_metadata
 .. automethod:: superannotate.SAClient.get_project_image_count
-.. automethod:: superannotate.SAClient.search_folders
-.. automethod:: superannotate.SAClient.assign_folder
-.. automethod:: superannotate.SAClient.unassign_folder
-.. automethod:: superannotate.SAClient.get_folder_by_id
-.. automethod:: superannotate.SAClient.get_folder_metadata
-.. automethod:: superannotate.SAClient.create_folder
-.. automethod:: superannotate.SAClient.delete_folders
 .. automethod:: superannotate.SAClient.upload_images_to_project
 .. automethod:: superannotate.SAClient.attach_items_from_integrated_storage
 .. automethod:: superannotate.SAClient.upload_image_to_project
@@ -30,5 +24,5 @@ Projects
 .. automethod:: superannotate.SAClient.add_contributors_to_project
 .. automethod:: superannotate.SAClient.get_project_settings
 .. automethod:: superannotate.SAClient.set_project_default_image_quality_in_editor
-.. automethod:: superannotate.SAClient.get_project_workflow
 .. automethod:: superannotate.SAClient.set_project_workflow
+.. automethod:: superannotate.SAClient.get_project_workflow

docs/source/api_reference/api_team.rst

@@ -1,6 +1,6 @@
-==========
+====
 Team
-==========
+====
 
 
 .. automethod:: superannotate.SAClient.get_team_metadata

requirements.txt

@@ -17,7 +17,6 @@ mixpanel==4.8.3
 pydantic>=1.10.4
 setuptools>=57.4.0
 email-validator>=1.0.3
-nest-asyncio==1.5.4
 jsonschema==3.2.0
 pandas>=1.1.4
 aiofiles==0.8.0

src/superannotate/__init__.py

@@ -3,7 +3,8 @@
 import sys
 import typing
 
-__version__ = "4.4.10"
+__version__ = "4.4.11"
+
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

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

@@ -1,6 +1,7 @@
 import functools
 import json
 import os
+import platform
 import sys
 import typing
 from inspect import signature
@@ -33,7 +34,7 @@ def __init__(self, token: TokenStr = None, config_path: str = None):
             if token:
                 config = ConfigEntity(SA_TOKEN=token)
             elif config_path:
-                config_path = Path(config_path)
+                config_path = Path(config_path).expanduser()
                 if not Path(config_path).is_file() or not os.access(
                     config_path, os.R_OK
                 ):
@@ -124,10 +125,10 @@ def _retrieve_configs_from_env() -> typing.Union[ConfigEntity, None]:
 class Tracker:
     def get_mp_instance(self) -> Mixpanel:
         client = self.get_client()
-        mp_token = "ca95ed96f80e8ec3be791e2d3097cf51"
-        if client:
-            if client.host != constants.BACKEND_URL:
-                mp_token = "e741d4863e7e05b1a45833d01865ef0d"
+        if client.controller._config.API_URL == constants.BACKEND_URL:  # noqa
+            mp_token = "ca95ed96f80e8ec3be791e2d3097cf51"
+        else:
+            mp_token = "e741d4863e7e05b1a45833d01865ef0d"
         return Mixpanel(mp_token)
 
     @staticmethod
@@ -137,6 +138,8 @@ def get_default_payload(team_name, user_id):
             "Team": team_name,
             "Team Owner": user_id,
             "Version": __version__,
+            "Python version": platform.python_version(),
+            "Python interpreter type": platform.python_implementation(),
         }
 
     def __init__(self, function):
@@ -170,6 +173,10 @@ def default_parser(function_name: str, kwargs: dict) -> tuple:
         for key, value in kwargs.items():
             if key == "self":
                 continue
+            elif key == "token":
+                properties["sa_token"] = str(bool(value))
+            elif key == "config_path":
+                properties[key] = str(bool(value))
             elif value is None:
                 properties[key] = value
             elif key == "project":
@@ -241,5 +248,6 @@ def __new__(mcs, name, bases, attrs):
                 attr_value, FunctionType
             ) and not attr_value.__name__.startswith("_"):
                 attrs[attr_name] = Tracker(validate_arguments(attr_value))
+        attrs["__init__"] = Tracker(validate_arguments(attrs["__init__"]))
         tmp = super().__new__(mcs, name, bases, attrs)
         return tmp