Fix

Author: VaghinakDev

requirements.txt

@@ -2,7 +2,7 @@ pydicom>=2.0.0
 boto3>=1.14.53
 requests==2.26.0
 requests-toolbelt>=0.9.1
-tqdm==4.48.2
+tqdm==4.64.0
 pillow>=7.2.0
 matplotlib>=3.3.1
 xmltodict==0.12.0

src/superannotate/__init__.py

@@ -1,7 +1,7 @@
 import os
 import sys
 
-__version__ = "4.4.2dev9"
+__version__ = "4.4.2dev10"
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

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

@@ -5,6 +5,7 @@
 import json
 import os
 import platform
+import re
 import sys
 import time
 from dataclasses import dataclass
@@ -292,7 +293,6 @@ def _upload_mask(self, item: AnnotationToUpload):
         )
 
     async def _upload_small_annotations(self, chunk) -> Report:
-        self.reporter.update_progress(len(chunk))
         failed_annotations, missing_classes, missing_attr_groups, missing_attrs = (
             [],
             [],
@@ -305,6 +305,7 @@ async def _upload_small_annotations(self, chunk) -> Report:
             folder_id=self._folder.id,
             items_name_file_map={i.name: i.data for i in chunk},
         )
+        self.reporter.update_progress(len(chunk))
         if response.ok:
             if response.data.failed_items:  # noqa
                 failed_annotations = response.data.failed_items
@@ -357,7 +358,6 @@ async def upload(_chunk):
 
     async def _upload_big_annotation(self, item) -> Tuple[str, bool]:
         try:
-            self.reporter.update_progress()
             is_uploaded = await self._backend_service.upload_big_annotation(
                 team_id=self._project.team_id,
                 project_id=self._project.id,
@@ -366,6 +366,7 @@ async def _upload_big_annotation(self, item) -> Tuple[str, bool]:
                 data=item.data,
                 chunk_size=5 * 1024 * 1024,
             )
+            self.reporter.update_progress()
             if is_uploaded and (
                 self._project.type == constants.ProjectType.PIXEL.value and item.mask
             ):
@@ -994,11 +995,18 @@ def get_postfix(self):
         return ".json"
 
     def download_annotation_classes(self, path: str):
-        classes = self._classes.get_all()
-        classes_path = Path(path) / "classes"
-        classes_path.mkdir(parents=True, exist_ok=True)
-        with open(classes_path / "classes.json", "w+") as file:
-            json.dump([i.dict() for i in classes], file, indent=4)
+        response = self._backend_client.list_annotation_classes(
+            team_id=self._project.team_id, project_id=self._project.id
+        )
+        if response.ok:
+            classes_path = Path(path) / "classes"
+            classes_path.mkdir(parents=True, exist_ok=True)
+            with open(classes_path / "classes.json", "w+") as file:
+                json.dump(
+                    [i.dict(exclude_unset=True) for i in response.data], file, indent=4
+                )
+        else:
+            self._response.errors = AppException("Cant download classes.")
 
     @staticmethod
     def get_items_count(path: str):
@@ -1084,6 +1092,9 @@ def execute(self):
 class ValidateAnnotationUseCase(BaseReportableUseCase):
     DEFAULT_VERSION = "V1.00"
     SCHEMAS: Dict[str, Draft7Validator] = {}
