Skip to content

Commit 987c0df

Browse files
committed
Fix item assignments join
1 parent 0b62a3c commit 987c0df

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2750,7 +2750,7 @@ def search_items(
27502750
]
27512751
"""
27522752
project, folder = self.controller.get_project_folder_by_path(project)
2753-
query_kwargs = {}
2753+
query_kwargs = {"include": ["assignments"]}
27542754
if name_contains:
27552755
query_kwargs["name__contains"] = name_contains
27562756
if annotation_status:
@@ -2768,7 +2768,9 @@ def search_items(
27682768
f"{project.name}{f'/{folder.name}' if not folder.is_root else ''}"
27692769
)
27702770
_items = self.controller.items.list_items(
2771-
project, folder, **query_kwargs
2771+
project,
2772+
folder,
2773+
**query_kwargs,
27722774
)
27732775
for i in _items:
27742776
i.path = path
@@ -2914,7 +2916,10 @@ def list_items(
29142916
).data
29152917
else:
29162918
folder = self.controller.get_folder(project, folder)
2917-
include = include or []
2919+
_include = {"assignments"}
2920+
if include:
2921+
_include.update(set(include))
2922+
include = list(_include)
29182923
include_custom_metadata = "custom_metadata" in include
29192924
if include_custom_metadata:
29202925
include.remove("custom_metadata")

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def old_list(self, project_id: int, folder_id: Optional[int], query: Query):
5353

5454
def list(self, project_id: int, folder_id: Optional[int], query: Query):
5555
query &= Join("metadata", ["path"])
56-
query &= Join("assignments")
5756
entity_context = [
5857
f'"team_id":{self.client.team_id}',
5958
f'"project_id":{project_id}',

tests/integration/test_video.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ def test_video_upload_from_folder(self):
6060
res = sa.upload_videos_from_folder_to_project(
6161
self.PROJECT_NAME, self.folder_path, target_fps=1
6262
)
63-
assert res == [
63+
assert set(res) == {
6464
"video_001.jpg",
6565
"video_002.jpg",
6666
"video_004.jpg",
6767
"video_005.jpg",
6868
"video_003.jpg",
69-
]
69+
}
7070
sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME)
7171
sa.upload_videos_from_folder_to_project(
7272
f"{self.PROJECT_NAME}/{self.TEST_FOLDER_NAME}",

0 commit comments

Comments
 (0)