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

lightly_studio/__init__.py

@@ -1,11 +1,11 @@
 # Set up logging before importing any other modules.
 # Add noqa to silence unused import and unsorted imports linter warnings.
 from . import setup_logging  # noqa: F401 I001
-
-# TODO (Jonas 08/25): This will be removed as soon as the new interface is used in the examples
-from lightly_studio.dataset.loader import DatasetLoader
 from lightly_studio.core.dataset import Dataset
 from lightly_studio.core.start_gui import start_gui
 
+# TODO (Jonas 08/25): This will be removed as soon as the new interface is used in the examples
+from lightly_studio.dataset.loader import DatasetLoader
+from lightly_studio.models.annotation_task import AnnotationType
 
-__all__ = ["Dataset", "DatasetLoader", "start_gui"]
+__all__ = ["AnnotationType", "Dataset", "DatasetLoader", "start_gui"]

lightly_studio/api/app.py

@@ -11,7 +11,7 @@ from fastapi.routing import APIRoute
 from sqlmodel import Session
 from typing_extensions import Annotated
 
-from lightly_studio.api.db import db_manager
+from lightly_studio import db_manager
 from lightly_studio.api.routes import healthz, images, webapp
 from lightly_studio.api.routes.api import (
     annotation,

lightly_studio/api/routes/api/annotation.py

@@ -7,16 +7,15 @@ from uuid import UUID
 from fastapi import APIRouter, Body, Depends, HTTPException, Path
 from fastapi.params import Query
 from pydantic import BaseModel
-from sqlmodel import Session
 from typing_extensions import Annotated
 
-from lightly_studio.api.db import get_session
 from lightly_studio.api.routes.api.dataset import get_and_validate_dataset_id
 from lightly_studio.api.routes.api.status import (
     HTTP_STATUS_CREATED,
     HTTP_STATUS_NOT_FOUND,
 )
 from lightly_studio.api.routes.api.validators import Paginated, PaginatedWithCursor
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.models.annotation.annotation_base import (
     AnnotationBaseTable,
     AnnotationDetailsView,
@@ -27,6 +26,7 @@ from lightly_studio.resolvers import annotation_resolver, tag_resolver
 from lightly_studio.resolvers.annotation_resolver.get_all import (
     GetAllAnnotationsResult,
 )
+from lightly_studio.resolvers.annotation_resolver.update_bounding_box import BoundingBoxCoordinates
 from lightly_studio.resolvers.annotations.annotations_filter import (
     AnnotationsFilter,
 )
@@ -36,7 +36,6 @@ from lightly_studio.services.annotations_service.update_annotation import (
 )
 
 annotations_router = APIRouter(prefix="/datasets/{dataset_id}", tags=["annotations"])
-SessionDep = Annotated[Session, Depends(get_session)]
 
 
 @annotations_router.get("/annotations/count")
@@ -134,11 +133,8 @@ class AnnotationUpdateInput(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
 
 
 @annotations_router.put("/annotations/{annotation_id}")
@@ -161,10 +157,7 @@ def update_annotation(
             annotation_id=annotation_id,
             dataset_id=dataset_id,
             label_name=annotation_update_input.label_name,
-            x=annotation_update_input.x,
-            y=annotation_update_input.y,
-            width=annotation_update_input.width,
-            height=annotation_update_input.height,
+            bounding_box=annotation_update_input.bounding_box,
         ),
     )
 
@@ -188,10 +181,7 @@ def update_annotations(
                 annotation_id=annotation_update_input.annotation_id,
                 dataset_id=dataset_id,
                 label_name=annotation_update_input.label_name,
-                x=annotation_update_input.x,
-                y=annotation_update_input.y,
-                width=annotation_update_input.width,
-                height=annotation_update_input.height,
+                bounding_box=annotation_update_input.bounding_box,
             )
             for annotation_update_input in annotation_update_inputs
         ],

lightly_studio/api/routes/api/annotation_label.py

@@ -4,15 +4,13 @@ from __future__ import annotations
 
 from uuid import UUID
 
-from fastapi import APIRouter, Depends, HTTPException
-from sqlmodel import Session
-from typing_extensions import Annotated
+from fastapi import APIRouter, HTTPException
 
-from lightly_studio.api.db import get_session
 from lightly_studio.api.routes.api.status import (
     HTTP_STATUS_CREATED,
     HTTP_STATUS_NOT_FOUND,
 )
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.models.annotation_label import (
     AnnotationLabelCreate,
     AnnotationLabelTable,
@@ -20,7 +18,6 @@ from lightly_studio.models.annotation_label import (
 from lightly_studio.resolvers import annotation_label_resolver
 
 annotations_label_router = APIRouter()
-SessionDep = Annotated[Session, Depends(get_session)]
 
 
 @annotations_label_router.post(

lightly_studio/api/routes/api/annotation_task.py

@@ -3,10 +3,9 @@
 from typing import List
 from uuid import UUID
 
-from fastapi import APIRouter, Depends, HTTPException, status
-from sqlmodel import Session
+from fastapi import APIRouter, HTTPException, status
 
-from lightly_studio.api.db import get_session
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.models.annotation_task import AnnotationTaskTable
 from lightly_studio.resolvers import annotation_task_resolver
 
@@ -15,7 +14,7 @@ router = APIRouter(prefix="/annotationtasks", tags=["annotationtasks"])
 
 @router.get("/", response_model=List[AnnotationTaskTable])
 def get_annotation_tasks(
-    session: Session = Depends(get_session),  # noqa: B008
+    session: SessionDep,
 ) -> List[AnnotationTaskTable]:
     """Get all annotation tasks."""
     return annotation_task_resolver.get_all(session=session)
@@ -24,7 +23,7 @@ def get_annotation_tasks(
 @router.get("/{annotation_task_id}", response_model=AnnotationTaskTable)
 def get_annotation_task(
     annotation_task_id: UUID,
-    session: Session = Depends(get_session),  # noqa: B008
+    session: SessionDep,
 ) -> AnnotationTaskTable:
     """Get an annotation task by ID."""
     task = annotation_task_resolver.get_by_id(

lightly_studio/api/routes/api/classifier.py

@@ -6,13 +6,11 @@ import io
 from pathlib import Path
 from uuid import UUID
 
-from fastapi import APIRouter, Depends, UploadFile
+from fastapi import APIRouter, UploadFile
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel
-from sqlmodel import Session
-from typing_extensions import Annotated
 
-from lightly_studio.api.db import get_session
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.few_shot_classifier.classifier import (
     ExportType,
 )
@@ -22,7 +20,6 @@ from lightly_studio.few_shot_classifier.classifier_manager import (
 from lightly_studio.models.classifier import EmbeddingClassifier
 
 classifier_router = APIRouter()
-SessionDep = Annotated[Session, Depends(get_session)]
 
 
 class GetNegativeSamplesRequest(BaseModel):

lightly_studio/api/routes/api/dataset.py

@@ -9,12 +9,12 @@ 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, Session
+from sqlmodel import Field
 from typing_extensions import Annotated
 
-from lightly_studio.api.db import get_session
 from lightly_studio.api.routes.api.status import HTTP_STATUS_NOT_FOUND
 from lightly_studio.api.routes.api.validators import Paginated
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.models.dataset import (
     DatasetCreate,
     DatasetTable,
@@ -26,7 +26,6 @@ from lightly_studio.resolvers.dataset_resolver import (
 )
 
 dataset_router = APIRouter()
-SessionDep = Annotated[Session, Depends(get_session)]
 
 
 def get_and_validate_dataset_id(

lightly_studio/api/routes/api/dataset_tag.py

@@ -8,10 +8,9 @@ from uuid import UUID
 from fastapi import APIRouter, Depends, HTTPException, Path, Query
 from pydantic import BaseModel
 from sqlalchemy.exc import IntegrityError
-from sqlmodel import Field, Session
+from sqlmodel import Field
 from typing_extensions import Annotated
 
-from lightly_studio.api.db import get_session
 from lightly_studio.api.routes.api.dataset import get_and_validate_dataset_id
 from lightly_studio.api.routes.api.status import (
     HTTP_STATUS_CONFLICT,
@@ -19,6 +18,7 @@ from lightly_studio.api.routes.api.status import (
     HTTP_STATUS_NOT_FOUND,
 )
 from lightly_studio.api.routes.api.validators import Paginated
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.models.dataset import DatasetTable
 from lightly_studio.models.tag import (
     TagCreate,
@@ -31,7 +31,6 @@ from lightly_studio.models.tag import (
 from lightly_studio.resolvers import tag_resolver
 
 tag_router = APIRouter()
-SessionDep = Annotated[Session, Depends(get_session)]
 
 
 @tag_router.post(

lightly_studio/api/routes/api/metadata.py

@@ -5,18 +5,16 @@ from __future__ import annotations
 from typing import List
 from uuid import UUID
 
-from fastapi import APIRouter, Depends, Path
-from sqlmodel import Session
+from fastapi import APIRouter, Path
 from typing_extensions import Annotated
 
-from lightly_studio.api.db import get_session
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.models.metadata import MetadataInfoView
 from lightly_studio.resolvers.metadata_resolver.sample.get_metadata_info import (
     get_all_metadata_keys_and_schema,
 )
 
 metadata_router = APIRouter(prefix="/datasets/{dataset_id}", tags=["metadata"])
-SessionDep = Annotated[Session, Depends(get_session)]
 
 
 @metadata_router.get("/metadata/info", response_model=List[MetadataInfoView])

lightly_studio/api/routes/api/metrics.py

@@ -4,12 +4,10 @@ from __future__ import annotations
 
 from uuid import UUID
 
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter
 from pydantic import BaseModel
-from sqlmodel import Session
-from typing_extensions import Annotated
 
-from lightly_studio.api.db import get_session
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.metrics.detection.map import (
     DetectionMetricsMAP,
     calculate_map_metric,
@@ -24,8 +22,6 @@ from lightly_studio.resolvers.annotations.annotations_filter import (
 
 metrics_router = APIRouter()
 
-SessionDep = Annotated[Session, Depends(get_session)]
-
 
 class DetectionMetricsMAPRequest(BaseModel):
     """Request for computing the MAP detection metric."""

lightly_studio/api/routes/api/sample.py

@@ -6,16 +6,15 @@ from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException, Path, Query
 from pydantic import BaseModel, Field
-from sqlmodel import Session
 from typing_extensions import Annotated
 
-from lightly_studio.api.db import get_session
 from lightly_studio.api.routes.api.dataset import get_and_validate_dataset_id
 from lightly_studio.api.routes.api.status import (
     HTTP_STATUS_CREATED,
     HTTP_STATUS_NOT_FOUND,
 )
 from lightly_studio.api.routes.api.validators import Paginated
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.models.dataset import DatasetTable
 from lightly_studio.models.sample import (
     SampleCreate,
@@ -27,12 +26,12 @@ from lightly_studio.resolvers import (
     sample_resolver,
     tag_resolver,
 )
+from lightly_studio.resolvers.sample_resolver import GetAllSamplesByDatasetIdResult
 from lightly_studio.resolvers.samples_filter import (
     SampleFilter,
 )
 
 samples_router = APIRouter(prefix="/datasets/{dataset_id}", tags=["samples"])
-SessionDep = Annotated[Session, Depends(get_session)]
 
 
 @samples_router.post("/samples", response_model=SampleView)
@@ -60,7 +59,7 @@ def read_samples(
     session: SessionDep,
     dataset_id: Annotated[UUID, Path(title="Dataset Id")],
     body: ReadSamplesRequest,
-) -> SampleViewsWithCount:
+) -> GetAllSamplesByDatasetIdResult:
     """Retrieve a list of samples from the database with optional filtering.
 
     Args:
@@ -71,22 +70,15 @@ def read_samples(
     Returns:
         A list of filtered samples.
     """
-    result = sample_resolver.get_all_by_dataset_id(
+    return sample_resolver.get_all_by_dataset_id(
         session=session,
         dataset_id=dataset_id,
-        # TODO(Michal, 06/2025): Pass the Paginated object directly.
-        offset=body.pagination.offset if body.pagination else 0,
-        limit=body.pagination.limit if body.pagination else 10,
+        pagination=body.pagination,
         filters=body.filters,
         text_embedding=body.text_embedding,
         sample_ids=body.sample_ids,
     )
 
-    return SampleViewsWithCount(
-        data=result.samples,
-        total_count=result.total_count,
-    )
-
 
 @samples_router.get("/samples/dimensions")
 def get_sample_dimensions(

lightly_studio/api/routes/api/settings.py

@@ -1,17 +1,13 @@
 """This module contains the API routes for user settings."""
 
-from fastapi import APIRouter, Depends
-from sqlmodel import Session
-from typing_extensions import Annotated
+from fastapi import APIRouter
 
-from lightly_studio.api.db import get_session
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.models.settings import SettingView
 from lightly_studio.resolvers import settings_resolver
 
 settings_router = APIRouter(tags=["settings"])
 
-SessionDep = Annotated[Session, Depends(get_session)]
-
 
 @settings_router.get("/settings")
 def get_settings(

lightly_studio/api/routes/images.py

@@ -5,12 +5,12 @@ from __future__ import annotations
 import os
 from collections.abc import Generator
 
-from fastapi import APIRouter, Depends, HTTPException
+import fsspec
+from fastapi import APIRouter, HTTPException
 from fastapi.responses import StreamingResponse
-from sqlmodel import Session
 
-from lightly_studio.api import db
 from lightly_studio.api.routes.api import status
+from lightly_studio.db_manager import SessionDep
 from lightly_studio.models import sample
 
 app_router = APIRouter()
@@ -19,7 +19,7 @@ app_router = APIRouter()
 @app_router.get("/sample/{sample_id}")
 async def serve_image_by_sample_id(
     sample_id: str,
-    session: Session = Depends(db.get_session),  # noqa: B008
+    session: SessionDep,
 ) -> StreamingResponse:
     """Serve an image by sample ID.
 
@@ -45,8 +45,8 @@ async def serve_image_by_sample_id(
 
     try:
         # Open the file.
-        with open(file_path, "rb") as file:
-            content = file.read()
+        fs, fs_path = fsspec.core.url_to_fs(file_path)
+        content = fs.cat_file(fs_path)
 
         # Determine content type based on file extension.
         content_type = _get_content_type(file_path)