lightly-studio 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

lightly_studio/selection/selection_config.py

@@ -2,21 +2,19 @@
 
 from __future__ import annotations
 
+from typing import Literal, Sequence
 from uuid import UUID
 
 from pydantic import BaseModel
 
-from lightly_studio.resolvers.samples_filter import SampleFilter
-
 
 class SelectionConfig(BaseModel):
     """Configuration for the selection process."""
 
     dataset_id: UUID
-    sample_filter: SampleFilter | None = None
     n_samples_to_select: int
     selection_result_tag_name: str
-    strategies: list[SelectionStrategy]
+    strategies: Sequence[SelectionStrategy]
 
 
 class SelectionStrategy(BaseModel):
@@ -28,4 +26,12 @@ class SelectionStrategy(BaseModel):
 class EmbeddingDiversityStrategy(SelectionStrategy):
     """Selection strategy based on embedding diversity."""
 
+    strategy_name: Literal["diversity"] = "diversity"
     embedding_model_name: str | None
+
+
+class MetadataWeightingStrategy(SelectionStrategy):
+    """Selection strategy based on metadata weighting."""
+
+    strategy_name: Literal["weights"] = "weights"
+    metadata_key: str

lightly_studio/services/annotations_service/__init__.py

@@ -1,11 +1,20 @@
 """Services for annotations operations."""
 
+from lightly_studio.services.annotations_service.create_annotation import (
+    create_annotation,
+)
+from lightly_studio.services.annotations_service.delete_annotation import (
+    delete_annotation,
+)
 from lightly_studio.services.annotations_service.get_annotation_by_id import (
     get_annotation_by_id,
 )
 from lightly_studio.services.annotations_service.update_annotation import (
     update_annotation,
 )
+from lightly_studio.services.annotations_service.update_annotation_bounding_box import (
+    update_annotation_bounding_box,
+)
 from lightly_studio.services.annotations_service.update_annotation_label import (
     update_annotation_label,
 )
@@ -14,8 +23,11 @@ from lightly_studio.services.annotations_service.update_annotations import (
 )
 
 __all__ = [
+    "create_annotation",
+    "delete_annotation",
     "get_annotation_by_id",
     "update_annotation",
+    "update_annotation_bounding_box",
     "update_annotation_label",
     "update_annotations",
 ]

lightly_studio/services/annotations_service/create_annotation.py

@@ -0,0 +1,63 @@
+"""Create annotation."""
+
+from __future__ import annotations
+
+from uuid import UUID
+
+from pydantic import BaseModel
+from sqlmodel import Session
+
+from lightly_studio.models.annotation.annotation_base import (
+    AnnotationBaseTable,
+    AnnotationCreate,
+    AnnotationType,
+)
+from lightly_studio.resolvers import annotation_resolver
+
+
+class AnnotationCreateParams(BaseModel):
+    """Input model for create annotation service."""
+
+    annotation_label_id: UUID
+    annotation_type: AnnotationType
+    dataset_id: UUID
+    sample_id: UUID
+
+    x: int | None = None
+    y: int | None = None
+    width: int | None = None
+    height: int | None = None
+
+    segmentation_mask: list[int] | None = None
+
+
+def create_annotation(session: Session, annotation: AnnotationCreateParams) -> AnnotationBaseTable:
+    """Create a new annotation.
+
+    Args:
+        session: Database session for executing the operation.
+        annotation: Annotation data to create.
+
+    Returns:
+        The retrieved annotation.
+    """
+    annotation_create = AnnotationCreate(
+        **annotation.model_dump(),
+    )
+    new_annotation_ids = annotation_resolver.create_many(
+        session=session,
+        annotations=[annotation_create],
+    )
+
+    if not new_annotation_ids:
+        raise ValueError("Failed to create annotation.")
+
+    created_annotation = annotation_resolver.get_by_id(
+        session=session,
+        annotation_id=new_annotation_ids[0],
+    )
+
+    if created_annotation is None:
+        raise ValueError(f"Failed to create annotation: {annotation}")
+
+    return created_annotation

lightly_studio/services/annotations_service/delete_annotation.py

