superannotate 4.4.31.dev2__tar.gz → 4.4.32__tar.gz

{superannotate-4.4.31.dev2/src/superannotate.egg-info → superannotate-4.4.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: superannotate
-Version: 4.4.31.dev2
+Version: 4.4.32
 Summary: Python SDK to SuperAnnotate platform
 Home-page: https://github.com/superannotateai/superannotate-python-sdk
 Author: SuperAnnotate AI

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/__init__.py

@@ -3,7 +3,7 @@ import os
 import sys
 
 
-__version__ = "4.4.31dev2"
+__version__ = "4.4.32"
 
 os.environ.update({"sa_version": __version__})
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/lib/app/interface/sdk_interface.py

@@ -461,6 +461,16 @@ class SAClient(BaseInterfaceFacade, metaclass=TrackableMeta):
     def pause_user_activity(
         self, pk: Union[int, str], projects: Union[List[int], List[str], Literal["*"]]
     ):
+        """
+        Block the team contributor from requesting items from the projects.
+
+        :param pk: The email address or user ID of the team contributor.
+        :type pk: str or int
+
+        :param projects: A list of project names or IDs from which the user should be blocked.
+                        The special value "*" means block access to all projects
+        :type projects: Union[List[int], List[str], Literal["*"]]
+        """
         user = self.controller.work_management.get_user_metadata(pk=pk)
         if user.role is not WMUserTypeEnum.Contributor:
             raise AppException("User must have a contributor role to pause activity.")
@@ -474,6 +484,16 @@ class SAClient(BaseInterfaceFacade, metaclass=TrackableMeta):
     def resume_user_activity(
         self, pk: Union[int, str], projects: Union[List[int], List[str], Literal["*"]]
     ):
+        """
+        Resume the team contributor from requesting items from the projects.
+
+        :param pk: The email address or user ID of the team contributor.
+        :type pk: str or int
+
+        :param projects: A list of project names or IDs from which the user should be resumed.
+                        The special value "*" means resume access to all projects
+        :type projects: Union[List[int], List[str], Literal["*"]]
+        """
         user = self.controller.work_management.get_user_metadata(pk=pk)
         if user.role is not WMUserTypeEnum.Contributor:
             raise AppException("User must have a contributor role to resume activity.")

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/lib/core/serviceproviders.py

@@ -672,6 +672,14 @@ class BaseExploreService(SuperannotateServiceProvider):
     ) -> ServiceResponse:
         raise NotImplementedError
 
+    @abstractmethod
+    def query_item_count(
+        self,
+        project: entities.ProjectEntity,
+        query: str = None,
+    ) -> ServiceResponse:
+        raise NotImplementedError
+
 
 class BaseServiceProvider:
     projects: BaseProjectService

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/lib/core/usecases/annotations.py

@@ -2046,7 +2046,7 @@ class UploadMultiModalAnnotationsUseCase(BaseReportableUseCase):
                 f"annotations to the project {self._project.name}."
             )
             if not self._root_folder.is_root:
-                if len(distributed_items) > 1 or None not in distributed_items:
+                if len(distributed_items) > 1 or "" not in distributed_items:
                     raise AppException(
                         "You can't include a folder when uploading from within a folder."
                     )

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/lib/core/usecases/items.py

@@ -163,6 +163,52 @@ class QueryEntitiesUseCase(BaseReportableUseCase):
         return self._response
 
 
+class QueryEntitiesCountUseCase(BaseReportableUseCase):
+    def __init__(
+        self,
+        reporter: Reporter,
+        project: ProjectEntity,
+        service_provider: BaseServiceProvider,
+        query: str,
+    ):
+        super().__init__(reporter)
+        self._project = project
+        self._service_provider = service_provider
+        self._query = query
+
+    def validate_arguments(self):
+        if self._query:
+            response = self._service_provider.explore.validate_saqul_query(
+                project=self._project, query=self._query
+            )
+
+            if not response.ok:
+                raise AppException(response.error)
+            if response.data["isValidQuery"]:
+                self._query = response.data["parsedQuery"]
+            else:
+                raise AppException("Incorrect query.")
+        else:
+            response = self._service_provider.explore.validate_saqul_query(
+                self._project, "-"
+            )
+            if not response.ok:
+                raise AppException(response.error)
+
+    def execute(self) -> Response:
+        if self.is_valid():
+            query_kwargs = {"query": self._query}
+            service_response = self._service_provider.explore.query_item_count(
+                self._project,
+                **query_kwargs,
+            )
+            if service_response.ok:
+                self._response.data = service_response.data
+            else:
+                self._response.errors = service_response.data
+        return self._response
+
+
 class AssignItemsUseCase(BaseUseCase):
     CHUNK_SIZE = 500
 

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/lib/infrastructure/annotation_adapter.py

