artemis-model 0.1.81__tar.gz → 0.1.83__tar.gz

{artemis_model-0.1.81 → artemis_model-0.1.83}/PKG-INFO

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

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