@@ -0,0 +1,22 @@
+"""Delete an annotation by its ID."""
+
+from __future__ import annotations
+
+from uuid import UUID
+
+from sqlmodel import Session
+
+from lightly_studio.resolvers import annotation_resolver
+
+
+def delete_annotation(session: Session, annotation_id: UUID) -> None:
+    """Delete an annotation by its ID.
+
+    Args:
+        session: Database session for executing the operation.
+        annotation_id: ID of the annotation to delete.
+
+    Raises:
+        ValueError: If the annotation with the given ID is not found.
+    """
+    annotation_resolver.delete_annotation(session=session, annotation_id=annotation_id)

lightly_studio/services/annotations_service/update_annotation.py

@@ -10,6 +10,7 @@ from sqlmodel import Session
 from lightly_studio.models.annotation.annotation_base import (
     AnnotationBaseTable,
 )
+from lightly_studio.resolvers.annotation_resolver.update_bounding_box import BoundingBoxCoordinates
 from lightly_studio.services import annotations_service
 
 
@@ -18,11 +19,8 @@ class AnnotationUpdate(BaseModel):
 
     annotation_id: UUID
     dataset_id: UUID
-    label_name: str | None
-    x: int | None = None
-    y: int | None = None
-    width: int | None = None
-    height: int | None = None
+    label_name: str | None = None
+    bounding_box: BoundingBoxCoordinates | None = None
 
 
 def update_annotation(session: Session, annotation_update: AnnotationUpdate) -> AnnotationBaseTable:
@@ -36,30 +34,21 @@ def update_annotation(session: Session, annotation_update: AnnotationUpdate) ->
         The updated annotation.
 
     """
-    if annotation_update.label_name is None:
-        raise ValueError("Label name must be provided for updating annotation")
-
-    # comment this out for now so e2e tests will pass
-    # todo: uncomment after passing bbox coordinates on update from frontend
-    # annotation=get_annotation_by_id(session,annotation_update.annotation_id)
-    # if annotation.annotation_type in (
-    #     AnnotationType.OBJECT_DETECTION,
-    #     AnnotationType.INSTANCE_SEGMENTATION,
-    # ) and any(
-    #     [
-    #         annotation_update.x is None,
-    #         annotation_update.y is None,
-    #         annotation_update.width is None,
-    #         annotation_update.height is None,
-    #     ]
-    # ):
-    #     raise ValueError(
-    #         "All bounding box coordinates (x, y, width, height) "
-    #         "must be provided for updating this annotation type"
-    #     )
-
-    return annotations_service.update_annotation_label(
-        session,
-        annotation_update.annotation_id,
-        annotation_update.label_name,
-    )
+    result = None
+    if annotation_update.label_name is not None:
+        result = annotations_service.update_annotation_label(
+            session,
+            annotation_update.annotation_id,
+            annotation_update.label_name,
+        )
+
+    if annotation_update.bounding_box is not None:
+        result = annotations_service.update_annotation_bounding_box(
+            session,
+            annotation_update.annotation_id,
+            bounding_box=annotation_update.bounding_box,
+        )
+
+    if result is None:
+        raise ValueError("No updates provided for the annotation.")
+    return result

lightly_studio/services/annotations_service/update_annotation_bounding_box.py

@@ -0,0 +1,36 @@
+"""Update the bounding box of an annotation."""
+
+from __future__ import annotations
+
+from uuid import UUID
+
+from sqlmodel import Session
+
+from lightly_studio.models.annotation.annotation_base import (
+    AnnotationBaseTable,
+)
+from lightly_studio.resolvers import (
+    annotation_resolver,
+)
+from lightly_studio.resolvers.annotation_resolver.update_bounding_box import BoundingBoxCoordinates
+
+
+def update_annotation_bounding_box(
+    session: Session, annotation_id: UUID, bounding_box: BoundingBoxCoordinates
+) -> AnnotationBaseTable:
+    """Update the bounding box of an annotation.
+
+    Args:
+        session: Database session for executing the operation.
+        annotation_id: UUID of the annotation to update.
+        bounding_box: New bounding box coordinates to assign to the annotation.
+
+    Returns:
+        The updated annotation with the new bounding box assigned.
+
+    """
+    return annotation_resolver.update_bounding_box(
+        session,
+        annotation_id,
+        bounding_box,
+    )