Merge branch 're-design-sdk' of https://github.com/superannotateai/superannotate-python-sdk into re-design-sdk

Author: dshabin

src/superannotate/__init__.py

@@ -1,5 +1,7 @@
+import os
 import logging.config
 
+from version import __version__
 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
@@ -156,6 +158,7 @@
 
 
 __all__ = [
+    "__version__",
     # Utils
     "AppException",
     #
@@ -287,7 +290,7 @@
 ]
 
 __author__ = "Superannotate"
-import os
+
 
 file_dir = os.path.split(os.path.realpath(__file__))[0]
 

src/superannotate/lib/core/usecases.py

@@ -129,10 +129,7 @@ def execute(self):
             if not projects:
                 self._response.errors = AppException("Project not found.")
             else:
-                for project in projects:
-                    if project.name == self._name:
-                        self._response.data = project
-                    break
+                self._response.data = next(project for project in projects if project.name == self._name)
         return self._response
 
 
@@ -1972,6 +1969,8 @@ def execute(self):
 
         if self._include_contributors:
             data["contributors"] = project.users
+        else:
+            project.users = []
 
         self._response.data = data
         return self._response

src/superannotate/lib/infrastructure/services.py

@@ -8,16 +8,19 @@
 
 import lib.core as constance
 import requests.packages.urllib3
+import requests.adapters
 from lib.core.exceptions import AppException
 from lib.core.serviceproviders import SuerannotateServiceProvider
 from requests.exceptions import HTTPError
+from lib.infrastructure.helpers import timed_lru_cache
 
 requests.packages.urllib3.disable_warnings()
 
 
 class BaseBackendService(SuerannotateServiceProvider):
     AUTH_TYPE = "sdk"
     PAGINATE_BY = 100
+    MAX_RETRY = 3
 
     """
     Base service class
@@ -31,8 +34,8 @@ def __init__(self, api_url: str, auth_token: str, logger, paginate_by=None):
         self.team_id = auth_token.split("=")[-1]
         self._session = None
 
-    @property
-    def session(self):
+    @timed_lru_cache(seconds=360)
+    def get_session(self):
         if not self._session:
             self._session = requests.Session()
             self._session.headers.update(self.default_headers)
@@ -77,8 +80,9 @@ def _request(
     ) -> requests.Response:
         kwargs = {"json": data} if data else {}
         headers_dict = self.default_headers.copy()
-        self.session.headers.update(headers if headers else {})
-        method = getattr(self.session, method)
+        session = self.get_session()
+        session.headers.update(headers if headers else {})
+        method = getattr(session, method)
         with self.safe_api():
             response = method(
                 url, **kwargs, headers=headers_dict, params=params, timeout=60,

tests/integration/test_interface.py

@@ -45,3 +45,10 @@ def test_delete_folder(self):
         print(sa.search_folders(self.PROJECT_NAME))
         with self.assertRaises(AppException):
             sa.delete_folders(self.PROJECT_NAME, ["non-existing folder"])
+
+    def test_get_project_metadata(self):
+        metadata = sa.get_project_metadata(self.PROJECT_NAME)
+        self.assertIsNotNone(metadata["id"])
+        self.assertListEqual(metadata.get("contributors", []), [])
+        metadata_with_users = sa.get_project_metadata(self.PROJECT_NAME, include_contributors=True)
+        self.assertIsNotNone(metadata_with_users.get("contributors"))

tests/profiling/profiling.py

@@ -3,7 +3,6 @@
 import time
 
 
-
 stat = time.time()
 sa.search_annotation_classes("Vector Project")
 end = time.time()