Merge branch 'friday' into 1100_enums

Author: VaghinakDev

src/superannotate/__init__.py

@@ -6,6 +6,8 @@
 import logging.config  # noqa
 import requests  # noqa
 from packaging.version import parse  # noqa
+from superannotate.lib.app.input_converters import convert_json_version  # noqa
+from superannotate.lib.app.input_converters import convert_project_type  # noqa
 from superannotate.lib.app.analytics.class_analytics import class_distribution  # noqa
 from superannotate.lib.app.exceptions import AppException  # noqa
 from superannotate.lib.app.input_converters import convert_json_version  # noqa
@@ -20,7 +22,6 @@
 from superannotate.version import __version__  # noqa
 import superannotate.lib.core.enums as enums  # noqa
 
-
 SESSIONS = {}
 
 __all__ = [

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

@@ -1,7 +1,6 @@
 import functools
 import os
 import sys
-from abc import abstractmethod
 from inspect import signature
 from pathlib import Path
 from types import FunctionType
@@ -12,8 +11,8 @@
 import lib.core as constants
 from lib.app.helpers import extract_project_folder
 from lib.app.interface.types import validate_arguments
+from lib.core import CONFIG
 from lib.core.exceptions import AppException
-from lib.core.reporter import Session
 from lib.infrastructure.controller import Controller
 from lib.infrastructure.repositories import ConfigRepository
 from mixpanel import Mixpanel
@@ -63,19 +62,12 @@ def _retrieve_configs(path) -> Tuple[str, str, str]:
         )
 
     @property
-    @abstractmethod
     def host(self):
-        raise NotImplementedError
+        return self._host
 
     @property
-    @abstractmethod
     def token(self):
-        raise NotImplementedError
-
-    @property
-    @abstractmethod
-    def logger(self):
-        raise NotImplementedError
+        return self._token
 
 
 class Tracker:
@@ -158,7 +150,7 @@ def _track_method(self, args, kwargs, success: bool):
         self._track(
             user_id,
             event_name,
-            {**default, **properties, **Session.get_current_session().data},
+            {**default, **properties, **CONFIG.get_current_session().data},
         )
 
     def __get__(self, obj, owner=None):

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

@@ -674,6 +674,51 @@ def delete_images(
             f"Images deleted in project {project_name}{'/' + folder_name if folder_name else ''}"
         )
 
+    def assign_items(
+        self, project: Union[NotEmptyStr, dict], items: List[str], user: str
+    ):
+        """Assigns items  to a user. The assignment role, QA or Annotator, will
+        be deduced from the user's role in the project. The type of the objects` image, video or text
+        will be deduced from the project type. With SDK, the user can be
+        assigned to a role in the project with the share_project function.
+
+        :param project: project name or folder path (e.g., "project1/folder1")
+        :type project: str
+        :param items: list of items to assign
+        :type item_names: list of str
+        :param user: user email
+        :type user: str
+        """
+
+        project_name, folder_name = extract_project_folder(project)
+
+        response = self.controller.assign_items(project_name, folder_name, items, user)
+
+        if not response.errors:
+            logger.info(f"Assign items to user {user}")
+        else:
+            raise AppException(response.errors)
+
+    def unassign_items(
+        self, project: Union[NotEmptyStr, dict], items: List[NotEmptyStr]
+    ):
+        """Removes assignment of given items for all assignees. With SDK,
+        the user can be assigned to a role in the project with the share_project
+        function.
+
+        :param project: project name or folder path (e.g., "project1/folder1")
+        :type project: str
+        :param items: list of items to unassign
+        :type item_names: list of str
+        """
+        project_name, folder_name = extract_project_folder(project)
+
+        response = self.controller.un_assign_items(
+            project_name=project_name, folder_name=folder_name, item_names=items
+        )
+        if response.errors:
+            raise AppException(response.errors)
+
     def assign_images(
         self, project: Union[NotEmptyStr, dict], image_names: List[str], user: str
     ):
