Skip to content

[PLT-1339] Fixed Cuid dependencies that crash if numpy was not installed #1807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions libs/labelbox/src/labelbox/annotated_types.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from typing_extensions import Annotated

from pydantic import Field


Cuid = Annotated[str, Field(min_length=25, max_length=25)]
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from typing import Optional
from pydantic import BaseModel, model_validator, model_serializer
from .types import Cuid

from ...annotated_types import Cuid


class FeatureSchema(BaseModel):
Expand Down
3 changes: 2 additions & 1 deletion libs/labelbox/src/labelbox/data/annotation_types/label.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
from labelbox.data.annotation_types.data.generic_data_row_data import GenericDataRowData
from labelbox.data.annotation_types.data.tiled_image import TiledImageData
from labelbox.schema import ontology

from ...annotated_types import Cuid
from .annotation import ClassificationAnnotation, ObjectAnnotation
from .relationship import RelationshipAnnotation
from .llm_prompt_response.prompt import PromptClassificationAnnotation
from .classification import ClassificationAnswer
from .data import AudioData, ConversationData, DicomData, DocumentData, HTMLData, ImageData, TextData, VideoData, LlmPromptCreationData, LlmPromptResponseCreationData, LlmResponseCreationData
from .geometry import Mask
from .metrics import ScalarMetric, ConfusionMatrixMetric
from .types import Cuid
from .video import VideoClassificationAnnotation
from .video import VideoObjectAnnotation, VideoMaskAnnotation
from .mmc import MessageEvaluationTaskAnnotation
Expand Down
2 changes: 0 additions & 2 deletions libs/labelbox/src/labelbox/data/annotation_types/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

from pydantic import StringConstraints, Field

Cuid = Annotated[str, StringConstraints(min_length=25, max_length=25)]

DType = TypeVar('DType')
DShape = TypeVar('DShape')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
from uuid import uuid4

from labelbox.utils import _CamelCaseMixin, is_exactly_one_set
from ...annotation_types.types import Cuid
from pydantic import model_validator, ConfigDict, BaseModel, Field
from uuid import uuid4
import threading

from ....annotated_types import Cuid

subclass_registry = {}

class _SubclassRegistryBase(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
from labelbox.data.mixins import ConfidenceMixin, CustomMetric, CustomMetricsMixin
from labelbox.data.serialization.ndjson.base import DataRow, NDAnnotation

from ....annotated_types import Cuid

from ...annotation_types.annotation import ClassificationAnnotation
from ...annotation_types.video import VideoClassificationAnnotation
from ...annotation_types.llm_prompt_response.prompt import PromptClassificationAnnotation, PromptText
from ...annotation_types.classification.classification import ClassificationAnswer, Text, Checklist, Radio
from ...annotation_types.types import Cuid
from ...annotation_types.data import TextData, VideoData, ImageData
from pydantic import model_validator, Field, BaseModel, ConfigDict, model_serializer
from pydantic.alias_generators import to_camel
from .base import _SubclassRegistryBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from labelbox.utils import _CamelCaseMixin

from .base import _SubclassRegistryBase, DataRow, NDAnnotation
from ...annotation_types.types import Cuid
from ...annotation_types.mmc import MessageSingleSelectionTask, MessageMultiSelectionTask, MessageRankingTask, MessageEvaluationTaskAnnotation


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from labelbox.data.annotation_types.ner.conversation_entity import ConversationEntity
from labelbox.data.annotation_types.video import VideoObjectAnnotation, DICOMObjectAnnotation
from labelbox.data.mixins import ConfidenceMixin, CustomMetricsMixin, CustomMetric, CustomMetricsNotSupportedMixin
from ....annotated_types import Cuid
import numpy as np

from PIL import Image
Expand All @@ -14,7 +15,6 @@

from ...annotation_types.data import ImageData, TextData, MaskData
from ...annotation_types.ner import DocumentEntity, DocumentTextSelection, TextEntity
from ...annotation_types.types import Cuid
from ...annotation_types.geometry import DocumentRectangle, Rectangle, Polygon, Line, Point, Mask
from ...annotation_types.annotation import ClassificationAnnotation, ObjectAnnotation
from ...annotation_types.video import VideoMaskAnnotation, DICOMMaskAnnotation, MaskFrame, MaskInstance
Expand Down
6 changes: 3 additions & 3 deletions libs/labelbox/src/labelbox/schema/labeling_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
from typing import Any
from typing_extensions import Annotated

from labelbox.exceptions import ResourceNotFoundError

from pydantic import BaseModel, Field

from labelbox.exceptions import ResourceNotFoundError
from labelbox.utils import _CamelCaseMixin
from labelbox.schema.labeling_service_dashboard import LabelingServiceDashboard
from labelbox.schema.labeling_service_status import LabelingServiceStatus

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


class LabelingService(_CamelCaseMixin):
Expand Down
Loading