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

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

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

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

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

artemis_model-0.1.87/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