Skip to content

fix: Pgvector patch #4108

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

Merged
HaoXuAI merged 7 commits into from
Apr 17, 2024
Merged

fix: Pgvector patch #4108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e274a23
update postgres online store to make it work with write and read APIs.
HaoXuAI Apr 16, 2024
6abffbf
format
HaoXuAI Apr 16, 2024
ce854d4
update doc
HaoXuAI Apr 16, 2024
1bad023
update doc
HaoXuAI Apr 16, 2024
1c62a34
minor change on return value
HaoXuAI Apr 17, 2024
d5d93e7
minor change on return value
HaoXuAI Apr 17, 2024
8bdbbdc
sync master
HaoXuAI Apr 17, 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
Prev Previous commit
Next Next commit
minor change on return value 
Signed-off-by: cmuhao <sduxuhao@gmail.com>
  • Loading branch information
@HaoXuAI
HaoXuAI committed Apr 17, 2024
commit d5d93e7aacc68f5d31771ab9df30af306e812c2c
4 changes: 3 additions & 1 deletion sdk/python/feast/feature_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2009,7 +2009,9 @@ def _retrieve_from_online_store(
else:
status = FieldStatus.PRESENT

read_row_protos.append((row_ts_proto, status, feature_val, vector_value, distance_val))
read_row_protos.append(
(row_ts_proto, status, feature_val, vector_value, distance_val)
)
return read_row_protos

@staticmethod
Expand Down
34 changes: 30 additions & 4 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 @@ -276,7 +276,14 @@ def retrieve_online_documents(
requested_feature: str,
embedding: List[float],
top_k: int,
) -> List[Tuple[Optional[datetime], Optional[ValueProto], Optional[ValueProto], Optional[ValueProto]]]:
) -> List[
Tuple[
Optional[datetime],
Optional[ValueProto],
Optional[ValueProto],
Optional[ValueProto],
]
]:
"""

Args:
Expand All @@ -300,7 +307,12 @@ def retrieve_online_documents(
query_embedding_str = f"[{','.join(str(el) for el in embedding)}]"

result: List[
Tuple[Optional[datetime], Optional[ValueProto], Optional[ValueProto], Optional[ValueProto]]
Tuple[
Optional[datetime],
Optional[ValueProto],
Optional[ValueProto],
Optional[ValueProto],
]
] = []
with self._get_conn(config) as conn, conn.cursor() as cur:
table_name = _table_id(project, table)
Expand Down Expand Up @@ -330,7 +342,14 @@ def retrieve_online_documents(
)
rows = cur.fetchall()

for entity_key, feature_name, value, vector_value, distance, event_ts in rows:
for (
entity_key,
feature_name,
value,
vector_value,
distance,
event_ts,
) in rows:
# TODO Deserialize entity_key to return the entity in response
# entity_key_proto = EntityKeyProto()
# entity_key_proto_bin = bytes(entity_key)
Expand All @@ -340,7 +359,14 @@ def retrieve_online_documents(

vector_value_proto = ValueProto(string_val=vector_value)
distance_value_proto = ValueProto(float_val=distance)
result.append((event_ts, feature_value_proto, vector_value_proto, distance_value_proto))
result.append(
(
event_ts,
feature_value_proto,
vector_value_proto,
distance_value_proto,
)
)

return result

Expand Down
9 changes: 8 additions & 1 deletion sdk/python/feast/infra/online_stores/online_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,14 @@ def retrieve_online_documents(
requested_feature: str,
embedding: List[float],
top_k: int,
) -> List[Tuple[Optional[datetime], Optional[ValueProto], Optional[ValueProto], Optional[ValueProto]]]:
) -> List[
Tuple[
Optional[datetime],
Optional[ValueProto],
Optional[ValueProto],
Optional[ValueProto],
]
]:
"""
Retrieves online feature values for the specified embeddings.

Expand Down
9 changes: 8 additions & 1 deletion sdk/python/feast/infra/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,14 @@ def retrieve_online_documents(
requested_feature: str,
query: List[float],
top_k: int,
) -> List[Tuple[Optional[datetime], Optional[ValueProto], Optional[ValueProto], Optional[ValueProto]]]:
) -> List[
Tuple[
Optional[datetime],
Optional[ValueProto],
Optional[ValueProto],
Optional[ValueProto],
]
]:
"""
Searches for the top-k nearest neighbors of the given document in the online document store.

Expand Down
9 changes: 8 additions & 1 deletion sdk/python/tests/foo_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,12 @@ def retrieve_online_documents(
requested_feature: str,
query: List[float],
top_k: int,
) -> List[Tuple[Optional[datetime], Optional[ValueProto], Optional[ValueProto], Optional[ValueProto]]]:
) -> List[
Tuple[
Optional[datetime],
Optional[ValueProto],
Optional[ValueProto],
Optional[ValueProto],
]
]:
return []