Merge pull request #665 from superannotateai/FRIDAY_2494

Friday 2494

Author: VaghinakDev

pytest.ini

@@ -3,5 +3,5 @@ minversion = 3.7
 log_cli=true
 python_files = test_*.py
 ;pytest_plugins = ['pytest_profiling']
-addopts = -n auto --dist=loadscope
+;addopts = -n auto --dist=loadscope
 

src/superannotate/__init__.py

@@ -3,7 +3,7 @@
 import sys
 
 
-__version__ = "4.4.17"
+__version__ = "4.4.18b1"
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

src/superannotate/lib/app/interface/sdk_interface.py

@@ -79,7 +79,7 @@
     "Tiled",
     "Other",
     "PointCloud",
-    "CustomEditor",
+    "GenAI",
 ]
 
 ANNOTATION_STATUS = Literal[

src/superannotate/lib/core/entities/classes.py

@@ -73,6 +73,7 @@ class AttributeGroup(TimedBaseModel):
     group_type: Optional[GroupTypeEnum]
     class_id: Optional[StrictInt]
     name: Optional[StrictStr]
+    isRequired: bool = Field(default=False)
     attributes: Optional[List[Attribute]]
     default_value: Any
 

src/superannotate/lib/core/enums.py

@@ -93,7 +93,7 @@ class ProjectType(BaseTitledEnum):
     TILED = "Tiled", 5
     OTHER = "Other", 6
     POINT_CLOUD = "PointCloud", 7
-    CUSTOM_EDITOR = "CustomEditor", 8
+    GEN_AI = "GenAI", 8
     UNSUPPORTED_TYPE_1 = "UnsupportedType", 9
     UNSUPPORTED_TYPE_2 = "UnsupportedType", 10
 

src/superannotate/lib/infrastructure/services/http_client.py

@@ -1,4 +1,5 @@
 import asyncio
+import io
 import json
 import logging
 import platform
@@ -13,7 +14,6 @@
 
 import aiohttp
 import requests
-from aiohttp.client_exceptions import ClientError
 from lib.core.exceptions import AppException
 from lib.core.service_types import ServiceResponse
 from lib.core.serviceproviders import BaseClient
@@ -229,19 +229,39 @@ class AIOHttpSession(aiohttp.ClientSession):
     RETRY_LIMIT = 3
     BACKOFF_FACTOR = 0.3
 
-    async def request(self, *args, **kwargs) -> aiohttp.ClientResponse:
-        attempts = self.RETRY_LIMIT
-        delay = 0
-        for _ in range(attempts):
-            delay += self.BACKOFF_FACTOR
-            attempts -= 1
-            try:
-                response = await super()._request(*args, **kwargs)
-            except ClientError:
-                if not attempts:
-                    raise
+    class AIOHttpSession(aiohttp.ClientSession):
+        RETRY_STATUS_CODES = [401, 403, 502, 503, 504]
+        RETRY_LIMIT = 3
+        BACKOFF_FACTOR = 0.3
+
+        @staticmethod
+        def _copy_form_data(data: aiohttp.FormData) -> aiohttp.FormData:
+            form_data = aiohttp.FormData(quote_fields=False)
+            for field in data._fields:  # noqa
+                if isinstance(field[2], io.IOBase):
+                    field[2].seek(0)
+                form_data.add_field(
+                    value=field[2],
+                    content_type=field[1].get("Content-Type", ""),
+                    **field[0],
+                )
+            return form_data
+
+        async def request(self, *args, **kwargs) -> aiohttp.ClientResponse:
+            attempts = self.RETRY_LIMIT
+            delay = 0
+            for _ in range(attempts):
+                delay += self.BACKOFF_FACTOR
+                try:
+                    response = await super()._request(*args, **kwargs)
+                    if attempts <= 1 or response.status not in self.RETRY_STATUS_CODES:
+                        return response
+                except (aiohttp.ClientError, RuntimeError) as e:
+                    if attempts <= 1:
+                        raise
+                    if isinstance(e, RuntimeError):
+                        data = kwargs["data"]
+                        if isinstance(data, aiohttp.FormData):
+                            kwargs["data"] = self._copy_form_data(data)
+                attempts -= 1
                 await asyncio.sleep(delay)
-                continue
-            if response.status not in self.RETRY_STATUS_CODES or not attempts:
-                return response
-            await asyncio.sleep(delay)

tests/integration/classes/test_create_annotation_class.py

@@ -44,6 +44,7 @@ def test_create_annotation_class_with_attr_and_default_value(self):
             attribute_groups=[
                 {
                     "name": "test",
+                    "isRequired:": False,
                     "attributes": [{"name": "Car"}, {"name": "Track"}, {"name": "Bus"}],
                     "default_value": "Bus",
                 }

tests/integration/export/test_export.py

@@ -106,4 +106,4 @@ def test_upload_s3(self):
             Bucket=self.TEST_S3_BUCKET, Prefix=self.TMP_DIR
         ).get("Contents", []):
             files.append(object_data["Key"])
-        self.assertEqual(33, len(files))
+        self.assertEqual(25, len(files))

tests/integration/projects/test_basic_project.py

@@ -11,6 +11,16 @@
 sa = SAClient()
 
 
+class TestGenAIProjectBasic(BaseTestCase):
+    PROJECT_NAME = "TestGenAICreate"
+    PROJECT_TYPE = "GenAI"
+    PROJECT_DESCRIPTION = "DESCRIPTION"
+
+    def test_search(self):
+        projects = sa.search_projects(self.PROJECT_NAME, return_metadata=True)
+        assert projects
+
+
 class TestProjectBasic(BaseTestCase):
     PROJECT_NAME = "TestWorkflowGet"
     PROJECT_TYPE = "Vector"