artemis-model 0.1.89__tar.gz → 0.1.91__tar.gz

{artemis_model-0.1.89 → artemis_model-0.1.91}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: artemis-model
-Version: 0.1.89
+Version: 0.1.91
 Summary: 
 Author: Jukeboxy
 Requires-Python: >=3.10.6,<4.0.0
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: alembic (>=1.13.1,<2.0.0)
 Requires-Dist: asyncpg (>=0.29.0,<0.30.0)
 Requires-Dist: greenlet (>=3.0.2,<4.0.0)
+Requires-Dist: pydantic (>=2.10.2,<3.0.0)
 Requires-Dist: python-slugify (>=8.0.4,<9.0.0)
 Requires-Dist: sqlalchemy (>=2.0.23,<3.0.0)
 Description-Content-Type: text/markdown

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/album.py

@@ -19,9 +19,7 @@ class AlbumMixin(TimeStampMixin):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     name: Mapped[str] = mapped_column(nullable=False)
     description: Mapped[str | None] = mapped_column(nullable=True)
-    entry_date: Mapped[datetime] = mapped_column(
-        nullable=False, default=datetime.utcnow
-    )
+    entry_date: Mapped[datetime] = mapped_column(nullable=False, default=datetime.utcnow)
     disabled: Mapped[bool] = mapped_column(nullable=False, default=False)
     legacy_id: Mapped[str] = mapped_column(nullable=False)
     is_internal: Mapped[bool] = mapped_column(nullable=False, default=False)
@@ -45,7 +43,7 @@ class AlbumMixin(TimeStampMixin):
             "Track",
             back_populates="album",
             cascade="all, delete-orphan",
-    )
+        )
 
 
 class AlbumSync(CustomSyncBase, AlbumMixin):
@@ -56,10 +54,8 @@ class Album(CustomBase, AlbumMixin):
     pass
 
 
-class AlbumArtistAssocMixin():
-    album_id: Mapped[int] = mapped_column(
-        ForeignKey("album.id"), primary_key=True, nullable=False
-    )
+class AlbumArtistAssocMixin:
+    album_id: Mapped[int] = mapped_column(ForeignKey("album.id"), primary_key=True, nullable=False)
     artist_id: Mapped[int] = mapped_column(
         ForeignKey("artist.id"), primary_key=True, nullable=False
     )

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/artist.py

@@ -18,9 +18,7 @@ def to_tsvector_ix(*columns):
 class ArtistMixin(TimeStampMixin):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     name: Mapped[str] = mapped_column(nullable=False)
-    entry_date: Mapped[datetime] = mapped_column(
-        nullable=False, default=datetime.utcnow
-    )
+    entry_date: Mapped[datetime] = mapped_column(nullable=False, default=datetime.utcnow)
     disabled: Mapped[bool] = mapped_column(nullable=False, default=False)
     is_internal: Mapped[bool] = mapped_column(nullable=False, default=False)
     legacy_id: Mapped[str] = mapped_column(nullable=False)

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/auth.py

@@ -1,4 +1,5 @@
 """Auth models."""
+
 import uuid
 from datetime import datetime
 from typing import Optional
@@ -16,9 +17,7 @@ class UserUnverifiedAccountMixin(TimeStampMixin):
     been verified. Once the user has been verified, the account will be moved to the UserAccount table.
     """
 
-    id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
-    )
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     email: Mapped[str] = mapped_column(index=True)
     name: Mapped[str] = mapped_column(nullable=False)
     mobile: Mapped[str] = mapped_column(nullable=True, index=True)
@@ -43,14 +42,10 @@ class UserAccountMixin(TimeStampMixin):
     This table is used to store the account info of users who have been verified.
     """
 
-    id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
-    )
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     email: Mapped[str] = mapped_column(index=True, unique=True)
     name: Mapped[str] = mapped_column(nullable=False)
