Skip to content

Commit 1c8c285

Browse files
author
Val Brodsky
committed
Fixed Cuid dependencies that crash if numpy was not installed
1 parent 4cd2637 commit 1c8c285

File tree

9 files changed

+18
-12
lines changed

9 files changed

+18
-12
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from typing_extensions import Annotated
2+
3+
from pydantic import Field
4+
5+
6+
Cuid = Annotated[str, Field(min_length=25, max_length=25)]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from typing import Optional
22
from pydantic import BaseModel, model_validator, model_serializer
3-
from .types import Cuid
3+
4+
from ...annotated_types import Cuid
45

56

67
class FeatureSchema(BaseModel):

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
from labelbox.data.annotation_types.data.generic_data_row_data import GenericDataRowData
77
from labelbox.data.annotation_types.data.tiled_image import TiledImageData
88
from labelbox.schema import ontology
9+
10+
from ...annotated_types import Cuid
911
from .annotation import ClassificationAnnotation, ObjectAnnotation
1012
from .relationship import RelationshipAnnotation
1113
from .llm_prompt_response.prompt import PromptClassificationAnnotation
1214
from .classification import ClassificationAnswer
1315
from .data import AudioData, ConversationData, DicomData, DocumentData, HTMLData, ImageData, TextData, VideoData, LlmPromptCreationData, LlmPromptResponseCreationData, LlmResponseCreationData
1416
from .geometry import Mask
1517
from .metrics import ScalarMetric, ConfusionMatrixMetric
16-
from .types import Cuid
1718
from .video import VideoClassificationAnnotation
1819
from .video import VideoObjectAnnotation, VideoMaskAnnotation
1920
from .mmc import MessageEvaluationTaskAnnotation

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
from pydantic import StringConstraints, Field
99

10-
Cuid = Annotated[str, StringConstraints(min_length=25, max_length=25)]
11-
1210
DType = TypeVar('DType')
1311
DShape = TypeVar('DShape')
1412

libs/labelbox/src/labelbox/data/serialization/ndjson/base.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
from uuid import uuid4
33

44
from labelbox.utils import _CamelCaseMixin, is_exactly_one_set
5-
from ...annotation_types.types import Cuid
65
from pydantic import model_validator, ConfigDict, BaseModel, Field
76
from uuid import uuid4
87
import threading
98

9+
from ....annotated_types import Cuid
10+
1011
subclass_registry = {}
1112

1213
class _SubclassRegistryBase(BaseModel):

libs/labelbox/src/labelbox/data/serialization/ndjson/classification.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
from labelbox.data.mixins import ConfidenceMixin, CustomMetric, CustomMetricsMixin
44
from labelbox.data.serialization.ndjson.base import DataRow, NDAnnotation
55

6+
from ....annotated_types import Cuid
7+
68
from ...annotation_types.annotation import ClassificationAnnotation
79
from ...annotation_types.video import VideoClassificationAnnotation
810
from ...annotation_types.llm_prompt_response.prompt import PromptClassificationAnnotation, PromptText
911
from ...annotation_types.classification.classification import ClassificationAnswer, Text, Checklist, Radio
10-
from ...annotation_types.types import Cuid
11-
from ...annotation_types.data import TextData, VideoData, ImageData
1212
from pydantic import model_validator, Field, BaseModel, ConfigDict, model_serializer
1313
from pydantic.alias_generators import to_camel
1414
from .base import _SubclassRegistryBase

libs/labelbox/src/labelbox/data/serialization/ndjson/mmc.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from labelbox.utils import _CamelCaseMixin
44

55
from .base import _SubclassRegistryBase, DataRow, NDAnnotation
6-
from ...annotation_types.types import Cuid
76
from ...annotation_types.mmc import MessageSingleSelectionTask, MessageMultiSelectionTask, MessageRankingTask, MessageEvaluationTaskAnnotation
87

98

libs/labelbox/src/labelbox/data/serialization/ndjson/objects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from labelbox.data.annotation_types.ner.conversation_entity import ConversationEntity
66
from labelbox.data.annotation_types.video import VideoObjectAnnotation, DICOMObjectAnnotation
77
from labelbox.data.mixins import ConfidenceMixin, CustomMetricsMixin, CustomMetric, CustomMetricsNotSupportedMixin
8+
from ....annotated_types import Cuid
89
import numpy as np
910

1011
from PIL import Image
@@ -14,7 +15,6 @@
1415

1516
from ...annotation_types.data import ImageData, TextData, MaskData
1617
from ...annotation_types.ner import DocumentEntity, DocumentTextSelection, TextEntity
17-
from ...annotation_types.types import Cuid
1818
from ...annotation_types.geometry import DocumentRectangle, Rectangle, Polygon, Line, Point, Mask
1919
from ...annotation_types.annotation import ClassificationAnnotation, ObjectAnnotation
2020
from ...annotation_types.video import VideoMaskAnnotation, DICOMMaskAnnotation, MaskFrame, MaskInstance

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
from typing import Any
33
from typing_extensions import Annotated
44

5-
from labelbox.exceptions import ResourceNotFoundError
6-
75
from pydantic import BaseModel, Field
6+
7+
from labelbox.exceptions import ResourceNotFoundError
88
from labelbox.utils import _CamelCaseMixin
99
from labelbox.schema.labeling_service_dashboard import LabelingServiceDashboard
1010
from labelbox.schema.labeling_service_status import LabelingServiceStatus
1111

12-
Cuid = Annotated[str, Field(min_length=25, max_length=25)]
12+
from ..annotated_types import Cuid
1313

1414

1515
class LabelingService(_CamelCaseMixin):

0 commit comments

Comments
 (0)