+    PATTERN_MAP = {
+        "\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\d(?:\\.\\d{3})Z": "YYYY-MM-DDTHH:MM:SS.fffZ"
+    }
 
     def __init__(
         self,
@@ -1161,6 +1172,13 @@ def oneOf(validator, oneOf, instance, schema):  # noqa
         if const_key:
             yield ValidationError(f"invalid {'.'.join(const_key)}")
 
+    @staticmethod
+    def _pattern(validator, patrn, instance, schema):
+        if validator.is_type(instance, "string") and not re.search(patrn, instance):
+            yield ValidationError(
+                f"{instance} does not match {ValidateAnnotationUseCase.PATTERN_MAP.get(patrn, patrn)}"
+            )
+
     @staticmethod
     def iter_errors(self, instance, _schema=None):
         if _schema is None:
@@ -1241,6 +1259,7 @@ def _get_validator(self, version: str) -> Draft7Validator:
             iter_errors = partial(self.iter_errors, validator)
             validator.iter_errors = iter_errors
             validator.VALIDATORS["oneOf"] = self.oneOf
+            validator.VALIDATORS["pattern"] = self._pattern
             ValidateAnnotationUseCase.SCHEMAS[key] = validator
         return validator
 

src/superannotate/lib/infrastructure/services.py

@@ -4,8 +4,10 @@
 import io
 import json
 import platform
+import threading
 import time
 from contextlib import contextmanager
+from functools import lru_cache
 from typing import Any
 from typing import Callable
 from typing import Dict
@@ -31,7 +33,6 @@
 from lib.core.service_types import UploadCustomFieldValues
 from lib.core.service_types import UserLimits
 from lib.core.serviceproviders import SuperannotateServiceProvider
-from lib.infrastructure.helpers import timed_lru_cache
 from lib.infrastructure.stream_data_handler import StreamedAnnotations
 from pydantic import BaseModel
 from pydantic import parse_obj_as
@@ -82,23 +83,32 @@ def __init__(
     def assets_provider_url(self):
         if self.api_url != constance.BACKEND_URL:
             # return "http://ec2-18-237-224-179.us-west-2.compute.amazonaws.com:3009/api/v1.01/"
-            # return "https://sa-assets-provider.us-west-2.elasticbeanstalk.com/api/v1.01/"
-            return "https://assets-provider.devsuperannotate.com/api/v1.01/"
+            return (
+                "https://sa-assets-provider.us-west-2.elasticbeanstalk.com/api/v1.01/"
+            )
+            # return "https://assets-provider.devsuperannotate.com/api/v1.01/"
         return "https://assets-provider.superannotate.com/api/v1/"
 
-    @timed_lru_cache(seconds=360)
-    def get_session(self):
+    @lru_cache(maxsize=32)
+    def _get_session(self, thread_id, ttl=None):  # noqa
+        del ttl
+        del thread_id
         session = requests.Session()
         session.headers.update(self.default_headers)
         return session
 
+    def get_session(self):
+        return self._get_session(
+            thread_id=threading.get_ident(), ttl=round(time.time() / 360)
+        )
+
     @property
     def default_headers(self):
         return {
             "Authorization": self._auth_token,
             "authtype": self.AUTH_TYPE,
             "Content-Type": "application/json",
-            "User-Agent": f"Python-SDK-Version: {__version__}; Python: {platform.python_version()}; "
+            "User-Agent": f"Python-SDK-Version: {__version__}; Python: {platform.python_version()};"
             f"OS: {platform.system()}; Team: {self.team_id}",
         }
 
@@ -442,13 +452,12 @@ def attach_files(
 
     def get_folder(self, query_string: str):
         get_folder_url = urljoin(self.api_url, self.URL_GET_FOLDER_BY_NAME)
+        params = {}
         if query_string:
             query_items = query_string.split("&")
-            params = {}
             for item in query_items:
                 tmp = item.split("=")
                 params[tmp[0]] = tmp[1]
-
         response = self._request(get_folder_url, "get", params=params)
         if response.ok:
             return response.json()
@@ -1141,9 +1150,8 @@ def get_annotations(
         query_params = {
             "team_id": team_id,
             "project_id": project_id,
+            "folder_id": folder_id,
         }
-        if folder_id:
-            query_params["folder_id"] = folder_id
 
         handler = StreamedAnnotations(
             self.default_headers,
@@ -1182,9 +1190,8 @@ async def download_annotations(
             query_params = {
                 "team_id": team_id,
                 "project_id": project_id,
+                "folder_id": folder_id,
             }
-            if folder_id:
-                query_params["folder_id"] = folder_id
             handler = StreamedAnnotations(
                 self.default_headers,
                 reporter,
@@ -1404,6 +1411,8 @@ async def upload_annotations(
                 },
                 data=data,
             )
+            if not _response.ok:
+                raise AppException(_response.json())
             data_json = await _response.json()
             response = ServiceResponse()
             response.status = _response.status