haystack-ml-stack 0.4.5a3__tar.gz → 0.4.6__tar.gz

{haystack_ml_stack-0.4.5a3 → haystack_ml_stack-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haystack-ml-stack
-Version: 0.4.5a3
+Version: 0.4.6
 Summary: Functions related to Haystack ML
 Author-email: Oscar Vega <oscar@haystack.tv>
 License: MIT

{haystack_ml_stack-0.4.5a3 → haystack_ml_stack-0.4.6}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "haystack-ml-stack"
-version = "0.4.5a3"
+version = "0.4.6"
 description = "Functions related to Haystack ML"
 readme = "README.md"
 authors = [{ name = "Oscar Vega", email = "oscar@haystack.tv" }]

haystack_ml_stack-0.4.6/src/haystack_ml_stack/_version.py

@@ -0,0 +1 @@
+__version__ = "0.4.6"

{haystack_ml_stack-0.4.5a3 → haystack_ml_stack-0.4.6}/src/haystack_ml_stack/dynamo.py

@@ -9,7 +9,7 @@ from boto3.dynamodb.types import TypeDeserializer
 
 from . import exceptions
 from ._serializers import FeatureRegistryId, SerializerRegistry
-from .utils import _complete_features_for_channels
+from .utils import _complete_features_for_channels, DEFAULT_CHANNELS
 
 logger = logging.getLogger(__name__)
 
@@ -274,7 +274,7 @@ _MOBILE_OS = {"ios", "android", "iphone", "galaxy"}
 
 
 def _get_os_cat(client_os: str) -> str:
-    normalized = client_os.lower().replace("debug","") if client_os else ""
+    normalized = client_os.lower().replace("debug", "") if client_os else ""
     return "MOBILE" if normalized in _MOBILE_OS else "TV"
 
 
@@ -503,16 +503,32 @@ def _process_channels(
         for stat in playlist_stats_user.values():
             all_channels.update(stat.data.keys())
 
-    # Get not preferred channels to be ignored
+    all_channels = all_channels | set(DEFAULT_CHANNELS)
+
+    # My headlines will stay on top so not part of the candidates
     # The group labels are also ignored, not real channels for UI
-    ignore_channels = set(["national_favorite", "local_favorite"])
+    ignore_channels = set(["my headlines", "national_favorite", "local_favorite"])
+
+    # Rule for weather
+    if user.get("geo", {}).get("country") != "US":
+        ignore_channels.add("weather")
+    # Rule for live_es
+    if "es" not in user.get("languages", []):
+        ignore_channels.add("live_es")
+
     inserted_channel_names = set()
     if channel_candidates is not None:
         preferred = set(user.get("preferredChannels", []) or [])
         for ch in channel_candidates.data:
-            if ch.category_group in ("national_favorite", "local_favorite"):
-                if ch.name not in preferred:
-                    ignore_channels.add(ch.name)
+            # Rule for authors
+            if (
+                ch.category_group in ("national_favorite", "local_favorite")
+                and ch.name not in preferred
+            ):
+                ignore_channels.add(ch.name)
+            # Rule for shows
+            if ch.category_group == "show" and ch.name.split("/")[0] not in preferred:
+                ignore_channels.add(ch.name)
 
         for ch in channel_candidates.data:
             if ch.name not in ignore_channels:
@@ -525,21 +541,7 @@ def _process_channels(
                 )
                 inserted_channel_names.add(ch.name)
 
-    DEFAULT_CHANNELS = [
-        "local news",
-        "science & technology",
-        "business & finance",
-        "entertainment news",
-        "live",
-        "live_es",
-        "weather",
-        "politics",
-        "international",
-        "top videos",
-        "editor picks",
-    ]
-
-    for name in all_channels | set(DEFAULT_CHANNELS):
+    for name in all_channels:
         if name not in ignore_channels and name not in inserted_channel_names:
             channels.append(
                 {

{haystack_ml_stack-0.4.5a3 → haystack_ml_stack-0.4.6}/src/haystack_ml_stack/utils.py

@@ -679,6 +679,21 @@ def _validate_pwatched_entry_context(entry_contexts: list[str]):
         raise ValueError(f"Invalid entry contexts found: {invalid_contexts}")
 
 
+DEFAULT_CHANNELS = [
+    "local news",
+    "science & technology",
+    "business & finance",
+    "entertainment news",
+    "live",
+    "live_es",
+    "weather",
+    "politics",
+    "international",
+    "top videos",
+    "editor picks",
+]
+
+
 def _complete_features_for_channels(
     channels: list[dict],
     user_features: dict[str, UserPlaylistStats],

{haystack_ml_stack-0.4.5a3 → haystack_ml_stack-0.4.6}/src/haystack_ml_stack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haystack-ml-stack
-Version: 0.4.5a3
+Version: 0.4.6
 Summary: Functions related to Haystack ML
 Author-email: Oscar Vega <oscar@haystack.tv>
 License: MIT

haystack_ml_stack-0.4.5a3/src/haystack_ml_stack/_version.py

@@ -1 +0,0 @@
-__version__ = "0.4.5a3"