@@ -44,7 +44,7 @@ class BaseMultimodalAnnotationAdapter(ABC):
         return None
 
     def set_component_value(self, component_id: str, value: Any):
-        self.annotation["data"][component_id] = {"value": value}
+        self.annotation.setdefault("data", {}).setdefault(component_id, {})["value"] = value
         return self
 
 

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/lib/infrastructure/controller.py

@@ -1678,3 +1678,17 @@ class Controller(BaseController):
         return ItemManager.process_response(
             self.service_provider, items, project, folder, map_fields=False
         )
+
+    def query_items_count(self, project_name: str, query: str = None) -> int:
+        project = self.get_project(project_name)
+
+        use_case = usecases.QueryEntitiesCountUseCase(
+            reporter=self.get_default_reporter(),
+            project=project,
+            query=query,
+            service_provider=self.service_provider,
+        )
+        response = use_case.execute()
+        if response.errors:
+            raise AppException(response.errors)
+        return response.data["count"]

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/lib/infrastructure/services/explore.py

@@ -10,6 +10,7 @@ from lib.core.service_types import ServiceResponse
 from lib.core.service_types import SubsetListResponse
 from lib.core.service_types import UploadCustomFieldValuesResponse
 from lib.core.serviceproviders import BaseExploreService
+from superannotate import AppException
 
 
 class ExploreService(BaseExploreService):
@@ -25,6 +26,7 @@ class ExploreService(BaseExploreService):
     URL_UPLOAD_CUSTOM_VALUE = "custom/metadata/item"
     URL_SAQUL_QUERY = "items/search"
     URL_VALIDATE_SAQUL_QUERY = "items/parse/query"
+    URL_QUERY_COUNT = "items/count"
 
     @property
     def explore_service_url(self):
@@ -201,3 +203,24 @@ class ExploreService(BaseExploreService):
         else:
             response = ServiceResponse(status=200, res_data=[])
         return response
+
+    def query_item_count(
+        self,
+        project: entities.ProjectEntity,
+        query: str = None,
+    ) -> ServiceResponse:
+
+        params = {
+            "project_id": project.id,
+            "includeFolderNames": True,
+        }
+        data = {"query": query}
+        response = self.client.request(
+            urljoin(self.explore_service_url, self.URL_QUERY_COUNT),
+            "post",
+            params=params,
+            data=data,
+        )
+        if not response.ok:
+            raise AppException(response.error)
+        return response

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/lib/infrastructure/stream_data_handler.py

@@ -2,7 +2,10 @@ import copy
 import json
 import logging
 import os
+import threading
+import time
 import typing
+from functools import lru_cache
 from typing import Callable
 
 import aiohttp
@@ -24,6 +27,7 @@ logger = logging.getLogger("sa")
 class StreamedAnnotations:
     DELIMITER = "\\n;)\\n"
     DELIMITER_LEN = len(DELIMITER)
+    VERIFY_SSL = False
 
     def __init__(
         self,
@@ -50,7 +54,6 @@ class StreamedAnnotations:
     async def fetch(
         self,
         method: str,
-        session: AIOHttpSession,
         url: str,
         data: dict = None,
         params: dict = None,
@@ -58,7 +61,9 @@ class StreamedAnnotations:
         kwargs = {"params": params, "json": data}
         if data:
             kwargs["json"].update(data)
-        response = await session.request(method, url, **kwargs, timeout=TIMEOUT)  # noqa
+        response = await self.get_session().request(
+            method, url, **kwargs, timeout=TIMEOUT
+        )  # noqa
         if not response.ok:
             logger.error(response.text)
         buffer = ""
@@ -86,6 +91,7 @@ class StreamedAnnotations:
                                 "Invalid JSON detected in small annotations stream process."
                             )
                         else:
+                            self.rest_session()
                             raise BackendError(
                                 "Invalid JSON detected at the start of the small annotations stream process."
                             )
@@ -103,33 +109,47 @@ class StreamedAnnotations:
                     )
                     break
 
