gukebox 1.0.0.dev5__tar.gz → 1.0.0.dev7__tar.gz

{gukebox-1.0.0.dev5 → gukebox-1.0.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gukebox
-Version: 1.0.0.dev5
+Version: 1.0.0.dev7
 Summary: A Jukebox to play music on speakers using 'CD' with NFC tag
 Keywords: jukebox,discstore,music,nfc
 Author: Gudsfile
@@ -35,6 +35,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: pydantic==2.12.5
+Requires-Dist: questionary==2.1.1
 Requires-Dist: soco==0.30.14
 Requires-Dist: typer==0.23.2 ; python_full_version < '3.10'
 Requires-Dist: typer==0.24.1 ; python_full_version >= '3.10'
@@ -42,16 +43,16 @@ Requires-Dist: fastapi==0.128.7 ; python_full_version < '3.10' and extra == 'api
 Requires-Dist: fastapi==0.135.1 ; python_full_version >= '3.10' and extra == 'api'
 Requires-Dist: uvicorn==0.39.0 ; python_full_version < '3.10' and extra == 'api'
 Requires-Dist: uvicorn==0.41.0 ; python_full_version >= '3.10' and extra == 'api'
-Requires-Dist: pyserial==3.5 ; extra == 'nfc'
-Requires-Dist: spidev==3.8 ; extra == 'nfc'
-Requires-Dist: lgpio==0.2.2.0 ; python_full_version < '3.13' and extra == 'nfc'
+Requires-Dist: pyserial==3.5 ; extra == 'pn532'
+Requires-Dist: spidev==3.8 ; extra == 'pn532'
+Requires-Dist: lgpio==0.2.2.0 ; python_full_version < '3.13' and extra == 'pn532'
 Requires-Dist: gukebox[api] ; extra == 'ui'
 Requires-Dist: fastui==0.9.0 ; python_full_version >= '3.10' and extra == 'ui'
 Requires-Dist: python-multipart==0.0.22 ; python_full_version >= '3.10' and extra == 'ui'
 Requires-Python: >=3.9, <3.14
 Project-URL: Repository, https://github.com/Gudsfile/jukebox
 Provides-Extra: api
-Provides-Extra: nfc
+Provides-Extra: pn532
 Provides-Extra: ui
 Description-Content-Type: text/markdown
 
@@ -106,7 +107,7 @@ Install the package from [PyPI](https://pypi.org/project/gukebox/).
 > The package name is `gukebox` with `g` instead of a `j` (due to a name already taken).
 
 > [!NOTE]
-> The `nfc` extra is optional but required for NFC reading, [check compatibility](#readers).
+> The `pn532` extra is optional but required for NFC reading, [check compatibility](#readers).
 
 ### Recommended installation
 
@@ -131,7 +132,7 @@ source jukebox/bin/activate
 
 3. Install `gukebox` into the virtual environment:
 ```shell
-pip install "gukebox[nfc]"
+pip install "gukebox[pn532]"
 ```
 
 > [!IMPORTANT]
@@ -218,7 +219,7 @@ Start the jukebox with the `jukebox` command (show help message with `--help`)
 jukebox PLAYER_TO_USE READER_TO_USE
 ```
 
-🎉 With choosing the `sonos` player and `nfc` reader, by approaching a NFC tag stored in the `library.json` file, you should hear the associated music begins.
+🎉 With choosing the `sonos` player and `pn532` reader, by approaching a NFC tag stored in the `library.json` file, you should hear the associated music begins.
 
 Optional Parameters
 
@@ -241,7 +242,7 @@ Expected syntax: `tag_id` or `tag_id duration_seconds`.
 - duration_seconds: a non-negative number of seconds used to simulate how long the tag remains in place. Fractional values are allowed.
 Complete example: `your:tag:uid 2.5`
 
-**NFC** (`nfc`)
+**NFC Pn532** (`pn532`)
 Read an NFC tag and get its UID.
 This project works with an NFC reader like the **PN532** and NFC tags like the **NTAG2xx**.
 It is configured according to the [Waveshare PN532 wiki](https://www.waveshare.com/wiki/PN532_NFC_HAT).

{gukebox-1.0.0.dev5 → gukebox-1.0.0.dev7}/README.md

@@ -49,7 +49,7 @@ Install the package from [PyPI](https://pypi.org/project/gukebox/).
 > The package name is `gukebox` with `g` instead of a `j` (due to a name already taken).
 
 > [!NOTE]
-> The `nfc` extra is optional but required for NFC reading, [check compatibility](#readers).
+> The `pn532` extra is optional but required for NFC reading, [check compatibility](#readers).
 
 ### Recommended installation
 
@@ -74,7 +74,7 @@ source jukebox/bin/activate
 
 3. Install `gukebox` into the virtual environment:
 ```shell
-pip install "gukebox[nfc]"
+pip install "gukebox[pn532]"
 ```
 
 > [!IMPORTANT]
@@ -161,7 +161,7 @@ Start the jukebox with the `jukebox` command (show help message with `--help`)
 jukebox PLAYER_TO_USE READER_TO_USE
 ```
 
-🎉 With choosing the `sonos` player and `nfc` reader, by approaching a NFC tag stored in the `library.json` file, you should hear the associated music begins.
+🎉 With choosing the `sonos` player and `pn532` reader, by approaching a NFC tag stored in the `library.json` file, you should hear the associated music begins.
 
 Optional Parameters
 
@@ -184,7 +184,7 @@ Expected syntax: `tag_id` or `tag_id duration_seconds`.
 - duration_seconds: a non-negative number of seconds used to simulate how long the tag remains in place. Fractional values are allowed.
 Complete example: `your:tag:uid 2.5`
 
-**NFC** (`nfc`)
+**NFC Pn532** (`pn532`)
 Read an NFC tag and get its UID.
 This project works with an NFC reader like the **PN532** and NFC tags like the **NTAG2xx**.
 It is configured according to the [Waveshare PN532 wiki](https://www.waveshare.com/wiki/PN532_NFC_HAT).

gukebox-1.0.0.dev7/discstore/adapters/inbound/api/__init__.py

@@ -0,0 +1,25 @@
+from discstore.adapters.inbound.api.current_tag_router import build_current_tag_router
+from discstore.adapters.inbound.api.discs_router import build_discs_router
+from discstore.adapters.inbound.api.models import (
+    CurrentTagDiscOutput,
+    CurrentTagStatusOutput,
+    DiscInput,
+    DiscOutput,
+    DiscPatchInput,
+    SettingsPatchInput,
+    SettingsResetInput,
+)
+from discstore.adapters.inbound.api.settings_router import build_settings_router
+
+__all__ = [
+    "CurrentTagDiscOutput",
+    "CurrentTagStatusOutput",
+    "DiscInput",
+    "DiscOutput",
+    "DiscPatchInput",
+    "SettingsPatchInput",
+    "SettingsResetInput",
+    "build_current_tag_router",
+    "build_discs_router",
+    "build_settings_router",
+]

gukebox-1.0.0.dev7/discstore/adapters/inbound/api/current_tag_router.py

@@ -0,0 +1,161 @@
+from typing import Any, Optional
+
+from fastapi import APIRouter, HTTPException, Response, status
+
+from discstore.adapters.inbound.api.models import (
+    CurrentTagDiscOutput,
+    CurrentTagStatusOutput,
+    DiscInput,
+    DiscOutput,
+    DiscPatchInput,
+)
+from discstore.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
+from discstore.domain.use_cases.add_disc import AddDisc
+from discstore.domain.use_cases.edit_disc import EditDisc
+from discstore.domain.use_cases.get_current_tag_status import GetCurrentTagStatus
+from discstore.domain.use_cases.get_disc import GetDisc
+from discstore.domain.use_cases.remove_disc import RemoveDisc
+
+
+def build_current_tag_router(
+    get_current_tag_status: GetCurrentTagStatus,
+    add_disc: AddDisc,
+    edit_disc: EditDisc,
+    get_disc: GetDisc,
+    remove_disc: RemoveDisc,
+) -> APIRouter:
+    router = APIRouter(prefix="/api/v1", tags=["current-tag"])
+
+    def read_current_tag_status() -> Optional[CurrentTagStatus]:
+        return get_current_tag_status.execute()
+
+    def ensure_expected_tag_id_matches(
+        expected_tag_id: Optional[str], current_tag_status: Optional[CurrentTagStatus]
+    ) -> None:
+        if expected_tag_id is None:
+            return
+
+        actual_tag_id = None if current_tag_status is None else current_tag_status.tag_id
+        if actual_tag_id != expected_tag_id:
+            raise HTTPException(
+                status_code=409,
+                detail=f"Current tag changed: expected_tag_id='{expected_tag_id}', actual_tag_id={repr(actual_tag_id)}",
+            )
+
+    def build_current_tag_disc_output(tag_id: str, disc: Disc) -> CurrentTagDiscOutput:
+        return CurrentTagDiscOutput(tag_id=tag_id, disc=DiscOutput(**disc.model_dump()))
+
+    @router.get(
+        "/current-tag",
+        response_model=CurrentTagStatusOutput,
+        responses={204: {"description": "No current tag"}},
+        summary="Get the current NFC tag status",
+    )
+    def get_current_tag() -> Any:
+        current_tag_status = read_current_tag_status()
+        if current_tag_status is None:
+            return Response(status_code=204)
+
+        return CurrentTagStatusOutput(**current_tag_status.model_dump())
+
+    @router.get(
+        "/current-tag/disc",
+        response_model=CurrentTagDiscOutput,
+        responses={204: {"description": "No current tag"}, 404: {"description": "Current tag disc not found"}},
+        summary="Get the current tag disc",
+    )
+    def get_current_tag_disc() -> Any:
+        current_tag_status = read_current_tag_status()
+        if current_tag_status is None:
+            return Response(status_code=204)
+
+        if not current_tag_status.known_in_library:
+            raise HTTPException(status_code=404, detail=f"Tag does not exist: tag_id='{current_tag_status.tag_id}'")
+
+        return build_current_tag_disc_output(current_tag_status.tag_id, get_disc.execute(current_tag_status.tag_id))
+
+    @router.post(
+        "/current-tag/disc",
+        response_model=CurrentTagDiscOutput,
+        status_code=201,
+        responses={204: {"description": "No current tag"}, 409: {"description": "Current tag changed or disc exists"}},
+        summary="Create a disc for the current tag",
+    )
+    def create_current_tag_disc(
+        disc: DiscInput,
+        expected_tag_id: Optional[str] = None,
+    ) -> Any:
+        current_tag_status = read_current_tag_status()
+        ensure_expected_tag_id_matches(expected_tag_id, current_tag_status)
+        if current_tag_status is None:
+            return Response(status_code=204)
+
+        try:
+            new_disc = Disc(**disc.model_dump())
+            add_disc.execute(current_tag_status.tag_id, new_disc)
+            return build_current_tag_disc_output(current_tag_status.tag_id, new_disc)
+        except ValueError as value_err:
+            raise HTTPException(status_code=409, detail=str(value_err))
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    @router.patch(
+        "/current-tag/disc",
+        response_model=CurrentTagDiscOutput,
+        responses={
+            204: {"description": "No current tag"},
+            404: {"description": "Current tag disc not found"},
+            409: {"description": "Current tag changed"},
+        },
+        summary="Update the current tag disc",
+    )
+    def update_current_tag_disc(
+        disc_patch: DiscPatchInput,
+        expected_tag_id: Optional[str] = None,
+    ) -> Any:
+        current_tag_status = read_current_tag_status()
+        ensure_expected_tag_id_matches(expected_tag_id, current_tag_status)
+        if current_tag_status is None:
+            return Response(status_code=204)
+
+        try:
+            metadata = None
+            if disc_patch.metadata is not None:
+                metadata = DiscMetadata(**disc_patch.metadata.model_dump(exclude_unset=True, exclude_none=True))
+
+            option = None
+            if disc_patch.option is not None:
+                option = DiscOption(**disc_patch.option.model_dump(exclude_unset=True, exclude_none=True))
+
+            edit_disc.execute(current_tag_status.tag_id, disc_patch.uri, metadata, option)
+            return build_current_tag_disc_output(current_tag_status.tag_id, get_disc.execute(current_tag_status.tag_id))
+        except ValueError as value_err:
+            raise HTTPException(status_code=404, detail=str(value_err))
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    @router.delete(
+        "/current-tag/disc",
+        status_code=204,
+        responses={
+            204: {"description": "No current tag or disc deleted"},
+            404: {"description": "Current tag disc not found"},
+            409: {"description": "Current tag changed"},
+        },
+        summary="Delete the current tag disc",
+    )
+    def delete_current_tag_disc(expected_tag_id: Optional[str] = None) -> Response:
+        current_tag_status = read_current_tag_status()
+        ensure_expected_tag_id_matches(expected_tag_id, current_tag_status)
+        if current_tag_status is None:
+            return Response(status_code=status.HTTP_204_NO_CONTENT)
+
+        try:
+            remove_disc.execute(current_tag_status.tag_id)
+            return Response(status_code=status.HTTP_204_NO_CONTENT)
+        except ValueError as value_err:
+            raise HTTPException(status_code=404, detail=str(value_err))
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    return router

gukebox-1.0.0.dev7/discstore/adapters/inbound/api/discs_router.py

@@ -0,0 +1,73 @@
+from typing import Dict
+
+from fastapi import APIRouter, HTTPException, Response, status
+
+from discstore.adapters.inbound.api.models import DiscInput, DiscOutput, DiscPatchInput
+from discstore.domain.entities import Disc, DiscMetadata, DiscOption
+from discstore.domain.use_cases.add_disc import AddDisc
+from discstore.domain.use_cases.edit_disc import EditDisc
+from discstore.domain.use_cases.get_disc import GetDisc
+from discstore.domain.use_cases.list_discs import ListDiscs
+from discstore.domain.use_cases.remove_disc import RemoveDisc
+
+
+def build_discs_router(
+    add_disc: AddDisc,
+    list_discs: ListDiscs,
+    remove_disc: RemoveDisc,
+    edit_disc: EditDisc,
+    get_disc: GetDisc,
+) -> APIRouter:
+    router = APIRouter(prefix="/api/v1", tags=["discs"])
+
+    @router.get("/discs", response_model=Dict[str, DiscOutput], summary="List discs")
+    def list_discs_route() -> Dict[str, Disc]:
+        return list_discs.execute()
+
+    @router.get("/discs/{tag_id}", response_model=DiscOutput, summary="Get a disc")
+    def get_disc_route(tag_id: str) -> Disc:
+        try:
+            return get_disc.execute(tag_id)
+        except ValueError as value_err:
+            raise HTTPException(status_code=404, detail=str(value_err))
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    @router.post("/discs/{tag_id}", response_model=DiscOutput, status_code=201, summary="Create a disc")
+    def create_disc_route(tag_id: str, disc: DiscInput) -> Disc:
+        try:
+            new_disc = Disc(**disc.model_dump())
+            return add_disc.execute(tag_id, new_disc)
+        except ValueError as value_err:
+            raise HTTPException(status_code=409, detail=str(value_err))
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    @router.patch("/discs/{tag_id}", response_model=DiscOutput, summary="Update a disc")
+    def update_disc_route(tag_id: str, disc_patch: DiscPatchInput) -> Disc:
+        try:
+            metadata = None
+            if disc_patch.metadata is not None:
+                metadata = DiscMetadata(**disc_patch.metadata.model_dump(exclude_unset=True, exclude_none=True))
+
+            option = None
+            if disc_patch.option is not None:
+                option = DiscOption(**disc_patch.option.model_dump(exclude_unset=True, exclude_none=True))
+
+            return edit_disc.execute(tag_id, disc_patch.uri, metadata, option)
+        except ValueError as value_err:
+            raise HTTPException(status_code=404, detail=str(value_err))
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    @router.delete("/discs/{tag_id}", status_code=204, summary="Delete a disc")
+    def remove_disc_route(tag_id: str) -> Response:
+        try:
+            remove_disc.execute(tag_id)
+            return Response(status_code=status.HTTP_204_NO_CONTENT)
+        except ValueError as value_err:
+            raise HTTPException(status_code=404, detail=str(value_err))
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    return router

gukebox-1.0.0.dev7/discstore/adapters/inbound/api/models.py

@@ -0,0 +1,48 @@
+from typing import Any, Dict, Optional
+
+from pydantic import BaseModel, RootModel
+
+from discstore.domain.entities import CurrentTagStatus, Disc
+
+
+class DiscInput(Disc):
+    pass
+
+
+class DiscOutput(Disc):
+    pass
+
+
+class DiscPatchMetadataInput(BaseModel):
+    artist: Optional[str] = None
+    album: Optional[str] = None
+    track: Optional[str] = None
+    playlist: Optional[str] = None
+
+
+class DiscPatchOptionInput(BaseModel):
+    shuffle: Optional[bool] = None
+    is_test: Optional[bool] = None
+
+
+class DiscPatchInput(BaseModel):
+    uri: Optional[str] = None
+    metadata: Optional[DiscPatchMetadataInput] = None
+    option: Optional[DiscPatchOptionInput] = None
+
+
+class CurrentTagStatusOutput(CurrentTagStatus):
+    pass
+
+
+class CurrentTagDiscOutput(BaseModel):
+    tag_id: str
+    disc: DiscOutput
+
+
+class SettingsResetInput(BaseModel):
+    path: str
+
+
+class SettingsPatchInput(RootModel[Dict[str, Any]]):
+    pass

gukebox-1.0.0.dev7/discstore/adapters/inbound/api/settings_router.py

@@ -0,0 +1,46 @@
+from typing import Any, Dict, cast
+
+from fastapi import APIRouter, HTTPException
+
+from discstore.adapters.inbound.api.models import SettingsPatchInput, SettingsResetInput
+from jukebox.settings.errors import SettingsError
+from jukebox.settings.service_protocols import SettingsService
+from jukebox.settings.types import JsonObject
+
+
+def build_settings_router(settings_service: SettingsService) -> APIRouter:
+    router = APIRouter(prefix="/api/v1", tags=["settings"])
+
+    @router.get("/settings", response_model=Dict[str, Any], summary="Get persisted settings")
+    def get_settings() -> JsonObject:
+        try:
+            return settings_service.get_persisted_settings_view()
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    @router.get("/settings/effective", response_model=Dict[str, Any], summary="Get effective settings")
+    def get_effective_settings() -> JsonObject:
+        try:
+            return settings_service.get_effective_settings_view()
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    @router.patch("/settings", response_model=Dict[str, Any], summary="Patch persisted settings")
+    def patch_settings(patch: SettingsPatchInput) -> JsonObject:
+        try:
+            return settings_service.patch_persisted_settings(cast(JsonObject, patch.root))
+        except SettingsError as err:
+            raise HTTPException(status_code=400, detail=str(err))
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    @router.post("/settings/reset", response_model=Dict[str, Any], summary="Reset a persisted setting")
+    def reset_settings(payload: SettingsResetInput) -> JsonObject:
+        try:
+            return settings_service.reset_persisted_value(payload.path)
+        except SettingsError as err:
+            raise HTTPException(status_code=400, detail=str(err))
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+    return router

gukebox-1.0.0.dev7/discstore/adapters/inbound/api_controller.py

@@ -0,0 +1,190 @@
+from typing import Optional
+
+from pydantic import BaseModel
+
+from jukebox.shared.dependency_messages import optional_extra_dependency_message
+
+try:
+    from fastapi import FastAPI, HTTPException
+
+    from discstore.adapters.inbound.api.current_tag_router import build_current_tag_router
+    from discstore.adapters.inbound.api.discs_router import build_discs_router
+    from discstore.adapters.inbound.api.models import (
+        CurrentTagDiscOutput,
+        CurrentTagStatusOutput,
+        DiscInput,
+        DiscOutput,
+        DiscPatchInput,
+        SettingsPatchInput,
+        SettingsResetInput,
+    )
+    from discstore.adapters.inbound.api.settings_router import build_settings_router
+except ModuleNotFoundError as e:
+    if e.name != "fastapi":
+        raise
+    raise ModuleNotFoundError(
+        optional_extra_dependency_message("The `api_controller` module", "api", "discstore api")
+    ) from e
+from discstore.domain.use_cases.add_disc import AddDisc
+from discstore.domain.use_cases.edit_disc import EditDisc
+from discstore.domain.use_cases.get_current_tag_status import GetCurrentTagStatus
+from discstore.domain.use_cases.get_disc import GetDisc
+from discstore.domain.use_cases.list_discs import ListDiscs
+from discstore.domain.use_cases.remove_disc import RemoveDisc
+from jukebox.settings.entities import SelectedSonosGroupSettings
+from jukebox.settings.selected_sonos_group_repository import SettingsSelectedSonosGroupRepository
+from jukebox.settings.service_protocols import SettingsService
+from jukebox.sonos.discovery import DiscoveredSonosSpeaker, SonosDiscoveryError
+from jukebox.sonos.selection import GetSonosSelectionStatus, SaveSonosSelection
+from jukebox.sonos.service import SonosService
+
+__all__ = [
+    "APIController",
+    "CurrentTagDiscOutput",
+    "CurrentTagStatusOutput",
+    "DiscInput",
+    "DiscOutput",
+    "DiscPatchInput",
+    "SettingsPatchInput",
+    "SettingsResetInput",
+    "SonosSelectionInput",
+]
+
+
+class SonosSpeakerOutput(DiscoveredSonosSpeaker):
+    pass
+
+
+class SelectedSonosGroupOutput(SelectedSonosGroupSettings):
+    pass
+
+
+class SonosSelectionMemberAvailabilityOutput(BaseModel):
+    uid: str
+    status: str
+    speaker: Optional[SonosSpeakerOutput] = None
+
+
+class SonosSelectionAvailabilityOutput(BaseModel):
+    status: str
+    members: list[SonosSelectionMemberAvailabilityOutput]
+
+
+class SonosSelectionOutput(BaseModel):
+    selected_group: Optional[SelectedSonosGroupOutput] = None
+    availability: SonosSelectionAvailabilityOutput
+
+
+class SonosSelectionInput(BaseModel):
+    uids: list[str]
+    coordinator_uid: Optional[str] = None
+
+
+class SonosSelectionUpdateOutput(BaseModel):
+    selected_group: SelectedSonosGroupOutput
+    availability: SonosSelectionAvailabilityOutput
+    message: str
+    restart_required: bool
+
+
+class APIController:
+    def __init__(
+        self,
+        add_disc: AddDisc,
+        list_discs: ListDiscs,
+        remove_disc: RemoveDisc,
+        edit_disc: EditDisc,
+        get_disc: GetDisc,
+        get_current_tag_status: GetCurrentTagStatus,
+        settings_service: SettingsService,
+        sonos_service: SonosService,
+    ):
+        self.add_disc = add_disc
+        self.list_discs = list_discs
+        self.remove_disc = remove_disc
+        self.edit_disc = edit_disc
+        self.get_disc = get_disc
+        self.get_current_tag_status = get_current_tag_status
+        self.settings_service = settings_service
+        self.sonos_service = sonos_service
+        self.app = FastAPI(
+            title="DiscStore API",
+            description="API for managing Jukebox disc library",
+            docs_url="/docs",
+            redoc_url="/redoc",
+        )
+        self.register_routes()
+
+    def register_routes(self):
+        self.app.include_router(
+            build_discs_router(
+                add_disc=self.add_disc,
+                list_discs=self.list_discs,
+                remove_disc=self.remove_disc,
+                edit_disc=self.edit_disc,
+                get_disc=self.get_disc,
+            )
+        )
+        self.app.include_router(
+            build_current_tag_router(
+                get_current_tag_status=self.get_current_tag_status,
+                add_disc=self.add_disc,
+                edit_disc=self.edit_disc,
+                get_disc=self.get_disc,
+                remove_disc=self.remove_disc,
+            )
+        )
+        self.app.include_router(build_settings_router(self.settings_service))
+
+        @self.app.get("/api/v1/sonos/speakers", response_model=list[SonosSpeakerOutput])
+        def get_sonos_speakers():
+            try:
+                return self.sonos_service.list_available_speakers()
+            except SonosDiscoveryError as err:
+                raise HTTPException(status_code=502, detail=str(err))
+            except Exception as err:
+                raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+        @self.app.get("/api/v1/sonos/selection", response_model=SonosSelectionOutput)
+        def get_sonos_selection():
+            try:
+                return GetSonosSelectionStatus(
+                    SettingsSelectedSonosGroupRepository(self.settings_service),
+                    self.sonos_service,
+                ).execute()
+            except SonosDiscoveryError as err:
+                raise HTTPException(status_code=502, detail=str(err))
+            except Exception as err:
+                raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+        @self.app.put("/api/v1/sonos/selection", response_model=SonosSelectionUpdateOutput)
+        def put_sonos_selection(payload: SonosSelectionInput):
+            try:
+                result = SaveSonosSelection(
+                    SettingsSelectedSonosGroupRepository(self.settings_service),
+                    self.sonos_service,
+                ).execute(payload.uids, coordinator_uid=payload.coordinator_uid)
+                return SonosSelectionUpdateOutput(
+                    selected_group=SelectedSonosGroupOutput(**result.selected_group.model_dump()),
+                    availability=SonosSelectionAvailabilityOutput(
+                        status="available",
+                        members=[
+                            SonosSelectionMemberAvailabilityOutput(
+                                uid=member.uid,
+                                status="available",
+                                speaker=SonosSpeakerOutput(**member.model_dump()),
+                            )
+                            for member in result.members
+                        ],
+                    ),
+                    message=result.settings_message,
+                    restart_required=result.restart_required,
+                )
+            except SonosDiscoveryError as err:
+                raise HTTPException(status_code=502, detail=str(err))
+            except ValueError as err:
+                raise HTTPException(status_code=400, detail=str(err))
+            except HTTPException:
+                raise
+            except Exception as err:
+                raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")

{gukebox-1.0.0.dev5 → gukebox-1.0.0.dev7}/discstore/adapters/inbound/ui_controller.py

@@ -83,6 +83,7 @@ class UIController(APIController):
             list_discs,
             remove_disc,
             edit_disc,
+            get_disc,
             get_current_tag_status,
             settings_service,
             sonos_service,

{gukebox-1.0.0.dev5 → gukebox-1.0.0.dev7}/discstore/domain/use_cases/add_disc.py

@@ -6,5 +6,6 @@ class AddDisc:
     def __init__(self, repository: LibraryRepository):
         self.repository = repository
 
-    def execute(self, tag_id: str, disc: Disc) -> None:
+    def execute(self, tag_id: str, disc: Disc) -> Disc:
         self.repository.add_disc(tag_id, disc)
+        return disc