artemis-model 0.1.86__tar.gz → 0.1.87__tar.gz

{artemis_model-0.1.86 → artemis_model-0.1.87}/PKG-INFO

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

{artemis_model-0.1.86 → artemis_model-0.1.87}/artemis_model/auth.py

@@ -63,15 +63,6 @@ class UserAccountMixin(TimeStampMixin):
     disabled_reason: Mapped[Optional[str]] = mapped_column(nullable=True)
     is_onboarded: Mapped[bool] = mapped_column(default=False)
 
-
-    @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 login_histories(cls) -> Mapped["LoginHistory"]:
         return relationship("LoginHistory", back_populates="account")

{artemis_model-0.1.86 → artemis_model-0.1.87}/artemis_model/device.py

@@ -2,32 +2,23 @@ import enum
 import uuid
 from datetime import datetime
 
-from sqlalchemy import JSON, UUID, Enum, ForeignKey
+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 AssociationProxy, association_proxy
+from sqlalchemy.ext.associationproxy import association_proxy
 
 from artemis_model.base import CustomSyncBase, CustomBase, TimeStampMixin
 
 
-class DeviceControlMode(enum.Enum):
-    PLAYER = "player"
-    CONTROL = "control"
-    
-
 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
-    )
+    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"
-    control_mode: Mapped[DeviceControlMode] = mapped_column(Enum(DeviceControlMode), nullable=True)
-    last_seen: Mapped[datetime | None] = mapped_column(nullable=True)
-    version: Mapped[int] = mapped_column(default=0)
-    device_specs: Mapped[JSON] = mapped_column(JSON, nullable=True) 
+    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"]]:
@@ -42,7 +33,7 @@ class DeviceMixin(TimeStampMixin):
         )
 
     @declared_attr
-    def users(cls) -> Mapped[list["UserAccount"]]:
+    def users(cls) -> Mapped[list["User"]]:
         return relationship(
             secondary="device_user_assoc", 
             viewonly=True
@@ -66,7 +57,7 @@ class DeviceUserAssocMixin(TimeStampMixin):
         ForeignKey("device.id"), primary_key=True, nullable=False
     )
     user_id: Mapped[uuid.UUID] = mapped_column(
-        ForeignKey("user_account.id"), primary_key=True, nullable=False
+        ForeignKey("user.id"), primary_key=True, nullable=False
     )
 
 
@@ -75,4 +66,4 @@ class DeviceUserAssocSync(CustomSyncBase, DeviceUserAssocMixin):
 
 
 class DeviceUserAssoc(CustomBase, DeviceUserAssocMixin):
-    pass
+    pass

{artemis_model-0.1.86 → artemis_model-0.1.87}/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.86 → artemis_model-0.1.87}/pyproject.toml

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