Merge branch 'main' into leonardo-lig-7942-gui-allow-to-create-tag-from-all-samples-fullfilling-the

Author: LeonardoRosaa

lightly_studio/src/lightly_studio/api/routes/api/annotation.py

@@ -237,6 +237,7 @@ def update_annotations(
                 collection_id=collection_id,
                 label_name=annotation_update_input.label_name,
                 bounding_box=annotation_update_input.bounding_box,
+                segmentation_mask=annotation_update_input.segmentation_mask,
             )
             for annotation_update_input in annotation_update_inputs
         ],

lightly_studio/src/lightly_studio/api/routes/api/collection.py

@@ -2,18 +2,15 @@
 
 from __future__ import annotations
 
-from datetime import datetime, timezone
 from typing import List
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException, Path, Query
-from fastapi.responses import PlainTextResponse
-from pydantic import BaseModel
-from sqlmodel import Field
 from typing_extensions import Annotated
 
 from lightly_studio.api.routes.api.status import HTTP_STATUS_NOT_FOUND
 from lightly_studio.api.routes.api.validators import Paginated
+from lightly_studio.dataset import embedding_utils
 from lightly_studio.db_manager import SessionDep
 from lightly_studio.models.collection import (
     CollectionCreate,
@@ -23,7 +20,6 @@
     CollectionViewWithCount,
 )
 from lightly_studio.resolvers import collection_resolver
-from lightly_studio.resolvers.collection_resolver.export import ExportFilter
 
 collection_router = APIRouter()
 
