artemis-model 0.1.81__py3-none-any.whl → 0.1.83__py3-none-any.whl

artemis_model/__init__.py

@@ -14,3 +14,4 @@ from artemis_model.track import *  # noqa
 from artemis_model.user import *  # noqa
 from artemis_model.zone import *  # noqa
 from artemis_model.otp import *  # noqa
+from artemis_model.device import *  # noqa

artemis_model/device.py

@@ -0,0 +1,69 @@
+import enum
+import uuid
+from datetime import datetime
+
+from sqlalchemy import JSON, UUID, ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.ext.declarative import declared_attr
+from sqlalchemy.ext.associationproxy import association_proxy
+
+from artemis_model.base import CustomSyncBase, CustomBase, TimeStampMixin
+
+
+class DeviceMixin(TimeStampMixin):
+    """
+    Represents a Jukebox device associated with zone that can be controlled by multiple users.
+    """
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    zone_id: Mapped[int] = mapped_column(ForeignKey("zone.id"), nullable=False, index=True)
+    
+    device_id: Mapped[str] = mapped_column(nullable=False, unique=True, index=True)
+    name: Mapped[str] = mapped_column(nullable=False)  # e.g., "Living Room Jukebox"
+    fcm_token: Mapped[str | None] = mapped_column(nullable=True)
+    device_specs: Mapped[dict] = mapped_column(JSON, nullable=True)  # control_mode can be stored here
+
+    @declared_attr
+    def zone(cls) -> Mapped["Zone"]:
+        return relationship(back_populates="devices")
+
+    @declared_attr
+    def device_user_assoc(cls) -> Mapped[list["DeviceUserAssoc"]]:
+        return relationship(cascade="all, delete-orphan")
+
+    @declared_attr
+    def users(cls) -> Mapped[list["User"]]:
+        return relationship(
+            secondary="device_user_assoc", 
+            viewonly=True
+        )
+
+
+class DeviceSync(CustomSyncBase, DeviceMixin):
+    pass
+
+
+class Device(CustomBase, DeviceMixin):
+    pass
+
+
+class DeviceUserAssocMixin(TimeStampMixin):
+    """
+    Association table for many-to-many relationship between UserAccount and Device.
+    """
+
+    device_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("device.id"), primary_key=True, nullable=False
+    )
+    user_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("user.id"), primary_key=True, nullable=False
+    )
+
+    last_seen: Mapped[datetime] = mapped_column(nullable=False, default=datetime.now)
+
+
+class DeviceUserAssocSync(CustomSyncBase, DeviceUserAssocMixin):
+    pass
+
+
+class DeviceUserAssoc(CustomBase, DeviceUserAssocMixin):
+    pass

artemis_model/playlist.py

@@ -30,21 +30,6 @@ class FavoritePlaylist(CustomBase, FavoritePlaylistMixin):
     pass
 
 
-class OrganizationApprovedPlaylistMixin(TimeStampMixin):
-    playlist_id: Mapped[int] = mapped_column(
-        ForeignKey("playlist.id"), primary_key=True
-    )
-    organization_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("organization.id"), primary_key=True)
-
-
-class OrganizationApprovedPlaylistSync(CustomSyncBase, OrganizationApprovedPlaylistMixin):
-    pass
-
-
-class OrganizationApprovedPlaylist(CustomBase, OrganizationApprovedPlaylistMixin):
-    pass
-
-
 class PlaylistMixin(TimeStampMixin):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     name: Mapped[str] = mapped_column(nullable=False, unique=True)
@@ -77,24 +62,10 @@ class PlaylistMixin(TimeStampMixin):
             lazy="select"
         )
 
-    @declared_attr
-    def org_approved_playlist_associations(cls):
-        return relationship(
-            "OrganizationApprovedPlaylist",
-            primaryjoin="and_(OrganizationApprovedPlaylist.playlist_id == Playlist.id)",
-            viewonly=True,
-            lazy="select"
-        )
-
     @hybrid_property
     def is_favorite(self):
         return bool(self.favorite_playlist_associations)
 
-    @hybrid_property
-    def is_org_approved(self):
-        return bool(self.org_approved_playlist_associations)
-
-
     @declared_attr
     def category_playlist_associations(cls) -> Mapped[
         list["PlaylistCategoryAssoc"]

artemis_model/user.py

@@ -28,6 +28,14 @@ class UserMixin(TimeStampMixin):
             cascade="all, delete-orphan",
         )
 
