artemis-model 0.1.133__py3-none-any.whl → 0.1.134__py3-none-any.whl

artemis_model/category.py

@@ -1,4 +1,4 @@
-from sqlalchemy import ARRAY, Computed, String, func, literal, text
+from sqlalchemy import Computed, String, 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
@@ -35,26 +35,20 @@ class CategoryMixin(TimeStampMixin):
             "playlist",
             creator=lambda p: PlaylistCategoryAssoc(playlist_id=p),
         )
+    
 
     # __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
 
 
 class Category(CustomBase, CategoryMixin):
-    pass
+    pass

{artemis_model-0.1.133.dist-info → artemis_model-0.1.134.dist-info}/METADATA

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

{artemis_model-0.1.133.dist-info → artemis_model-0.1.134.dist-info}/RECORD

@@ -4,7 +4,7 @@ artemis_model/artist.py,sha256=vjXlFN2mOEidAzUzxmsAP5GnVTvJUuhFdhQaH214lgw,1563
 artemis_model/auth.py,sha256=0Yg_6N1nj4U31F86u1PE0leIa3D64QlYrsDlavulN6s,4033
 artemis_model/banned_tracks.py,sha256=uU-F-6DL2EshPAUwLTTHjYZ7UEz4vm0Wfcif2F0lSKw,664
 artemis_model/base.py,sha256=zC20m8a1Sa11oEY0ay1iIRQeybGYvXY5p3Vr-pxoKnQ,6802
-artemis_model/category.py,sha256=jhCZrK-LxPmc0pXmVifAZWdCENssBTzdTmC3nqqZc6s,1761
+artemis_model/category.py,sha256=HvBKLNI5J54UoM8e45ymDDhYFmiM4-zJwXez0TXepf8,1674
 artemis_model/dj_set.py,sha256=fOYnCu4n5TiqyiSojfdFnO7LuPe_mM2SUwBV5xHy2Kc,3782
 artemis_model/genre.py,sha256=8_-IuJS543wIhUVCES3bdrDpKPKx-plDuBKGBcoMIbc,1570
 artemis_model/location.py,sha256=-ovGxYAajdQxNoQvafUBynSgcrdBklynXM7Qe7gmY5c,4645
@@ -27,6 +27,6 @@ artemis_model/track.py,sha256=QwUF0QKVn1I64648B-NI75-IzGQvnLt9B0emD4GnS6E,3757
 artemis_model/user.py,sha256=eqIdCiBJRNLjCwPPCn-gQ6si0O5JUBGfp9oWJL5zVW4,2131
 artemis_model/zone.py,sha256=iGRUtzUwKh9LHT3MOfzzg1DnkPBts_ZBzZVTi2EmIgs,2282
 artemis_model/zone_activity.py,sha256=BY4iODavY9ceJ5oRChdjjxf26S3U30Yb7Pxm5YRFpCo,1590
-artemis_model-0.1.133.dist-info/METADATA,sha256=ouIOKMFLGpN1YJ3ZotW2ndqO-U3cYY8kAigu1p2Ibv8,3445
-artemis_model-0.1.133.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-artemis_model-0.1.133.dist-info/RECORD,,
+artemis_model-0.1.134.dist-info/METADATA,sha256=RDzeS0msWjpXBAlMRQDMdy6X5KPwAZdbFn7DYGbC0iQ,3445
+artemis_model-0.1.134.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+artemis_model-0.1.134.dist-info/RECORD,,