Skip to content

Commit 6768959

Browse files
author
Val Brodsky
committed
Remove typing_extensions
1 parent 4fa9ad7 commit 6768959

File tree

11 files changed

+34
-50
lines changed

11 files changed

+34
-50
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
from typing_extensions import Annotated
1+
from typing import Annotated
22

33
from pydantic import Field
44

5-
65
Cuid = Annotated[str, Field(min_length=25, max_length=25)]

libs/labelbox/src/labelbox/data/annotation_types/metrics/scalar.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
from typing import Dict, Optional, Union
2-
from typing_extensions import Annotated
31
from enum import Enum
2+
from typing import Annotated, Dict, Optional, Union
43

54
from pydantic import field_validator
65
from pydantic.types import confloat
76

8-
from .base import ConfidenceValue, BaseMetric
7+
from .base import BaseMetric, ConfidenceValue
98

109
ScalarMetricValue = Annotated[float, confloat(ge=0, le=100_000_000)]
1110
ScalarMetricConfidenceValue = Dict[ConfidenceValue, ScalarMetricValue]

libs/labelbox/src/labelbox/data/annotation_types/types.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import sys
2-
from typing import Generic, TypeVar, Any
1+
from typing import Any, Generic, TypeVar
32

4-
from typing_extensions import Annotated
5-
from packaging import version
63
import numpy as np
7-
8-
from pydantic import StringConstraints, Field
4+
from packaging import version
5+
from pydantic import Field
96

107
DType = TypeVar("DType")
118
DShape = TypeVar("DShape")

libs/labelbox/src/labelbox/schema/data_row_metadata.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
11
# type: ignore
2-
from datetime import datetime
2+
import warnings
33
from copy import deepcopy
4+
from datetime import datetime
45
from enum import Enum
56
from itertools import chain
6-
import warnings
7-
87
from typing import (
8+
Annotated,
9+
Any,
10+
Callable,
11+
Dict,
12+
Generator,
913
List,
1014
Optional,
11-
Dict,
12-
Union,
13-
Callable,
1415
Type,
15-
Any,
16-
Generator,
16+
Union,
1717
overload,
1818
)
19-
from typing_extensions import Annotated
2019

21-
from labelbox.schema.identifiables import DataRowIdentifiers, UniqueIds
22-
from labelbox.schema.identifiable import UniqueId, GlobalKey
2320
from pydantic import (
2421
BaseModel,
22+
ConfigDict,
2523
Field,
2624
StringConstraints,
2725
conlist,
28-
ConfigDict,
2926
model_serializer,
3027
)
3128

29+
from labelbox.schema.identifiable import GlobalKey, UniqueId
30+
from labelbox.schema.identifiables import DataRowIdentifiers, UniqueIds
3231
from labelbox.schema.ontology import SchemaId
3332
from labelbox.utils import (
3433
_CamelCaseMixin,
@@ -417,7 +416,7 @@ def update_enum_option(
417416
schema = self._validate_custom_schema_by_name(name)
418417
if schema.kind != DataRowMetadataKind.enum:
419418
raise ValueError(
420-
f"Updating Enum option is only supported for Enum metadata schema"
419+
"Updating Enum option is only supported for Enum metadata schema"
421420
)
422421
valid_options: List[str] = [o.name for o in schema.options]
423422

@@ -803,13 +802,13 @@ def _convert_metadata_field(metadata_field):
803802
if isinstance(metadata_field, DataRowMetadataField):
804803
return metadata_field
805804
elif isinstance(metadata_field, dict):
806-
if not "value" in metadata_field:
805+
if "value" not in metadata_field:
807806
raise ValueError(
808807
f"Custom metadata field '{metadata_field}' must have a 'value' key"
809808
)
810809
if (
811-
not "schema_id" in metadata_field
812-
and not "name" in metadata_field
810+
"schema_id" not in metadata_field
811+
and "name" not in metadata_field
813812
):
814813
raise ValueError(
815814
f"Custom metadata field '{metadata_field}' must have either 'schema_id' or 'name' key"

libs/labelbox/src/labelbox/schema/export_filters.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11

22
from datetime import datetime, timezone
3-
from typing import Collection, Dict, List, Literal, Optional, Tuple
4-
5-
from typing_extensions import TypedDict
3+
from typing import Collection, Dict, List, Literal, Optional, Tuple, TypedDict
64

75
SEARCH_LIMIT_PER_EXPORT_V2 = 2_000
86
ISO_8061_FORMAT = "%Y-%m-%dT%H:%M:%S%z"

libs/labelbox/src/labelbox/schema/export_params.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
from typing import List, Optional
2-
3-
from typing_extensions import TypedDict
1+
from typing import List, Optional, TypedDict
42

53
from labelbox.schema.media_type import MediaType
64

libs/labelbox/src/labelbox/schema/labeling_service.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
from datetime import datetime
22
from typing import Any
3-
from typing_extensions import Annotated
4-
5-
from pydantic import BaseModel, Field
63

74
from labelbox.exceptions import ResourceNotFoundError
8-
from labelbox.utils import _CamelCaseMixin
95
from labelbox.schema.labeling_service_dashboard import LabelingServiceDashboard
106
from labelbox.schema.labeling_service_status import LabelingServiceStatus
7+
from labelbox.utils import _CamelCaseMixin
118

129
from ..annotated_types import Cuid
1310

libs/labelbox/src/labelbox/schema/ontology.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# type: ignore
22

33
import colorsys
4+
import json
5+
import warnings
46
from dataclasses import dataclass, field
57
from enum import Enum
6-
from typing import Any, Dict, List, Optional, Union, Type
7-
from typing_extensions import Annotated
8-
import warnings
8+
from typing import Annotated, Any, Dict, List, Optional, Type, Union
9+
10+
from pydantic import StringConstraints
911

1012
from labelbox.exceptions import InconsistentOntologyException
1113
from labelbox.orm.db_object import DbObject
1214
from labelbox.orm.model import Field, Relationship
13-
import json
14-
from pydantic import StringConstraints
1515

1616
FeatureSchemaId: Type[str] = Annotated[
1717
str, StringConstraints(min_length=25, max_length=25)

libs/labelbox/src/labelbox/schema/project_overview.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from typing import Dict, List
2-
from typing_extensions import TypedDict
1+
from typing import Dict, List, TypedDict
2+
33
from pydantic import BaseModel
44

55

libs/labelbox/src/labelbox/schema/search_filters.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import datetime
22
from enum import Enum
3-
from typing import List, Union
4-
from pydantic import PlainSerializer, BaseModel, Field
3+
from typing import Annotated, List, Union
54

6-
from typing_extensions import Annotated
5+
from pydantic import BaseModel, Field, PlainSerializer, field_validator
76

8-
from pydantic import BaseModel, Field, field_validator
97
from labelbox.schema.labeling_service_status import LabelingServiceStatus
108
from labelbox.utils import format_iso_datetime
119

0 commit comments

Comments
 (0)