artemis-model 0.1.133__tar.gz → 0.1.135__tar.gz

{artemis_model-0.1.133 → artemis_model-0.1.135}/PKG-INFO

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

{artemis_model-0.1.133 → artemis_model-0.1.135}/artemis_model/category.py

@@ -1,4 +1,4 @@
-from sqlalchemy import ARRAY, Computed, String, func, literal, text
+from sqlalchemy import Computed, func, literal, text
 from sqlalchemy.ext.associationproxy import AssociationProxy, association_proxy
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -16,12 +16,12 @@ def to_tsvector_ix(*columns):
 
 class CategoryMixin(TimeStampMixin):
     id: Mapped[int] = mapped_column(primary_key=True)
-    name: Mapped[str] = mapped_column(nullable=False)
-    sub_categories: Mapped[list[str]] = mapped_column(ARRAY(String), default=[])
+    main_category: Mapped[str] = mapped_column(nullable=False)
+    sub_category: Mapped[str] = mapped_column(nullable=False)
 
     name_tsv = mapped_column(
         TSVector(),
-        Computed("to_tsvector('english', name)", persisted=True),
+        Computed("to_tsvector('english', main_category || ' ' || sub_category)", persisted=True),
     )
 
     @declared_attr
@@ -39,18 +39,11 @@ class CategoryMixin(TimeStampMixin):
     # __table_args__ = (
     #     Index(
     #         "fts_ix_category_name_tsv",
-    #         to_tsvector_ix("name"),
+    #         to_tsvector_ix("main_category", "sub_category"),
     #         postgresql_using="gin",
     #     ),
     # )
 
-    @property
-    def is_subcategory(self) -> bool:
-        if self.sub_categories:
-            return True
-
-        return False
-
 
 class CategorySync(CustomSyncBase, CategoryMixin):
     pass

{artemis_model-0.1.133 → artemis_model-0.1.135}/artemis_model/playlist.py

@@ -1,7 +1,7 @@
 import uuid
 from datetime import date, datetime
 
-from sqlalchemy import Computed, ForeignKey, func, literal, text
+from sqlalchemy import Computed, ForeignKey, func, literal, text, ARRAY, String
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.ext.associationproxy import AssociationProxy, association_proxy
 from sqlalchemy.orm import Mapped, mapped_column, relationship
@@ -43,6 +43,8 @@ class PlaylistMixin(TimeStampMixin):
     published_at: Mapped[date | None] = mapped_column(nullable=True)
     is_private: Mapped[bool] = mapped_column(default=False)
     total_duration: Mapped[int] = mapped_column(default=0)
+    track_count: Mapped[int] = mapped_column(default=0)
+    artist_names: Mapped[list[str]] = mapped_column(ARRAY(String), nullable=False, default=[])
 
     name_tsv = mapped_column(
         TSVector(),

{artemis_model-0.1.133 → artemis_model-0.1.135}/pyproject.toml

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