+    @declared_attr
+    def devices(cls) -> Mapped[list["Device"]]:
+        return relationship(
+            "Device",
+            secondary="device_user_assoc",  # Directly reference the association table
+            back_populates="users",
+        )
+    
     @declared_attr
     def user_permission_associations(cls) -> Mapped[List["UserPermissionAssoc"]]:
         return relationship(

artemis_model/zone.py

@@ -39,6 +39,10 @@ class ZoneMixin(TimeStampMixin):
     @declared_attr
     def setting(cls) -> Mapped["Setting"]:
         return relationship(back_populates="zone", uselist=False)
+    
+    @declared_attr
+    def devices(cls) -> Mapped[list["Device"]]:
+        return relationship(back_populates="zone")
 
 
 class ZoneSync(CustomSyncBase, ZoneMixin):

{artemis_model-0.1.81.dist-info → artemis_model-0.1.83.dist-info}/METADATA

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

{artemis_model-0.1.81.dist-info → artemis_model-0.1.83.dist-info}/RECORD

@@ -1,9 +1,10 @@
-artemis_model/__init__.py,sha256=VwCQjY-_A2WqI4wLdUwVKh8diUOE67qkGK_8KqL665k,692
+artemis_model/__init__.py,sha256=ppr3Y8tA0RIhszLWNEIL2eIXzj8ho833nbrejsXPuMk,735
 artemis_model/album.py,sha256=cnjrE0catTK24uWTrAoRcZUQB3CPt5l8s9PeM2sxLrc,2103
 artemis_model/artist.py,sha256=Mx2bnl7bxqm2ELjDIePGFfIkQU_DbnfOTc507dzh14g,1577
 artemis_model/auth.py,sha256=WVonoYbCE0uvRuPR2Fz1hZJ-xmbyTuBVt6H51X6OfEs,4087
 artemis_model/base.py,sha256=21Isonytb_iWfmde4u8LiU6a27h7mkgnwncTAKi9ezY,6768
 artemis_model/category.py,sha256=jhCZrK-LxPmc0pXmVifAZWdCENssBTzdTmC3nqqZc6s,1761
+artemis_model/device.py,sha256=VWIQ9kMBp2QiRlz6BOiP1je1bEalHsXy3ic70VsfN3w,2190
 artemis_model/dj_set.py,sha256=-0rU2xOAJ4vecite8yKFmp9yFLPZurFrdFmYAjPHtso,3848
 artemis_model/genre.py,sha256=oMs1ZZfr0SZWmWzW9PEPuaNcatfeIx53nk5M3DPodrQ,1615
 artemis_model/location.py,sha256=T6TlUCXxGyicYtb39dw7XjbCSNECZnMPYahxtOtyEiE,4687
@@ -11,12 +12,12 @@ artemis_model/message.py,sha256=gua3X_1hS7akmS42wQGtL0I-FCJUHdTBM4n2DW4hTxQ,3280
 artemis_model/organization.py,sha256=hu9jKB2qu57BwN0sUUK13p3tC-Hqw9EghFMqjFP9Pr4,2387
 artemis_model/otp.py,sha256=TjZ_EHeIedjsLIqyZTtzd0s6Uc-1dleMEV8DhzsW44o,1046
 artemis_model/permission.py,sha256=sEBRN-bQJl2TNtRJ5LRuySoEbW1lY4DCoyRk0nOM-kY,1503
-artemis_model/playlist.py,sha256=AfpKo5LHm-R-LomkqBmOFliQRLGH4zbBDWSs1uZvGz0,7422
+artemis_model/playlist.py,sha256=1mR1FbjeG5ZKzILLd7Mo_fuMplEwN3gPCO-jHvkE1WM,6550
 artemis_model/schedule.py,sha256=pnoKDMlUh28o61I7kZddNYn6z-uqOt_ml1nbWxKVeRM,1722
 artemis_model/setting.py,sha256=McWbeDZP45km3VSSwP1BgAmmjO4qCL0pTnOmJVAz0WI,1265
 artemis_model/track.py,sha256=x8BHKDZl9uQmQH6DWpzH-SEsfecLghOBdBT7qXgN3d0,3865
-artemis_model/user.py,sha256=ZtZVwavSPoQmYM1_MarMULy-DJa2pH482G_G8su0b6c,2211
-artemis_model/zone.py,sha256=iGRUtzUwKh9LHT3MOfzzg1DnkPBts_ZBzZVTi2EmIgs,2282
-artemis_model-0.1.81.dist-info/METADATA,sha256=cY6JdsyVE0NQv13eR5-yVq9KnPEl4O6PQb0bHttuCnk,3402
-artemis_model-0.1.81.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-artemis_model-0.1.81.dist-info/RECORD,,
+artemis_model/user.py,sha256=jGG3FpO6ddehXVl9XWqv4poQH6QQZut48saob3Cy8vU,2467
+artemis_model/zone.py,sha256=p0fWoWbTTX4-Qrjs6QWIpUMktpx3toQPLnKKcz53aYw,2405
+artemis_model-0.1.83.dist-info/METADATA,sha256=XxOFn6yW6HwGM-aTVnpmlmmzXXgGan0dwBJ17E2Nb6I,3402
+artemis_model-0.1.83.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+artemis_model-0.1.83.dist-info/RECORD,,

{artemis_model-0.1.81.dist-info → artemis_model-0.1.83.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any