Fix bugs in batch retrieval for python sdk

feast-dev · Oct 24, 2019 · 81a6703 · 81a6703
1 parent 9f72368
commit 81a6703
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/sdk/python/feast/client.py b/sdk/python/feast/client.py
@@ -331,6 +331,9 @@ def get_batch_features(
             # Validate entity rows based on entities in Feast Core
             self._validate_entity_rows_for_batch_retrieval(entity_rows, fs_request)
 
+            # we want the timestamp column naming to be consistent with the rest of feast
+            entity_rows.columns = ['event_timestamp' if col=='datetime' else col for col in entity_rows.columns]
+
             # Retrieve serving information to determine store type and staging location
             serving_info = (
                 self._serving_service_stub.GetFeastServingInfo()

diff --git a/sdk/python/feast/job.py b/sdk/python/feast/job.py
@@ -94,7 +94,7 @@ def result(self, timeout_sec: int = DEFAULT_TIMEOUT_SEC):
         for file_uri in uris:
             if file_uri.scheme == "gs":
                 file_obj = tempfile.TemporaryFile()
-                self.storage_client.download_blob_to_file(file_uri, file_obj)
+                self.storage_client.download_blob_to_file(file_uri.geturl(), file_obj)
             elif file_uri.scheme == "file":
                 file_obj = open(file_uri.path, "rb")
             else:

diff --git a/sdk/python/feast/utils/loaders.py b/sdk/python/feast/utils/loaders.py
@@ -96,8 +96,8 @@ def upload_file_to_gcs(local_path: str, bucket: str, remote_path: str):
     """
     storage_client = storage.Client(project=None)
     bucket = storage_client.get_bucket(bucket)
-    blob = bucket.blob(local_path)
-    blob.upload_from_filename(remote_path)
+    blob = bucket.blob(remote_path)
+    blob.upload_from_filename(local_path)
 
 
 def export_dataframe_to_local(df: pd.DataFrame, dir_path: Optional[str] = None):