gukebox 1.0.0.dev8__tar.gz → 1.0.0.dev9__tar.gz

{gukebox-1.0.0.dev8 → gukebox-1.0.0.dev9}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.3
 Name: gukebox
-Version: 1.0.0.dev8
+Version: 1.0.0.dev9
 Summary: A Jukebox to play music on speakers using 'CD' with NFC tag
-Keywords: jukebox,discstore,music,nfc
+Keywords: jukebox,music,nfc
 Author: Gudsfile
 License: MIT License
          
@@ -71,7 +71,7 @@ Description-Content-Type: text/markdown
 
 🚧 At the moment:
 
-- NFC tags - CDs must be pre-populated in a JSON file (`discstore` included with `jukebox` may be of help to you)
+- NFC tags - CDs must be pre-populated in a JSON file (`jukebox-admin` included with `jukebox` may be of help to you)
 - supports many music providers (Spotify, Apple Music, etc.), just add the URIs to the JSON file
 - only works with Sonos speakers (there is a "dryrun" player for development), but code is designed to **add new ones**
 - **as soon as** the NFC tag is removed, the music pauses, then resumes when the NFC tag is replaced
@@ -161,18 +161,18 @@ uv sync
 
 ## First steps
 
-Initialize the library file with `discstore` or manually create it at `~/.config/jukebox/library.json`.
+Initialize the library file with `jukebox-admin` or manually create it at `~/.config/jukebox/library.json`.
 
-### Manage the library with the discstore
+### Manage the library with the Admin CLI
 
 To associate an URI with an NFC tag:
 
 ```shell
-discstore add tag_id --uri /path/to/media.mp3
+jukebox-admin library add tag_id --uri /path/to/media.mp3
 ```
 or to pull the `tag_id` currently on the reader:
 ```shell
-discstore add --from-current --uri /path/to/media.mp3
+jukebox-admin library add --from-current --uri /path/to/media.mp3
 ```
 
 Other commands are available, use `--help` to see them.
@@ -204,8 +204,6 @@ uv run --extra api jukebox-admin api
 uv run --extra ui jukebox-admin ui
 ```
 
-`discstore settings ...`, `discstore api`, and `discstore ui` remain available as compatibility commands, but `jukebox-admin` is the preferred CLI for admin flows.
-
 ### Manage the library manually
 
 Complete your `~/.config/jukebox/library.json` file with each tag id and the expected media URI.
@@ -258,7 +256,7 @@ jukebox --player PLAYER --reader READER
 
 The `library.json` file is a JSON file that contains the artists, albums and tags.
 It is used by the `jukebox` command to find the corresponding metadata for each tag.
-And the `discstore` command help you to managed this file with a CLI, an interactive CLI, an API or an UI (see `discstore --help`).
+And the `jukebox-admin library` command help you to managed this file with a CLI, an interactive CLI, an API or an UI (see `jukebox-admin --help`).
 
 By default, this file should be placed at `~/.config/jukebox/library.json`. But you can use another path by creating a `JUKEBOX_LIBRARY_PATH` environment variable or with the `--library` argument.
 
@@ -346,11 +344,6 @@ Start the jukebox with `uv` and use `--help` to show help message
 uv run jukebox --player PLAYER_TO_USE --reader READER_TO_USE
 ```
 
-Start the discstore `uv` and use `--help` to show help message
-```shell
-uv run discstore --help
-```
-
 Use `jukebox-admin` for admin commands:
 
 ```shell
@@ -364,14 +357,6 @@ uv run --extra api jukebox-admin api
 uv run --extra ui jukebox-admin ui
 ```
 
-Legacy compatibility commands remain available during the transition:
-
-```shell
-uv run discstore settings show
-uv run --extra api discstore api
-uv run --extra ui discstore ui
-```
-
 ### Development commands
 
 | Command | Description |

{gukebox-1.0.0.dev8 → gukebox-1.0.0.dev9}/README.md

@@ -13,7 +13,7 @@
 
 🚧 At the moment:
 
-- NFC tags - CDs must be pre-populated in a JSON file (`discstore` included with `jukebox` may be of help to you)
+- NFC tags - CDs must be pre-populated in a JSON file (`jukebox-admin` included with `jukebox` may be of help to you)
 - supports many music providers (Spotify, Apple Music, etc.), just add the URIs to the JSON file
 - only works with Sonos speakers (there is a "dryrun" player for development), but code is designed to **add new ones**
 - **as soon as** the NFC tag is removed, the music pauses, then resumes when the NFC tag is replaced
@@ -103,18 +103,18 @@ uv sync
 
 ## First steps
 
-Initialize the library file with `discstore` or manually create it at `~/.config/jukebox/library.json`.
+Initialize the library file with `jukebox-admin` or manually create it at `~/.config/jukebox/library.json`.
 
