haystack-ml-stack 0.3.1__tar.gz → 0.3.3__tar.gz

{haystack_ml_stack-0.3.1 → haystack_ml_stack-0.3.3}/PKG-INFO

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

{haystack_ml_stack-0.3.1 → haystack_ml_stack-0.3.3}/pyproject.toml

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

{haystack_ml_stack-0.3.1 → haystack_ml_stack-0.3.3}/src/haystack_ml_stack/__init__.py

@@ -11,4 +11,4 @@ from ._serializers import SerializerRegistry, FeatureRegistryId
 
 __all__ = [*__all__, "SerializerRegistry", "FeatureRegistryId"]
 
-__version__ = "0.3.1"
+__version__ = "0.3.3"

{haystack_ml_stack-0.3.1 → haystack_ml_stack-0.3.3}/src/haystack_ml_stack/app.py

@@ -6,6 +6,7 @@ from http import HTTPStatus
 from typing import Any, Dict, List, Optional
 import time
 from contextlib import asynccontextmanager, AsyncExitStack
+import traceback
 
 import aiobotocore.session
 from aiobotocore.config import AioConfig
@@ -253,7 +254,7 @@ def create_app(
             model_output = model["predict"](model_input, model["params"])
             predict_end = time.perf_counter_ns()
         except Exception as e:
-            logger.error("Model prediction failed: %s", e)
+            logger.error("Model prediction failed: \n%s", traceback.format_exc())
             raise HTTPException(
                 status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
                 detail="Model prediction failed",

{haystack_ml_stack-0.3.1 → haystack_ml_stack-0.3.3}/src/haystack_ml_stack/generated/v1/features_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: features.proto
-# Protobuf Python Version: 6.33.4
+# Protobuf Python Version: 6.33.2
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -13,7 +13,7 @@ _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
     6,
     33,
-    4,
+    2,
     '',
     'features.proto'
 )

{haystack_ml_stack-0.3.1 → haystack_ml_stack-0.3.3}/src/haystack_ml_stack/generated/v1/features_pb2.pyi

@@ -7,7 +7,7 @@ from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 DESCRIPTOR: _descriptor.FileDescriptor
 
 class EntryContextCounts(_message.Message):
-    __slots__ = ("attempts", "watched")
+    __slots__ = ()
     ATTEMPTS_FIELD_NUMBER: _ClassVar[int]
     WATCHED_FIELD_NUMBER: _ClassVar[int]
     attempts: int
@@ -15,7 +15,7 @@ class EntryContextCounts(_message.Message):
     def __init__(self, attempts: _Optional[int] = ..., watched: _Optional[int] = ...) -> None: ...
 
 class SelectCounts(_message.Message):
-    __slots__ = ("total_selects", "total_selects_and_watched", "total_browsed")
+    __slots__ = ()
     TOTAL_SELECTS_FIELD_NUMBER: _ClassVar[int]
     TOTAL_SELECTS_AND_WATCHED_FIELD_NUMBER: _ClassVar[int]
     TOTAL_BROWSED_FIELD_NUMBER: _ClassVar[int]
@@ -25,7 +25,7 @@ class SelectCounts(_message.Message):
     def __init__(self, total_selects: _Optional[int] = ..., total_selects_and_watched: _Optional[int] = ..., total_browsed: _Optional[int] = ...) -> None: ...
 
 class EntryContextPWatched(_message.Message):
-    __slots__ = ("autoplay", "sel_thumb", "choose_next", "ch_swtch", "launch_first_in_session")
+    __slots__ = ()
     AUTOPLAY_FIELD_NUMBER: _ClassVar[int]
     SEL_THUMB_FIELD_NUMBER: _ClassVar[int]
     CHOOSE_NEXT_FIELD_NUMBER: _ClassVar[int]
@@ -39,7 +39,7 @@ class EntryContextPWatched(_message.Message):
     def __init__(self, autoplay: _Optional[_Union[EntryContextCounts, _Mapping]] = ..., sel_thumb: _Optional[_Union[EntryContextCounts, _Mapping]] = ..., choose_next: _Optional[_Union[EntryContextCounts, _Mapping]] = ..., ch_swtch: _Optional[_Union[EntryContextCounts, _Mapping]] = ..., launch_first_in_session: _Optional[_Union[EntryContextCounts, _Mapping]] = ...) -> None: ...
 
 class PositionPSelect(_message.Message):
-    __slots__ = ("first_pos", "second_pos", "third_pos", "rest_pos")
+    __slots__ = ()
     FIRST_POS_FIELD_NUMBER: _ClassVar[int]
     SECOND_POS_FIELD_NUMBER: _ClassVar[int]
     THIRD_POS_FIELD_NUMBER: _ClassVar[int]
@@ -51,7 +51,7 @@ class PositionPSelect(_message.Message):
     def __init__(self, first_pos: _Optional[_Union[SelectCounts, _Mapping]] = ..., second_pos: _Optional[_Union[SelectCounts, _Mapping]] = ..., third_pos: _Optional[_Union[SelectCounts, _Mapping]] = ..., rest_pos: _Optional[_Union[SelectCounts, _Mapping]] = ...) -> None: ...
 
 class BrowsedDebiasedPositionPSelects(_message.Message):
-    __slots__ = ("up_to_4_browsed", "all_browsed")
+    __slots__ = ()
     UP_TO_4_BROWSED_FIELD_NUMBER: _ClassVar[int]
     ALL_BROWSED_FIELD_NUMBER: _ClassVar[int]
     up_to_4_browsed: PositionPSelect
@@ -59,7 +59,7 @@ class BrowsedDebiasedPositionPSelects(_message.Message):
     def __init__(self, up_to_4_browsed: _Optional[_Union[PositionPSelect, _Mapping]] = ..., all_browsed: _Optional[_Union[PositionPSelect, _Mapping]] = ...) -> None: ...
 
 class StreamPSelect(_message.Message):
-    __slots__ = ("version", "data")
+    __slots__ = ()
     VERSION_FIELD_NUMBER: _ClassVar[int]
     DATA_FIELD_NUMBER: _ClassVar[int]
     version: int
@@ -67,7 +67,7 @@ class StreamPSelect(_message.Message):
     def __init__(self, version: _Optional[int] = ..., data: _Optional[_Union[BrowsedDebiasedPositionPSelects, _Mapping]] = ...) -> None: ...
 
 class StreamPWatched(_message.Message):
-    __slots__ = ("version", "data")
+    __slots__ = ()
     VERSION_FIELD_NUMBER: _ClassVar[int]
     DATA_FIELD_NUMBER: _ClassVar[int]
     version: int
@@ -75,7 +75,7 @@ class StreamPWatched(_message.Message):
     def __init__(self, version: _Optional[int] = ..., data: _Optional[_Union[EntryContextPWatched, _Mapping]] = ...) -> None: ...
 
 class UserPWatched(_message.Message):
-    __slots__ = ("version", "data")
+    __slots__ = ()
     VERSION_FIELD_NUMBER: _ClassVar[int]
     DATA_FIELD_NUMBER: _ClassVar[int]
     version: int
@@ -83,9 +83,9 @@ class UserPWatched(_message.Message):
     def __init__(self, version: _Optional[int] = ..., data: _Optional[_Union[EntryContextPWatched, _Mapping]] = ...) -> None: ...
 
 class UserPersonalizingPWatched(_message.Message):
-    __slots__ = ("version", "data")
+    __slots__ = ()
     class DataEntry(_message.Message):
-        __slots__ = ("key", "value")
+        __slots__ = ()
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str
@@ -98,7 +98,7 @@ class UserPersonalizingPWatched(_message.Message):
     def __init__(self, version: _Optional[int] = ..., data: _Optional[_Mapping[str, EntryContextPWatched]] = ...) -> None: ...
 
 class UserPSelect(_message.Message):
-    __slots__ = ("version", "data")
+    __slots__ = ()
     VERSION_FIELD_NUMBER: _ClassVar[int]
     DATA_FIELD_NUMBER: _ClassVar[int]
     version: int
@@ -106,9 +106,9 @@ class UserPSelect(_message.Message):
     def __init__(self, version: _Optional[int] = ..., data: _Optional[_Union[BrowsedDebiasedPositionPSelects, _Mapping]] = ...) -> None: ...
 
 class UserPersonalizingPSelect(_message.Message):
-    __slots__ = ("version", "data")
+    __slots__ = ()
     class DataEntry(_message.Message):
-        __slots__ = ("key", "value")
+        __slots__ = ()
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str
@@ -121,9 +121,9 @@ class UserPersonalizingPSelect(_message.Message):
     def __init__(self, version: _Optional[int] = ..., data: _Optional[_Mapping[str, BrowsedDebiasedPositionPSelects]] = ...) -> None: ...
 
 class StreamSimilarityScores(_message.Message):
-    __slots__ = ("version", "data")
+    __slots__ = ()
     class DataEntry(_message.Message):
-        __slots__ = ("key", "value")
+        __slots__ = ()
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str

{haystack_ml_stack-0.3.1 → haystack_ml_stack-0.3.3}/src/haystack_ml_stack/utils.py

@@ -204,7 +204,7 @@ def device_watched_count_cleanups(
 
     counts_obj: StreamPWatched = stream.get(
         f"PWATCHED#24H#{device_type}", StreamPWatched()
-    )
+    ).data
     if out is None:
         out = {}
     out = _cleanup_entry_context_counts(

{haystack_ml_stack-0.3.1 → haystack_ml_stack-0.3.3}/src/haystack_ml_stack.egg-info/PKG-INFO

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

{haystack_ml_stack-0.3.1 → haystack_ml_stack-0.3.3}/tests/test_utils.py

@@ -372,6 +372,58 @@ def test_stream_pwatched_cleanup():
     assert (actual == expected).all()
 
 
+def test_device_stream_pwatched_cleanup():
+    stream_pwatched_data = {
+        "version": 1,
+        "data": {
+            "autoplay": {"attempts": 1, "watched": 1},
+            "ch_swtch": {"attempts": 2, "watched": 0},
+        },
+    }
+    stream_pwatched = features_pb2_v1.StreamPWatched()
+    ProtoParseDict(js_dict=stream_pwatched_data, message=stream_pwatched)
+    stream = {"PWATCHED#24H#TV": stream_pwatched}
+    out = {}
+    utils.device_watched_count_cleanups(
+        stream=stream,
+        entry_contexts=["autoplay", "ch_swtch", "sel_thumb"],
+        device_type="TV",
+        out=out,
+    )
+    expected = pd.Series(
+        {
+            "STREAM_AUTOPLAY_TV_24H_TOTAL_ATTEMPTS": 1,
+            "STREAM_AUTOPLAY_TV_24H_TOTAL_WATCHED": 1,
+            "STREAM_CH_SWTCH_TV_24H_TOTAL_ATTEMPTS": 2,
+            "STREAM_CH_SWTCH_TV_24H_TOTAL_WATCHED": 0,
+            "STREAM_SEL_THUMB_TV_24H_TOTAL_ATTEMPTS": 0,
+            "STREAM_SEL_THUMB_TV_24H_TOTAL_WATCHED": 0,
+        }
+    )
+    actual = pd.Series(out).loc[expected.index]
+    assert (actual == expected).all()
+    stream = {"PWATCHED#24H#MOBILE": stream_pwatched}
+    out = {}
+    utils.device_watched_count_cleanups(
+        stream=stream,
+        entry_contexts=["autoplay", "ch_swtch", "sel_thumb"],
+        device_type="MOBILE",
+        out=out,
+    )
+    expected = pd.Series(
+        {
+            "STREAM_AUTOPLAY_MOBILE_24H_TOTAL_ATTEMPTS": 1,
+            "STREAM_AUTOPLAY_MOBILE_24H_TOTAL_WATCHED": 1,
+            "STREAM_CH_SWTCH_MOBILE_24H_TOTAL_ATTEMPTS": 2,
+            "STREAM_CH_SWTCH_MOBILE_24H_TOTAL_WATCHED": 0,
+            "STREAM_SEL_THUMB_MOBILE_24H_TOTAL_ATTEMPTS": 0,
+            "STREAM_SEL_THUMB_MOBILE_24H_TOTAL_WATCHED": 0,
+        }
+    )
+    actual = pd.Series(out).loc[expected.index]
+    assert (actual == expected).all()
+
+
 def test_stream_global_pselect_cleanup():
     stream_pselect_data = {
         "version": 1,