-    mobile: Mapped[Optional[str]] = mapped_column(
-        nullable=True, unique=True, index=True
-    )
+    mobile: Mapped[Optional[str]] = mapped_column(nullable=True, unique=True, index=True)
     password = mapped_column(LargeBinary, nullable=True)
     provider: Mapped[str] = mapped_column(nullable=False)
     oauth_id: Mapped[Optional[str]] = mapped_column(nullable=True, index=True)
@@ -84,9 +79,8 @@ class LoginHistoryMixin:
     """
     This table is used to store the login history of users.
     """
-    id: Mapped[int] = mapped_column(
-        primary_key=True, autoincrement=True, nullable=False
-    )
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True, nullable=False)
     account_id: Mapped[uuid.UUID] = mapped_column(
         ForeignKey("user_account.id"), nullable=False, index=True
     )

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/base.py

@@ -2,8 +2,14 @@ import re
 from datetime import datetime
 from typing import Any
 
-from sqlalchemy.orm import (DeclarativeBase, Mapped, declared_attr,
-                            mapped_column, object_session, relationship)
+from sqlalchemy.orm import (
+    DeclarativeBase,
+    Mapped,
+    declared_attr,
+    mapped_column,
+    object_session,
+    relationship,
+)
 from sqlalchemy.ext.asyncio import AsyncAttrs
 from sqlalchemy import Column, Uuid, event, inspect, TypeDecorator
 from sqlalchemy.dialects.postgresql import TSVECTOR
@@ -45,8 +51,9 @@ class CustomBase(DeclarativeBase, AsyncAttrs):
         for key in self.__repr_attrs__:
             if not hasattr(self, key):
                 raise KeyError(
-                    "{} has incorrect attribute '{}' in "
-                    "__repr__attrs__".format(self.__class__, key)
+                    "{} has incorrect attribute '{}' in " "__repr__attrs__".format(
+                        self.__class__, key
+                    )
                 )
             value = getattr(self, key)
             wrap_in_quote = isinstance(value, str)
@@ -191,8 +198,9 @@ class CustomSyncBase(DeclarativeBase):
         for key in self.__repr_attrs__:
             if not hasattr(self, key):
                 raise KeyError(
-                    "{} has incorrect attribute '{}' in "
-                    "__repr__attrs__".format(self.__class__, key)
+                    "{} has incorrect attribute '{}' in " "__repr__attrs__".format(
+                        self.__class__, key
+                    )
                 )
             value = getattr(self, key)
             wrap_in_quote = isinstance(value, str)

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/dj_set.py

@@ -37,9 +37,7 @@ class DjSetMixin(TimeStampMixin, AuditMixin):
     organization_id: Mapped[uuid.UUID] = mapped_column(
         ForeignKey("organization.id"), nullable=True, index=True
     )
-    entry_date: Mapped[datetime] = mapped_column(
-        nullable=False, default=datetime.utcnow
-    )
+    entry_date: Mapped[datetime] = mapped_column(nullable=False, default=datetime.utcnow)
     cover_image: Mapped[str] = mapped_column(nullable=True)
     disabled: Mapped[bool] = mapped_column(nullable=False, default=False)
     legacy_id: Mapped[str] = mapped_column(nullable=True)
@@ -62,7 +60,9 @@ class DjSetMixin(TimeStampMixin, AuditMixin):
         return association_proxy(
             "dj_set_genre_associations",
             "genre",
-            creator=lambda genre: DjSetGenreAssoc(genre_id=genre.get("id"), weight=genre.get("weight", 0)),
+            creator=lambda genre: DjSetGenreAssoc(
+                genre_id=genre.get("id"), weight=genre.get("weight", 0)
+            ),
         )
 
     @declared_attr
@@ -71,24 +71,16 @@ class DjSetMixin(TimeStampMixin, AuditMixin):
 
     @declared_attr
     def dj_set_track_associations(cls) -> Mapped[list["DjSetTrackAssoc"]]:
