Skip to content

Commit 7f7cab8

Browse files
committed
log fixes
1 parent 0ccaa5d commit 7f7cab8

File tree

3 files changed

+19
-24
lines changed

3 files changed

+19
-24
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -692,10 +692,10 @@ def assign_items(
692692

693693
project_name, folder_name = extract_project_folder(project)
694694

695-
response = self.controller.assign_items(project_name, folder_name, items, user)
695+
response, cnt_assigned = self.controller.assign_items(project_name, folder_name, items, user)
696696

697697
if not response.errors:
698-
logger.info(f"Assign items to user {user}")
698+
logger.info(f"Assigned {cnt_assigned}/{len(items)} items to user {user}")
699699
else:
700700
raise AppException(response.errors)
701701

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

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -210,34 +210,29 @@ def __init__(
210210
self._user = user
211211
self._service = service
212212

213-
def validate_user(
214-
self,
215-
):
216213

217-
for c in self._project.users:
218-
if c["user_id"] == self._user:
219-
return True
220-
221-
raise AppValidationException(
222-
f"{self._user} is not a verified contributor for the {self._project.name}"
223-
)
214+
def validate_item_names(self, ):
215+
self._item_names = list(set(self._item_names))
224216

225217
def execute(self):
218+
cnt_assigned = 0
226219
if self.is_valid():
227220
for i in range(0, len(self._item_names), self.CHUNK_SIZE):
228-
is_assigned = self._service.assign_items(
221+
status, response = self._service.assign_items(
229222
team_id=self._project.team_id,
230223
project_id=self._project.id,
231224
folder_name=self._folder.name,
232225
user=self._user,
233226
item_names=self._item_names[i : i + self.CHUNK_SIZE], # noqa: E203
234227
)
235-
if not is_assigned:
236-
self._response.errors = AppException(
237-
f"Cant assign {', '.join(self._item_names[i: i + self.CHUNK_SIZE])}"
238-
)
239-
continue
240-
return self._response
228+
if status == 406 and 'error' in response: # User not found
229+
self._response.errors+=response['error']
230+
return self._response, 0
231+
elif 'error' in response:
232+
response['successCount'] = 0
233+
234+
cnt_assigned+=response['successCount']
235+
return self._response, cnt_assigned
241236

242237

243238
class UnAssignItemsUseCase(BaseUseCase):

src/superannotate/lib/infrastructure/services.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ def _request(
134134
if response.status_code == 404 and retried < 3:
135135
return self._request(
136136
url,
137-
method="get",
138-
data=None,
139-
headers=None,
140-
params=None,
137+
method=method,
138+
data=data,
139+
headers=headers,
140+
params=params,
141141
retried=retried + 1,
142142
content_type=content_type,
143143
)
@@ -777,7 +777,7 @@ def assign_items(
777777
"folder_name": folder_name,
778778
},
779779
)
780-
return res.ok
780+
return res.status_code, res.json()
781781

782782
def un_assign_items(
783783
self,

0 commit comments

Comments
 (0)