artemis-model 0.1.94__tar.gz → 0.1.96__tar.gz

{artemis_model-0.1.94 → artemis_model-0.1.96}/PKG-INFO

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

artemis_model-0.1.96/artemis_model/redis/__init__.py

@@ -0,0 +1,26 @@
+"""Redis models."""
+
+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,
+    KEY_ZONE_SCHEDULE_BUCKET_TEMPLATE,
+    KEY_ZONE_STATE_TEMPLATE,
+    KEY_ZONE_ACTIVE_DEVICE_TEMPLATE,
+)
+
+__all__ = [
+    "ZoneState",
+    "NowPlaying",
+    "SessionId",
+    "BucketId",
+    "ActiveDevice",
+    "KEY_ZONE_PLAY_HISTORY_TEMPLATE",
+    "KEY_ZONE_PUSH_PLAYLIST_BUCKET_TEMPLATE",
+    "KEY_ZONE_SCHEDULE_BUCKET_TEMPLATE",
+    "KEY_ZONE_STATE_TEMPLATE",
+    "KEY_ZONE_ACTIVE_DEVICE_TEMPLATE",
+    "RedisTrackBucketItem",
+]

artemis_model-0.1.96/artemis_model/redis/bucket.py

@@ -0,0 +1,47 @@
+"""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}

artemis_model-0.1.96/artemis_model/redis/keys.py

@@ -0,0 +1,16 @@
+"""Redis keys."""
+
+KEY_ZONE_PLAY_HISTORY_TEMPLATE = "zone_{zone_id}_play_history"
+KEY_ZONE_PUSH_PLAYLIST_BUCKET_TEMPLATE = "zone_{zone_id}_pp_bucket_{timeslot_ts}"
+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",
+    "KEY_ZONE_SCHEDULE_BUCKET_TEMPLATE",
+    "KEY_ZONE_STATE_TEMPLATE",
+    "KEY_ZONE_ACTIVE_DEVICE_TEMPLATE",
+]

{artemis_model-0.1.94 → artemis_model-0.1.96}/pyproject.toml

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

artemis_model-0.1.94/artemis_model/redis/__init__.py

@@ -1,6 +0,0 @@
-"""Redis models."""
-
-from .zone_state import ZoneState, NowPlaying, SessionId, BucketId
-from .device import ActiveDevice
-
-__all__ = ["ZoneState", "NowPlaying", "SessionId", "BucketId", "ActiveDevice"]