Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/superannotate/lib/app/interface/sdk_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -1679,6 +1679,7 @@ def upload_image_annotations(
raise AppException("Folder not found.")

image = self.controller.items.get_by_name(project, folder, image_name).data

if not image:
raise AppException("Image not found.")
response = self.controller.annotations.upload_image_annotations(
Expand Down Expand Up @@ -2491,7 +2492,7 @@ def query(
)
if response.errors:
raise AppException(response.errors)
return BaseSerializer.serialize_iterable(response.data)
return BaseSerializer.serialize_iterable(response.data, exclude = set(["meta"]))

def get_item_metadata(
self,
Expand Down Expand Up @@ -2550,6 +2551,7 @@ def get_item_metadata(
include_custom_metadata=include_custom_metadata,
)
exclude = {"custom_metadata"} if not include_custom_metadata else {}
exclude.add("meta")
if response.errors:
raise AppException(response.errors)
return BaseSerializer(response.data).serialize(exclude=exclude)
Expand Down Expand Up @@ -2656,6 +2658,7 @@ def search_items(
include_custom_metadata=include_custom_metadata,
)
exclude = {"custom_metadata"} if not include_custom_metadata else {}
exclude.add("meta")
if response.errors:
raise AppException(response.errors)
return BaseSerializer.serialize_iterable(response.data, exclude=exclude)
Expand Down
2 changes: 1 addition & 1 deletion src/superannotate/lib/core/entities/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ImageEntity(BaseItemEntity):
)
approval_status: Optional[ApprovalStatus] = Field(None)
is_pinned: Optional[bool]
# meta: Optional[dict]
meta: Optional[dict]

class Config:
extra = Extra.ignore
Expand Down
2 changes: 1 addition & 1 deletion src/superannotate/lib/core/serviceproviders.py
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ def list(
raise NotImplementedError

@abstractmethod
def create(self, project: entities.ProjectEntity, name: str) -> SubsetResponse:
def create_multiple(self, project: entities.ProjectEntity, names: List[str]) -> SubsetListResponse:
raise NotImplementedError

@abstractmethod
Expand Down
3 changes: 2 additions & 1 deletion src/superannotate/lib/core/usecases/annotations.py
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ def execute(self):
chunk_size=5 * 1024 * 1024,
)
)
if not uploaded.ok:
if not uploaded:
self._response.errors = constants.INVALID_JSON_MESSAGE
else:
response = asyncio.run(
Expand Down Expand Up @@ -697,6 +697,7 @@ def execute(self):
self._image.annotation_status = (
constants.AnnotationStatus.IN_PROGRESS.value
)
self._image.is_pinned = int(self._image.is_pinned)
self._service_provider.items.update(self._project, self._image)
if self._verbose:
self.reporter.log_info(
Expand Down
12 changes: 8 additions & 4 deletions src/superannotate/lib/core/usecases/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,7 @@ def __distribute_to_results(self, item_id, response, item):
def validate_items(
self,
):

filtered_items = self.__filter_duplicates()
if len(filtered_items) != len(self.items):
self.reporter.log_info(
Expand All @@ -922,6 +923,7 @@ def validate_items(
self.items = self.__filter_invalid_items()
self.__separate_to_paths()


def validate_project(self):
response = self._service_provider.validate_saqul_query(self.project, "_")
if not response.ok:
Expand All @@ -946,18 +948,20 @@ def execute(

self.item_ids.extend(ids)

futures = []
subsets = self._service_provider.subsets.list(self.project).data
subset = None
for s in subsets:
if s.name == self.subset_name:
subset = s
break


if not subset:
subset = self._service_provider.subsets.create(
subset = self._service_provider.subsets.create_multiple(
self.project,
self.subset_name,
).data
[self.subset_name]
).data[0]

self.reporter.log_info(
f"You've successfully created a new subset - {self.subset_name}."
Expand All @@ -969,7 +973,7 @@ def execute(
tmp_response = self._service_provider.subsets.add_items(
project=self.project,
item_ids=self.item_ids[i : i + self.CHUNK_SIZE], # noqa
subset=subset,
subset=subset
)

if not response:
Expand Down
12 changes: 6 additions & 6 deletions src/superannotate/lib/infrastructure/services/subset.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from lib.core import entities
from lib.core.conditions import Condition
from lib.core.service_types import SubsetResponse
from lib.core.service_types import SubsetListResponse
from lib.core.serviceproviders import BaseSubsetService


Expand All @@ -18,12 +18,12 @@ def list(self, project: entities.ProjectEntity, condition: Condition = None):
item_type=entities.SubSetEntity,
)

def create(self, project: entities.ProjectEntity, name: str):
def create_multiple(self, project: entities.ProjectEntity, name: List[str]):
return self.client.request(
"POST",
self.URL_CREATE.format(project_id=project.id),
method = "POST",
url =self.URL_CREATE.format(project_id=project.id),
data={"names": [name]},
content_type=SubsetResponse,
content_type=SubsetListResponse
)

def add_items(
Expand All @@ -38,7 +38,7 @@ def add_items(
project_id=project.id, subset_id=subset.id
),
method="POST",
data=data,
data=data
)
if not response.ok:
response.data["skipped"] = set()
Expand Down