artemis-model 0.1.114__py3-none-any.whl → 0.1.116__py3-none-any.whl

artemis_model/banned_tracks.py

@@ -6,16 +6,19 @@ from artemis_model.base import AuditMixin, TimeStampMixin, CustomSyncBase, Custo
 
 
 class BannedTracksMixin(TimeStampMixin, AuditMixin):
-    """Banned Tracks per Zone Model"""    
+    """Banned Tracks per Zone Model"""
+
     zone_id: Mapped[int] = mapped_column(Integer, primary_key=True)
     track_id: Mapped[UUID] = mapped_column(UUID(as_uuid=True), primary_key=True)
 
 
 class BannedTracksSync(CustomSyncBase, BannedTracksMixin):
     """Banned Tracks per Zone Model"""
+
     pass
 
 
 class BannedTracks(CustomBase, BannedTracksMixin):
     """Banned Tracks per Zone Model"""
+
     pass

artemis_model/redis/bucket.py

@@ -1,25 +1,16 @@
 """Redis track buckets"""
-import json
+
 from pydantic import BaseModel, Field, ConfigDict
 from typing import Annotated
 from datetime import datetime, timezone
 import uuid
 
 
-TrackId = Annotated[
-    uuid.UUID,
-    Field(description="Track ID (UUID)")
-]
+TrackId = Annotated[uuid.UUID, Field(description="Track ID (UUID)")]
 
-PlaylistId = Annotated[
-    int,
-    Field(description="Playlist ID (integer)")
-]
+PlaylistId = Annotated[int, Field(description="Playlist ID (integer)")]
 
-Timestamp = Annotated[
-    int,
-    Field(description="Unix timestamp")
-]
+Timestamp = Annotated[int, Field(description="Unix timestamp")]
 
 
 class RedisTrackBucketItem(BaseModel):
@@ -34,10 +25,7 @@ class RedisTrackBucketItem(BaseModel):
     playlist_id: PlaylistId
     ts: Timestamp = Field(default_factory=lambda: int(datetime.now(timezone.utc).timestamp()))
 
-    model_config = ConfigDict(
-        json_encoders={uuid.UUID: str},
-        populate_by_name=True
-    )
+    model_config = ConfigDict(json_encoders={uuid.UUID: str}, populate_by_name=True)
 
     def as_redis_entry(self) -> dict[str, int]:
         """
@@ -46,8 +34,7 @@ class RedisTrackBucketItem(BaseModel):
         """
         key = self.model_dump_json(include={"track_id", "playlist_id"})
         return {key: self.ts}
-    
-    
+
     @classmethod
     def from_redis_entry(cls, entry: dict[str, int]) -> "RedisTrackBucketItem":
         """
@@ -58,5 +45,6 @@ class RedisTrackBucketItem(BaseModel):
 
 class RedisTrackBucketItemValue(BaseModel):
     """JSON string format for Redis keys: '{"track_id": "...", "playlist_id": ...}'"""
+
     track_id: TrackId
     playlist_id: PlaylistId

artemis_model/redis/play_history.py

@@ -5,15 +5,9 @@ from typing import Annotated
 from datetime import datetime, timezone
 
 
-TrackId = Annotated[
-    str,
-    Field(description="Track ID (UUID or string)")
-]
+TrackId = Annotated[str, Field(description="Track ID (UUID or string)")]
 
-Timestamp = Annotated[
-    int,
-    Field(description="Unix timestamp")
-]
+Timestamp = Annotated[int, Field(description="Unix timestamp")]
 
 
 class RedisTrackPlayHistoryItem(BaseModel):
@@ -21,6 +15,7 @@ class RedisTrackPlayHistoryItem(BaseModel):
     Represents the value stored in Redis sorted set:
     A string like "track_id#timestamp"
     """
+
     track_id: TrackId
     ts: Timestamp = Field(default_factory=lambda: int(datetime.now(timezone.utc).timestamp()))
 

artemis_model/redis/zone_state.py

@@ -27,6 +27,50 @@ BucketId = Annotated[
 ]
 
 