@@ -688,6 +733,14 @@ def assign_images(
         :param user: user email
         :type user: str
         """
+
+        warning_msg = (
+            "We're deprecating the assign_images function. Please use assign_items instead."
+            "Learn more. \n"
+            "https://superannotate.readthedocs.io/en/stable/superannotate.sdk.html#superannotate.assign_items"
+        )
+        logger.warning(warning_msg)
+        warnings.warn(warning_msg, DeprecationWarning)
         project_name, folder_name = extract_project_folder(project)
         project = self.controller.get_project_metadata(project_name).data
 
@@ -726,18 +779,26 @@ def assign_images(
     def unassign_images(
         self, project: Union[NotEmptyStr, dict], image_names: List[NotEmptyStr]
     ):
-        """Removes assignment of given images for all assignees.With SDK,
+        """Removes assignment of given images for all assignees. With SDK,
         the user can be assigned to a role in the project with the share_project
         function.
 
         :param project: project name or folder path (e.g., "project1/folder1")
         :type project: str
-        :param image_names: list of image unassign
+        :param image_names: list of images to unassign
         :type image_names: list of str
         """
+
+        warning_msg = (
+            "We're deprecating the unassign_images function. Please use unassign_items instead."
+            "Learn more. \n"
+            "https://superannotate.readthedocs.io/en/stable/superannotate.sdk.html#superannotate.unassign_items"
+        )
+        logger.warning(warning_msg)
+        warnings.warn(warning_msg, DeprecationWarning)
         project_name, folder_name = extract_project_folder(project)
 
-        response = self.controller.un_assign_images(
+        response = self.controller.un_assign_items(
             project_name=project_name, folder_name=folder_name, image_names=image_names
         )
         if response.errors:

src/superannotate/lib/core/__init__.py

@@ -1,5 +1,6 @@
 from os.path import expanduser
 
+from superannotate.lib.core.config import Config
 from superannotate.lib.core.enums import AnnotationStatus
 from superannotate.lib.core.enums import ImageQuality
 from superannotate.lib.core.enums import ProjectState
@@ -12,6 +13,9 @@
 from superannotate.lib.core.enums import UserRole
 
 
+CONFIG = Config()
+
+
 CONFIG_PATH = "~/.superannotate/config.json"
 CONFIG_FILE_LOCATION = expanduser(CONFIG_PATH)
 LOG_FILE_LOCATION = expanduser("~/.superannotate/sa.log")

src/superannotate/lib/core/config.py

@@ -0,0 +1,70 @@
+import threading
+from typing import Dict
+
+from dataclasses import dataclass
+from dataclasses import field
+
+
+class Session:
+    def __init__(self):
+        self.pk = threading.get_ident()
+        self._data_dict = {}
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        if type is not None:
+            return False
+
+    def __del__(self):
+        Config().delete_current_session()
+
+    @property
+    def data(self):
+        return self._data_dict
+
+    @staticmethod
+    def get_current_session():
+        return Config().get_current_session()
+
+    def __setitem__(self, key, item):
+        self._data_dict[key] = item
+
+    def __getitem__(self, key):
+        return self._data_dict[key]
+
+    def __repr__(self):
+        return repr(self._data_dict)
+
+    def clear(self):
+        return self._data_dict.clear()
+
+
+class Singleton(type):
+    _instances = {}
+    _lock = threading.Lock()
+
+    def __call__(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            with cls._lock:
+                if cls not in cls._instances:
+                    cls._instances[cls] = super().__call__(*args, **kwargs)
+        return cls._instances[cls]
+
+
+@dataclass()
+class Config(metaclass=Singleton):
+    SESSIONS: Dict[int, Session] = field(default_factory=dict)
+
+    def get_current_session(self):
+        session = self.SESSIONS.get(threading.get_ident())
+        if not session:
+            session = Session()
+            self.SESSIONS.update({session.pk: session})
+        return session
+
+    def delete_current_session(self):
+        ident = threading.get_ident()
+        if ident in self.SESSIONS:
+            del self.SESSIONS[ident]

src/superannotate/lib/core/reporter.py

@@ -6,6 +6,7 @@
 from typing import Union
 
 import tqdm
+from lib.core import CONFIG
 from superannotate.logger import get_default_logger
 
 
@@ -31,59 +32,13 @@ def init_spin(self):
             sys.stdout.write("\b")
 
 
-class Session:
-    def __init__(self):
-        self.pk = threading.get_ident()
-        self._data_dict = {}
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, type, value, traceback):
-        if type is not None:
-            return False
-
-    def __del__(self):
-        globs = globals()
-        if "SESSIONS" in globs and globs["SESSIONS"].get(self.pk):
-            del globs["SESSIONS"][self.pk]
-
-    @property
-    def data(self):
-        return self._data_dict
-
-    @staticmethod
-    def get_current_session():
-        globs = globals()
-        if not globs.get("SESSIONS") or not globs["SESSIONS"].get(
-            threading.get_ident()
-        ):
-            session = Session()
-            globals().update({"SESSIONS": {session.pk: session}})
-            return session
-        return globs["SESSIONS"][threading.get_ident()]
-
-    def __setitem__(self, key, item):
-        self._data_dict[key] = item
-
-    def __getitem__(self, key):
-        return self._data_dict[key]
-
-    def __repr__(self):
-        return repr(self._data_dict)
-
-    def clear(self):
-        return self._data_dict.clear()
-
-
 class Reporter:
     def __init__(
         self,
         log_info: bool = True,
         log_warning: bool = True,
         disable_progress_bar: bool = False,
         log_debug: bool = True,
-        session: Session = None,
     ):
         self.logger = get_default_logger()
         self._log_info = log_info
@@ -95,7 +50,7 @@ def __init__(
         self.debug_messages = []
         self.custom_messages = defaultdict(set)
         self.progress_bar = None
-        self.session = session
+        self.session = CONFIG.get_current_session()
         self._spinner = None
 
     def start_spinner(self):

src/superannotate/lib/core/response.py

@@ -8,6 +8,9 @@ def __init__(self, status: str = None, data: Union[dict, list] = None):
         self._report = []
         self._errors = []
 
+    def __str__(self):
+        return f"Response object with status:{self.status}, data : {self.data}, errors: {self.errors} "
+
     @property
     def data(self):
         return self._data
@@ -30,7 +33,7 @@ def report_messages(self):
 
     @property
     def status(self):
-        return self.data
+        return self._status
 
     @status.setter
     def status(self, value):

src/superannotate/lib/core/serviceproviders.py

@@ -175,6 +175,16 @@ def assign_images(
     ):
         raise NotImplementedError
 
+    def assign_items(
+        self,
+        team_id: int,
+        project_id: int,
+        folder_name: str,
+        user: str,
+        item_names: list,
+    ):
+        raise NotImplementedError
+
     def get_bulk_images(
         self, project_id: int, team_id: int, folder_id: int, images: List[str]
     ) -> List[dict]:
@@ -202,6 +212,15 @@ def un_assign_images(
     ):
         raise NotImplementedError
 
+    def un_assign_items(
+        self,
+        team_id: int,
+        project_id: int,
+        folder_name: str,
+        item_names: list,
+    ):
+        raise NotImplementedError
+
     def un_share_project(
         self,
         team_id: int,