artemis-model 0.1.95__py3-none-any.whl → 0.1.97__py3-none-any.whl

artemis_model/redis/__init__.py

@@ -2,6 +2,7 @@
 
 from .zone_state import ZoneState, NowPlaying, SessionId, BucketId
 from .device import ActiveDevice
+from .bucket import RedisTrackBucketItem
 from .keys import (
     KEY_ZONE_PLAY_HISTORY_TEMPLATE,
     KEY_ZONE_PUSH_PLAYLIST_BUCKET_TEMPLATE,
@@ -21,4 +22,5 @@ __all__ = [
     "KEY_ZONE_SCHEDULE_BUCKET_TEMPLATE",
     "KEY_ZONE_STATE_TEMPLATE",
     "KEY_ZONE_ACTIVE_DEVICE_TEMPLATE",
+    "RedisTrackBucketItem",
 ]

artemis_model/redis/bucket.py

@@ -0,0 +1,54 @@
+"""Redis track buckets"""
+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)")
+]
+
+PlaylistId = Annotated[
+    int,
+    Field(description="Playlist ID (integer)")
+]
+
+Timestamp = Annotated[
+    int,
+    Field(description="Unix timestamp")
+]
+
+
+class RedisTrackBucketItem(BaseModel):
+    """
+    Represents a composite Redis key along with a timestamp.
+    The Redis entry will be:
+    { '{"track_id": "...", "playlist_id": ...}': ts }
+    ts is the timestamp of utc now.
+    """
+
+    track_id: TrackId
+    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
+    )
+
+    def as_redis_entry(self) -> dict[str, int]:
+        """
+        Generate a Redis-ready dictionary:
+        { '{"track_id": "...", "playlist_id": ...}': ts }
+        """
+        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":
+        """
+        Parse a Redis entry into a RedisTrackBucketItem.
+        """
+        return cls.model_validate_json(list(entry.keys())[0])

artemis_model/redis/keys.py

@@ -6,6 +6,7 @@ KEY_ZONE_SCHEDULE_BUCKET_TEMPLATE = "zone_{zone_id}_sc_bucket_{timeslot_ts}"
 KEY_ZONE_STATE_TEMPLATE = "zone_{zone_id}_state"
 KEY_ZONE_ACTIVE_DEVICE_TEMPLATE = "zone_{zone_id}_active_devices"
 
+
 __all__ = [
     "KEY_ZONE_PLAY_HISTORY_TEMPLATE",
     "KEY_ZONE_PUSH_PLAYLIST_BUCKET_TEMPLATE",

artemis_model/redis/play_history

@@ -0,0 +1,43 @@
+"""Redis play history"""
+
+from pydantic import BaseModel, Field
+from typing import Annotated
+from datetime import datetime, timezone
+
+
+TrackId = Annotated[
+    str,
+    Field(description="Track ID (UUID or string)")
+]
+
+Timestamp = Annotated[
+    int,
+    Field(description="Unix timestamp")
+]
+
+
+class TrackPlayHistoryValue(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()))
+
+    def as_redis_entry(self) -> str:
+        """
+        Generate a Redis-ready string:
+        "track_id#timestamp"
+        """
+        return f"{self.track_id}#{self.ts}"
+
+    @classmethod
+    def from_redis_entry(cls, value: str) -> "TrackPlayHistoryValue":
+        """
+        Parse a Redis entry into a TrackPlayHistoryValue.
+        """
+        try:
+            track_id, ts = value.rsplit("#", 1)
+            return cls(track_id=track_id, ts=int(ts))
+        except Exception as e:
+            raise ValueError(f"Invalid format for TrackPlayHistoryValue: {value}") from e

{artemis_model-0.1.95.dist-info → artemis_model-0.1.97.dist-info}/METADATA

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

{artemis_model-0.1.95.dist-info → artemis_model-0.1.97.dist-info}/RECORD

@@ -12,9 +12,11 @@ artemis_model/organization.py,sha256=yjGHJLTOtb9PUfxSPal782Rceb8xb8vftXX67tHRNqc
 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=xJy7MwgKHE1-KVZJAP8g8mr9HAl1j469hRIqjZvV8nI,626
+artemis_model/redis/__init__.py,sha256=uNxgdnhiYNEb5eTq4ZLbXyb-rlc8NXOcXncnCg6fJQc,695
+artemis_model/redis/bucket.py,sha256=r3CEHSPeb8iFs1J0TMf3oZddnPSJkwvjjkWiemRUtdo,1408
 artemis_model/redis/device.py,sha256=ZUiIyVmtWiEwayFIg9mktiFaVuHQ7Fg0rvSjjWyryCI,484
-artemis_model/redis/keys.py,sha256=Eb4TgtS-M1j-KuHVeFzxpVzm_zsizrUCRgeAv9BnLF4,566
+artemis_model/redis/keys.py,sha256=bnlSaBCIakLCIlgTr8BlYJmKEtKKvtdr43QIJCLnc90,567
+artemis_model/redis/play_history,sha256=DZdSrY9Ji9i1H7b9Pcry8v0e_5Q0aUpkXWW6SNAO7FQ,1140
 artemis_model/redis/zone_state.py,sha256=PgHiGUZ2WI3bqO-8CW2cwzLEQu3l4wJAzIABSWErfBM,1712
 artemis_model/schedule.py,sha256=CkLHWz-BwvUY2EQCfoU4SymgCariPzoQdtRLITqBPmk,2451
 artemis_model/setting.py,sha256=EWzOmE31mLNWwmV_wmqttHPMycvQZW7SJUIozF2b8bo,1190
@@ -23,6 +25,6 @@ artemis_model/sqs/messages.py,sha256=98cWxrj48T1AcEnltqVGTts6rcmTYimeN8fC6wkdNQk
 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-0.1.95.dist-info/METADATA,sha256=VeBx7zfoktkLfk6E17yUkNUzI1iYmS6Dzrlk0PzjxGA,3444
-artemis_model-0.1.95.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-artemis_model-0.1.95.dist-info/RECORD,,
+artemis_model-0.1.97.dist-info/METADATA,sha256=iZK0-ssqYu48mjl0yZSlbQWgYeGiPHgLh9AoFI8dgEM,3444
+artemis_model-0.1.97.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+artemis_model-0.1.97.dist-info/RECORD,,