artemis-model 0.1.146__py3-none-any.whl → 0.1.148__py3-none-any.whl

artemis_model/__init__.py

@@ -5,6 +5,7 @@ from artemis_model.category import *  # noqa
 from artemis_model.dj_set import *  # noqa
 from artemis_model.genre import *  # noqa
 from artemis_model.location import *  # noqa
+from artemis_model.location_genre_exclusion import *  # noqa
 from artemis_model.message import *  # noqa
 from artemis_model.organization import *  # noqa
 from artemis_model.playlist import *  # noqa

artemis_model/location.py

@@ -86,6 +86,14 @@ class LocationMixin(TimeStampMixin):
             cascade="all, delete-orphan",
         )
 
+    @declared_attr
+    def genre_exclusions(cls) -> Mapped[list["LocationGenreExclusion"]]:
+        return relationship(
+            "LocationGenreExclusion",
+            back_populates="location",
+            cascade="all, delete-orphan",
+        )
+
     timezone: Mapped[str] = mapped_column(nullable=False, default="America/New_York")
 
 

artemis_model/location_genre_exclusion.py

@@ -0,0 +1,38 @@
+import uuid
+from sqlalchemy import ForeignKey, UniqueConstraint
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.ext.declarative import declared_attr
+
+from artemis_model.base import TimeStampMixin, CustomSyncBase, CustomBase
+
+
+class LocationGenreExclusionMixin(TimeStampMixin):
+    """Association table for tracking which genres are excluded at the location level."""
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    location_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("location.id", ondelete="CASCADE"), nullable=False, index=True
+    )
+    genre_id: Mapped[int] = mapped_column(
+        ForeignKey("genre.id", ondelete="CASCADE"), nullable=False, index=True
+    )
+
+    @declared_attr
+    def location(cls) -> Mapped["Location"]:
+        return relationship(back_populates="genre_exclusions")
+
+    @declared_attr
+    def genre(cls) -> Mapped["Genre"]:
+        return relationship()
+
+    __table_args__ = (
+        UniqueConstraint("location_id", "genre_id", name="unique_location_genre_exclusion"),
+    )
+
+
+class LocationGenreExclusionSync(CustomSyncBase, LocationGenreExclusionMixin):
+    pass
+
+
+class LocationGenreExclusion(CustomBase, LocationGenreExclusionMixin):
+    pass

artemis_model/sqs/messages.py

@@ -66,12 +66,10 @@ class PushPlaylistIn(BaseMessage):
     action: Action = Action.PUSH_PLAYLIST
     zone_id: int
     playlist_ids: list[int]
+    bucket_ts: BucketTS 
     expire_at: datetime | None = Field(
         default=None, description="The datetime that the playlist will expire"
     )
-    bucket_ts: BucketTS = Field(
-        default_factory=lambda: int(datetime.now(timezone.utc).timestamp()),
-    )
 
 
 class PushPlaylistExpireIn(BaseMessage):

{artemis_model-0.1.146.dist-info → artemis_model-0.1.148.dist-info}/METADATA

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

{artemis_model-0.1.146.dist-info → artemis_model-0.1.148.dist-info}/RECORD

@@ -1,4 +1,4 @@
-artemis_model/__init__.py,sha256=zEeAUndIbJdp_M6pFlON_BEehnMaMcTvusijGktpnvk,792
+artemis_model/__init__.py,sha256=Ejibc6nk_vwWCPqRZirhof2Y2t-zeaYvOWyXJLUZsTg,853
 artemis_model/album.py,sha256=9uw9HVNHVBjl-0Dgv-o5MHXhUPwedvbnbzzY3A1cKQg,2077
 artemis_model/artist.py,sha256=vjXlFN2mOEidAzUzxmsAP5GnVTvJUuhFdhQaH214lgw,1563
 artemis_model/auth.py,sha256=0Yg_6N1nj4U31F86u1PE0leIa3D64QlYrsDlavulN6s,4033
@@ -7,7 +7,8 @@ artemis_model/base.py,sha256=zC20m8a1Sa11oEY0ay1iIRQeybGYvXY5p3Vr-pxoKnQ,6802
 artemis_model/category.py,sha256=ERZC8YBTtmF72ykSiVEtf_Ws3mPuN28ECfTxWF7H8tE,1662
 artemis_model/dj_set.py,sha256=fOYnCu4n5TiqyiSojfdFnO7LuPe_mM2SUwBV5xHy2Kc,3782
 artemis_model/genre.py,sha256=8_-IuJS543wIhUVCES3bdrDpKPKx-plDuBKGBcoMIbc,1570
-artemis_model/location.py,sha256=-ovGxYAajdQxNoQvafUBynSgcrdBklynXM7Qe7gmY5c,4645
+artemis_model/location.py,sha256=6Z99OCxhB3VQ4CqNwZP3ShnJ-gOnc5rxGnCn5aCIFZ8,4896
+artemis_model/location_genre_exclusion.py,sha256=SMX4TXmpwn28tytUq7-qP9ZyJ_ULs5SUv4h7sU0dRFo,1252
 artemis_model/message.py,sha256=W4vhllsD4Nn11JIKeXlgsKC2NWCt3UMkWh-Sma71gBI,3325
 artemis_model/organization.py,sha256=yjGHJLTOtb9PUfxSPal782Rceb8xb8vftXX67tHRNqc,2351
 artemis_model/otp.py,sha256=guIRGtyFlHUBthCAEsTh5_Hs-1yiGN_qfEO4uHNcv4s,1017
@@ -22,11 +23,11 @@ artemis_model/redis/zone_state.py,sha256=2ITvK40NcI1gEXu7ImnT05HeqU2-ep2gFoD-oH_
 artemis_model/schedule.py,sha256=CkLHWz-BwvUY2EQCfoU4SymgCariPzoQdtRLITqBPmk,2451
 artemis_model/setting.py,sha256=EWzOmE31mLNWwmV_wmqttHPMycvQZW7SJUIozF2b8bo,1190
 artemis_model/sqs/__init__.py,sha256=nHpXQns64qQ5Cqjyo6w9fDGO_wWhprqn1bhKf3eWnio,17
-artemis_model/sqs/messages.py,sha256=VVgjofwFkO9XhBKK64OiD3vEySex613HWWz3Xv0STe0,2989
+artemis_model/sqs/messages.py,sha256=AfCiD2-xHAzr_uUFiuLJlbZ2JJeztZq2RE_0wKNvrl0,2898
 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.146.dist-info/METADATA,sha256=WlIqdM6C2vsOrptsswJh9r0HpHjcdSUxbHpkkCXc0Ow,3445
-artemis_model-0.1.146.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-artemis_model-0.1.146.dist-info/RECORD,,
+artemis_model-0.1.148.dist-info/METADATA,sha256=rzxZwL6haqnmDmoARazFKxNkJ9hqnccEWmbV2Sf09sc,3445
+artemis_model-0.1.148.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+artemis_model-0.1.148.dist-info/RECORD,,