fix: preserve timestamp range for min_event_timestamp and fix formatting

YassinNouh21 · ntkathole · commit e82371d475b1 · 2026-03-16T09:20:11.000+05:30
The entity_df fix alone would cause min_event_timestamp to be computed
as end_date - TTL (instead of start_date - TTL), clipping valid data
from the query window. Override entity_df_event_timestamp_range to
(start_date, end_date) in non-entity mode so the full range is used.

Also fix ruff formatting in the test file.

Signed-off-by: yassinnouh21 &lt;yassinnouh21@gmail.com&gt;
diff --git a/sdk/python/feast/infra/offline_stores/contrib/postgres_offline_store/postgres.py b/sdk/python/feast/infra/offline_stores/contrib/postgres_offline_store/postgres.py
@@ -167,11 +167,18 @@ def get_historical_features(
             offline_utils.infer_event_timestamp_from_entity_df(entity_schema)
         )
 
-        entity_df_event_timestamp_range = _get_entity_df_event_timestamp_range(
-            entity_df,
-            entity_df_event_timestamp_col,
-            config,
-        )
+        # In non-entity mode, use the actual requested range so that
+        # min_event_timestamp (= range[0] - TTL) doesn't clip the window.
+        # The synthetic entity_df only has end_date, which would wrongly
+        # set min_event_timestamp to end_date - TTL instead of start_date - TTL.
+        if start_date is not None and end_date is not None:
+            entity_df_event_timestamp_range = (start_date, end_date)
+        else:
+            entity_df_event_timestamp_range = _get_entity_df_event_timestamp_range(
+                entity_df,
+                entity_df_event_timestamp_col,
+                config,
+            )
 
         @contextlib.contextmanager
         def query_generator() -> Iterator[str]:
diff --git a/sdk/python/tests/unit/infra/offline_stores/contrib/postgres_offline_store/test_postgres.py b/sdk/python/tests/unit/infra/offline_stores/contrib/postgres_offline_store/test_postgres.py
@@ -638,22 +638,27 @@ def test_non_entity_entity_df_uses_end_date(self):
             return_value={"event_timestamp": "timestamp"}
         )
 
-        with patch.multiple(
-            "feast.infra.offline_stores.contrib.postgres_offline_store.postgres",
-            _get_conn=MagicMock(),
-            _upload_entity_df=MagicMock(),
-            _get_entity_schema=mock_get_entity_schema,
-            _get_entity_df_event_timestamp_range=MagicMock(
-                return_value=(start_date, end_date)
+        with (
+            patch.multiple(
+                "feast.infra.offline_stores.contrib.postgres_offline_store.postgres",
+                _get_conn=MagicMock(),
+                _upload_entity_df=MagicMock(),
+                _get_entity_schema=mock_get_entity_schema,
+                _get_entity_df_event_timestamp_range=MagicMock(
+                    return_value=(start_date, end_date)
+                ),
+            ),
+            patch(
+                "feast.infra.offline_stores.contrib.postgres_offline_store.postgres.offline_utils.get_expected_join_keys",
+                return_value=[],
+            ),
+            patch(
+                "feast.infra.offline_stores.contrib.postgres_offline_store.postgres.offline_utils.assert_expected_columns_in_entity_df",
+            ),
+            patch(
+                "feast.infra.offline_stores.contrib.postgres_offline_store.postgres.offline_utils.get_feature_view_query_context",
+                return_value=[],
             ),
-        ), patch(
-            "feast.infra.offline_stores.contrib.postgres_offline_store.postgres.offline_utils.get_expected_join_keys",
-            return_value=[],
-        ), patch(
-            "feast.infra.offline_stores.contrib.postgres_offline_store.postgres.offline_utils.assert_expected_columns_in_entity_df",
-        ), patch(
-            "feast.infra.offline_stores.contrib.postgres_offline_store.postgres.offline_utils.get_feature_view_query_context",
-            return_value=[],
         ):
             PostgreSQLOfflineStore.get_historical_features(
                 config=test_repo_config,
