gukebox 1.0.0.dev12__tar.gz → 1.0.0.dev14__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gukebox
-Version: 1.0.0.dev12
+Version: 1.0.0.dev14
 Summary: A Jukebox to play music on speakers using 'CD' with NFC tag
 Keywords: jukebox,music,nfc
 Author: Gudsfile
@@ -29,27 +29,22 @@ Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 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: pydantic==2.13.3
 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'
-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: soco==0.31.0
+Requires-Dist: typer==0.24.1
+Requires-Dist: fastapi==0.135.1 ; extra == 'api'
+Requires-Dist: uvicorn==0.41.0 ; extra == 'api'
 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
+Requires-Dist: fastui==0.9.0 ; extra == 'ui'
+Requires-Dist: python-multipart==0.0.26 ; extra == 'ui'
+Requires-Python: >=3.11, <3.14
 Project-URL: Repository, https://github.com/Gudsfile/jukebox
 Provides-Extra: api
 Provides-Extra: pn532
@@ -91,13 +86,17 @@ Description-Content-Type: text/markdown
 - [The library file](#the-library-file)
 - [Developer setup](#developer-setup)
 
-## Notes
+## Python Compatibility
 
-Python 3.7 is supported by Jukebox up to version 0.4.1.
+Jukebox 1.0+ requires Python 3.11 or newer.
 
-Python 3.8 is supported by Jukebox up to version 0.5.4.
-
-The `ui` extension is only available for Python versions 3.10 and above.
+| Python version | Compatible Jukebox versions | Notes |
+|----------------|-----------------------------|-------|
+| 3.7            | 0.4.0 – 0.4.1               | Legacy |
+| 3.8            | 0.4.0 – 0.5.4               | Legacy |
+| 3.9 – 3.10     | 0.4.0 – 0.9.0 (incl. 1.0.0.dev13) | Legacy |
+| 3.11 – 3.12    | 0.4.0 – latest              | Actively supported |
+| 3.13           | 0.5.3 – latest              | Actively supported (see installation notes) |
 
 ## Install
 
@@ -190,10 +189,9 @@ jukebox-admin settings show --effective
 To use the `api` and `ui` commands, additional packages are required. You can install the `package[extra]` syntax regardless of the package manager you use, for example:
 
 ```shell
-# Python 3.9+ required
 uv tool install gukebox[api]
 
-# Python 3.10+ required, ui includes the api extra
+# ui includes the api extra
 uv tool install gukebox[ui]
 ```
 

{gukebox-1.0.0.dev12 → gukebox-1.0.0.dev14}/README.md

@@ -33,13 +33,17 @@
 - [The library file](#the-library-file)
 - [Developer setup](#developer-setup)
 
-## Notes
+## Python Compatibility
 
-Python 3.7 is supported by Jukebox up to version 0.4.1.
+Jukebox 1.0+ requires Python 3.11 or newer.
 
-Python 3.8 is supported by Jukebox up to version 0.5.4.
-
-The `ui` extension is only available for Python versions 3.10 and above.
+| Python version | Compatible Jukebox versions | Notes |
+|----------------|-----------------------------|-------|
+| 3.7            | 0.4.0 – 0.4.1               | Legacy |
+| 3.8            | 0.4.0 – 0.5.4               | Legacy |
+| 3.9 – 3.10     | 0.4.0 – 0.9.0 (incl. 1.0.0.dev13) | Legacy |
+| 3.11 – 3.12    | 0.4.0 – latest              | Actively supported |
+| 3.13           | 0.5.3 – latest              | Actively supported (see installation notes) |
 
 ## Install
 
@@ -132,10 +136,9 @@ jukebox-admin settings show --effective
 To use the `api` and `ui` commands, additional packages are required. You can install the `package[extra]` syntax regardless of the package manager you use, for example:
 
 ```shell
-# Python 3.9+ required
 uv tool install gukebox[api]
 
-# Python 3.10+ required, ui includes the api extra
+# ui includes the api extra
 uv tool install gukebox[ui]
 ```
 

{gukebox-1.0.0.dev12 → gukebox-1.0.0.dev14}/discstore/adapters/inbound/api/current_tag_router.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from fastapi import APIRouter, HTTPException, Response, status
 from pydantic import ValidationError
@@ -27,11 +27,11 @@ def build_current_tag_router(
 ) -> APIRouter:
     router = APIRouter(prefix="/api/v1", tags=["current-tag"])
 
-    def read_current_tag_status() -> Optional[CurrentTagStatus]:
+    def read_current_tag_status() -> CurrentTagStatus | None:
         return get_current_tag_status.execute()
 
     def ensure_expected_tag_id_matches(
-        expected_tag_id: Optional[str], current_tag_status: Optional[CurrentTagStatus]
+        expected_tag_id: str | None, current_tag_status: CurrentTagStatus | None
     ) -> None:
         if expected_tag_id is None:
             return
@@ -84,7 +84,7 @@ def build_current_tag_router(
     )
     def create_current_tag_disc(
         disc: DiscInput,
-        expected_tag_id: Optional[str] = None,
+        expected_tag_id: str | None = None,
     ) -> Any:
         current_tag_status = read_current_tag_status()
         ensure_expected_tag_id_matches(expected_tag_id, current_tag_status)
@@ -112,7 +112,7 @@ def build_current_tag_router(
     )
     def update_current_tag_disc(
         disc_patch: DiscPatchInput,
-        expected_tag_id: Optional[str] = None,
+        expected_tag_id: str | None = None,
     ) -> Any:
         current_tag_status = read_current_tag_status()
         ensure_expected_tag_id_matches(expected_tag_id, current_tag_status)
@@ -147,7 +147,7 @@ def build_current_tag_router(
         },
         summary="Delete the current tag disc",
     )
-    def delete_current_tag_disc(expected_tag_id: Optional[str] = None) -> Response:
+    def delete_current_tag_disc(expected_tag_id: str | None = 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:

{gukebox-1.0.0.dev12 → gukebox-1.0.0.dev14}/discstore/adapters/inbound/api/discs_router.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 from fastapi import APIRouter, HTTPException, Response, status
 from pydantic import ValidationError
 
@@ -21,8 +19,8 @@ def build_discs_router(
 ) -> 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]:
+    @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")

{gukebox-1.0.0.dev12 → gukebox-1.0.0.dev14}/discstore/adapters/inbound/api/models.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Any
 
 from pydantic import BaseModel, RootModel
 
@@ -14,21 +14,21 @@ class DiscOutput(Disc):
 
 
 class DiscPatchMetadataInput(BaseModel):
-    artist: Optional[str] = None
-    album: Optional[str] = None
-    track: Optional[str] = None
-    playlist: Optional[str] = None
+    artist: str | None = None
+    album: str | None = None
+    track: str | None = None
+    playlist: str | None = None
 
 
 class DiscPatchOptionInput(BaseModel):
-    shuffle: Optional[bool] = None
-    is_test: Optional[bool] = None
+    shuffle: bool | None = None
+    is_test: bool | None = None
 
 
 class DiscPatchInput(BaseModel):
-    uri: Optional[str] = None
-    metadata: Optional[DiscPatchMetadataInput] = None
-    option: Optional[DiscPatchOptionInput] = None
+    uri: str | None = None
+    metadata: DiscPatchMetadataInput | None = None
+    option: DiscPatchOptionInput | None = None
 
 
 class CurrentTagStatusOutput(CurrentTagStatus):
@@ -44,5 +44,5 @@ class SettingsResetInput(BaseModel):
     path: str
 
 
-class SettingsPatchInput(RootModel[Dict[str, Any]]):
+class SettingsPatchInput(RootModel[dict[str, Any]]):
     pass

{gukebox-1.0.0.dev12 → gukebox-1.0.0.dev14}/discstore/adapters/inbound/api/settings_router.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, cast
+from typing import Any, cast
 
 from fastapi import APIRouter, HTTPException
 
@@ -11,21 +11,21 @@ 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")
+    @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")
+    @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")
+    @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))
@@ -34,7 +34,7 @@ def build_settings_router(settings_service: SettingsService) -> APIRouter:
         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")
+    @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)