-        return relationship(
-            cascade="all, delete-orphan"
-        )
+        return relationship(cascade="all, delete-orphan")
 
     @declared_attr
     def genres(cls) -> Mapped[list["Genre"]]:
-        return relationship(
-            secondary="dj_set_genre_assoc",
-            lazy="joined",
-            viewonly=True
-        )
+        return relationship(secondary="dj_set_genre_assoc", lazy="joined", viewonly=True)
 
 
 @declared_attr
 def tracks(cls) -> Mapped[list["Track"]]:
-    return relationship(
-        secondary="dj_set_track_assoc", viewonly=True
-    )
+    return relationship(secondary="dj_set_track_assoc", viewonly=True)
 
 
 class DjSetSync(CustomSyncBase, DjSetMixin):

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/genre.py

@@ -1,4 +1,3 @@
-
 from sqlalchemy import Computed, func, literal, text
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -26,15 +25,11 @@ class GenreMixin(TimeStampMixin):
 
     @declared_attr
     def tracks(cls) -> Mapped[list["Track"]]:
-        return relationship(
-            "Track", secondary="track_genre_assoc", back_populates="genres"
-        )
+        return relationship("Track", secondary="track_genre_assoc", back_populates="genres")
 
     @declared_attr
     def dj_set_genre_associations(cls) -> Mapped[list["DjSetGenreAssoc"]]:
-        return relationship(
-            back_populates="genre", cascade="all, delete-orphan"
-        )
+        return relationship(back_populates="genre", cascade="all, delete-orphan")
 
     def dj_sets(cls) -> Mapped[list["DjSet"]]:
         return relationship("DjSet", secondary="dj_set_genre_assoc", back_populates="genre")

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/location.py

@@ -38,9 +38,7 @@ class Address(CustomBase, AddressMixin):
 
 
 class LocationMixin(TimeStampMixin):
-    id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
-    )
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     name: Mapped[str] = mapped_column(nullable=False)
     slug: Mapped[str] = mapped_column(nullable=False)
     organization_id: Mapped[uuid.UUID] = mapped_column(
@@ -113,9 +111,7 @@ listen(Location.name, "set", generate_slug)
 
 class LocationGroupMixin(TimeStampMixin):
     id: Mapped[int] = mapped_column(autoincrement=True, primary_key=True)
-    organization_id = mapped_column(
-        ForeignKey("organization.id"), nullable=False, index=True
-    )
+    organization_id = mapped_column(ForeignKey("organization.id"), nullable=False, index=True)
     name: Mapped[str] = mapped_column(nullable=False)
     description: Mapped[str] = mapped_column(nullable=True)
     disabled: Mapped[bool] = mapped_column(nullable=False, default=False)
@@ -136,9 +132,7 @@ class LocationGroup(CustomBase, LocationGroupMixin):
 
 
 class UserLocationAssocMixin(TimeStampMixin):
-    location_id: Mapped[uuid.UUID] = mapped_column(
-        ForeignKey("location.id"), primary_key=True
-    )
+    location_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("location.id"), primary_key=True)
     user_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("user.id"), primary_key=True)
 
     @declared_attr

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/message.py

@@ -12,13 +12,18 @@ class MessageMixin(TimeStampMixin, AuditMixin):
     """
     This table is used to store the message.
     """
+
     id: Mapped[int] = mapped_column(autoincrement=True, primary_key=True, index=True)
     name: Mapped[str] = mapped_column(nullable=False)
     disabled: Mapped[bool] = mapped_column(nullable=False, default=False)
     s3_link: Mapped[str] = mapped_column(nullable=False)
 
-    organization_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("organization.id"), nullable=False, index=True)
-    message_group_id: Mapped[int] = mapped_column(ForeignKey("message_group.id"), nullable=True, index=True, default=None)
+    organization_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("organization.id"), nullable=False, index=True
+    )
+    message_group_id: Mapped[int] = mapped_column(
+        ForeignKey("message_group.id"), nullable=True, index=True, default=None
+    )
 
     @declared_attr
     def organization(cls) -> Mapped["Organization"]:
