Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fix online pg import #4581

Merged
merged 5 commits into from
Sep 28, 2024
Merged

fix: Fix online pg import #4581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e6a9ae
fix postgres import issue
HaoXuAI Sep 27, 2024
15599fb
fix postgres import issue
HaoXuAI Sep 27, 2024
a674b09
fix postgres import issue
HaoXuAI Sep 27, 2024
1b4d70c
fix postgres import issue
HaoXuAI Sep 27, 2024
8ecbd6c
fix lint
HaoXuAI Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions sdk/python/feast/infra/online_stores/contrib/postgres.py
View file
Open in desktop
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
10 changes: 2 additions & 8 deletions sdk/python/feast/infra/online_stores/contrib/singlestore_online_store/singlestore.py
View file
Open in desktop
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
View file
Open in desktop
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:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it make sense to set a defalt timezone instead of a none?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure, i didn't implement it but just moved it out to helper function. it currently in singlestore module and imported into postgres module lol

if ts.tzinfo is None:
return ts
else:
return ts.astimezone(tz=timezone.utc).replace(tzinfo=None)
Loading