Merge pull request #444 from superannotateai/session_fix

Session fix

Author: VaghinakDev

src/superannotate/__init__.py

@@ -2,20 +2,15 @@
 import sys
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
-from superannotate.lib.app.input_converters.conversion import (
-    convert_json_version,
-)  # noqa
-from superannotate.lib.app.input_converters.conversion import (
-    convert_project_type,
-)  # noqa
-
 
 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
+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.input_converters import export_annotation  # noqa
 from superannotate.lib.app.input_converters import import_annotation  # noqa
@@ -26,7 +21,6 @@
 from superannotate.logger import get_default_logger  # noqa
 from superannotate.version import __version__  # noqa
 
-
 SESSIONS = {}
 
 __all__ = [

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

@@ -1,13 +1,13 @@
 import copy
 import json
-from dataclasses import dataclass
 from pathlib import Path
 from typing import List
 from typing import Optional
 from typing import Union
 
 import lib.core as constances
 import pandas as pd
+from dataclasses import dataclass
 from lib.app.exceptions import AppException
 from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
 from lib.core import PIXEL_ANNOTATION_POSTFIX

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
@@ -11,8 +10,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
@@ -27,15 +26,14 @@ def __init__(
         token: str = None,
         config_path: str = constants.CONFIG_PATH,
     ):
-        host = constants.BACKEND_URL
         env_token = os.environ.get("SA_TOKEN")
+        host = os.environ.get("SA_URL", constants.BACKEND_URL)
         version = os.environ.get("SA_VERSION", "v1")
         ssl_verify = bool(os.environ.get("SA_SSL", True))
         if token:
             token = Controller.validate_token(token=token)
         elif env_token:
             host = os.environ.get("SA_URL", constants.BACKEND_URL)
-
             token = Controller.validate_token(env_token)
         else:
             config_path = os.path.expanduser(str(config_path))
@@ -68,7 +66,6 @@ def token(self):
         return self._token
 
 
-
 class Tracker:
     def get_mp_instance(self) -> Mixpanel:
         if self.client:
@@ -149,7 +146,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

@@ -61,7 +61,6 @@
 logger = get_default_logger()
 
 
-
 class SAClient(BaseInterfaceFacade, metaclass=TrackableMeta):
     def get_team_metadata(self):
         """Returns team metadata
@@ -313,7 +312,6 @@ def rename_project(self, project: NotEmptyStr, new_name: NotEmptyStr):
         )
         return ProjectSerializer(response.data).serialize()
 
-
     def get_folder_metadata(self, project: NotEmptyStr, folder_name: NotEmptyStr):
         """Returns folder metadata
 
@@ -687,9 +685,7 @@ def assign_items(
 
         project_name, folder_name = extract_project_folder(project)
 
-        response = self.controller.assign_items(
-            project, folder_name, item_names, user
-        )
+        response = self.controller.assign_items(project, folder_name, item_names, user)
 
         if not response.errors:
             logger.info(f"Assign items to user {user}")
@@ -733,8 +729,8 @@ def assign_images(
 
         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"
+            "Learn more. \n"
+            "https://superannotate.readthedocs.io/en/stable/superannotate.sdk.html#superannotate.assign_items"
         )
         logger.warning(warning_msg)
         warnings.warn(warning_msg, DeprecationWarning)
@@ -788,8 +784,8 @@ def unassign_images(
 
         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"
+            "Learn more. \n"
+            "https://superannotate.readthedocs.io/en/stable/superannotate.sdk.html#superannotate.unassign_items"
         )
         logger.warning(warning_msg)
         warnings.warn(warning_msg, DeprecationWarning)

src/superannotate/lib/core/__init__.py

@@ -1,6 +1,6 @@
 from os.path import expanduser
-from pathlib import Path
 
+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
@@ -13,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.get("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

@@ -10,6 +10,7 @@ def __init__(self, status: str = None, data: Union[dict, list] = None):
 
     def __str__(self):
         return f"Response object with status:{self.status}, data : {self.data}, errors: {self.errors} "
+
     @property
     def data(self):
         return self._data

src/superannotate/lib/core/serviceproviders.py

@@ -218,7 +218,6 @@ def un_assign_items(
         project_id: int,
         folder_name: str,
         item_names: list,
-
     ):
         raise NotImplementedError
 

src/superannotate/lib/core/usecases/annotations.py

@@ -816,7 +816,9 @@ def execute(self):
         if self.is_valid():
             export_path = str(
                 self.destination
-                / Path(f"{self._project.name} {datetime.now().strftime('%B %d %Y %H_%M')}")
+                / Path(
+                    f"{self._project.name} {datetime.now().strftime('%B %d %Y %H_%M')}"
+                )
             )
             self.reporter.log_info(
                 f"Downloading the annotations of the requested items to {export_path}\nThis might take a while…"