@@ -47,6 +52,7 @@ class MessagePlayDetailMixin(TimeStampMixin, AuditMixin):
     Frequency is used only for rotated messages.
     Timesheet is used only for scheduled messages.
     """
+
     id: Mapped[int] = mapped_column(autoincrement=True, primary_key=True, index=True)
     message_id: Mapped[int] = mapped_column(ForeignKey("message.id"), nullable=False, index=True)
     zone_id: Mapped[int] = mapped_column(ForeignKey("zone.id"), index=True)
@@ -76,9 +82,12 @@ class MessageGroupMixin(TimeStampMixin, AuditMixin):
     """
     This table is used to store the message group.
     """
+
     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)
+    organization_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey("organization.id"), nullable=False, index=True
+    )
 
     @declared_attr
     def organization(cls) -> Mapped["Organization"]:

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/organization.py

@@ -12,9 +12,7 @@ from sqlalchemy.ext.declarative import declared_attr
 
 
 class OrganizationMixin(TimeStampMixin):
-    id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
-    )
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     name: Mapped[str] = mapped_column(nullable=False)
     description: Mapped[str | None] = mapped_column(nullable=True)
     slug: Mapped[str] = mapped_column(nullable=False, index=True)
@@ -30,9 +28,7 @@ class OrganizationMixin(TimeStampMixin):
 
     @declared_attr
     def users(cls) -> Mapped[List["User"]]:
-        return relationship(
-            secondary="organization_user_assoc", back_populates="organizations"
-        )
+        return relationship(secondary="organization_user_assoc", back_populates="organizations")
 
     @declared_attr
     def messages(cls) -> Mapped[List["Message"]]:

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/otp.py

@@ -1,4 +1,3 @@
-
 import uuid
 from datetime import datetime
 from sqlalchemy.orm import Mapped, mapped_column
@@ -12,18 +11,14 @@ class OtpMixin(TimeStampMixin):
     requested_by can be an UserAccount or UserUnverifiedAccount id.
     """
 
-    id: Mapped[int] = mapped_column(
-        primary_key=True, autoincrement=True, nullable=False
-    )
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True, nullable=False)
     code: Mapped[str] = mapped_column(nullable=False)
     purpose: Mapped[str] = mapped_column(nullable=False)
     requested_by_id: Mapped[uuid.UUID] = mapped_column(nullable=False, index=True)
     method: Mapped[str] = mapped_column(nullable=False, index=True)
     secret: Mapped[str] = mapped_column(nullable=False)
     created_at: Mapped[datetime] = mapped_column(default=datetime.utcnow, index=True)
-    updated_at: Mapped[datetime] = mapped_column(
-        default=datetime.utcnow, onupdate=datetime.utcnow
-    )
+    updated_at: Mapped[datetime] = mapped_column(default=datetime.utcnow, onupdate=datetime.utcnow)
 
 
 class OtpSync(CustomSyncBase, OtpMixin):

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/permission.py

@@ -10,27 +10,21 @@ from sqlalchemy.ext.declarative import declared_attr
 
 
 class PermissionMixin(TimeStampMixin):
-    id: Mapped[str] = mapped_column(
-         primary_key=True
-    )
+    id: Mapped[str] = mapped_column(primary_key=True)
     name: Mapped[str] = mapped_column(nullable=False)
     description: Mapped[str] = mapped_column(nullable=False)
-    type: Mapped[str] = mapped_column(nullable=False)  # music-management, player-management, user-management
+    type: Mapped[str] = mapped_column(
+        nullable=False
+    )  # music-management, player-management, user-management
 
     @declared_attr
     def user_permission_associations(cls) -> Mapped[List["UserPermissionAssoc"]]:
