Skip to content

Commit a4fbe9d

Browse files
committed
Fixed keep_status
tod
1 parent 2dce957 commit a4fbe9d

File tree

2 files changed

+30
-34
lines changed

2 files changed

+30
-34
lines changed

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

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -842,22 +842,21 @@ def execute(self):
842842
name_path_mappings.keys()
843843
- set(self._report.failed_annotations).union(set(missing_annotations))
844844
)
845-
if uploaded_annotations and self._keep_status is not None:
846-
response = self._service_provider.work_management.list_workflows(
847-
Filter("id", self._project.id, OperatorEnum.EQ)
845+
response = self._service_provider.work_management.list_workflows(
846+
Filter("id", self._project.id, OperatorEnum.EQ)
847+
)
848+
if response.error:
849+
raise response.error
850+
workflow = response.data[0]
851+
if workflow.is_system and uploaded_annotations and not self._keep_status:
852+
statuses_changed = set_annotation_statuses_in_progress(
853+
service_provider=self._service_provider,
854+
project=self._project,
855+
folder=self._folder,
856+
item_names=uploaded_annotations,
848857
)
849-
if response.error:
850-
raise response.error
851-
workflow = response.data[0]
852-
if workflow.is_system and not self._keep_status:
853-
statuses_changed = set_annotation_statuses_in_progress(
854-
service_provider=self._service_provider,
855-
project=self._project,
856-
folder=self._folder,
857-
item_names=uploaded_annotations,
858-
)
859-
if not statuses_changed:
860-
self._response.errors = AppException("Failed to change status.")
858+
if not statuses_changed:
859+
self._response.errors = AppException("Failed to change status.")
861860

862861
if missing_annotations:
863862
logger.warning(
@@ -1085,26 +1084,23 @@ def execute(self):
10851084
],
10861085
Body=mask,
10871086
)
1088-
if self._keep_status is not None and not self._keep_status:
1089-
response = (
1090-
self._service_provider.work_management.list_workflows(
1091-
Filter("id", self._project.workflow_id, OperatorEnum.EQ)
1092-
)
1087+
response = self._service_provider.work_management.list_workflows(
1088+
Filter("id", self._project.workflow_id, OperatorEnum.EQ)
1089+
)
1090+
if not response.ok:
1091+
raise AppException(response.error)
1092+
workflow = response.data[0]
1093+
if workflow.is_system and not self._keep_status:
1094+
statuses_changed = set_annotation_statuses_in_progress(
1095+
service_provider=self._service_provider,
1096+
project=self._project,
1097+
folder=self._folder,
1098+
item_names=[self._image.name],
10931099
)
1094-
if not response.ok:
1095-
raise AppException(response.error)
1096-
workflow = response.data[0]
1097-
if workflow.is_system:
1098-
statuses_changed = set_annotation_statuses_in_progress(
1099-
service_provider=self._service_provider,
1100-
project=self._project,
1101-
folder=self._folder,
1102-
item_names=[self._image.name],
1100+
if not statuses_changed:
1101+
self._response.errors = AppException(
1102+
"Failed to change status."
11031103
)
1104-
if not statuses_changed:
1105-
self._response.errors = AppException(
1106-
"Failed to change status."
1107-
)
11081104
if self._verbose:
11091105
self.reporter.log_info(
11101106
f"Uploading annotations for image {str(self._image.name)} in project {self._project.name}."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ def execute(self):
713713
response = self._service_provider.item_service.list(
714714
self._project.id,
715715
self._folder.id,
716-
Filter("name", self._item_names, OperatorEnum.IN),
716+
Filter("name", chunk, OperatorEnum.IN),
717717
)
718718
if response.error:
719719
raise AppException(response.error)

0 commit comments

Comments
 (0)