artemis-model 0.1.163__py3-none-any.whl → 0.1.166__py3-none-any.whl

artemis_model/__init__.py

@@ -19,3 +19,4 @@ from artemis_model.zone import *  # noqa
 from artemis_model.otp import *  # noqa
 from artemis_model.banned_tracks import *  # noqa
 from artemis_model.zone_activity import *  # noqa
+from artemis_model.zone_state import *  # noqa

artemis_model/redis/__init__.py

@@ -12,7 +12,6 @@ from .zone_state import (
 from .device import ActiveDevice
 from .bucket import RedisTrackBucketItem
 from .play_history import RedisTrackPlayHistoryItem
-from .user import hash_token
 from .keys import (
     KEY_ZONE_PLAY_HISTORY_TEMPLATE,
     KEY_ZONE_PUSH_PLAYLIST_BUCKET_TEMPLATE,
@@ -23,7 +22,6 @@ from .keys import (
 
 
 __all__ = [
-    "hash_token",
     "ZoneState",
     "NowPlaying",
     "SessionId",

artemis_model/redis/keys.py

@@ -1,6 +1,5 @@
 """Redis keys."""
 
-KEY_USER_REFRESH_TOKEN_TEMPLATE = "user_{user_id}_rt"
 KEY_ZONE_ACTIVE_DEVICE_TEMPLATE = "zone_{zone_id}_active_devices"
 KEY_ZONE_PLAY_HISTORY_TEMPLATE = "zone_{zone_id}_play_history"
 KEY_ZONE_PUSH_PLAYLIST_BUCKET_TEMPLATE = "zone_{zone_id}_pp_bucket_{timeslot_ts}"
@@ -10,7 +9,6 @@ KEY_ZONE_STATE_TEMPLATE = "zone_{zone_id}_state"
 
 
 __all__ = [
-    "KEY_USER_REFRESH_TOKEN_TEMPLATE",
     "KEY_ZONE_ACTIVE_DEVICE_TEMPLATE",
     "KEY_ZONE_PLAY_HISTORY_TEMPLATE",
     "KEY_ZONE_PUSH_PLAYLIST_BUCKET_TEMPLATE",

artemis_model/zone_state.py

@@ -0,0 +1,86 @@
+"""Zone state data models."""
+
+# models/zone_state.py
+
+import uuid
+from datetime import datetime
+from typing import Optional
+
+from sqlalchemy import UUID, DateTime, ForeignKey, Integer, String
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.ext.declarative import declared_attr
+
+from artemis_model.base import CustomSyncBase, TimeStampMixin, CustomBase
+
+
+class ZoneStateMetaMixin(TimeStampMixin):
+    """
+    Rarely changing part of a zone's state.
+    One row per zone.
+    """
+
+    zone_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("zone.id", ondelete="CASCADE"),
+        primary_key=True,
+        default=uuid.uuid4,
+        doc="Zone identifier (PK)",
+    )
+
+    player_mode: Mapped[str] = mapped_column(String, default="scheduled", nullable=False, index=True)
+    player_state: Mapped[str] = mapped_column(String, default="ready", nullable=False, index=True)
+    pp_details: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+    schedule_details: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+
+    @declared_attr
+    def now_playing(cls) -> Mapped["ZoneNowPlaying"]:
+        return relationship(
+            "ZoneNowPlaying",
+            back_populates="meta",
+            uselist=False,
+            cascade="all, delete-orphan",
+        )
+
+
+class ZoneStateMetaSync(CustomSyncBase, ZoneStateMetaMixin):
+    pass
+
+
+class ZoneStateMeta(CustomBase, ZoneStateMetaMixin):
+    pass
+
+
+class ZoneNowPlayingMixin:
+    """
+    Frequently changing part of a zone's state.
+    Keep row narrow; PK-only index for cheap updates.
+    One row per zone (FK to ZoneStateMeta).
+    """
+
+    zone_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("zone_state_meta.zone_id", ondelete="CASCADE"),
+        primary_key=True,
+        doc="Matches zone_state_meta.zone_id",
+    )
+
+    track_name: Mapped[Optional[str]] = mapped_column(String, nullable=True)
+    artist_name: Mapped[Optional[str]] = mapped_column(String, nullable=True)
+    album_name: Mapped[Optional[str]] = mapped_column(String, nullable=True)
+    playlist_id: Mapped[Optional[int]] = mapped_column(Integer, nullable=True)
+
+    # Lightweight timestamp for freshness; mirrors your style (see LoginHistory)
+    updated_at = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
+
+    @declared_attr
+    def meta(cls) -> Mapped["ZoneStateMeta"]:
+        return relationship("ZoneStateMeta", back_populates="now_playing")
+    
+
+class ZoneNowPlayingSync(CustomSyncBase, ZoneNowPlayingMixin):
+    pass
+
+
+class ZoneNowPlaying(CustomBase, ZoneNowPlayingMixin):
+    pass

{artemis_model-0.1.163.dist-info → artemis_model-0.1.166.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: artemis-model
-Version: 0.1.163
+Version: 0.1.166
 Summary: 
 Author: Jukeboxy
 Requires-Python: >=3.10.6,<4.0.0

{artemis_model-0.1.163.dist-info → artemis_model-0.1.166.dist-info}/RECORD

@@ -1,4 +1,4 @@
-artemis_model/__init__.py,sha256=R__YcDg7FMAMHyy9CVjqi6fC58DEWkwMXCg0S9Az6Ck,981
+artemis_model/__init__.py,sha256=zjzjYdT0t_8rCTCpDRJ0P4UKhVezRz10zUQnYOfd9WU,1028
 artemis_model/album.py,sha256=9uw9HVNHVBjl-0Dgv-o5MHXhUPwedvbnbzzY3A1cKQg,2077
 artemis_model/approved_playlist_list.py,sha256=JJ2n15JA7kBbsKrQA-GpfriMEjCHZmWcFhFAKfNcPxY,1869
 artemis_model/artist.py,sha256=vjXlFN2mOEidAzUzxmsAP5GnVTvJUuhFdhQaH214lgw,1563
@@ -16,12 +16,11 @@ artemis_model/organization_include_pal_setting.py,sha256=OhNRn4aH96IquJcJBsubvZE
 artemis_model/otp.py,sha256=guIRGtyFlHUBthCAEsTh5_Hs-1yiGN_qfEO4uHNcv4s,1017
 artemis_model/permission.py,sha256=Bn1Bg1aCS4Z4_3tqEqvtrzqAYDCImsvmGyIEMoVycEk,1452
 artemis_model/playlist.py,sha256=O60zlP1LrDkzNrrfNA7TD_kotd5A9i8PuFhwonXFhN0,6559
-artemis_model/redis/__init__.py,sha256=uagGPkaIkSsCqEFVMYj3kr8d7dWiBNCg0gqe_iqUdgI,991
+artemis_model/redis/__init__.py,sha256=hwxNaoTAwFWJxHL6ijp5MOJkapWPv9PEPoY6rtUhCyI,944
 artemis_model/redis/bucket.py,sha256=DlmIf6GxfKq9CzcXmMx5IcviaqOTvuWwIb6lAVcZQGs,1537
 artemis_model/redis/device.py,sha256=MmCIpBmWxm80CHeZinAXYZOdtPE49xXLo9oRa4FyjcY,505
-artemis_model/redis/keys.py,sha256=B5QMZGLd8BCJLj4cLv3-tREKVhk8UJbufDahl80Xpuk,767
+artemis_model/redis/keys.py,sha256=X5lvVJHeKHt0lJKhi5i8KzNtDGQ3TuGrjm3V2CcTgXw,674
 artemis_model/redis/play_history.py,sha256=Jm0guS0UZDxfCXeWJ8vqcjjl93W_EeC7XcBXcclKPiE,1259
-artemis_model/redis/user.py,sha256=nhaebEx9uaDZlu7KjfnvnUfGyxFPqc5w4kMbXkp63lI,183
 artemis_model/redis/zone_state.py,sha256=A5z2ss1-zq6_UHavs6mBgxsllXLz5hYbKCNRAjD-ONw,3152
 artemis_model/schedule.py,sha256=CkLHWz-BwvUY2EQCfoU4SymgCariPzoQdtRLITqBPmk,2451
 artemis_model/setting.py,sha256=xe5SHDziY8RzFxzB1GzousxI1FXYhyXZ5proEseS60g,1190
@@ -31,6 +30,7 @@ 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=BY4iODavY9ceJ5oRChdjjxf26S3U30Yb7Pxm5YRFpCo,1590
-artemis_model-0.1.163.dist-info/METADATA,sha256=NEHYvHPgrd3ZAe-R5e8mF55sO5gmTP_MtZwz8f7vGMk,3496
-artemis_model-0.1.163.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-artemis_model-0.1.163.dist-info/RECORD,,
+artemis_model/zone_state.py,sha256=kjDJ4FwIg6SYsLyjKbkQMq9Wex6fPcmBMObeQ17ugRE,2703
+artemis_model-0.1.166.dist-info/METADATA,sha256=8IW1cudevYvbRWAWX327aHUJ6DPkBnQbVj_8YsFZdlk,3496
+artemis_model-0.1.166.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+artemis_model-0.1.166.dist-info/RECORD,,

artemis_model/redis/user.py

@@ -1,8 +0,0 @@
-"""User related data models and helpers."""
-
-import hashlib
-
-
-def hash_token(token: str) -> str:
-    """Hash the given token."""
-    return hashlib.sha256(token.encode()).hexdigest()