adressing PR change requests

Author: VahagnTKA

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

@@ -1091,34 +1091,20 @@ async def download_small_annotations(self, queue_idx, export_path):
         postfix = self.get_postfix()
         while item is not None:
             item = await cur_queue.get()
-            if not item:
-                await self._backend_client.download_small_annotations(
-                        team_id=self._project.team_id,
-                        project_id=self._project.id,
-                        folder_id=self._folder.uuid,
-                        items=items,
-                        reporter=self.reporter,
-                        download_path=f"{export_path}{'/' + self._folder.name if not self._folder.is_root else ''}",
-                        postfix=postfix,
-                        callback=self._callback,
-                    )
-                await cur_queue.put(None)
-                break
+            if item:
+                items.append(item)
 
-            items.append(item)
-            if len(items) == max_chunk_size:
-                await self._backend_client.download_small_annotations(
-                        team_id=self._project.team_id,
-                        project_id=self._project.id,
-                        folder_id=self._folder.uuid,
-                        items=items,
-                        reporter=self.reporter,
-                        download_path=f"{export_path}{'/' + self._folder.name if not self._folder.is_root else ''}",
-                        postfix=postfix,
-                        callback=self._callback,
-                    )
-                items = []
 
+        await self._backend_client.download_small_annotations(
+                team_id=self._project.team_id,
+                project_id=self._project.id,
+                folder_id=self._folder.uuid,
+                items=items,
+                reporter=self.reporter,
+                download_path=f"{export_path}{'/' + self._folder.name if not self._folder.is_root else ''}",
+                postfix=postfix,
+                callback=self._callback,
+            )
 
     async def distribute_to_queues(self, item_names, sm_queue_id, l_queue_id, folder_id):
 
@@ -1212,11 +1198,11 @@ def execute(self):
                     new_export_path = export_path
                     if folder.name != 'root':
                         new_export_path +=  f'/{folder.name}'
-                    executor.submit(self.per_folder_execute, item_names, folder.uuid, new_export_path)
-
+                    future = executor.submit(self.per_folder_execute, item_names, folder.uuid, new_export_path)
+                    futures.append(future)
 
-                    for future in concurrent.futures.as_completed(futures):
-                        print("asd")
+                for future in concurrent.futures.as_completed(futures):
+                    pass
 
 
             self.reporter.stop_spinner()

src/superannotate/lib/infrastructure/services.py

@@ -56,6 +56,7 @@ class BaseBackendService(SuperannotateServiceProvider):
     PAGINATE_BY = 100
     LIMIT = 100
     MAX_ITEMS_COUNT = 50 * 1000
+    ASSETS_PROVIDER_VERSION = 'v2'
 
     """
     Base service class
@@ -79,12 +80,14 @@ def __init__(
         self._testing = testing
         self.get_session()
 
-    def get_assets_provider_url(self, version = 'v2'):
+
+    @property
+    def assets_provider_url(self):
         if self.api_url != constants.BACKEND_URL:
-            return f"https://assets-provider.devsuperannotate.com/api/{version}/"
-        return f"https://assets-provider.superannotate.com/api/{version}/"
+            return f"https://assets-provider.devsuperannotate.com/api/{self.ASSETS_PROVIDER_VERSION}/"
+        return f"https://assets-provider.superannotate.com/api/{self.ASSETS_PROVIDER_VERSION}/"
+
 
-    assets_provider_url = property(get_assets_provider_url)
 
 
     @lru_cache(maxsize=32)
@@ -314,8 +317,9 @@ class SuperannotateBackendService(BaseBackendService):
     URL_START_FILE_SYNC = "items/{item_id}/annotations/sync"
     URL_START_FILE_SYNC_STATUS = "items/{item_id}/annotations/sync/status"
     URL_CLASSIFY_ITEM_SIZE = "items/annotations/download/method"
-    URL_SYNC_LARGE_ANNOTATION = "items/{}/annotations/sync"
-    URL_SYNC_LARGE_ANNOTATION_STATUS = "items/{}/annotations/sync/status"
+    URL_SYNC_LARGE_ANNOTATION = "items/{item_id}/annotations/sync"
+    URL_SYNC_LARGE_ANNOTATION_STATUS = "items/{item_id}/annotations/sync/status"
+    URL_DOWNLOAD_LARGE_ANNOTATION = "items/{item_id}/annotations/download"
 
     def upload_priority_scores(
         self, team_id: int, project_id: int, folder_id: int, priorities: list
@@ -1172,7 +1176,7 @@ async def download_big_annotation(
             "version":"V1.00"
         }
 
-        url = urljoin(self.get_assets_provider_url('v1.01'), f'items/{item_id}/annotations/download')
+        url = urljoin(self.assets_provider_url, self.URL_DOWNLOAD_LARGE_ANNOTATION.format(item_id=item_id))
 
         sync_params = {
             "team_id": team_id,
@@ -1184,7 +1188,7 @@ async def download_big_annotation(
             "desired_source":"secondary"
         }
 
-        sync_url = urljoin(self.get_assets_provider_url('v2'), self.URL_SYNC_LARGE_ANNOTATION.format(item_id))
+        sync_url = urljoin(self.assets_provider_url, self.URL_SYNC_LARGE_ANNOTATION.format(item_id=item_id))
 
         res = self._request(
             url = sync_url,
@@ -1198,7 +1202,7 @@ async def download_big_annotation(
 
         synced = False
 
-        sync_status_url = urljoin(self.get_assets_provider_url('v2'), self.URL_SYNC_LARGE_ANNOTATION_STATUS.format(item_id))
+        sync_status_url = urljoin(self.assets_provider_url, self.URL_SYNC_LARGE_ANNOTATION_STATUS.format(item_id=item_id))
         while synced != 'SUCCESS':
             synced = self._request(
                 url = sync_status_url,
@@ -1209,7 +1213,7 @@ async def download_big_annotation(
 
 
         async with aiohttp.ClientSession(
-            connector=aiohttp.TCPConnector(ssl=False), headers = self.default_headers
+            connector=aiohttp.TCPConnector(ssl=False), headers = self.default_headers,
         ) as session:
 
             start_response = await session.post(
@@ -1249,7 +1253,6 @@ async def download_small_annotations(
             callback=callback,
         )
 
-        Path(download_path).mkdir(exist_ok=True, parents=True)
         return await handler.download_data(
             url=urljoin(self.assets_provider_url, self.URL_GET_ANNOTATIONS),
             data=items,
@@ -1594,7 +1597,7 @@ def sort_items_by_size(self, item_names, team_id, project_id, folder_id):
         }
 
         url = urljoin(
-            self.get_assets_provider_url('v2'), 'items/annotations/download/method'
+            self.assets_provider_url, self.URL_CLASSIFY_ITEM_SIZE
         )
 
         body = {