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

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

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

{artemis_model-0.1.161 → artemis_model-0.1.163}/artemis_model/__init__.py

@@ -1,4 +1,5 @@
 from artemis_model.album import *  # noqa
+from artemis_model.approved_playlist_list import *  # noqa
 from artemis_model.artist import *  # noqa
 from artemis_model.auth import *  # noqa
 from artemis_model.category import *  # noqa

artemis_model-0.1.163/artemis_model/approved_playlist_list.py

@@ -0,0 +1,59 @@
+import uuid
+from typing import List
+
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.ext.declarative import declared_attr
+
+from artemis_model.base import CustomSyncBase, TimeStampMixin, AuditMixin, CustomBase
+
+
+class ApprovedPlaylistListMixin(TimeStampMixin, AuditMixin):
+
+    id: Mapped[int] = mapped_column(autoincrement=True, primary_key=True, index=True)
+    name: Mapped[str] = mapped_column(nullable=False)
+    organization_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("organization.id"), nullable=False, index=True
+    )
+
+    @declared_attr
+    def organization(cls) -> Mapped["Organization"]:
+        return relationship("Organization", back_populates="approved_playlist_lists")
+
+    @declared_attr
+    def playlist_associations(cls) -> Mapped[List["ApprovedPlaylistListPlaylistAssoc"]]:
+        return relationship(cascade="all, delete-orphan")
+
+    @declared_attr
+    def playlists(cls) -> Mapped[List["Playlist"]]:
+        return relationship(
+            "Playlist",
+            secondary="approved_playlist_list_playlist_assoc",
+            viewonly=True
+        )
+
+
+class ApprovedPlaylistListSync(CustomSyncBase, ApprovedPlaylistListMixin):
+    pass
+
+
+class ApprovedPlaylistList(CustomBase, ApprovedPlaylistListMixin):
+    pass
+
+
+class ApprovedPlaylistListPlaylistAssocMixin(TimeStampMixin):
+
+    approved_playlist_list_id: Mapped[int] = mapped_column(
+        ForeignKey("approved_playlist_list.id"), primary_key=True, nullable=False
+    )
+    playlist_id: Mapped[int] = mapped_column(
+        ForeignKey("playlist.id"), primary_key=True, nullable=False
+    )
+
+
+class ApprovedPlaylistListPlaylistAssocSync(CustomSyncBase, ApprovedPlaylistListPlaylistAssocMixin):
+    pass
+
+
+class ApprovedPlaylistListPlaylistAssoc(CustomBase, ApprovedPlaylistListPlaylistAssocMixin):
+    pass

{artemis_model-0.1.161 → artemis_model-0.1.163}/artemis_model/organization.py

@@ -42,6 +42,21 @@ class OrganizationMixin(TimeStampMixin):
     def include_pal_setting(cls) -> Mapped["OrganizationIncludePalSetting"]:
         return relationship(back_populates="organization", uselist=False, cascade="all, delete-orphan")
 
+    @declared_attr
+    def approved_playlist_lists(cls) -> Mapped[List["ApprovedPlaylistList"]]:
+        return relationship("ApprovedPlaylistList", back_populates="organization")
+
+    @property
+    def approved_playlists(self) -> List[int]:
+        """
+        Convenience property to get all playlist IDs from all approved lists, flattened.
+        Returns empty list if no approved lists exist.
+        """
+        playlist_ids = []
+        for approved_list in self.approved_playlist_lists:
+            playlist_ids.extend([playlist.id for playlist in approved_list.playlists])
+        return playlist_ids
+
 
 def generate_slug(target: Any, value: Any, old_value: Any, initiator: Any) -> None:
     """Creates a reasonable slug based on organization name."""

{artemis_model-0.1.161 → artemis_model-0.1.163}/artemis_model/redis/__init__.py

@@ -12,6 +12,7 @@ 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,
@@ -22,6 +23,7 @@ from .keys import (
 
 
 __all__ = [
+    "hash_token",
     "ZoneState",
     "NowPlaying",
     "SessionId",

{artemis_model-0.1.161 → artemis_model-0.1.163}/artemis_model/redis/keys.py

@@ -1,17 +1,20 @@
 """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}"
 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"
 KEY_ZONE_SKIPPED_TRACKS_TEMPLATE = "zone_{zone_id}_skipped_tracks"
+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",
     "KEY_ZONE_SCHEDULE_BUCKET_TEMPLATE",
+    "KEY_ZONE_SKIPPED_TRACKS_TEMPLATE",
     "KEY_ZONE_STATE_TEMPLATE",
-    "KEY_ZONE_ACTIVE_DEVICE_TEMPLATE",
 ]

artemis_model-0.1.163/artemis_model/redis/user.py

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

{artemis_model-0.1.161 → artemis_model-0.1.163}/pyproject.toml

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