-### Manage the library with the discstore
+### Manage the library with the Admin CLI
 
 To associate an URI with an NFC tag:
 
 ```shell
-discstore add tag_id --uri /path/to/media.mp3
+jukebox-admin library add tag_id --uri /path/to/media.mp3
 ```
 or to pull the `tag_id` currently on the reader:
 ```shell
-discstore add --from-current --uri /path/to/media.mp3
+jukebox-admin library add --from-current --uri /path/to/media.mp3
 ```
 
 Other commands are available, use `--help` to see them.
@@ -146,8 +146,6 @@ uv run --extra api jukebox-admin api
 uv run --extra ui jukebox-admin ui
 ```
 
-`discstore settings ...`, `discstore api`, and `discstore ui` remain available as compatibility commands, but `jukebox-admin` is the preferred CLI for admin flows.
-
 ### Manage the library manually
 
 Complete your `~/.config/jukebox/library.json` file with each tag id and the expected media URI.
@@ -200,7 +198,7 @@ jukebox --player PLAYER --reader READER
 
 The `library.json` file is a JSON file that contains the artists, albums and tags.
 It is used by the `jukebox` command to find the corresponding metadata for each tag.
-And the `discstore` command help you to managed this file with a CLI, an interactive CLI, an API or an UI (see `discstore --help`).
+And the `jukebox-admin library` command help you to managed this file with a CLI, an interactive CLI, an API or an UI (see `jukebox-admin --help`).
 
 By default, this file should be placed at `~/.config/jukebox/library.json`. But you can use another path by creating a `JUKEBOX_LIBRARY_PATH` environment variable or with the `--library` argument.
 
@@ -288,11 +286,6 @@ Start the jukebox with `uv` and use `--help` to show help message
 uv run jukebox --player PLAYER_TO_USE --reader READER_TO_USE
 ```
 
-Start the discstore `uv` and use `--help` to show help message
-```shell
-uv run discstore --help
-```
-
 Use `jukebox-admin` for admin commands:
 
 ```shell
@@ -306,14 +299,6 @@ uv run --extra api jukebox-admin api
 uv run --extra ui jukebox-admin ui
 ```
 
-Legacy compatibility commands remain available during the transition:
-
-```shell
-uv run discstore settings show
-uv run --extra api discstore api
-uv run --extra ui discstore ui
-```
-
 ### Development commands
 
 | Command | Description |

{gukebox-1.0.0.dev8 → gukebox-1.0.0.dev9}/discstore/adapters/inbound/api_controller.py

@@ -23,7 +23,7 @@ except ModuleNotFoundError as e:
     if e.name != "fastapi":
         raise
     raise ModuleNotFoundError(
-        optional_extra_dependency_message("The `api_controller` module", "api", "discstore api")
+        optional_extra_dependency_message("The `api_controller` module", "api", "jukebox-admin api")
     ) from e
 from discstore.domain.use_cases.add_disc import AddDisc
 from discstore.domain.use_cases.edit_disc import EditDisc
@@ -108,8 +108,8 @@ class APIController:
         self.settings_service = settings_service
         self.sonos_service = sonos_service
         self.app = FastAPI(
-            title="DiscStore API",
-            description="API for managing Jukebox disc library",
+            title="Jukebox Admin API",
+            description="API for managing Jukebox disc library and settings",
             docs_url="/docs",
             redoc_url="/redoc",
         )

{gukebox-1.0.0.dev8 → gukebox-1.0.0.dev9}/discstore/adapters/inbound/ui_controller.py

@@ -16,7 +16,7 @@ try:
     from fastui.forms import fastui_form
 except ModuleNotFoundError as e:
     raise ModuleNotFoundError(
-        optional_extra_dependency_message("The `ui_controller` module", "ui", "discstore ui")
+        optional_extra_dependency_message("The `ui_controller` module", "ui", "jukebox-admin ui")
     ) from e
 
 from pydantic import BaseModel, Field
@@ -24,6 +24,7 @@ from pydantic import BaseModel, Field
 from discstore.adapters.inbound.api_controller import APIController
 from discstore.adapters.inbound.ui_pages.library import DiscForm, DiscTable, LibraryUIPageBuilder
 from discstore.adapters.inbound.ui_pages.settings import SettingsUIPageBuilder
+from discstore.adapters.inbound.ui_pages.sonos import SonosSelectionForm, SonosUIPageBuilder
 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
@@ -36,8 +37,11 @@ from jukebox.settings.definitions import (
     get_setting_definition,
 )
 from jukebox.settings.errors import SettingsError
+from jukebox.settings.selected_sonos_group_repository import SettingsSelectedSonosGroupRepository
 from jukebox.settings.service_protocols import SettingsService
 from jukebox.settings.types import JsonObject
