gukebox 1.0.0.dev14__tar.gz → 1.0.2__tar.gz

{gukebox-1.0.0.dev14 → gukebox-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gukebox
-Version: 1.0.0.dev14
+Version: 1.0.2
 Summary: A Jukebox to play music on speakers using 'CD' with NFC tag
 Keywords: jukebox,music,nfc
 Author: Gudsfile
@@ -43,7 +43,7 @@ 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 ; extra == 'ui'
-Requires-Dist: python-multipart==0.0.26 ; extra == 'ui'
+Requires-Dist: python-multipart==0.0.27 ; extra == 'ui'
 Requires-Python: >=3.11, <3.14
 Project-URL: Repository, https://github.com/Gudsfile/jukebox
 Provides-Extra: api

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/api/current_tag_router.py

@@ -3,19 +3,19 @@ from typing import Any
 from fastapi import APIRouter, HTTPException, Response, status
 from pydantic import ValidationError
 
-from discstore.adapters.inbound.api.models import (
+from jukebox.adapters.inbound.admin.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
+from jukebox.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
 
 
 def build_current_tag_router(

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/api/discs_router.py

@@ -1,13 +1,13 @@
 from fastapi import APIRouter, HTTPException, Response, status
 from pydantic import ValidationError
 
-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
+from jukebox.adapters.inbound.admin.api.models import DiscInput, DiscOutput, DiscPatchInput
+from jukebox.domain.entities import Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
 
 
 def build_discs_router(

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/api/models.py

@@ -2,7 +2,7 @@ from typing import Any
 
 from pydantic import BaseModel, RootModel
 
-from discstore.domain.entities import CurrentTagStatus, Disc
+from jukebox.domain.entities import CurrentTagStatus, Disc
 
 
 class DiscInput(Disc):

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/api/settings_router.py

@@ -2,7 +2,7 @@ from typing import Any, cast
 
 from fastapi import APIRouter, HTTPException
 
-from discstore.adapters.inbound.api.models import SettingsPatchInput, SettingsResetInput
+from jukebox.adapters.inbound.admin.api.models import SettingsPatchInput, SettingsResetInput
 from jukebox.settings.errors import SettingsError
 from jukebox.settings.service_protocols import SettingsService
 from jukebox.settings.types import JsonObject

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/api_controller.py

@@ -5,9 +5,9 @@ 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 (
+    from jukebox.adapters.inbound.admin.api.current_tag_router import build_current_tag_router
+    from jukebox.adapters.inbound.admin.api.discs_router import build_discs_router
+    from jukebox.adapters.inbound.admin.api.models import (
         CurrentTagDiscOutput,
         CurrentTagStatusOutput,
         DiscInput,
@@ -16,19 +16,19 @@ try:
         SettingsPatchInput,
         SettingsResetInput,
     )
-    from discstore.adapters.inbound.api.settings_router import build_settings_router
+    from jukebox.adapters.inbound.admin.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", "jukebox-admin 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.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.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

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/cli_controller.py

@@ -1,7 +1,7 @@
 import logging
 
-from discstore.adapters.inbound.cli_display import display_library_line, display_library_table
-from discstore.commands import (
+from jukebox.adapters.inbound.admin.cli_display import display_library_line, display_library_table
+from jukebox.admin.library_commands import (
     CliAddCommand,
     CliEditCommand,
     CliGetCommand,
@@ -9,14 +9,14 @@ from discstore.commands import (
     CliRemoveCommand,
     CliSearchCommand,
 )
-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
-from discstore.domain.use_cases.resolve_tag_id import ResolveTagId
-from discstore.domain.use_cases.search_discs import SearchDiscs
+from jukebox.domain.entities import Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
+from jukebox.domain.use_cases.library.resolve_tag_id import ResolveTagId
+from jukebox.domain.use_cases.library.search_discs import SearchDiscs
 
 LOGGER = logging.getLogger("discstore")
 

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/cli_display.py

@@ -1,4 +1,4 @@
-from discstore.domain.entities import Disc
+from jukebox.domain.entities import Disc
 
 MAX_COL_WIDTH = 20
 

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/interactive_cli_controller.py

@@ -1,12 +1,12 @@
 import logging
 
-from discstore.adapters.inbound.cli_display import display_library_line, display_library_table
-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.list_discs import ListDiscs
-from discstore.domain.use_cases.remove_disc import RemoveDisc
+from jukebox.adapters.inbound.admin.cli_display import display_library_line, display_library_table
+from jukebox.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
 
 LOGGER = logging.getLogger("discstore")
 

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/ui_controller.py

@@ -1,4 +1,3 @@
-from collections.abc import AsyncIterator
 from typing import Annotated
 
 from jukebox.shared.dependency_messages import optional_extra_dependency_message
@@ -17,25 +16,21 @@ except ModuleNotFoundError as e:
 
 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
-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.definitions import (
-    EditableSettingDisplay,
-    get_setting_definition,
-)
+from jukebox.adapters.inbound.admin.api_controller import APIController
+from jukebox.adapters.inbound.admin.ui_pages.library import DiscForm, LibraryUIPageBuilder
+from jukebox.adapters.inbound.admin.ui_pages.settings import SettingsUIPageBuilder
+from jukebox.adapters.inbound.admin.ui_pages.sonos import SonosSelectionForm, SonosUIPageBuilder
+from jukebox.domain.entities import Disc, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
+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, JsonValue
 from jukebox.sonos.discovery import SonosDiscoveryError
 from jukebox.sonos.selection import SaveSonosSelection
 from jukebox.sonos.service import SonosService
@@ -81,12 +76,12 @@ class UIController(APIController):
 
         @self.app.get("/api/ui/", response_model=FastUI, response_model_exclude_none=True)
         def list_discs(toast: str | None = None) -> list[AnyComponent]:
-            return self._build_index_page_components(toast=toast)
+            return self.library_pages.build_index_page_components(toast=toast)
 
         @self.app.get("/api/ui/current-tag-banner/events")
         async def get_current_tag_banner_events(request: Request) -> StreamingResponse:
             return StreamingResponse(
-                self._current_tag_banner_event_stream(request),
+                self.library_pages.current_tag_banner_event_stream(request),
                 media_type="text/event-stream",
                 headers={
                     "Cache-Control": "no-cache",
@@ -97,9 +92,11 @@ class UIController(APIController):
 
         @self.app.get("/api/ui/discs/new", response_model=FastUI, response_model_exclude_none=True)
         def new_disc_form(prefill: str | None = None) -> list[AnyComponent]:
-            return self._build_form_page_components(
+            return self.library_pages.build_form_page_components(
                 title="Add disc",
-                form_components=self._build_new_disc_form_components(prefill_current=(prefill == "current")),
+                form_components=self.library_pages.build_new_disc_form_components(
+                    prefill_current=(prefill == "current")
+                ),
             )
 
         @self.app.post("/api/ui/discs", response_model=FastUI, response_model_exclude_none=True)
@@ -124,9 +121,9 @@ class UIController(APIController):
 
         @self.app.get("/api/ui/discs/{tag_id}/edit", response_model=FastUI, response_model_exclude_none=True)
         def edit_disc_form(tag_id: str) -> list[AnyComponent]:
-            return self._build_form_page_components(
+            return self.library_pages.build_form_page_components(
                 title=f"Edit disc {tag_id}",
-                form_components=self._build_edit_disc_form_components(tag_id),
+                form_components=self.library_pages.build_edit_disc_form_components(tag_id),
             )
 
         @self.app.post("/api/ui/discs/{tag_id}", response_model=FastUI, response_model_exclude_none=True)
@@ -166,9 +163,9 @@ class UIController(APIController):
 
         @self.app.get("/api/ui/discs/{tag_id}/delete", response_model=FastUI, response_model_exclude_none=True)
         def delete_disc_confirmation(tag_id: str) -> list[AnyComponent]:
-            return self._build_form_page_components(
+            return self.library_pages.build_form_page_components(
                 title=f"Delete disc {tag_id}",
-                form_components=self._build_delete_disc_form_components(tag_id),
+                form_components=self.library_pages.build_delete_disc_form_components(tag_id),
             )
 
         # Fast-UI buttons and forms do not support the DELETE method directly. So we cannot call DELETE on
@@ -186,11 +183,11 @@ class UIController(APIController):
 
         @self.app.get("/api/ui/settings", response_model=FastUI, response_model_exclude_none=True)
         def settings_page(toast: str | None = None, toast_message: str | None = None) -> list[AnyComponent]:
-            return self._build_settings_page_components(toast=toast, toast_message=toast_message)
+            return self.settings_pages.build_settings_page_components(toast=toast, toast_message=toast_message)
 
         @self.app.get("/api/ui/settings/{setting_path}/edit", response_model=FastUI, response_model_exclude_none=True)
         def edit_setting_form(setting_path: str) -> list[AnyComponent]:
-            return self._build_settings_edit_page_components(setting_path)
+            return self.settings_pages.build_settings_edit_page_components(setting_path)
 
         @self.app.post("/api/ui/settings/{setting_path}", response_model=FastUI, response_model_exclude_none=True)
         async def update_setting(
@@ -202,13 +199,15 @@ class UIController(APIController):
                 raise HTTPException(status_code=404, detail=f"Unknown setting path: {setting_path}")
 
             try:
-                patch = self._build_settings_patch(setting_path, form.value)
+                patch = self.settings_pages.build_settings_patch(setting_path, form.value)
                 result = self.settings_service.patch_persisted_settings(patch)
             except ValueError as err:
                 raise self._field_validation_error("value", str(err))
             except SettingsError as err:
-                if self._persisted_value_matches(setting_path, self._lookup_optional_dotted_path(patch, setting_path)):
-                    return self._build_settings_success_response(
+                if self.settings_pages.persisted_value_matches(
+                    setting_path, self.settings_pages.lookup_optional_dotted_path(patch, setting_path)
+                ):
+                    return self.settings_pages.build_settings_success_response(
                         "Settings saved, but effective settings are still unavailable."
                     )
                 raise self._field_validation_error("value", str(err))
@@ -217,15 +216,15 @@ class UIController(APIController):
             except Exception as err:
                 raise HTTPException(status_code=500, detail=f"Server error: {str(err)}")
 
-            return self._build_settings_success_response(str(result["message"]))
+            return self.settings_pages.build_settings_success_response(str(result["message"]))
 
         @self.app.post("/api/ui/settings/{setting_path}/reset", response_model=FastUI, response_model_exclude_none=True)
         async def reset_setting(setting_path: str) -> list[AnyComponent]:
-            return self._reset_setting(setting_path)
+            return self.settings_pages.reset_setting(setting_path)
 
         @self.app.get("/api/ui/sonos", response_model=FastUI, response_model_exclude_none=True)
         def sonos_page(toast: str | None = None, toast_message: str | None = None) -> list[AnyComponent]:
-            return self._build_sonos_page_components(toast=toast, toast_message=toast_message)
+            return self.sonos_pages.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(
@@ -236,7 +235,7 @@ class UIController(APIController):
             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(
+            return self.sonos_pages.build_sonos_edit_page_components(
                 error_message=error_message,
                 field_errors=field_errors,
                 submitted_uids=uids,
@@ -292,38 +291,6 @@ class UIController(APIController):
             c.FireEvent(event=GoToEvent(url=f"/?toast={toast_event_name}")),
         ]
 
-    def _build_settings_success_response(self, message: str) -> list[AnyComponent]:
-        return self.settings_pages.build_settings_success_response(message)
-
-    def _reset_setting(self, setting_path: str) -> list[AnyComponent]:
-        return self.settings_pages.reset_setting(setting_path)
-
-    def _build_sonos_page_components(
-        self,
-        toast: str | None = None,
-        toast_message: str | None = None,
-        error_message: str | None = 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: str | None = None,
-        field_errors: dict[str, str] | None = None,
-        submitted_uids: list[str] | None = None,
-        submitted_coordinator_uid: str | None = 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:
@@ -333,7 +300,7 @@ class UIController(APIController):
                 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))
+            return self.sonos_pages.build_sonos_page_components(error_message=str(err))
         except HTTPException:
             raise
         except Exception as err:
@@ -372,116 +339,6 @@ class UIController(APIController):
 
         return f"{prefix}{speaker.name} [{speaker.uid}]"
 
-    def _build_index_page_components(self, toast: str | None = None) -> list[AnyComponent]:
-        return self.library_pages.build_index_page_components(toast=toast)
-
-    def _build_settings_page_components(
-        self,
-        toast: str | None = None,
-        toast_message: str | None = None,
-    ) -> list[AnyComponent]:
-        return self.settings_pages.build_settings_page_components(toast=toast, toast_message=toast_message)
-
-    def _build_settings_section_components(
-        self,
-        section: str,
-        settings: list[EditableSettingDisplay],
-    ) -> list[AnyComponent]:
-        return self.settings_pages.build_settings_section_components(section, settings)
-
-    def _build_settings_row(self, setting: EditableSettingDisplay, index: int) -> AnyComponent:
-        return self.settings_pages.build_settings_row(setting, index)
-
-    def _build_settings_edit_page_components(
-        self,
-        setting_path: str,
-        reset_error: str | None = None,
-    ) -> list[AnyComponent]:
-        return self.settings_pages.build_settings_edit_page_components(setting_path, reset_error=reset_error)
-
-    def _build_settings_edit_form(self, setting: EditableSettingDisplay) -> AnyComponent:
-        return self.settings_pages.build_settings_edit_form(setting)
-
-    def _build_settings_reset_form(self, setting_path: str) -> AnyComponent:
-        return self.settings_pages.build_settings_reset_form(setting_path)
-
-    def _get_settings_displays(self) -> tuple[list[EditableSettingDisplay], str | None]:
-        return self.settings_pages.get_settings_displays()
-
-    def _build_settings_badges(self, setting: EditableSettingDisplay) -> list[AnyComponent]:
-        return self.settings_pages.build_settings_badges(setting)
-
-    def _build_settings_value_summary(self, setting: EditableSettingDisplay) -> AnyComponent:
-        return self.settings_pages.build_settings_value_summary(setting)
-
-    def _build_settings_value_cell(self, label: str, value: str) -> AnyComponent:
-        return self.settings_pages.build_settings_value_cell(label, value)
-
-    def _build_settings_edit_guidance(self, setting: EditableSettingDisplay) -> str:
-        return self.settings_pages.build_settings_edit_guidance(setting)
-
-    def _build_settings_patch(self, setting_path: str, raw_value: str) -> JsonObject:
-        return self.settings_pages.build_settings_patch(setting_path, raw_value)
-
-    def _build_dotted_patch(self, dotted_path: str, value: JsonValue) -> JsonObject:
-        return self.settings_pages.build_dotted_patch(dotted_path, value)
-
-    def _persisted_value_matches(self, dotted_path: str, expected_value: object) -> bool:
-        return self.settings_pages.persisted_value_matches(dotted_path, expected_value)
-
-    def _has_persisted_value(self, dotted_path: str) -> bool:
-        return self.settings_pages.has_persisted_value(dotted_path)
-
-    def _lookup_optional_dotted_path(self, root: JsonObject, dotted_path: str) -> object:
-        return self.settings_pages.lookup_optional_dotted_path(root, dotted_path)
-
-    def _format_settings_display_value(self, setting_path: str, value: object) -> str:
-        return self.settings_pages.format_settings_display_value(setting_path, value)
-
-    def _format_settings_provenance(self, provenance: str) -> str:
-        return self.settings_pages.format_settings_provenance(provenance)
-
-    def _build_form_page_components(self, title: str, form_components: list[AnyComponent]) -> list[AnyComponent]:
-        return self.library_pages.build_form_page_components(title=title, form_components=form_components)
-
-    def _build_current_tag_banner_components(self, current_tag_status: CurrentTagStatus | None) -> list[AnyComponent]:
-        return self.library_pages.build_current_tag_banner_components(current_tag_status)
-
-    def _build_disc_library_components(self, discs: list[DiscTable]) -> list[AnyComponent]:
-        return self.library_pages.build_disc_library_components(discs)
-
-    def _build_disc_library_header(self) -> AnyComponent:
-        return self.library_pages._build_disc_library_header()
-
-    def _build_disc_library_row(self, disc: DiscTable) -> AnyComponent:
-        return self.library_pages._build_disc_library_row(disc)
-
-    def _build_disc_header_cell(self, label: str, class_name: str) -> AnyComponent:
-        return self.library_pages._build_disc_header_cell(label, class_name)
-
-    def _build_disc_value_cell(self, label: str, value: str | None, class_name: str) -> AnyComponent:
-        return self.library_pages._build_disc_value_cell(label, value, class_name)
-
-    def _build_new_disc_form_components(self, prefill_current: bool) -> list[AnyComponent]:
-        return self.library_pages.build_new_disc_form_components(prefill_current)
-
-    def _build_edit_disc_form_components(self, tag_id: str) -> list[AnyComponent]:
-        return self.library_pages.build_edit_disc_form_components(tag_id)
-
-    def _build_delete_disc_form_components(self, tag_id: str) -> list[AnyComponent]:
-        return self.library_pages.build_delete_disc_form_components(tag_id)
-
-    async def _current_tag_banner_event_stream(
-        self,
-        request: Request,
-        poll_interval_seconds: float = 0.5,
-    ) -> AsyncIterator[bytes]:
-        async for payload in self.library_pages.current_tag_banner_event_stream(request, poll_interval_seconds):
-            yield payload
-
-    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:

{gukebox-1.0.0.dev14/discstore/adapters/inbound → gukebox-1.0.2/jukebox/adapters/inbound/admin}/ui_pages/library.py

@@ -8,10 +8,10 @@ from fastui import components as c
 from fastui.events import BackEvent, GoToEvent, PageEvent
 from pydantic import BaseModel, Field
 
-from discstore.domain.entities import CurrentTagStatus, DiscMetadata, DiscOption
-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 jukebox.domain.entities import CurrentTagStatus, DiscMetadata, DiscOption
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
 
 
 class DiscTable(DiscMetadata, DiscOption):

{gukebox-1.0.0.dev14 → gukebox-1.0.2}/jukebox/admin/app.py

@@ -5,8 +5,8 @@ from typing import Annotated
 import typer
 from pydantic import ValidationError
 
-from discstore.command_handlers import execute_library_command
-from discstore.commands import (
+from jukebox.admin.library_command_handlers import execute_library_command
+from jukebox.admin.library_commands import (
     CliAddCommand,
     CliEditCommand,
     CliGetCommand,
@@ -16,7 +16,6 @@ from discstore.commands import (
     CliSearchCommand,
     InteractiveCliCommand,
 )
-from discstore.di_container import build_cli_controller, build_interactive_cli_controller
 from jukebox.settings.errors import SettingsError
 from jukebox.shared.config_utils import get_package_version
 from jukebox.shared.logger import set_logger
@@ -41,7 +40,14 @@ from .commands import (
     is_settings_command,
     is_sonos_command,
 )
-from .di_container import build_admin_api_app, build_admin_services, build_admin_ui_app, build_settings_service
+from .di_container import (
+    build_admin_api_app,
+    build_admin_services,
+    build_admin_ui_app,
+    build_cli_controller,
+    build_interactive_cli_controller,
+    build_settings_service,
+)
 from .pn532_command_handlers import execute_pn532_command
 from .pn532_commands import Pn532ProbeCommand, Pn532ProfilesCommand, Pn532SelectCommand, is_pn532_command
 from .sonos_households import GroupedSonosHousehold

{gukebox-1.0.0.dev14 → gukebox-1.0.2}/jukebox/admin/di_container.py

@@ -1,12 +1,14 @@
-from discstore.adapters.outbound.json_library_adapter import JsonLibraryAdapter
-from discstore.adapters.outbound.text_current_tag_adapter import TextCurrentTagAdapter
-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.adapters.outbound.json_library_adapter import JsonLibraryAdapter
 from jukebox.adapters.outbound.sonos_discovery_adapter import SoCoSonosDiscoveryAdapter
+from jukebox.adapters.outbound.text_current_tag_adapter import TextCurrentTagAdapter
+from jukebox.domain.use_cases.library.add_disc import AddDisc
+from jukebox.domain.use_cases.library.edit_disc import EditDisc
+from jukebox.domain.use_cases.library.get_current_tag_status import GetCurrentTagStatus
+from jukebox.domain.use_cases.library.get_disc import GetDisc
+from jukebox.domain.use_cases.library.list_discs import ListDiscs
+from jukebox.domain.use_cases.library.remove_disc import RemoveDisc
+from jukebox.domain.use_cases.library.resolve_tag_id import ResolveTagId
+from jukebox.domain.use_cases.library.search_discs import SearchDiscs
 from jukebox.settings.file_settings_repository import FileSettingsRepository
 from jukebox.settings.resolve import SettingsService as SettingsServiceImpl
 from jukebox.settings.resolve import build_environment_settings_overrides
@@ -56,7 +58,7 @@ def build_admin_api_app(library_path: str, services: AdminServices):
     repository = JsonLibraryAdapter(library_path)
     current_tag_repository = TextCurrentTagAdapter(get_current_tag_path(library_path))
 
-    from discstore.adapters.inbound.api_controller import APIController
+    from jukebox.adapters.inbound.admin.api_controller import APIController
 
     return APIController(
         AddDisc(repository),
@@ -74,7 +76,7 @@ def build_admin_ui_app(library_path: str, services: AdminServices):
     repository = JsonLibraryAdapter(library_path)
     current_tag_repository = TextCurrentTagAdapter(get_current_tag_path(library_path))
 
-    from discstore.adapters.inbound.ui_controller import UIController
+    from jukebox.adapters.inbound.admin.ui_controller import UIController
 
     return UIController(
         AddDisc(repository),
@@ -90,3 +92,36 @@ def build_admin_ui_app(library_path: str, services: AdminServices):
 
 def build_sonos_service() -> SonosService:
     return DefaultSonosService(SoCoSonosDiscoveryAdapter())
+
+
+def build_cli_controller(library_path: str):
+    repository = JsonLibraryAdapter(library_path)
+    current_tag_repository = TextCurrentTagAdapter(get_current_tag_path(library_path))
+    get_current_tag_status = GetCurrentTagStatus(current_tag_repository, repository)
+
+    from jukebox.adapters.inbound.admin.cli_controller import CLIController
+
+    return CLIController(
+        AddDisc(repository),
+        ListDiscs(repository),
+        RemoveDisc(repository),
+        EditDisc(repository),
+        GetDisc(repository),
+        SearchDiscs(repository),
+        ResolveTagId(get_current_tag_status),
+    )
+
+
+def build_interactive_cli_controller(library_path: str):
+    repository = JsonLibraryAdapter(library_path)
+    current_tag_repository = TextCurrentTagAdapter(get_current_tag_path(library_path))
+
+    from jukebox.adapters.inbound.admin.interactive_cli_controller import InteractiveCLIController
+
+    return InteractiveCLIController(
+        AddDisc(repository),
+        ListDiscs(repository),
+        RemoveDisc(repository),
+        EditDisc(repository),
+        GetCurrentTagStatus(current_tag_repository, repository),
+    )

gukebox-1.0.0.dev14/discstore/command_handlers.py → gukebox-1.0.2/jukebox/admin/library_command_handlers.py

@@ -3,7 +3,7 @@ from typing import Protocol
 
 from jukebox.settings.service_protocols import SettingsService
 
-from .commands import InteractiveCliCommand
+from .library_commands import InteractiveCliCommand
 
 
 class LibraryController(Protocol):