+class PushedPlaylist(BaseModel):
+    """Pushed playlist schema."""
+
+    id: int = Field(
+        description="The id of the pushed playlist. It's generated as a timestamp value of the current time."
+    )
+    name: str = Field(
+        description="The name of the pushed playlist",
+    )
+
+
+class PushedPlaylistMetadata(BaseModel):
+    """Pushed playlist metadata schema."""
+
+    expire_at: int = Field(
+        description="The expire time of the pushed playlist. It's calculated in set_bucket_track as the timestamp value of the timeslot."
+    )
+    playlists: list[PushedPlaylist] = Field(
+        description="The playlists of the pushed playlist",
+    )
+
+
+class PushedPlaylistDetails(BaseModel):
+    """Player details schema."""
+
+    redis_details: dict[SessionId, BucketId] | 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.
+        """,
+    )
+    metadata: PushedPlaylistMetadata | None = Field(
+        default=None,
+        description="The metadata 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."""
 
@@ -42,16 +86,18 @@ class ZoneState(BaseModel):
         default=None,
         description="The currently playing track",
     )
-    push_playlist_details: dict[SessionId, BucketId] | None = Field(
-        default_factory=dict,
+    pp_details: PushedPlaylistDetails | None = Field(
+        default=None,
         description="The details of the pushed playlist",
     )
 
-    @field_validator("push_playlist_details", mode="before")
-    @classmethod
-    def default_empty_dict_if_none(cls, v):
-        """Override none value to empty dict."""
-        return v or {}
-
 
-__all__ = ["ZoneState", "NowPlaying", "SessionId", "BucketId"]
+__all__ = [
+    "ZoneState",
+    "NowPlaying",
+    "SessionId",
+    "BucketId",
+    "PushedPlaylist",
+    "PushedPlaylistMetadata",
+    "PushedPlaylistDetails",
+]

artemis_model/sqs/messages.py

@@ -10,6 +10,8 @@ from artemis_model.redis.zone_state import SessionId
 from artemis_model.schedule import ScheduleItem
 from pydantic import BaseModel, Field
 
+from artemis_model.zone_activity import ZoneActivityType
+
 
 class Action(str, Enum):
     """Message type enum."""
@@ -101,3 +103,12 @@ class BanTrackIn(BaseMessage):
     zone_id: int
     track_id: UUID
     playlist_id: int
+
+
+class ZoneActivityIn(BaseMessage):
+    """Zone activity message schema."""
+
+    action: Action = Action.ZONE_ACTIVITY
+    zone_id: int
+    activity_type: ZoneActivityType
+    activity_data: dict

artemis_model/zone_activity.py

@@ -39,9 +39,11 @@ class PlayerActivityMixin(TimeStampMixin, AuditMixin):
 
 class PlayerActivitySync(CustomSyncBase, PlayerActivityMixin):
     """Sync model for Player Activity"""
+
     pass
 
 
 class PlayerActivity(CustomBase, PlayerActivityMixin):
     """Base model for Player Activity"""
+
     pass

{artemis_model-0.1.114.dist-info → artemis_model-0.1.116.dist-info}/METADATA

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

{artemis_model-0.1.114.dist-info → artemis_model-0.1.116.dist-info}/RECORD

@@ -2,7 +2,7 @@ artemis_model/__init__.py,sha256=zEeAUndIbJdp_M6pFlON_BEehnMaMcTvusijGktpnvk,792
 artemis_model/album.py,sha256=9uw9HVNHVBjl-0Dgv-o5MHXhUPwedvbnbzzY3A1cKQg,2077
 artemis_model/artist.py,sha256=vjXlFN2mOEidAzUzxmsAP5GnVTvJUuhFdhQaH214lgw,1563
 artemis_model/auth.py,sha256=0Yg_6N1nj4U31F86u1PE0leIa3D64QlYrsDlavulN6s,4033
-artemis_model/banned_tracks.py,sha256=L8w8scdu9GL0Qcuf65HNolhzbqSUXq9TCprUzNtX2AU,665
+artemis_model/banned_tracks.py,sha256=uU-F-6DL2EshPAUwLTTHjYZ7UEz4vm0Wfcif2F0lSKw,664
 artemis_model/base.py,sha256=zC20m8a1Sa11oEY0ay1iIRQeybGYvXY5p3Vr-pxoKnQ,6802
 artemis_model/category.py,sha256=jhCZrK-LxPmc0pXmVifAZWdCENssBTzdTmC3nqqZc6s,1761
 artemis_model/dj_set.py,sha256=fOYnCu4n5TiqyiSojfdFnO7LuPe_mM2SUwBV5xHy2Kc,3782
@@ -14,19 +14,19 @@ artemis_model/otp.py,sha256=guIRGtyFlHUBthCAEsTh5_Hs-1yiGN_qfEO4uHNcv4s,1017
 artemis_model/permission.py,sha256=Bn1Bg1aCS4Z4_3tqEqvtrzqAYDCImsvmGyIEMoVycEk,1452
 artemis_model/playlist.py,sha256=L22KSJgTZmNEc9CqM3TFD4Wnx3TW77GQJ5EFLJCxZ20,6393
 artemis_model/redis/__init__.py,sha256=qwAtvh2NrxRsjk_MqdeTZDwoaGc1K4PZhCCdTDsSTvA,781
-artemis_model/redis/bucket.py,sha256=q3Fq_OBwqOEj3_H3CVQEKY8TPtVi86dvVUkIlN_W1JA,1608
+artemis_model/redis/bucket.py,sha256=DlmIf6GxfKq9CzcXmMx5IcviaqOTvuWwIb6lAVcZQGs,1537
 artemis_model/redis/device.py,sha256=ZUiIyVmtWiEwayFIg9mktiFaVuHQ7Fg0rvSjjWyryCI,484
 artemis_model/redis/keys.py,sha256=bnlSaBCIakLCIlgTr8BlYJmKEtKKvtdr43QIJCLnc90,567
-artemis_model/redis/play_history.py,sha256=pLWDpDlqZCH2bXTW-H0RFddJjXXmvobvIBm9iTUVy4k,1278
-artemis_model/redis/zone_state.py,sha256=PgHiGUZ2WI3bqO-8CW2cwzLEQu3l4wJAzIABSWErfBM,1712
+artemis_model/redis/play_history.py,sha256=Jm0guS0UZDxfCXeWJ8vqcjjl93W_EeC7XcBXcclKPiE,1259
+artemis_model/redis/zone_state.py,sha256=F0-nAS6zGQ6-qy5AInG3AayYdaPHnk7jyax-Q2G-1sY,2993
 artemis_model/schedule.py,sha256=CkLHWz-BwvUY2EQCfoU4SymgCariPzoQdtRLITqBPmk,2451
 artemis_model/setting.py,sha256=EWzOmE31mLNWwmV_wmqttHPMycvQZW7SJUIozF2b8bo,1190
 artemis_model/sqs/__init__.py,sha256=nHpXQns64qQ5Cqjyo6w9fDGO_wWhprqn1bhKf3eWnio,17
-artemis_model/sqs/messages.py,sha256=8PcZYUsh85x3TikZ4hBvGl_xUl9onKUwSCxZWgToEgQ,2668
+artemis_model/sqs/messages.py,sha256=mT8Q2OmrX5E3XUYIC-QBOAGPm4nuuWZa4CgFtCOOuwM,2923
 artemis_model/track.py,sha256=QwUF0QKVn1I64648B-NI75-IzGQvnLt9B0emD4GnS6E,3757
 artemis_model/user.py,sha256=eqIdCiBJRNLjCwPPCn-gQ6si0O5JUBGfp9oWJL5zVW4,2131
 artemis_model/zone.py,sha256=iGRUtzUwKh9LHT3MOfzzg1DnkPBts_ZBzZVTi2EmIgs,2282
-artemis_model/zone_activity.py,sha256=TgBIbVhU_aVvhPIe7eC4TSJayW8aMSJWoOiv6JduS4w,1598
-artemis_model-0.1.114.dist-info/METADATA,sha256=H3jVVmEerVNAXOgVSmOHaFeBVmJQzmXS9ZSu-wtPDaU,3445
-artemis_model-0.1.114.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-artemis_model-0.1.114.dist-info/RECORD,,
+artemis_model/zone_activity.py,sha256=IkB1Ggjb24-FXAd4pSOeyhngX54U9OtTdFTvm4DYL1A,1600
+artemis_model-0.1.116.dist-info/METADATA,sha256=gYFeFvyzsboYhkLsE2cdfibl30rZlGyL1EPWvKO3E3M,3445
+artemis_model-0.1.116.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+artemis_model-0.1.116.dist-info/RECORD,,