-        return relationship(
-            back_populates="permission", cascade="all, delete-orphan"
-        )
+        return relationship(back_populates="permission", cascade="all, delete-orphan")
 
 
 class UserPermissionAssocMixin(TimeStampMixin):
-    user_id: Mapped[uuid.UUID] = mapped_column(
-        ForeignKey("user.id"), primary_key=True
-    )
-    permission_id: Mapped[uuid.UUID] = mapped_column(
-        ForeignKey("permission.id"), primary_key=True
-    )
+    user_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("user.id"), primary_key=True)
+    permission_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("permission.id"), primary_key=True)
 
     @declared_attr
     def permission(cls) -> Mapped["Permission"]:

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/playlist.py

@@ -16,9 +16,7 @@ def to_tsvector_ix(*columns):
 
 
 class FavoritePlaylistMixin:
-    playlist_id: Mapped[int] = mapped_column(
-        ForeignKey("playlist.id"), primary_key=True
-    )
+    playlist_id: Mapped[int] = mapped_column(ForeignKey("playlist.id"), primary_key=True)
     user_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("user.id"), primary_key=True)
 
 
@@ -33,9 +31,7 @@ class FavoritePlaylist(CustomBase, FavoritePlaylistMixin):
 class PlaylistMixin(TimeStampMixin):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     name: Mapped[str] = mapped_column(nullable=False, unique=True)
-    entry_date: Mapped[datetime] = mapped_column(
-        nullable=False, default=datetime.utcnow
-    )
+    entry_date: Mapped[datetime] = mapped_column(nullable=False, default=datetime.utcnow)
     disabled: Mapped[bool] = mapped_column(nullable=False, default=False)
     legacy_id: Mapped[str] = mapped_column(nullable=True)
     is_published: Mapped[bool] = mapped_column(default=False)  # legacy isTest
@@ -59,7 +55,7 @@ class PlaylistMixin(TimeStampMixin):
             "FavoritePlaylist",
             primaryjoin="and_(FavoritePlaylist.playlist_id == Playlist.id)",
             viewonly=True,
-            lazy="select"
+            lazy="select",
         )
 
     @hybrid_property
@@ -67,21 +63,15 @@ class PlaylistMixin(TimeStampMixin):
         return bool(self.favorite_playlist_associations)
 
     @declared_attr
-    def category_playlist_associations(cls) -> Mapped[
-        list["PlaylistCategoryAssoc"]
-    ]:
+    def category_playlist_associations(cls) -> Mapped[list["PlaylistCategoryAssoc"]]:
         return relationship(cascade="all, delete-orphan")
 
     @declared_attr
     def track_playlist_associations(cls) -> Mapped[list["PlaylistTrackAssoc"]]:
-        return relationship(
-            cascade="all, delete-orphan"
-        )
+        return relationship(cascade="all, delete-orphan")
 
     @declared_attr
-    def organization_playlist_associations(cls) -> Mapped[
-        list["PlaylistOrganizationAssoc"]
-    ]:
+    def organization_playlist_associations(cls) -> Mapped[list["PlaylistOrganizationAssoc"]]:
         return relationship(cascade="all, delete-orphan")
 
     @declared_attr
@@ -110,15 +100,11 @@ class PlaylistMixin(TimeStampMixin):
 
     @declared_attr
     def tracks(cls) -> Mapped[list["Track"]]:
-        return relationship(
-            secondary="playlist_track_assoc", viewonly=True
-        )
+        return relationship(secondary="playlist_track_assoc", viewonly=True)
 
     @declared_attr
     def categories(cls) -> Mapped[list["Category"]]:
-        return relationship(
-            secondary="playlist_category_assoc", viewonly=True
-        )
+        return relationship(secondary="playlist_category_assoc", viewonly=True)
 
     # __table_args__ = (
     #     Index(