+from jukebox.sonos.discovery import SonosDiscoveryError
+from jukebox.sonos.selection import SaveSonosSelection
 from jukebox.sonos.service import SonosService
 
 
@@ -63,6 +67,7 @@ class UIController(APIController):
             get_disc=get_disc,
             get_current_tag_status=get_current_tag_status,
         )
+        self.sonos_pages = SonosUIPageBuilder(settings_service=settings_service, sonos_service=sonos_service)
         self.settings_pages = SettingsUIPageBuilder(settings_service=settings_service)
         super().__init__(
             add_disc,
@@ -222,10 +227,69 @@ class UIController(APIController):
         async def reset_setting(setting_path: str) -> list[AnyComponent]:
             return self._reset_setting(setting_path)
 
+        @self.app.get("/api/ui/sonos", response_model=FastUI, response_model_exclude_none=True)
+        def sonos_page(toast: Optional[str] = None, toast_message: Optional[str] = None) -> List[AnyComponent]:
+            return self._build_sonos_page_components(toast=toast, toast_message=toast_message)
+
+        @self.app.get("/api/ui/sonos/edit", response_model=FastUI, response_model_exclude_none=True)
+        def edit_sonos_form(
+            error_message: Optional[str] = None,
+            uids: Optional[List[str]] = None,
+            coordinator_uid: Optional[str] = None,
+        ) -> List[AnyComponent]:
+            field_errors = None
+            if error_message:
+                field_errors = {self._sonos_field_name_for_error(error_message): error_message}
+            return self._build_sonos_edit_page_components(
+                error_message=error_message,
+                field_errors=field_errors,
+                submitted_uids=uids,
+                submitted_coordinator_uid=coordinator_uid,
+            )
+
+        @self.app.post("/api/ui/sonos/edit", response_model=FastUI, response_model_exclude_none=True)
+        async def update_sonos_selection(
+            form: Annotated[SonosSelectionForm, fastui_form(SonosSelectionForm)],
+        ) -> list[AnyComponent]:
+            try:
+                result = SaveSonosSelection(
+                    selected_group_repository=SettingsSelectedSonosGroupRepository(self.settings_service),
+                    sonos_service=self.sonos_service,
+                ).execute(form.uids, coordinator_uid=form.coordinator_uid)
+            except SonosDiscoveryError as err:
+                raise HTTPException(status_code=502, detail=str(err))
+            except SettingsError as err:
+                display_message = self._build_sonos_error_message(str(err), form.coordinator_uid)
+                if self._persisted_sonos_selection_matches(form.uids, form.coordinator_uid):
+                    return self.sonos_pages.build_sonos_success_response(
+                        "Sonos selection saved, but effective settings are still unavailable."
+                    )
+                return self.sonos_pages.build_sonos_edit_error_response(
+                    display_message,
+                    form.uids,
+                    form.coordinator_uid,
+                )
+            except ValueError as err:
+                return self.sonos_pages.build_sonos_edit_error_response(
+                    self._build_sonos_error_message(str(err), form.coordinator_uid),
+                    form.uids,
+                    form.coordinator_uid,
+                )
+            except HTTPException:
+                raise
+            except Exception as err:
+                raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+            return self.sonos_pages.build_sonos_success_response(str(result.settings_message))
+
+        @self.app.post("/api/ui/sonos/reset", response_model=FastUI, response_model_exclude_none=True)
+        async def reset_sonos_selection() -> list[AnyComponent]:
+            return self._reset_sonos_selection()
+
         @self.app.get("/{path:path}")
         def html_landing(path: str) -> HTMLResponse:
             del path
-            return HTMLResponse(prebuilt_html(title="DiscStore for Jukebox", api_root_url="/api/ui"))
+            return HTMLResponse(prebuilt_html(title="Jukebox Admin", api_root_url="/api/ui"))
 
     def _build_success_response(self, toast_event_name: str) -> list[AnyComponent]:
         return [
@@ -238,6 +302,80 @@ class UIController(APIController):
     def _reset_setting(self, setting_path: str) -> list[AnyComponent]:
         return self.settings_pages.reset_setting(setting_path)
 
+    def _build_sonos_page_components(
+        self,
+        toast: Optional[str] = None,
+        toast_message: Optional[str] = None,
+        error_message: Optional[str] = None,
+    ) -> List[AnyComponent]:
+        return self.sonos_pages.build_sonos_page_components(
+            toast=toast,
+            toast_message=toast_message,
+            error_message=error_message,
+        )
+
+    def _build_sonos_edit_page_components(
+        self,
+        error_message: Optional[str] = None,
+        field_errors: Optional[dict[str, str]] = None,
+        submitted_uids: Optional[List[str]] = None,
+        submitted_coordinator_uid: Optional[str] = None,
+    ) -> List[AnyComponent]:
+        return self.sonos_pages.build_sonos_edit_page_components(
+            error_message=error_message,
+            field_errors=field_errors,
+            submitted_uids=submitted_uids,
+            submitted_coordinator_uid=submitted_coordinator_uid,
+        )
+
+    def _reset_sonos_selection(self) -> list[AnyComponent]:
+        selected_group_repository = SettingsSelectedSonosGroupRepository(self.settings_service)
+        try:
+            result = self.settings_service.reset_persisted_value("jukebox.player.sonos.selected_group")
+        except SettingsError as err:
+            if selected_group_repository.get_selected_group() is None:
+                return self.sonos_pages.build_sonos_success_response(
+                    "Sonos selection cleared, but effective settings are still unavailable."
+                )
+            return self._build_sonos_page_components(error_message=str(err))
+        except HTTPException:
+            raise
+        except Exception as err:
+            raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
+
+        return self.sonos_pages.build_sonos_success_response(str(result.get("message", "Settings saved.")))
+
+    def _persisted_sonos_selection_matches(self, uids: List[str], coordinator_uid: Optional[str]) -> bool:
+        try:
+            selected_group = SettingsSelectedSonosGroupRepository(self.settings_service).get_selected_group()
+        except Exception:
+            return False
+
+        if selected_group is None:
+            return False
+
+        expected_coordinator_uid = coordinator_uid or (uids[0] if uids else None)
+        return (
+            selected_group.coordinator_uid == expected_coordinator_uid
+            and [member.uid for member in selected_group.members] == uids
+        )
+
+    def _build_sonos_error_message(self, message: str, coordinator_uid: Optional[str]) -> str:
+        prefix = "Selected Sonos coordinator must be one of the selected speakers: "
+        if coordinator_uid is None or not message.startswith(prefix):
+            return message
+
+        try:
+            speakers = self.sonos_service.list_available_speakers()
+        except Exception:
+            return message
+
+        speaker = next((speaker for speaker in speakers if speaker.uid == coordinator_uid), None)
+        if speaker is None:
+            return message
+
+        return f"{prefix}{speaker.name} [{speaker.uid}]"
+
     def _build_index_page_components(self, toast: Optional[str] = None) -> List[AnyComponent]:
         return self.library_pages.build_index_page_components(toast=toast)
 
@@ -350,6 +488,12 @@ class UIController(APIController):
     def _serialize_current_tag_components(self, components: List[AnyComponent]) -> str:
         return self.library_pages.serialize_current_tag_components(components)
 
+    @staticmethod
+    def _sonos_field_name_for_error(message: str) -> str:
+        if "coordinator" in message:
+            return "coordinator_uid"
+        return "uids"
+
     def _field_validation_error(self, field_name: str, message: str) -> HTTPException:
         return HTTPException(
             status_code=422,

{gukebox-1.0.0.dev8 → gukebox-1.0.0.dev9}/discstore/adapters/inbound/ui_pages/library.py

@@ -47,7 +47,7 @@ class LibraryUIPageBuilder:
         ]
 
         components: list[AnyComponent] = [
-            c.Heading(text="DiscStore for Jukebox", level=1),
+            c.Heading(text="Jukebox Admin", level=1),
             c.Paragraph(text=f"📀 {len(discs)} disc(s) in library"),
             c.ServerLoad(
                 path="/current-tag-banner/events",
@@ -58,6 +58,11 @@ class LibraryUIPageBuilder:
                 class_name="d-flex flex-wrap gap-2",
                 components=[
                     c.Button(text="➕ Add a new disc", on_click=GoToEvent(url="/discs/new")),
+                    c.Button(
+                        text="🔊 Sonos Speakers",
+                        on_click=GoToEvent(url="/sonos"),
+                        class_name="btn btn-secondary",
+                    ),
                     c.Button(text="⚙️ Settings", on_click=GoToEvent(url="/settings"), class_name="btn btn-secondary"),
                 ],
             ),

{gukebox-1.0.0.dev8 → gukebox-1.0.0.dev9}/discstore/adapters/inbound/ui_pages/settings.py

@@ -142,9 +142,13 @@ class SettingsUIPageBuilder:
 
         action_components: list[AnyComponent] = [
             c.Button(
-                text="Edit ✏️",
-                on_click=GoToEvent(url=f"/settings/{setting.path}/edit"),
-                class_name="btn btn-secondary",
+                text="Manage Speakers 🔊" if setting.path == "jukebox.player.sonos.selected_group" else "Edit ✏️",
+                on_click=(
+                    GoToEvent(url="/sonos")
+                    if setting.path == "jukebox.player.sonos.selected_group"
+                    else GoToEvent(url=f"/settings/{setting.path}/edit")
+                ),
+                class_name="btn btn-secondary text-nowrap",
             )
         ]
         row_class_name = "px-3 py-3"