merged

franciscojavierarceo · franciscojavierarceo · commit 4c28acc1eccd · 2024-09-29T22:49:33.000-04:00
Signed-off-by: Francisco Javier Arceo &lt;farceo@redhat.com&gt;
diff --git a/sdk/python/feast/types.py b/sdk/python/feast/types.py
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from abc import ABC, abstractmethod
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Dict, Union
 
 import pyarrow
 
 from feast.value_type import ValueType
-from feast.utils import _utc_now
 
 PRIMITIVE_FEAST_TYPES_TO_VALUE_TYPES = {
     "INVALID": "UNKNOWN",
@@ -33,6 +33,10 @@
 }
 
 
+def _utc_now() -> datetime:
+    return datetime.now(tz=timezone.utc)
+
+
 class ComplexFeastType(ABC):
     """
     A ComplexFeastType represents a structured type that is recognized by Feast.
@@ -189,7 +193,7 @@ def __str__(self):
     Float32: pyarrow.float32(),
     Float64: pyarrow.float64(),
     # Note: datetime only supports microseconds https://github.com/python/cpython/blob/3.8/Lib/datetime.py#L1559
-    UnixTimestamp: pyarrow.timestamp('us', tz=_utc_now().tzname()),
+    UnixTimestamp: pyarrow.timestamp("us", tz=_utc_now().tzname()),
 }
 
 
diff --git a/sdk/python/feast/utils.py b/sdk/python/feast/utils.py
@@ -232,7 +232,8 @@ def _convert_arrow_to_proto(
     feature_view: "FeatureView",
     join_keys: Dict[str, ValueType],
 ) -> List[Tuple[EntityKeyProto, Dict[str, ValueProto], datetime, Optional[datetime]]]:
-    if isinstance(feature_view, OnDemandFeatureView):
+    # This is a workaround for isinstance(feature_view, OnDemandFeatureView), which triggers a circular import
+    if getattr(feature_view, "source_request_sources", None):
         return _convert_arrow_odfv_to_proto(table, feature_view, join_keys)
     else:
         return _convert_arrow_fv_to_proto(table, feature_view, join_keys)
@@ -1140,6 +1141,7 @@ def tags_str_to_dict(tags: str = "") -> dict[str, str]:
             cast(tuple[str, str], tag.split(":", 1)) for tag in tags_list if ":" in tag
         ).items()
     }
+<<<<<<< HEAD
 
 
 def _utc_now() -> datetime:
@@ -1192,3 +1194,5 @@ def _build_retrieve_online_document_record(
         vector_value_proto,
         distance_value_proto,
     )
+=======
+>>>>>>> f97a28ca (checking in progress)
diff --git a/sdk/python/tests/unit/test_on_demand_python_transformation.py b/sdk/python/tests/unit/test_on_demand_python_transformation.py
@@ -1,7 +1,6 @@
 import os
 import re
 import tempfile
-import time
 import unittest
 from datetime import datetime, timedelta
 from typing import Any
@@ -162,6 +161,7 @@ def python_stored_writes_feature_view(
                     ],
                     "current_datetime": [datetime.now() for _ in inputs["conv_rate"]],
                 }
+                print("running odfv transform")
                 return output
 
             with pytest.raises(TypeError):
@@ -283,27 +283,32 @@ def test_python_docs_demo(self):
         )
 
     def test_stored_writes(self):
-        entity_rows = [
+        entity_rows_to_write = [
             {
                 "driver_id": 1001,
                 "conv_rate": 0.25,
                 "acc_rate": 0.25,
             }
         ]
-
+        entity_rows_to_read = [
+            {
+                "driver_id": 1001,
+            }
+        ]
+        print("storing odfv features")
         self.store.write_to_online_store(
             feature_view_name="python_stored_writes_feature_view",
-            df=entity_rows,
+            df=entity_rows_to_write,
         )
-        time.sleep(1)
+        print("reading odfv features")
         online_python_response = self.store.get_online_features(
-            entity_rows=entity_rows,
+            entity_rows=entity_rows_to_read,
             features=[
                 "python_stored_writes_feature_view:conv_rate_plus_acc",
                 "python_stored_writes_feature_view:current_datetime",
             ],
         ).to_dict()
-
+        print(online_python_response)
         assert sorted(list(online_python_response.keys())) == sorted(
             [
                 "driver_id",
