Skip to content

Commit 79b16fc

Browse files
committed
AL-000: Made confidece optional
1 parent 8a3c35f commit 79b16fc

File tree

6 files changed

+83
-31
lines changed

6 files changed

+83
-31
lines changed

labelbox/data/serialization/ndjson/objects.py

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ def from_common(cls,
6060
'x': point.x,
6161
'y': point.y
6262
},
63-
dataRow=DataRow(id=data.uid),
64-
name=name,
65-
schema_id=feature_schema_id,
66-
uuid=extra.get('uuid'),
67-
classifications=classifications,
68-
confidence=confidence)
63+
dataRow=DataRow(id=data.uid),
64+
name=name,
65+
schema_id=feature_schema_id,
66+
uuid=extra.get('uuid'),
67+
classifications=classifications,
68+
confidence=confidence)
6969

7070

7171
class NDFramePoint(VideoSupported):
@@ -97,17 +97,18 @@ def from_common(cls, line: Line,
9797
classifications: List[ClassificationAnnotation], name: str,
9898
feature_schema_id: Cuid, extra: Dict[str, Any],
9999
data: Union[ImageData,
100-
TextData], confidence: float) -> "NDLine":
100+
TextData],
101+
confidence: Optional[float] = None) -> "NDLine":
101102
return cls(line=[{
102103
'x': pt.x,
103104
'y': pt.y
104105
} for pt in line.points],
105-
dataRow=DataRow(id=data.uid),
106-
name=name,
107-
schema_id=feature_schema_id,
108-
uuid=extra.get('uuid'),
109-
classifications=classifications,
110-
confidence=confidence)
106+
dataRow=DataRow(id=data.uid),
107+
name=name,
108+
schema_id=feature_schema_id,
109+
uuid=extra.get('uuid'),
110+
classifications=classifications,
111+
confidence=confidence)
111112

112113

113114
class NDFrameLine(VideoSupported):
@@ -151,12 +152,12 @@ def from_common(cls,
151152
'x': pt.x,
152153
'y': pt.y
153154
} for pt in polygon.points],
154-
dataRow=DataRow(id=data.uid),
155-
name=name,
156-
schema_id=feature_schema_id,
157-
uuid=extra.get('uuid'),
158-
classifications=classifications,
159-
confidence=confidence)
155+
dataRow=DataRow(id=data.uid),
156+
name=name,
157+
schema_id=feature_schema_id,
158+
uuid=extra.get('uuid'),
159+
classifications=classifications,
160+
confidence=confidence)
160161

161162

162163
class NDRectangle(NDBaseObject, ConfidenceMixin):
@@ -320,7 +321,8 @@ def from_common(cls,
320321
confidence: Optional[float] = None) -> "NDMask":
321322

322323
if mask.mask.url is not None:
323-
lbv1_mask = _URIMask(instanceURI=mask.mask.url, colorRGB=mask.color)
324+
lbv1_mask = _URIMask(
325+
instanceURI=mask.mask.url, colorRGB=mask.color)
324326
else:
325327
binary = np.all(mask.mask.value == mask.color, axis=-1)
326328
im_bytes = BytesIO()
@@ -358,12 +360,12 @@ def from_common(cls, text_entity: TextEntity,
358360
start=text_entity.start,
359361
end=text_entity.end,
360362
),
361-
dataRow=DataRow(id=data.uid),
362-
name=name,
363-
schema_id=feature_schema_id,
364-
uuid=extra.get('uuid'),
365-
classifications=classifications,
366-
confidence=confidence)
363+
dataRow=DataRow(id=data.uid),
364+
name=name,
365+
schema_id=feature_schema_id,
366+
uuid=extra.get('uuid'),
367+
classifications=classifications,
368+
confidence=confidence)
367369

368370

369371
class NDObject:
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[
2+
{
3+
"line": [
4+
{
5+
"x": 2534.353,
6+
"y": 249.471
7+
},
8+
{
9+
"x": 2429.492,
10+
"y": 182.092
11+
},
12+
{
13+
"x": 2294.322,
14+
"y": 221.962
15+
}
16+
],
17+
"uuid": "5ad9c52f-058d-49c8-a749-3f20b84f8cd4",
18+
"dataRow": {
19+
"id": "cl6xnv9h61fv0085yhtoq06ht"
20+
},
21+
"name": "some-line",
22+
"schemaId": "cl6xnuwt95lqq07330tbb3mfd",
23+
"classifications": []
24+
}
25+
]

tests/data/assets/ndjson/text_entity_import.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dataRow": {
99
"id": "cl6xnv9h61fv0085yhtoq06ht"
1010
},
11-
"name": "some-text-emtity",
11+
"name": "some-text-entity",
1212
"schemaId": "cl6xnuwt95lqq07330tbb3mfd",
1313
"classifications": [],
1414
"confidence": 0.53
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[
2+
{
3+
"location": {
4+
"start": 67,
5+
"end": 128
6+
},
7+
"uuid": "5ad9c52f-058d-49c8-a749-3f20b84f8cd4",
8+
"dataRow": {
9+
"id": "cl6xnv9h61fv0085yhtoq06ht"
10+
},
11+
"name": "some-text-entity",
12+
"schemaId": "cl6xnuwt95lqq07330tbb3mfd",
13+
"classifications": []
14+
}
15+
]

tests/data/serialization/ndjson/test_polyline.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import json
2-
2+
import pytest
33
from labelbox.data.serialization.ndjson.converter import NDJsonConverter
44

55

6-
def test_polyline_import():
7-
with open('tests/data/assets/ndjson/polyline_import.json', 'r') as file:
6+
@pytest.mark.parametrize("filename", [
7+
"tests/data/assets/ndjson/polyline_without_confidence_import.json",
8+
"tests/data/assets/ndjson/polyline_import.json"
9+
])
10+
def test_polyline_import(filename: str):
11+
with open(filename, 'r') as file:
812
data = json.load(file)
913
res = NDJsonConverter.deserialize(data).as_list()
1014
res = list(NDJsonConverter.serialize(res))

tests/data/serialization/ndjson/test_text_entity.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
import json
22

3+
import pytest
4+
35
from labelbox.data.serialization.ndjson.converter import NDJsonConverter
46

57

6-
def test_text_entity_import():
8+
@pytest.mark.parametrize("filename", [
9+
"tests/data/assets/ndjson/text_entity_import.json",
10+
"tests/data/assets/ndjson/text_entity_without_confidence_import.json"
11+
])
12+
def test_text_entity_import(filename: str):
713
with open('tests/data/assets/ndjson/text_entity_import.json', 'r') as file:
814
data = json.load(file)
915
res = NDJsonConverter.deserialize(data).as_list()

0 commit comments

Comments
 (0)