feast 0.66.0.dev50__tar.gz → 0.66.0.dev52__tar.gz

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/.secrets.baseline

@@ -957,7 +957,7 @@
         "filename": "infra/feast-operator/api/v1/featurestore_types.go",
         "hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
         "is_verified": false,
-        "line_number": 937
+        "line_number": 942
       }
     ],
     "infra/feast-operator/api/v1/zz_generated.deepcopy.go": [

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: feast
-Version: 0.66.0.dev50
+Version: 0.66.0.dev52
 Summary: Python SDK for Feast
 Author: Feast
 License-Expression: Apache-2.0

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/aggregation/__init__.py

@@ -90,7 +90,7 @@ class Aggregation:
 
     def __eq__(self, other):
         if not isinstance(other, Aggregation):
-            raise TypeError("Comparisons should only involve Aggregations.")
+            return False
 
         if (
             self.column != other.column

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/base_feature_view.py

@@ -172,9 +172,7 @@ class BaseFeatureView(ABC):
 
     def __eq__(self, other):
         if not isinstance(other, BaseFeatureView):
-            raise TypeError(
-                "Comparisons should only involve BaseFeatureView class objects."
-            )
+            return False
 
         if (
             self.name != other.name

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/data_format.py

@@ -33,6 +33,8 @@ class FileFormat(ABC):
         pass
 
     def __eq__(self, other):
+        if not isinstance(other, FileFormat):
+            return False
         return self.to_proto() == other.to_proto()
 
     @classmethod
@@ -95,6 +97,8 @@ class StreamFormat(ABC):
         pass
 
     def __eq__(self, other):
+        if not isinstance(other, StreamFormat):
+            return False
         return self.to_proto() == other.to_proto()
 
     @classmethod

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/data_source.py

@@ -279,7 +279,7 @@ class DataSource(ABC):
             return False
 
         if not isinstance(other, DataSource):
-            raise TypeError("Comparisons should only involve DataSource class objects.")
+            return False
 
         if (
             self.name != other.name
@@ -499,9 +499,7 @@ class KafkaSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, KafkaSource):
-            raise TypeError(
-                "Comparisons should only involve KafkaSource class objects."
-            )
+            return False
 
         if not super().__eq__(other):
             return False
@@ -639,9 +637,7 @@ class RequestSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, RequestSource):
-            raise TypeError(
-                "Comparisons should only involve RequestSource class objects."
-            )
+            return False
 
         if not super().__eq__(other):
             return False
@@ -801,9 +797,7 @@ class KinesisSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, KinesisSource):
-            raise TypeError(
-                "Comparisons should only involve KinesisSource class objects."
-            )
+            return False
 
         if not super().__eq__(other):
             return False

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/entity.py

@@ -126,7 +126,7 @@ class Entity:
 
     def __eq__(self, other):
         if not isinstance(other, Entity):
-            raise TypeError("Comparisons should only involve Entity class objects.")
+            return False
 
         if (
             self.name != other.name

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/feature.py

@@ -50,6 +50,8 @@ class Feature:
             self._labels = labels
 
     def __eq__(self, other):
+        if not isinstance(other, Feature):
+            return False
         if self.name != other.name or self.dtype != other.dtype:
             return False
         return True

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/feature_service.py

@@ -293,9 +293,7 @@ class FeatureService:
 
     def __eq__(self, other):
         if not isinstance(other, FeatureService):
-            raise TypeError(
-                "Comparisons should only involve FeatureService class objects."
-            )
+            return False
 
         if (
             self.name != other.name

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/feature_store.py

@@ -2341,7 +2341,7 @@ class FeatureStore:
         }
 
         for source_fv in source_fvs:
-            all_join_keys.update(source_fv.entities)
+            all_join_keys.update(source_fv.join_keys)
             if source_fv.batch_source:
                 entity_timestamp_col_names.add(source_fv.batch_source.timestamp_field)
 
@@ -2381,7 +2381,7 @@ class FeatureStore:
             job = provider.offline_store.pull_latest_from_table_or_query(
                 config=self.config,
                 data_source=source_fv.batch_source,
-                join_key_columns=source_fv.entities,
+                join_key_columns=source_fv.join_keys,
                 feature_name_columns=[f.name for f in source_fv.features],
                 timestamp_field=source_fv.batch_source.timestamp_field,
                 created_timestamp_column=getattr(

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/feature_view.py

@@ -395,9 +395,7 @@ class FeatureView(BaseFeatureView):
 
     def __eq__(self, other):
         if not isinstance(other, FeatureView):
-            raise TypeError(
-                "Comparisons should only involve FeatureView class objects."
-            )
+            return False
 
         if not super().__eq__(other):
             return False

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/bigquery_source.py

@@ -97,9 +97,7 @@ class BigQuerySource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, BigQuerySource):
-            raise TypeError(
-                "Comparisons should only involve BigQuerySource class objects."
-            )
+            return False
 
         return (
             super().__eq__(other)

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/contrib/athena_offline_store/athena_source.py

@@ -115,9 +115,7 @@ class AthenaSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, AthenaSource):
-            raise TypeError(
-                "Comparisons should only involve AthenaSource class objects."
-            )
+            return False
 
         return (
             super().__eq__(other)

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/contrib/couchbase_offline_store/couchbase_source.py

@@ -93,9 +93,7 @@ class CouchbaseColumnarSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, CouchbaseColumnarSource):
-            raise TypeError(
-                "Comparisons should only involve CouchbaseColumnarSource class objects."
-            )
+            return False
 
         return (
             super().__eq__(other)

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/contrib/mssql_offline_store/mssqlserver_source.py

@@ -170,9 +170,7 @@ class MsSqlServerSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, MsSqlServerSource):
-            raise TypeError(
-                "Comparisons should only involve SqlServerSource class objects."
-            )
+            return False
 
         return (
             self.name == other.name

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/contrib/oracle_offline_store/oracle_source.py

@@ -105,9 +105,7 @@ class OracleSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, OracleSource):
-            raise TypeError(
-                "Comparisons should only involve OracleSource class objects."
-            )
+            return False
 
         return (
             self.name == other.name

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/contrib/postgres_offline_store/postgres_source.py

@@ -77,9 +77,7 @@ class PostgreSQLSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, PostgreSQLSource):
-            raise TypeError(
-                "Comparisons should only involve PostgreSQLSource class objects."
-            )
+            return False
 
         return (
             super().__eq__(other)

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/contrib/ray_offline_store/ray_source.py

@@ -228,7 +228,7 @@ class RaySource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, RaySource):
-            raise TypeError("Comparisons should only involve RaySource class objects.")
+            return False
         base_eq = super().__eq__(other)
         if not base_eq:
             return False

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/contrib/spark_offline_store/spark_source.py

@@ -262,8 +262,13 @@ class SparkSource(DataSource):
         return reader.load(self.path)
 
     def __eq__(self, other):
-        base_eq = super().__eq__(other)
-        if not base_eq:
+        # Guard before the spark-specific attribute access below: the base
+        # DataSource.__eq__ accepts any DataSource subclass, so a cross-type
+        # comparison (e.g. against a FileSource with a matching name) would
+        # otherwise raise AttributeError on `other.table` (#6636).
+        if not isinstance(other, SparkSource):
+            return False
+        if not super().__eq__(other):
             return False
         return (
             self.table == other.table

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/contrib/trino_offline_store/trino_source.py

@@ -146,9 +146,7 @@ class TrinoSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, TrinoSource):
-            raise TypeError(
-                "Comparisons should only involve TrinoSource class objects."
-            )
+            return False
 
         return (
             super().__eq__(other)

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/file_source.py

@@ -97,7 +97,7 @@ class FileSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, FileSource):
-            raise TypeError("Comparisons should only involve FileSource class objects.")
+            return False
 
         return (
             super().__eq__(other)

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/redshift_source.py

@@ -123,9 +123,7 @@ class RedshiftSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, RedshiftSource):
-            raise TypeError(
-                "Comparisons should only involve RedshiftSource class objects."
-            )
+            return False
 
         return (
             super().__eq__(other)

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/offline_stores/snowflake_source.py

@@ -132,9 +132,7 @@ class SnowflakeSource(DataSource):
 
     def __eq__(self, other):
         if not isinstance(other, SnowflakeSource):
-            raise TypeError(
-                "Comparisons should only involve SnowflakeSource class objects."
-            )
+            return False
 
         return (
             super().__eq__(other)

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/online_stores/dynamodb.py

@@ -14,6 +14,7 @@
 import asyncio
 import contextlib
 import itertools
+import json
 import logging
 from collections import OrderedDict, defaultdict
 from concurrent.futures import ThreadPoolExecutor
@@ -24,13 +25,17 @@ from aiobotocore.config import AioConfig
 from pydantic import StrictBool, StrictStr
 
 from feast import Entity, FeatureView, utils
+from feast.infra.infra_object import InfraObject
 from feast.infra.online_stores.helpers import compute_entity_id, compute_versioned_name
 from feast.infra.online_stores.online_store import OnlineStore
 from feast.infra.supported_async_methods import SupportedAsyncMethods
 from feast.infra.utils.aws_utils import dynamo_write_items_async
+from feast.protos.feast.core.InfraObject_pb2 import InfraObject as InfraObjectProto
+from feast.protos.feast.core.Registry_pb2 import Registry as RegistryProto
 from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto
 from feast.protos.feast.types.Value_pb2 import Value as ValueProto
 from feast.repo_config import FeastConfigBaseModel, RepoConfig
+from feast.stream_feature_view import StreamFeatureView
 from feast.utils import get_user_agent
 
 try:
@@ -379,6 +384,31 @@ class DynamoDBOnlineStore(OnlineStore):
                 _get_table_name(online_config, config, table_to_delete),
             )
 
+    def plan(
+        self, config: RepoConfig, desired_registry_proto: RegistryProto
+    ) -> List[InfraObject]:
+        online_config = config.online_store
+        assert isinstance(online_config, DynamoDBOnlineStoreConfig)
+
+        # feature_views and stream_feature_views are distinct proto types
+        # (FeatureViewProto vs StreamFeatureViewProto); each needs its
+        # matching from_proto(), not one applied to both indiscriminately.
+        views = [
+            FeatureView.from_proto(view)
+            for view in desired_registry_proto.feature_views
+        ] + [
+            StreamFeatureView.from_proto(view)
+            for view in desired_registry_proto.stream_feature_views
+        ]
+        return [
+            DynamoDBTable(
+                name=_get_table_name(online_config, config, view),
+                region=online_config.region,
+                endpoint_url=online_config.endpoint_url,
+            )
+            for view in views
+        ]
+
     def teardown(
         self,
         config: RepoConfig,
@@ -1222,6 +1252,68 @@ def _get_table_name(
     )
 
 
+DYNAMODB_INFRA_OBJECT_CLASS_TYPE = "feast.infra.online_stores.dynamodb.DynamoDBTable"
+
+
+class DynamoDBTable(InfraObject):
+    """
+    A DynamoDB table managed by Feast, reported by DynamoDBOnlineStore.plan()
+    so `feast plan` can show DynamoDB table changes.
+
+    Uses the InfraObject proto's CustomInfra field rather than a dedicated
+    proto message, since that field exists precisely to let online stores
+    add InfraObject support without changing the core InfraObject proto.
+
+    Note: `feast apply` does not call update()/teardown() on this object --
+    DynamoDBOnlineStore.update()/teardown() perform the actual table
+    creation and deletion directly (see FeatureStore._should_use_plan(),
+    which gates the new diff-based apply path to the local/sqlite provider
+    only). update()/teardown() here are no-ops that satisfy InfraObject's
+    abstract interface.
+    """
+
+    def __init__(self, name: str, region: str, endpoint_url: Optional[str] = None):
+        super().__init__(name)
+        self.region = region
+        self.endpoint_url = endpoint_url
+
+    def to_infra_object_proto(self) -> InfraObjectProto:
+        return InfraObjectProto(
+            infra_object_class_type=DYNAMODB_INFRA_OBJECT_CLASS_TYPE,
+            custom_infra=InfraObjectProto.CustomInfra(field=self.to_proto()),
+        )
+
+    def to_proto(self) -> bytes:
+        return json.dumps(
+            {
+                "name": self.name,
+                "region": self.region,
+                "endpoint_url": self.endpoint_url,
+            }
+        ).encode("utf-8")
+
+    @staticmethod
+    def from_infra_object_proto(
+        infra_object_proto: InfraObjectProto,
+    ) -> "DynamoDBTable":
+        return DynamoDBTable.from_proto(infra_object_proto.custom_infra.field)
+
+    @staticmethod
+    def from_proto(serialized: bytes) -> "DynamoDBTable":
+        payload = json.loads(serialized.decode("utf-8"))
+        return DynamoDBTable(
+            name=payload["name"],
+            region=payload["region"],
+            endpoint_url=payload.get("endpoint_url"),
+        )
+
+    def update(self) -> None:
+        pass
+
+    def teardown(self) -> None:
+        pass
+
+
 def _delete_table_idempotent(
     dynamodb_resource,
     table_name: str,

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/online_stores/redis.py

@@ -370,6 +370,13 @@ class RedisOnlineStore(OnlineStore):
             # flattening the list of lists. `hmget` does the lookup assuming a list of keys in the key bin
             prev_event_timestamps = [i[0] for i in prev_event_timestamps]
 
+            # Latest event timestamp queued so far in this batch, per entity key. The
+            # reads above all happened before any write, so without this rows sharing
+            # an entity key would each compare against the same pre-batch value, all
+            # pass the staleness check, and the last one queued would win regardless
+            # of its event time.
+            batch_latest_nanos: Dict[bytes, int] = {}
+
             for redis_key_bin, prev_event_time, (_, values, timestamp, _) in zip(
                 keys, prev_event_timestamps, data
             ):
@@ -381,15 +388,21 @@ class RedisOnlineStore(OnlineStore):
                 # New timestamp in nanoseconds
                 new_total_nanos = ts.seconds * 1_000_000_000 + ts.nanos
                 # Compare against existing timestamp (nanosecond precision)
+                prev_total_nanos = 0
                 if prev_event_time:
                     prev_ts = Timestamp()
                     prev_ts.ParseFromString(prev_event_time)
                     prev_total_nanos = prev_ts.seconds * 1_000_000_000 + prev_ts.nanos
-                    # Skip only if older OR exact same instant
-                    if prev_total_nanos and new_total_nanos <= prev_total_nanos:
-                        if progress:
-                            progress(1)
-                        continue
+                # Whichever is newer: the stored value or an earlier row of this batch
+                latest_seen_nanos = max(
+                    prev_total_nanos, batch_latest_nanos.get(redis_key_bin, 0)
+                )
+                # Skip only if older OR exact same instant
+                if latest_seen_nanos and new_total_nanos <= latest_seen_nanos:
+                    if progress:
+                        progress(1)
+                    continue
+                batch_latest_nanos[redis_key_bin] = new_total_nanos
                 # Store full timestamp (seconds + nanos)
                 entity_hset = {ts_key: ts.SerializeToString()}
 
@@ -466,6 +479,10 @@ class RedisOnlineStore(OnlineStore):
 
         prev_event_timestamps = [i[0] for i in prev_event_timestamps]
 
+        # See online_write_batch: guards against rows in this batch that share an
+        # entity key overwriting each other out of event-time order.
+        batch_latest_nanos: Dict[bytes, int] = {}
+
         async with client.pipeline(transaction=False) as pipe:
             for redis_key_bin, prev_event_time, (_, values, timestamp, _) in zip(
                 keys, prev_event_timestamps, data
@@ -475,14 +492,19 @@ class RedisOnlineStore(OnlineStore):
                 ts.FromDatetime(aware_ts)
                 new_total_nanos = ts.seconds * 1_000_000_000 + ts.nanos
 
+                prev_total_nanos = 0
                 if prev_event_time:
                     prev_ts = Timestamp()
                     prev_ts.ParseFromString(prev_event_time)
                     prev_total_nanos = prev_ts.seconds * 1_000_000_000 + prev_ts.nanos
-                    if prev_total_nanos and new_total_nanos <= prev_total_nanos:
-                        if progress:
-                            progress(1)
-                        continue
+                latest_seen_nanos = max(
+                    prev_total_nanos, batch_latest_nanos.get(redis_key_bin, 0)
+                )
+                if latest_seen_nanos and new_total_nanos <= latest_seen_nanos:
+                    if progress:
+                        progress(1)
+                    continue
+                batch_latest_nanos[redis_key_bin] = new_total_nanos
 
                 entity_hset = {ts_key: ts.SerializeToString()}
                 for feature_name, val in values.items():

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/infra/online_stores/sqlite.py

@@ -60,6 +60,7 @@ from feast.protos.feast.core.SqliteTable_pb2 import SqliteTable as SqliteTablePr
 from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto
 from feast.protos.feast.types.Value_pb2 import Value as ValueProto
 from feast.repo_config import FeastConfigBaseModel, RepoConfig
+from feast.stream_feature_view import StreamFeatureView
 from feast.type_map import feast_value_type_to_python_type
 from feast.types import FEAST_VECTOR_TYPES, PrimitiveFeastType
 from feast.utils import (
@@ -465,20 +466,23 @@ class SqliteOnlineStore(OnlineStore):
             config.online_store, "enable_openai_compatible_store", False
         )
 
+        # FeatureView.from_proto() is @typechecked and only accepts a
+        # FeatureViewProto, so it can't be applied to stream_feature_views
+        # (StreamFeatureViewProto) too -- each list needs its matching class.
+        views = [
+            FeatureView.from_proto(view)
+            for view in desired_registry_proto.feature_views
+        ] + [
+            StreamFeatureView.from_proto(view)
+            for view in desired_registry_proto.stream_feature_views
+        ]
         infra_objects: List[InfraObject] = [
             SqliteTable(
                 path=self._get_db_path(config),
-                name=_table_id(
-                    project,
-                    FeatureView.from_proto(view),
-                    versioning,
-                ),
+                name=_table_id(project, view, versioning),
                 include_value_num=include_value_num,
             )
-            for view in [
-                *desired_registry_proto.feature_views,
-                *desired_registry_proto.stream_feature_views,
-            ]
+            for view in views
         ]
 
         for lv_proto in desired_registry_proto.label_views:

{feast-0.66.0.dev50 → feast-0.66.0.dev52}/sdk/python/feast/labeling/label_view.py

@@ -221,7 +221,7 @@ class LabelView(BaseFeatureView):
 
     def __eq__(self, other):
         if not isinstance(other, LabelView):
-            raise TypeError("Comparisons should only involve LabelView class objects.")
+            return False
 
         if not super().__eq__(other):
             return False