artemis-model 0.1.163__tar.gz → 0.1.166__tar.gz

{artemis_model-0.1.163 → artemis_model-0.1.166}/PKG-INFO

@@ -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 → artemis_model-0.1.166}/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-0.1.163 → artemis_model-0.1.166}/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-0.1.163 → artemis_model-0.1.166}/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-0.1.166/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 → artemis_model-0.1.166}/pyproject.toml

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

artemis_model-0.1.163/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()