{gukebox-1.0.0.dev12 → gukebox-1.0.0.dev14}/discstore/adapters/inbound/api_controller.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import BaseModel
 
 from jukebox.shared.dependency_messages import optional_extra_dependency_message
@@ -62,7 +60,7 @@ class SelectedSonosGroupOutput(SelectedSonosGroupSettings):
 class SonosSelectionMemberAvailabilityOutput(BaseModel):
     uid: str
     status: str
-    speaker: Optional[SonosSpeakerOutput] = None
+    speaker: SonosSpeakerOutput | None = None
 
 
 class SonosSelectionAvailabilityOutput(BaseModel):
@@ -71,13 +69,13 @@ class SonosSelectionAvailabilityOutput(BaseModel):
 
 
 class SonosSelectionOutput(BaseModel):
-    selected_group: Optional[SelectedSonosGroupOutput] = None
+    selected_group: SelectedSonosGroupOutput | None = None
     availability: SonosSelectionAvailabilityOutput
 
 
 class SonosSelectionInput(BaseModel):
     uids: list[str]
-    coordinator_uid: Optional[str] = None
+    coordinator_uid: str | None = None
 
 
 class SonosSelectionUpdateOutput(BaseModel):

{gukebox-1.0.0.dev12 → gukebox-1.0.0.dev14}/discstore/adapters/inbound/cli_controller.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Union
 
 from discstore.adapters.inbound.cli_display import display_library_line, display_library_table
 from discstore.commands import (
@@ -43,24 +42,23 @@ class CLIController:
 
     def run(
         self,
-        command: Union[
-            CliAddCommand, CliListCommand, CliRemoveCommand, CliEditCommand, CliGetCommand, CliSearchCommand
-        ],
+        command: CliAddCommand | CliListCommand | CliRemoveCommand | CliEditCommand | CliGetCommand | CliSearchCommand,
     ) -> None:
-        if isinstance(command, CliAddCommand):
-            self.add_disc_flow(command)
-        elif isinstance(command, CliListCommand):
-            self.list_discs_flow(command)
-        elif isinstance(command, CliRemoveCommand):
-            self.remove_disc_flow(command)
-        elif isinstance(command, CliEditCommand):
-            self.edit_disc_flow(command)
-        elif isinstance(command, CliGetCommand):
-            self.get_disc_flow(command)
-        elif isinstance(command, CliSearchCommand):
-            self.search_discs_flow(command)
-        else:
-            LOGGER.error(f"Command not implemented yet: command='{command}'")
+        match command:
+            case CliAddCommand():
+                self.add_disc_flow(command)
+            case CliListCommand():
+                self.list_discs_flow(command)
+            case CliRemoveCommand():
+                self.remove_disc_flow(command)
+            case CliEditCommand():
+                self.edit_disc_flow(command)
+            case CliGetCommand():
+                self.get_disc_flow(command)
+            case CliSearchCommand():
+                self.search_discs_flow(command)
+            case _:
+                LOGGER.error("Command not implemented yet: command='%s'", command)
 
     def add_disc_flow(self, command: CliAddCommand) -> None:
         tag = self.resolve_tag_id.execute(command.tag, command.use_current_tag)
@@ -79,7 +77,7 @@ class CLIController:
         if command.mode == "line":
             display_library_line(discs)
             return
-        LOGGER.error(f"Displaying mode not implemented yet: mode='{command.mode}'")
+        LOGGER.error("Displaying mode not implemented yet: mode='%s'", command.mode)
 
     def remove_disc_flow(self, command: CliRemoveCommand) -> None:
         tag = self.resolve_tag_id.execute(command.tag, command.use_current_tag)
@@ -122,7 +120,7 @@ class CLIController:
     def search_discs_flow(self, command: CliSearchCommand) -> None:
         results = self.search_discs.execute(command.query)
         if not results:
-            LOGGER.info(f"No discs found matching '{command.query}'")
+            LOGGER.info("No discs found matching '%s'", command.query)
             return
-        LOGGER.info(f"Found {len(results)} disc(s) matching '{command.query}':")
+        LOGGER.info("Found %d disc(s) matching '%s':", len(results), command.query)
         display_library_table(results)

{gukebox-1.0.0.dev12 → gukebox-1.0.0.dev14}/discstore/adapters/inbound/cli_display.py

@@ -1,11 +1,9 @@
-from typing import Dict
-
 from discstore.domain.entities import Disc
 
 MAX_COL_WIDTH = 20
 
 
-def display_library_line(discs: Dict[str, Disc]) -> None:
+def display_library_line(discs: dict[str, Disc]) -> None:
     if not discs:
         print("The library is empty")
         return
@@ -28,7 +26,7 @@ def truncate(text: str, max_length: int) -> str:
     return text[: max_length - 3] + "..."
 
 
-def display_library_table(discs: Dict[str, Disc]) -> None:
+def display_library_table(discs: dict[str, Disc]) -> None:
     if not discs:
         print("The library is empty")
         return

{gukebox-1.0.0.dev12 → gukebox-1.0.0.dev14}/discstore/adapters/inbound/interactive_cli_controller.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Optional
 
 from discstore.adapters.inbound.cli_display import display_library_line, display_library_table
 from discstore.domain.entities import CurrentTagStatus, Disc, DiscMetadata, DiscOption
@@ -38,24 +37,25 @@ class InteractiveCLIController:
 
     def handle_command(self, command: str) -> None:
         try:
-            if command == "add":
-                self.add_disc_flow()
-            elif command == "remove":
-                self.remove_disc_flow()
-            elif command == "list":
-                self.list_discs_flow()
-            elif command == "edit":
-                self.edit_disc_flow()
-            elif command == "current":
-                self.current_tag_flow()
-            elif command == "exit":
-                print("See you soon!")
-                exit(0)
-            elif command == "help":
-                print(self.help_message)
-            else:
-                print(f"Invalid command `{command}`")
-                print(self.help_message)
+            match command:
+                case "add":
+                    self.add_disc_flow()
+                case "remove":
+                    self.remove_disc_flow()
+                case "list":
+                    self.list_discs_flow()
+                case "edit":
+                    self.edit_disc_flow()
+                case "current":
+                    self.current_tag_flow()
+                case "exit":
+                    print("See you soon!")
+                    exit(0)
+                case "help":
+                    print(self.help_message)
+                case _:
+                    print(f"Invalid command `{command}`")
+                    print(self.help_message)
         except Exception as err:
             print(f"Error: {err}")
             LOGGER.error("Error during handling command: %s", err)
@@ -112,7 +112,7 @@ class InteractiveCLIController:
         print(f"Tag ID           : {current_tag_status.tag_id}")
         print(f"Known in library : {'yes' if current_tag_status.known_in_library else 'no'}")
 
-    def _prompt_for_tag(self, current_tag_status: Optional[CurrentTagStatus], action: str) -> str:
+    def _prompt_for_tag(self, current_tag_status: CurrentTagStatus | None, action: str) -> str:
         default_tag = ""
         if current_tag_status is not None and (
             (action == "add" and not current_tag_status.known_in_library)