artemis-model 0.1.87__py3-none-any.whl → 0.1.89__py3-none-any.whl

artemis_model/__init__.py

@@ -14,4 +14,3 @@ 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/redis/__init__.py

@@ -0,0 +1,5 @@
+"""Redis models."""
+
+from .zone_state import ZoneState, NowPlaying, SessionId, BucketId
+
+__all__ = ["ZoneState", "NowPlaying", "SessionId", "BucketId"]

artemis_model/redis/zone_state.py

@@ -0,0 +1,61 @@
+"""Zone state schema."""
+
+
+from dataclasses import Field
+from typing import Annotated, Literal
+
+from pydantic import BaseModel, field_validator
+
+
+class NowPlaying(BaseModel):
+    """Now playing schema."""
+
+    name: str = Field(description="The name of the track", default="UNKNOWN")
+    artist_name: str = Field(description="The artist name of the track", default="UNKNOWN")
+    album_name: str = Field(description="The album name of the track", default="UNKNOWN")
+
+
+SessionId = Annotated[
+    int,
+    Field(
+        description="The session id of the pushed playlist. It's generated as a timestamp value of the current time."
+    ),
+]
+BucketId = Annotated[
+    int | None,
+    Field(
+        description="The bucket id of the pushed playlist. It's calculated in set_bucket_track as the timestamp value of the timeslot."
+    ),
+]
+
+
+
+class ZoneState(BaseModel):
+    """Zone state schema."""
+
+    player_mode: Literal["scheduled", "pushplaylist"] = Field(
+        default="scheduled",
+        description="The mode of the player",
+    )
+    player_state: Literal["playing", "paused", "stopped", "ready"] = Field(
+        default="ready",
+        description="The state of the player",
+    )
+    now_playing: NowPlaying | None = Field(
+        default=None,
+        description="The currently playing track",
+    )
+    push_playlist_details: dict[SessionId, BucketId] | None = Field(
+        default_factory=dict,
+        description="The details of the pushed playlist",
+    )
+
+    @field_validator("push_playlist_details", mode="before")
+    @classmethod
+    def default_empty_dict_if_none(cls, v):
+        """Override none value to empty dict."""
+        return v or {}
+    
+    
+
+__all__ = ["ZoneState", "NowPlaying", "SessionId", "BucketId"]

artemis_model/user.py

@@ -28,14 +28,6 @@ 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.87.dist-info → artemis_model-0.1.89.dist-info}/METADATA

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

{artemis_model-0.1.87.dist-info → artemis_model-0.1.89.dist-info}/RECORD

@@ -1,10 +1,9 @@
-artemis_model/__init__.py,sha256=ppr3Y8tA0RIhszLWNEIL2eIXzj8ho833nbrejsXPuMk,735
+artemis_model/__init__.py,sha256=VwCQjY-_A2WqI4wLdUwVKh8diUOE67qkGK_8KqL665k,692
 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=b_TAh3v9JWGsKCjlWtyljLj8QVnruVWU6L7BEDNGIQQ,2110
 artemis_model/dj_set.py,sha256=-0rU2xOAJ4vecite8yKFmp9yFLPZurFrdFmYAjPHtso,3848
 artemis_model/genre.py,sha256=oMs1ZZfr0SZWmWzW9PEPuaNcatfeIx53nk5M3DPodrQ,1615
 artemis_model/location.py,sha256=T6TlUCXxGyicYtb39dw7XjbCSNECZnMPYahxtOtyEiE,4687
@@ -13,11 +12,13 @@ artemis_model/organization.py,sha256=hu9jKB2qu57BwN0sUUK13p3tC-Hqw9EghFMqjFP9Pr4
 artemis_model/otp.py,sha256=TjZ_EHeIedjsLIqyZTtzd0s6Uc-1dleMEV8DhzsW44o,1046
 artemis_model/permission.py,sha256=sEBRN-bQJl2TNtRJ5LRuySoEbW1lY4DCoyRk0nOM-kY,1503
 artemis_model/playlist.py,sha256=1mR1FbjeG5ZKzILLd7Mo_fuMplEwN3gPCO-jHvkE1WM,6550
+artemis_model/redis/__init__.py,sha256=EHuVa0Bn3AJ9g__8hm39K8MklmBXBr7HKOMpgno1z8w,152
+artemis_model/redis/zone_state.py,sha256=2Kyzco0SdiFmHrIOg8upeDgNe1M3wk1Nrh4uu4md7NY,1746
 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=jGG3FpO6ddehXVl9XWqv4poQH6QQZut48saob3Cy8vU,2467
+artemis_model/user.py,sha256=ZtZVwavSPoQmYM1_MarMULy-DJa2pH482G_G8su0b6c,2211
 artemis_model/zone.py,sha256=iGRUtzUwKh9LHT3MOfzzg1DnkPBts_ZBzZVTi2EmIgs,2282
-artemis_model-0.1.87.dist-info/METADATA,sha256=39Ls_EQEk3eZ_B6R4o1uRnQQ8PWoHzpOyJK_hZiiA_8,3402
-artemis_model-0.1.87.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-artemis_model-0.1.87.dist-info/RECORD,,
+artemis_model-0.1.89.dist-info/METADATA,sha256=mkzW6n0T0TuOW03pJc2mD6pQ8ZXNT72NOkHbpSosKQc,3402
+artemis_model-0.1.89.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+artemis_model-0.1.89.dist-info/RECORD,,

artemis_model/device.py

@@ -1,69 +0,0 @@
-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 that can be controlled by multiple users.
-    """
-    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
-    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 device_user_assoc(cls) -> Mapped[list["DeviceUserAssoc"]]:
-        return relationship(cascade="all, delete-orphan")
-
-    @declared_attr
-    def user_ids(cls) -> Mapped[list["UserAccount"] | None]:
-        return association_proxy(
-            "device_user_assoc",
-            "user",
-            creator=lambda u: DeviceUserAssoc(user_id=u),
-        )
-
-    @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
-    )
-
-
-class DeviceUserAssocSync(CustomSyncBase, DeviceUserAssocMixin):
-    pass
-
-
-class DeviceUserAssoc(CustomBase, DeviceUserAssocMixin):
-    pass