Skip to content

Commit cda69b7

Browse files
author
Val Brodsky
committed
Update typings
1 parent 11e16a4 commit cda69b7

File tree

12 files changed

+34
-53
lines changed

12 files changed

+34
-53
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/data/raster.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from abc import ABC
22
from io import BytesIO
3-
from typing import Callable, Optional, Union
3+
from typing import Callable, Literal, Optional, Union
44

55
import numpy as np
66
import requests
@@ -9,9 +9,6 @@
99
from PIL import Image
1010
from pydantic import BaseModel, ConfigDict, model_validator
1111
from requests.exceptions import ConnectTimeout
12-
from typing_extensions import Literal
13-
14-
from pydantic import BaseModel, model_validator, ConfigDict
1512

1613
from ..types import TypedArray
1714

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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import sys
2-
from typing import Generic, TypeVar, Any
2+
from typing import Annotated, Any, Generic, TypeVar
33

4-
from typing_extensions import Annotated
5-
from packaging import version
64
import numpy as np
7-
8-
from pydantic import StringConstraints, Field, ConfigDict
5+
from packaging import version
6+
from pydantic import ConfigDict, Field, StringConstraints
97
from pydantic_core import core_schema
108

119
DType = TypeVar("DType")

libs/labelbox/src/labelbox/data/metrics/group.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
try:
1717
from typing import Literal
1818
except ImportError:
19-
from typing_extensions import Literal
19+
from typing import Literal
2020

21+
from ..annotation_types import ClassificationAnnotation, Label, ObjectAnnotation
2122
from ..annotation_types.feature import FeatureSchema
22-
from ..annotation_types import ObjectAnnotation, ClassificationAnnotation, Label
2323

2424

2525
def get_identifying_key(

libs/labelbox/src/labelbox/project_validation.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
from typing import Optional, Set
1+
from typing import Annotated, Optional, Set
22

33
from pydantic import BaseModel, ConfigDict, Field, model_validator
4-
from typing_extensions import Annotated
54

65
from labelbox.schema.media_type import MediaType
76
from labelbox.schema.ontology_kind import EditorTaskType

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
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+
BeforeValidator,
23+
ConfigDict,
2524
Field,
2625
StringConstraints,
2726
conlist,
28-
ConfigDict,
2927
model_serializer,
30-
BeforeValidator,
3128
)
3229

30+
from labelbox.schema.identifiable import GlobalKey, UniqueId
31+
from labelbox.schema.identifiables import DataRowIdentifiers, UniqueIds
3332
from labelbox.schema.ontology import SchemaId
3433
from labelbox.utils import (
3534
_CamelCaseMixin,

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
from datetime import datetime, timezone
2-
from typing import Collection, Dict, List, Optional, Tuple, TypedDict
3-
4-
from labelbox.typing_imports import Literal
2+
from typing import Collection, Dict, List, Literal, Optional, Tuple, TypedDict
53

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
import warnings
66
from dataclasses import dataclass, field
77
from enum import Enum
8-
from typing import Any, Dict, List, Optional, Type, Union
8+
from typing import Annotated, Any, Dict, List, Optional, Type, Union
99

1010
from lbox.exceptions import InconsistentOntologyException
1111
from pydantic import StringConstraints
12-
from typing_extensions import Annotated
1312

1413
from labelbox.orm.db_object import DbObject
1514
from labelbox.orm.model import Field, Relationship

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

0 commit comments

Comments
 (0)