artemis-model 0.1.142__tar.gz → 0.1.144__tar.gz

{artemis_model-0.1.142 → artemis_model-0.1.144}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: artemis-model
-Version: 0.1.142
+Version: 0.1.144
 Summary: 
 Author: Jukeboxy
 Requires-Python: >=3.10.6,<4.0.0

{artemis_model-0.1.142 → artemis_model-0.1.144}/artemis_model/redis/__init__.py

@@ -4,7 +4,7 @@ from .zone_state import (
     ZoneState,
     NowPlaying,
     SessionId,
-    BucketId,
+    BucketTS,
     PlaylistSimple,
     PushedPlaylistDetails,
     ScheduleDetails,
@@ -25,7 +25,7 @@ __all__ = [
     "ZoneState",
     "NowPlaying",
     "SessionId",
-    "BucketId",
+    "BucketTS",
     "ActiveDevice",
     "PlaylistSimple",
     "PushedPlaylistDetails",

{artemis_model-0.1.142 → artemis_model-0.1.144}/artemis_model/redis/zone_state.py

@@ -21,10 +21,10 @@ SessionId = Annotated[
         description="The session id of the pushed playlist. It's generated as a timestamp value of the current time."
     ),
 ]
-BucketId = Annotated[
+BucketTS = Annotated[
     int | None,
     Field(
-        description="The bucket id of the pushed playlist. It's calculated in set_bucket_track as the timestamp value of the timeslot."
+        description="The bucket id of the pushed playlist. It's calculated as the timestamp value of the timeslot."
     ),
 ]
 
@@ -56,11 +56,10 @@ class ScheduleDetails(BaseModel):
 class PushedPlaylistDetails(BaseModel):
     """Player details schema."""
 
-    redis_details: dict[SessionId, BucketId] | None = Field(
+    bucket_ts: BucketTS | None = Field(
         default_factory=dict,
         description="""Pushed playlists does exist in Redis with a timestamp.
         Example: zone_{zone_id}_pp_bucket_{ts}
-        Every pushplaylist action has a session id. Here we map these session ids to the bucket id.
         """,
     )
     playlists: list[PlaylistSimple] | None = Field(
@@ -76,12 +75,6 @@ class PushedPlaylistDetails(BaseModel):
         description="The expiry type of the pushed playlist",
     )
 
-    @field_validator("redis_details", mode="before")
-    @classmethod
-    def default_empty_dict_if_none(cls, v):
-        """Override none value to empty dict."""
-        return v or {}
-
 
 class ZoneState(BaseModel):
     """Zone state schema."""
@@ -112,7 +105,7 @@ __all__ = [
     "ZoneState",
     "NowPlaying",
     "SessionId",
-    "BucketId",
+    "BucketTS",
     "PlaylistSimple",
     "PushedPlaylistDetails",
     "ScheduleDetails",

{artemis_model-0.1.142 → artemis_model-0.1.144}/artemis_model/sqs/messages.py

@@ -6,7 +6,7 @@ from typing import Literal
 from uuid import UUID
 
 
-from artemis_model.redis.zone_state import BucketId, SessionId
+from artemis_model.redis.zone_state import BucketTS, SessionId
 from artemis_model.schedule import ScheduleItem
 from pydantic import BaseModel, Field
 
@@ -88,7 +88,7 @@ class RefreshTrackBucketIn(BaseMessage):
 
     action: Action = Action.REFRESH_TRACK_BUCKET
     zone_id: int
-    bucket_key: str
+    bucket_ts: BucketTS
 
 
 class RecalculateScheduleIn(BaseMessage):

{artemis_model-0.1.142 → artemis_model-0.1.144}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "artemis-model"
-version = "0.1.142"
+version = "0.1.144"
 description = ""
 authors = ["Jukeboxy"]
 readme = "README.md"