@@ -176,18 +162,14 @@ class PlaylistTrackAssoc(CustomBase, PlaylistTrackAssocMixin):
 
 
 class PlaylistCategoryAssocMixin(TimeStampMixin):
-    playlist_id = mapped_column(
-        ForeignKey("playlist.id"), primary_key=True, nullable=False
-    )
+    playlist_id = mapped_column(ForeignKey("playlist.id"), primary_key=True, nullable=False)
     category_id: Mapped[int] = mapped_column(
         ForeignKey("category.id"), primary_key=True, nullable=False
     )
 
     @declared_attr
     def category(cls) -> Mapped["Category"]:
-        return relationship(
-            back_populates="category_playlist_associations"
-        )
+        return relationship(back_populates="category_playlist_associations")
 
 
 class PlaylistCategoryAssocSync(CustomSyncBase, PlaylistCategoryAssocMixin):

artemis_model-0.1.91/artemis_model/redis/__init__.py

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

artemis_model-0.1.91/artemis_model/redis/device.py

@@ -0,0 +1,22 @@
+"""Active device redis model."""
+
+from datetime import datetime, timezone
+from typing import Literal
+from uuid import UUID
+
+from pydantic import BaseModel, Field
+
+
+class ActiveDevice(BaseModel):
+    """Active device schema."""
+
+    user_id: UUID
+    client_id: str
+    device_id: str
+    mode: Literal["player-mode", "controller-mode"]
+    connected_at: datetime | str = Field(
+        default_factory=lambda: datetime.now(timezone.utc).isoformat()
+    )
+
+
+__all__ = ["ActiveDevice"]

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/redis/zone_state.py

@@ -1,10 +1,8 @@
 """Zone state schema."""
 
-
-from dataclasses import Field
 from typing import Annotated, Literal
 
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, Field, field_validator
 
 
 class NowPlaying(BaseModel):
@@ -29,7 +27,6 @@ BucketId = Annotated[
 ]
 
 
-
 class ZoneState(BaseModel):
     """Zone state schema."""
 
@@ -55,7 +52,6 @@ class ZoneState(BaseModel):
     def default_empty_dict_if_none(cls, v):
         """Override none value to empty dict."""
         return v or {}
-    
-    
+
 
 __all__ = ["ZoneState", "NowPlaying", "SessionId", "BucketId"]

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/setting.py

@@ -8,26 +8,27 @@ from sqlalchemy.ext.declarative import declared_attr
 
 class SettingMixin(TimeStampMixin):
     """
-        Exclusion Schema
-        {
-            "genres": {
-                "<genre_id>": "<genre_name>",
-                "<genre_id>": "<genre_name>",
-                ...
-            },
-            "artists": {
-                "<artist_id>": "<artist_name>",
-                "<artist_id>": "<artist_name>",
-                ...
-            },
-            "tracks": {
-                "<track_id>": "<track_name>",
-                "<track_id>": "<track_name>",
-                ...
-            },
-            "exclude_pal": True/False
-        }
+    Exclusion Schema
+    {
+        "genres": {
+            "<genre_id>": "<genre_name>",
+            "<genre_id>": "<genre_name>",
+            ...
+        },
+        "artists": {
+            "<artist_id>": "<artist_name>",
+            "<artist_id>": "<artist_name>",
+            ...
+        },
+        "tracks": {
+            "<track_id>": "<track_name>",
+            "<track_id>": "<track_name>",
+            ...
+        },
+        "exclude_pal": True/False
+    }
     """
+
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     zone_id: Mapped[int] = mapped_column(ForeignKey("zone.id"), index=True)
     exclusion: Mapped[JSON] = mapped_column(JSON, nullable=True)

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/track.py

@@ -16,17 +16,11 @@ def to_tsvector_ix(*columns):
 
 
 class TrackMixin(TimeStampMixin):
-    id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
-    )
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     name: Mapped[str] = mapped_column(nullable=False)
     album_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("album.id"), nullable=False)