+    @lru_cache(maxsize=32)
+    def _get_session(self, thread_id, ttl=None):  # noqa
+        del ttl
+        del thread_id
+        return AIOHttpSession(
+            headers=self._headers,
+            timeout=TIMEOUT,
+            connector=aiohttp.TCPConnector(
+                ssl=self.VERIFY_SSL, keepalive_timeout=2**32
+            ),
+            raise_for_status=True,
+        )
+
+    def get_session(self):
+        return self._get_session(
+            thread_id=threading.get_ident(), ttl=round(time.time() / 360)
+        )
+
+    def rest_session(self):
+        self._get_session.cache_clear()
+
     async def list_annotations(
         self,
         method: str,
         url: str,
         data: typing.List[int] = None,
         params: dict = None,
-        verify_ssl=False,
     ):
         params = copy.copy(params)
         params["limit"] = len(data)
         annotations = []
-        async with AIOHttpSession(
-            headers=self._headers,
-            timeout=TIMEOUT,
-            connector=aiohttp.TCPConnector(ssl=verify_ssl, keepalive_timeout=2**32),
-            raise_for_status=True,
-        ) as session:
-            async for annotation in self.fetch(
-                method,
-                session,
-                url,
-                self._process_data(data),
-                params=copy.copy(params),
-            ):
-                annotations.append(
-                    self._callback(annotation) if self._callback else annotation
-                )
+
+        async for annotation in self.fetch(
+            method,
+            url,
+            self._process_data(data),
+            params=copy.copy(params),
+        ):
+            annotations.append(
+                self._callback(annotation) if self._callback else annotation
+            )
 
         return annotations
 
@@ -143,28 +163,22 @@ class StreamedAnnotations:
     ):
         params = copy.copy(params)
         params["limit"] = len(data)
-        async with AIOHttpSession(
-            headers=self._headers,
-            timeout=TIMEOUT,
-            connector=aiohttp.TCPConnector(ssl=False, keepalive_timeout=2**32),
-            raise_for_status=True,
-        ) as session:
-            async for annotation in self.fetch(
-                method,
-                session,
-                url,
-                self._process_data(data),
-                params=params,
-            ):
-                self._annotations.append(
-                    self._callback(annotation) if self._callback else annotation
-                )
-                self._store_annotation(
-                    download_path,
-                    annotation,
-                    self._callback,
-                )
-                self._items_downloaded += 1
+
+        async for annotation in self.fetch(
+            method,
+            url,
+            self._process_data(data),
+            params=params,
+        ):
+            self._annotations.append(
+                self._callback(annotation) if self._callback else annotation
+            )
+            self._store_annotation(
+                download_path,
+                annotation,
+                self._callback,
+            )
+            self._items_downloaded += 1
 
     @staticmethod
     def _store_annotation(path, annotation: dict, callback: Callable = None):
@@ -177,3 +191,6 @@ class StreamedAnnotations:
         if data and self._map_function:
             return self._map_function(data)
         return data
+
+    def __del__(self):
+        self.rest_session()

{superannotate-4.4.31.dev2 → superannotate-4.4.32}/src/superannotate/lib/infrastructure/utils.py

@@ -149,11 +149,11 @@ class RoleCache(BaseCachedWorkManagementRepository):
         self._K_V_map[project.id] = {
             "role_name_id_map": {
                 **{role["role"]["name"]: role["role_id"] for role in roles},
-                "ProjectAdmin": 3
+                "ProjectAdmin": 3,
             },
             "role_id_name_map": {
                 **{role["role_id"]: role["role"]["name"] for role in roles},
-                3: "ProjectAdmin"
+                3: "ProjectAdmin",
             },
         }
         self._update_cache_timestamp(project.id)

{superannotate-4.4.31.dev2 → superannotate-4.4.32/src/superannotate.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: superannotate
-Version: 4.4.31.dev2
+Version: 4.4.32
 Summary: Python SDK to SuperAnnotate platform
 Home-page: https://github.com/superannotateai/superannotate-python-sdk
 Author: SuperAnnotate AI