Skip to content

Commit

Permalink
fix: Fix online pg import (feast-dev#4581)
Browse files Browse the repository at this point in the history
* fix postgres import issue

Signed-off-by: cmuhao <[email protected]>

* fix postgres import issue

Signed-off-by: cmuhao <[email protected]>

* fix postgres import issue

Signed-off-by: cmuhao <[email protected]>

* fix postgres import issue

Signed-off-by: cmuhao <[email protected]>

* fix lint

Signed-off-by: cmuhao <[email protected]>

---------

Signed-off-by: cmuhao <[email protected]>
  • Loading branch information
HaoXuAI authored Sep 28, 2024
1 parent 8cd0dcf commit 1f17caa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 1 addition & 3 deletions sdk/python/feast/infra/online_stores/contrib/postgres.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
from feast import Entity
from feast.feature_view import FeatureView
from feast.infra.key_encoding_utils import get_list_val_str, serialize_entity_key
from feast.infra.online_stores.contrib.singlestore_online_store.singlestore import (
_to_naive_utc,
)
from feast.infra.online_stores.helpers import _to_naive_utc
from feast.infra.online_stores.online_store import OnlineStore
from feast.infra.utils.postgres.connection_utils import (
_get_conn,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import

from collections import defaultdict
from datetime import datetime, timezone
from datetime import datetime
from typing import Any, Callable, Dict, List, Literal, Optional, Sequence, Tuple

import singlestoredb
Expand All @@ -11,6 +11,7 @@

from feast import Entity, FeatureView, RepoConfig
from feast.infra.key_encoding_utils import serialize_entity_key
from feast.infra.online_stores.helpers import _to_naive_utc
from feast.infra.online_stores.online_store import OnlineStore
from feast.protos.feast.types.EntityKey_pb2 import EntityKey as EntityKeyProto
from feast.protos.feast.types.Value_pb2 import Value as ValueProto
Expand Down Expand Up @@ -225,10 +226,3 @@ def _drop_table_and_index(cur: Cursor, project: str, table: FeatureView) -> None

def _table_id(project: str, table: FeatureView) -> str:
return f"{project}_{table.name}"


def _to_naive_utc(ts: datetime) -> datetime:
if ts.tzinfo is None:
return ts
else:
return ts.astimezone(tz=timezone.utc).replace(tzinfo=None)
8 changes: 8 additions & 0 deletions sdk/python/feast/infra/online_stores/helpers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import struct
from datetime import datetime, timezone
from typing import Any, List

import mmh3
Expand Down Expand Up @@ -62,3 +63,10 @@ def compute_entity_id(
entity_key_serialization_version=entity_key_serialization_version,
)
).hex()


def _to_naive_utc(ts: datetime) -> datetime:
if ts.tzinfo is None:
return ts
else:
return ts.astimezone(tz=timezone.utc).replace(tzinfo=None)

0 comments on commit 1f17caa

Please sign in to comment.