-    artist_id: Mapped[uuid.UUID] = mapped_column(
-        ForeignKey("artist.id"), nullable=False
-    )
-    entry_date: Mapped[datetime] = mapped_column(
-        nullable=False, default=datetime.utcnow
-    )
+    artist_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("artist.id"), nullable=False)
+    entry_date: Mapped[datetime] = mapped_column(nullable=False, default=datetime.utcnow)
     disabled: Mapped[bool] = mapped_column(nullable=False, default=False)
     legacy_id: Mapped[str] = mapped_column(nullable=False)
     is_internal: Mapped[bool] = mapped_column(nullable=False, default=False)
@@ -42,15 +36,11 @@ class TrackMixin(TimeStampMixin):
 
     @declared_attr
     def track_playlist_associations(cls) -> Mapped[list["PlaylistTrackAssoc"]]:
-        return relationship(
-            back_populates="track", cascade="all, delete-orphan"
-        )
+        return relationship(back_populates="track", cascade="all, delete-orphan")
 
     @declared_attr
     def dj_set_track_associations(cls) -> Mapped[list["DjSetTrackAssoc"]]:
-        return relationship(
-            back_populates="track", cascade="all, delete-orphan"
-        )
+        return relationship(back_populates="track", cascade="all, delete-orphan")
 
     @declared_attr
     def album(cls) -> Mapped["Album"]:
@@ -62,9 +52,7 @@ class TrackMixin(TimeStampMixin):
 
     @declared_attr
     def genres(cls) -> Mapped[List["Genre"]]:
-        return relationship(
-            "Genre", secondary="track_genre_assoc", back_populates="tracks"
-        )
+        return relationship("Genre", secondary="track_genre_assoc", back_populates="tracks")
 
     @declared_attr
     def label(cls) -> Mapped["TrackLabel"]:

{artemis_model-0.1.89 → artemis_model-0.1.91}/artemis_model/user.py

@@ -14,9 +14,7 @@ class UserMixin(TimeStampMixin):
     This table is used to store the user itself.
     """
 
-    id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
-    )
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     account_id: Mapped[uuid.UUID] = mapped_column(
         ForeignKey("user_account.id"), nullable=False, index=True
     )
@@ -40,15 +38,11 @@ class UserMixin(TimeStampMixin):
 
     @declared_attr
     def organizations(cls) -> Mapped[List["Organization"]]:
-        return relationship(
-            secondary="organization_user_assoc", back_populates="users"
-        )
+        return relationship(secondary="organization_user_assoc", back_populates="users")
 
     @declared_attr
     def locations(cls) -> Mapped[List["Location"]]:
-        return relationship(
-            secondary="user_location_assoc", viewonly=True
-        )
+        return relationship(secondary="user_location_assoc", viewonly=True)
 
     @declared_attr
     def permission_ids(cls) -> AssociationProxy[List["Permission"] | None]:
@@ -60,9 +54,7 @@ class UserMixin(TimeStampMixin):
 
     @declared_attr
     def permissions(cls) -> Mapped[list["Permission"]]:
-        return relationship(
-            secondary="user_permission_assoc", viewonly=True
-        )
+        return relationship(secondary="user_permission_assoc", viewonly=True)
 
 
 class UserSync(CustomSyncBase, UserMixin):

{artemis_model-0.1.89 → artemis_model-0.1.91}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "artemis-model"
-version = "0.1.89"
+version = "0.1.91"
 description = ""
 authors = ["Jukeboxy"]
 readme = "README.md"
@@ -12,6 +12,7 @@ greenlet = "^3.0.2"
 python-slugify = "^8.0.4"
 alembic = "^1.13.1"
 asyncpg = "^0.29.0"
+pydantic = "^2.10.2"
 
 
 [tool.poetry.dev-dependencies]

artemis_model-0.1.89/artemis_model/redis/__init__.py

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