@@ -124,72 +120,16 @@ def delete_collection(
     return {"status": "deleted"}
 
 
-# TODO(Michal, 09/2025): Move to export.py
-class ExportBody(BaseModel):
-    """body parameters for including or excluding tag_ids or sample_ids."""
-
-    include: ExportFilter | None = Field(
-        None, description="include filter for sample_ids or tag_ids"
-    )
-    exclude: ExportFilter | None = Field(
-        None, description="exclude filter for sample_ids or tag_ids"
-    )
-
-
-# This endpoint should be a GET, however due to the potential huge size
-# of sample_ids, it is a POST request to avoid URL length limitations.
-# A body with a GET request is supported by fastAPI however it has undefined
-# behavior: https://fastapi.tiangolo.com/tutorial/body/
-# TODO(Michal, 09/2025): Move to export.py
-@collection_router.post(
-    "/collections/{collection_id}/export",
-)
-def export_collection_to_absolute_paths(
+@collection_router.get("/collections/{collection_id}/has_embeddings")
+def has_embeddings(
     session: SessionDep,
     collection: Annotated[
         CollectionTable,
         Path(title="collection Id"),
         Depends(get_and_validate_collection_id),
     ],
-    body: ExportBody,
-) -> PlainTextResponse:
-    """Export collection from the database."""
-    # export collection to absolute paths
-    exported = collection_resolver.export(
-        session=session,
-        collection_id=collection.collection_id,
-        include=body.include,
-        exclude=body.exclude,
-    )
-
-    # Create a response with the exported data
-    response = PlainTextResponse("\n".join(exported))
-
-    # Add the Content-Disposition header to force download
-    filename = f"{collection.name}_exported_{datetime.now(timezone.utc)}.txt"
-    response.headers["Access-Control-Expose-Headers"] = "Content-Disposition"
-    response.headers["Content-Disposition"] = f"attachment; filename={filename}"
-
-    return response
-
-
-# TODO(Michal, 09/2025): Move to export.py
-@collection_router.post(
-    "/collections/{collection_id}/export/stats",
-)
-def export_collection_stats(
-    session: SessionDep,
-    collection: Annotated[
-        CollectionTable,
-        Path(title="collection Id"),
-        Depends(get_and_validate_collection_id),
-    ],
-    body: ExportBody,
-) -> int:
-    """Get statistics about the export query."""
-    return collection_resolver.get_filtered_samples_count(
-        session=session,
-        collection_id=collection.collection_id,
-        include=body.include,
-        exclude=body.exclude,
+) -> bool:
+    """Check if a collection has embeddings."""
+    return embedding_utils.collection_has_embeddings(
+        session=session, collection_id=collection.collection_id
     )

lightly_studio/src/lightly_studio/api/routes/api/export.py

@@ -3,18 +3,23 @@
 from __future__ import annotations
 
 from collections.abc import Generator
+from datetime import datetime, timezone
 from pathlib import Path as PathlibPath
 from tempfile import TemporaryDirectory
 
 from fastapi import APIRouter, Depends, Path
-from fastapi.responses import StreamingResponse
+from fastapi.responses import PlainTextResponse, StreamingResponse
+from pydantic import BaseModel
+from sqlmodel import Field
 from typing_extensions import Annotated
 
 from lightly_studio.api.routes.api import collection as collection_api
 from lightly_studio.core.dataset_query.dataset_query import DatasetQuery
 from lightly_studio.db_manager import SessionDep
 from lightly_studio.export import export_dataset
 from lightly_studio.models.collection import CollectionTable
+from lightly_studio.resolvers import collection_resolver
+from lightly_studio.resolvers.collection_resolver.export import ExportFilter
 
 export_router = APIRouter(prefix="/collections/{collection_id}", tags=["export"])
 
@@ -103,6 +108,74 @@ def export_collection_captions(
     )
 
 
+class ExportBody(BaseModel):
+    """body parameters for including or excluding tag_ids or sample_ids."""
+
+    include: ExportFilter | None = Field(
+        None, description="include filter for sample_ids or tag_ids"
+    )
+    exclude: ExportFilter | None = Field(
+        None, description="exclude filter for sample_ids or tag_ids"
+    )
+
+
+# This endpoint should be a GET, however due to the potential huge size
+# of sample_ids, it is a POST request to avoid URL length limitations.
+# A body with a GET request is supported by fastAPI however it has undefined
+# behavior: https://fastapi.tiangolo.com/tutorial/body/
+@export_router.post(
+    "/export",
+)
+def export_collection_to_absolute_paths(
+    session: SessionDep,
+    collection: Annotated[
+        CollectionTable,
+        Path(title="collection Id"),
+        Depends(collection_api.get_and_validate_collection_id),
+    ],
+    body: ExportBody,
+) -> PlainTextResponse:
+    """Export collection from the database."""
+    # export collection to absolute paths
+    exported = collection_resolver.export(
+        session=session,
+        collection_id=collection.collection_id,
+        include=body.include,
+        exclude=body.exclude,
+    )
+
+    # Create a response with the exported data
+    response = PlainTextResponse("\n".join(exported))
+
+    # Add the Content-Disposition header to force download
+    filename = f"{collection.name}_exported_{datetime.now(timezone.utc)}.txt"
+    response.headers["Access-Control-Expose-Headers"] = "Content-Disposition"
+    response.headers["Content-Disposition"] = f"attachment; filename={filename}"
+
+    return response
+
+
+@export_router.post(
+    "/export/stats",
+)
+def export_collection_stats(
+    session: SessionDep,
+    collection: Annotated[
+        CollectionTable,
+        Path(title="collection Id"),
+        Depends(collection_api.get_and_validate_collection_id),
+    ],
+    body: ExportBody,
+) -> int:
+    """Get statistics about the export query."""
+    return collection_resolver.get_filtered_samples_count(
+        session=session,
+        collection_id=collection.collection_id,
+        include=body.include,
+        exclude=body.exclude,
+    )
+
+
 def _stream_export_file(
     temp_dir: TemporaryDirectory[str],
     file_path: PathlibPath,

lightly_studio/src/lightly_studio/api/routes/api/features.py

@@ -11,6 +11,8 @@
 features_router = APIRouter()
 
 
+# TODO(Michal, 12/2025): Features are currently unused. Remove the endpoint if still not used
+# in a couple of months.
 @features_router.get("/features")
 def get_features() -> list[str]:
     """Get the list of active features in the LightlyStudio app."""