Skip to content

feat: Add retrieve online documents v2 method into pgvector #5253

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
franciscojavierarceo merged 11 commits into from
Apr 11, 2025
Merged

feat: Add retrieve online documents v2 method into pgvector #5253

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a03b8c4
feat: add online document retrieval with hybrid search capabilities
YassinNouh21 Apr 8, 2025
75233cf
test: add integration tests for hybrid search and document retrieval
YassinNouh21 Apr 8, 2025
776c327
fix formatting
YassinNouh21 Apr 8, 2025
e1f0cae
fix: Refactor string_fields assignment to filter features by dtype an…
YassinNouh21 Apr 9, 2025
246d6a6
fix: improve query execution logic in postgres.py
YassinNouh21 Apr 9, 2025
6e3413c
fix linter
YassinNouh21 Apr 9, 2025
0169cb6
fix: simplify sorting logic in query execution
YassinNouh21 Apr 9, 2025
d35e0ba
fix formatting
YassinNouh21 Apr 9, 2025
86d40b0
fix: update string feature check to use ValueType enumeration
YassinNouh21 Apr 9, 2025
55dec54
formatting
YassinNouh21 Apr 9, 2025
15dcabf
fix datetime
YassinNouh21 Apr 10, 2025
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
fix: improve query execution logic in postgres.py 
Signed-off-by: Yassin Nouh <70436855+YassinNouh21@users.noreply.github.com>
  • Loading branch information
@YassinNouh21
YassinNouh21 committed Apr 9, 2025
commit 246d6a671848a5ae7d15ca1e6c58eb2c9821c8aa
31 changes: 9 additions & 22 deletions sdk/python/feast/infra/online_stores/postgres_online_store/postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,20 +533,12 @@ def retrieve_online_documents_v2(
and feature.name in requested_features
]

for feature in table.features:
if (
feature.dtype.to_value_type().value == 2
and feature.name in requested_features
): # 2 is STRING
string_fields.append(feature.name)

table_name = _table_id(config.project, table)

with self._get_conn(config, autocommit=True) as conn, conn.cursor() as cur:
# Case 1: Hybrid Search (vector + text)
if embedding is not None and query_string is not None and string_fields:
# Case 1: Hybrid Search (vector + text)
tsquery_str = " & ".join(query_string.split())

query = sql.SQL(
"""
SELECT
Expand All @@ -568,12 +560,10 @@ def retrieve_online_documents_v2(
table_name=sql.Identifier(table_name),
top_k=sql.Literal(top_k),
)
params = (embedding, tsquery_str, string_fields, tsquery_str)

cur.execute(query, (embedding, tsquery_str, string_fields, tsquery_str))
rows = cur.fetchall()

# Case 2: Vector Search Only
elif embedding is not None:
# Case 2: Vector Search Only
query = sql.SQL(
"""
SELECT
Expand All @@ -594,12 +584,10 @@ def retrieve_online_documents_v2(
table_name=sql.Identifier(table_name),
top_k=sql.Literal(top_k),
)
params = (embedding,)

cur.execute(query, (embedding,))
rows = cur.fetchall()

# Case 3: Text Search Only
elif query_string is not None and string_fields:
# Case 3: Text Search Only
tsquery_str = " & ".join(query_string.split())
query = sql.SQL(
"""
Expand Down Expand Up @@ -628,17 +616,16 @@ def retrieve_online_documents_v2(
table_name=sql.Identifier(table_name),
top_k=sql.Literal(top_k),
)

cur.execute(
query, (tsquery_str, string_fields, tsquery_str, requested_features)
)
rows = cur.fetchall()
params = (tsquery_str, string_fields, tsquery_str, requested_features)

else:
raise ValueError(
"Either vector_enabled must be True for embedding search or string fields must be available for query_string search"
)

cur.execute(query, params)
rows = cur.fetchall()

# Group by entity_key to build feature records
entities_dict: Dict[str, Dict[str, Any]] = defaultdict(
lambda: {
Expand Down