Skip to content

Commit c3ed9e9

Browse files
authored
Merge pull request #2021 from kili-technology/feature/lab-4125-aau-in-consensus-labeling-step-i-export-all-annotators
feat(LAB-4125): in consensus labeling step, I export all annotators' …
2 parents 07bf0cc + 9c62bfe commit c3ed9e9

File tree

18 files changed

+1510
-141
lines changed

18 files changed

+1510
-141
lines changed

pyproject.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies = [
4444
"filelock >= 3.0.0, < 4.0.0",
4545
"pip-system-certs >= 4.0.0, < 5.0.0; platform_system=='Windows'",
4646
"pyrate-limiter >= 3, < 4",
47-
"kili-formats == 1.3.0"
47+
"kili-formats == 1.4.0"
4848
]
4949
urls = { homepage = "https://github.com/kili-technology/kili-python-sdk" }
5050

@@ -63,8 +63,8 @@ dev = [
6363
"pytest-xdist[psutil]",
6464
"pytest-timeout",
6565
# documentation
66-
"mkdocs",
67-
"mkdocs-material",
66+
"mkdocs >= 1.0.0, < 2.0.0",
67+
"mkdocs-material >= 9.0.0, < 9.6.0",
6868
"mkdocstrings",
6969
"mkdocstrings-python-legacy",
7070
"mkdocs-click",
@@ -79,7 +79,7 @@ dev = [
7979
"nbconvert",
8080
"ipykernel",
8181
# optional dependencies
82-
"kili-formats[all] == 1.3.0",
82+
"kili-formats[all] == 1.4.0",
8383
"opencv-python >= 4.0.0, < 5.0.0",
8484
"azure-storage-blob >= 12.0.0, < 13.0.0",
8585
# optional dependencies gis
@@ -90,14 +90,14 @@ dev = [
9090
# optional dependencies - yolo
9191
"pyyaml >= 6.0, < 7.0",
9292
# optional dependencies - image
93-
"Pillow >=9.0.0, <11.0.0"
93+
"Pillow >=10.0.0, <13.0.0"
9494
]
9595
all = [
9696
# aggregate all optional deps without dev
9797
"azure-storage-blob >= 12.0.0, < 13.0.0",
98-
"kili-formats[all] == 1.3.0",
98+
"kili-formats[all] == 1.4.0",
9999
"opencv-python >= 4.0.0, < 5.0.0",
100-
"Pillow >=9.0.0, <11.0.0",
100+
"Pillow >=10.0.0, <13.0.0",
101101
"pyproj == 3.7.1",
102102
"pyyaml >= 6.0, < 7.0",
103103
"shapely >= 1.8, < 3",
@@ -108,20 +108,20 @@ cli = [
108108
"tabulate >= 0.9.0, < 0.10.0"
109109
]
110110
coco = [
111-
"kili-formats[coco] == 1.3.0"
111+
"kili-formats[coco] == 1.4.0"
112112
]
113113
gis = [
114114
"pyproj == 3.7.1",
115115
"shapely >= 1.8, < 3"
116116
]
117117
image = [
118-
"Pillow >=9.0.0, <11.0.0",
119-
"kili-formats[image] == 1.3.0"
118+
"Pillow >=10.0.0, <13.0.0",
119+
"kili-formats[image] == 1.4.0"
120120
]
121121
image-utils = ["opencv-python >= 4.0.0, < 5.0.0"]
122122

123123
video = [
124-
"kili-formats[video] == 1.3.0"
124+
"kili-formats[video] == 1.4.0"
125125
]
126126
yolo = [
127127
"pyyaml >= 6.0, < 7.0"

src/kili/adapters/kili_api_gateway/asset/formatters.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ def load_asset_json_fields(asset: dict, fields: ListOrTuple[str], http_client: H
139139
if "latestLabel.jsonResponse" in fields and asset.get("latestLabel") is not None:
140140
_process_label_json_response(asset["latestLabel"], url_to_label_mapping)
141141

142+
if "latestLabels.jsonResponse" in fields:
143+
for label in asset.get("latestLabels", []):
144+
if label is not None:
145+
_process_label_json_response(label, url_to_label_mapping)
146+
142147
if url_to_label_mapping:
143148
download_json_responses_parallel(url_to_label_mapping, http_client)
144149

0 commit comments

Comments
 (0)