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

extractor: Add list based lookups #619

Merged
merged 2 commits into from
Dec 25, 2024
Merged

extractor: Add list based lookups #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db8690c
Rebased
aditya-nambiar Dec 25, 2024
bb924f2
Add test for list lookup using repeat
aditya-nambiar Dec 25, 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
3 changes: 3 additions & 0 deletions fennel/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## [1.5.64] - 2024-12-25
- Support list lookup based autogenerated extractors.

## [1.5.63] - 2024-12-24
- Add support for zip, repeat, pow, log, and sqrt expressions

Expand Down
292 changes: 272 additions & 20 deletions fennel/client_tests/test_featureset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
expectations,
expect_column_values_to_be_between,
)
from fennel.expr import col, lit, when
from fennel.expr import col, lit, when, repeat
from fennel.testing import mock, log

################################################################################
Expand All @@ -37,6 +37,7 @@ class UserInfoDataset:
user_id: int = field(key=True)
name: str
age: Optional[int]
hobbies: List[Optional[str]]
timestamp: datetime = field(timestamp=True)
country: str

Expand Down Expand Up @@ -206,10 +207,10 @@ def test_simple_extractor(self, client):
)
now = datetime.now(timezone.utc)
data = [
[18232, "John", 32, "USA", now],
[18234, "Monica", 24, "Chile", now],
[18232, "John", 32, "USA", now, ["Reading", "Writing"]],
[18234, "Monica", 24, "Chile", now, ["Cooking", "Music"]],
]
columns = ["user_id", "name", "age", "country", "timestamp"]
columns = ["user_id", "name", "age", "country", "timestamp", "hobbies"]
input_df = pd.DataFrame(data, columns=columns)
response = client.log("fennel_webhook", "UserInfoDataset", input_df)
assert response.status_code == requests.codes.OK, response.json()
Expand Down Expand Up @@ -254,10 +255,10 @@ def test_e2e_query(self, client):
)
now = datetime.now(timezone.utc)
data = [
[18232, "John", 32, "USA", now],
[18234, "Monica", 24, "Chile", now],
[18232, "John", 32, "USA", now, ["Reading", "Writing"]],
[18234, "Monica", 24, "Chile", now, ["Cooking", "Music"]],
]
columns = ["user_id", "name", "age", "country", "timestamp"]
columns = ["user_id", "name", "age", "country", "timestamp", "hobbies"]
input_df = pd.DataFrame(data, columns=columns)
response = client.log("fennel_webhook", "UserInfoDataset", input_df)
assert response.status_code == requests.codes.OK, response.json()
Expand Down Expand Up @@ -393,11 +394,19 @@ def test_derived_extractor(self, client):
)
now = datetime.now(timezone.utc)
data = [
[18232, "John", 32, "USA", now],
[18234, "Monica", 24, "Chile", now],
[18232, "John", 32, "USA", now, ["Reading", "Writing"]],
[18234, "Monica", 24, "Chile", now, ["Cooking", "Music"]],
]
df = pd.DataFrame(
data, columns=["user_id", "name", "age", "country", "timestamp"]
data,
columns=[
"user_id",
"name",
"age",
"country",
"timestamp",
"hobbies",
],
)
response = client.log("fennel_webhook", "UserInfoDataset", df)
assert response.status_code == requests.codes.OK, response.json()
Expand Down Expand Up @@ -485,10 +494,10 @@ def test_dag_resolution2(self, client):
)
now = datetime.now(timezone.utc)
data = [
[18232, "John", 32, "USA", now],
[18234, "Monica", 24, "Chile", now],
[18232, "John", 32, "USA", now, ["Reading", "Writing"]],
[18234, "Monica", 24, "Chile", now, ["Cooking", "Music"]],
]
columns = ["user_id", "name", "age", "country", "timestamp"]
columns = ["user_id", "name", "age", "country", "timestamp", "hobbies"]
df = pd.DataFrame(data, columns=columns)
response = client.log("fennel_webhook", "UserInfoDataset", df)
assert response.status_code == requests.codes.OK, response.json()
Expand Down Expand Up @@ -586,10 +595,10 @@ def test_dag_resolution_complex(self, client):
client.sleep()
now = datetime.now(timezone.utc)
data = [
[18232, "John", 32, "USA", now],
[18234, "Monica", 24, "Chile", now],
[18232, "John", 32, "USA", now, ["Reading", "Writing"]],
[18234, "Monica", 24, "Chile", now, ["Cooking", "Music"]],
]
columns = ["user_id", "name", "age", "country", "timestamp"]
columns = ["user_id", "name", "age", "country", "timestamp", "hobbies"]
df = pd.DataFrame(data, columns=columns)
response = client.log("fennel_webhook", "UserInfoDataset", df)
assert response.status_code == requests.codes.OK, response.json()
Expand Down Expand Up @@ -1068,11 +1077,11 @@ def test_chained_lookups(client):

now = datetime.now(timezone.utc)
data = [
[18232, "John", 32, "USA", now],
[18234, "Monica", 24, "Chile", now],
[18235, "Rahul", 28, "India", now],
[18232, "John", 32, "USA", now, ["Reading", "Writing"]],
[18234, "Monica", 24, "Chile", now, ["Cooking", "Music"]],
[18235, "Rahul", 28, "India", now, ["Reading", "Football"]],
]
columns = ["user_id", "name", "age", "country", "timestamp"]
columns = ["user_id", "name", "age", "country", "timestamp", "hobbies"]
input_df = pd.DataFrame(data, columns=columns)
client.log("fennel_webhook", "UserInfoDataset", input_df)

Expand Down Expand Up @@ -1263,3 +1272,246 @@ def time_feature_extractor(cls, ts: pd.Series) -> pd.DataFrame:
featuresets=[QueryTimeFeatures],
message="first_commit",
)


@pytest.mark.integration
@mock
def test_looks_like_list_lookup(client):
@featureset
class UserInfoListLookup:
user_id: int
hobbies: List[Optional[str]] = F(
UserInfoDataset.hobbies, default=["Unknown"]
)

client.commit(
datasets=[UserInfoDataset],
featuresets=[UserInfoListLookup],
message="Initial commit",
)

now = datetime.now(timezone.utc)
data = [
[18232, "John", 32, "USA", now, ["Reading", "Writing"]],
[18234, "Monica", 24, "Chile", now, ["Reading", "Writing"]],
[18235, "Rahul", 28, "India", now, ["Reading", "Writing"]],
]
columns = ["user_id", "name", "age", "country", "timestamp", "hobbies"]
input_df = pd.DataFrame(data, columns=columns)
client.log("fennel_webhook", "UserInfoDataset", input_df)

client.sleep()

feature_df = client.query(
outputs=[UserInfoListLookup],
inputs=[UserInfoListLookup.user_id],
input_dataframe=pd.DataFrame(
{"UserInfoListLookup.user_id": [18234, 18235]}
),
)

assert feature_df.shape == (2, 2)
assert feature_df["UserInfoListLookup.hobbies"].tolist() == [
["Reading", "Writing"],
["Reading", "Writing"],
]


@pytest.mark.integration
@mock
def test_list_lookup(client):
@featureset
class UserInfoListLookup:
user_id: List[int]
country: List[Optional[str]] = F(UserInfoDataset.country)
name: List[str] = F(UserInfoDataset.name, default="Unknown")

@featureset
class UserInfoListLookup2:
user_id_request: int = F(Request.user_id)
user_id: List[int] = F(repeat(col("user_id_request"), 5))
country: List[Optional[str]] = F(UserInfoDataset.country)
name: List[str] = F(UserInfoDataset.name, default="Unknown")

client.commit(
datasets=[UserInfoDataset],
featuresets=[UserInfoListLookup, UserInfoListLookup2, Request],
message="Initial commit",
)
client.sleep()

now = datetime.now(timezone.utc)
data = [
[18232, "John", 32, "USA", now, ["Reading", "Writing"]],
[18234, "Monica", 24, "Chile", now, ["Reading", "Writing"]],
[18235, "Rahul", 28, "India", now, ["Reading", "Writing"]],
]
columns = ["user_id", "name", "age", "country", "timestamp", "hobbies"]
input_df = pd.DataFrame(data, columns=columns)
client.log("fennel_webhook", "UserInfoDataset", input_df)

client.sleep()

feature_df = client.query(
outputs=[UserInfoListLookup],
inputs=[UserInfoListLookup.user_id],
input_dataframe=pd.DataFrame(
{
"UserInfoListLookup.user_id": [
[18232, 18234, 18235, 123],
[18232, 18234],
[18234, 18235, 1],
]
}
),
)

assert feature_df.shape == (3, 3)
assert feature_df["UserInfoListLookup.country"].tolist() == [
["USA", "Chile", "India", pd.NA],
["USA", "Chile"],
["Chile", "India", pd.NA],
]
assert feature_df["UserInfoListLookup.name"].tolist() == [
["John", "Monica", "Rahul", "Unknown"],
["John", "Monica"],
["Monica", "Rahul", "Unknown"],
]

feature_df2 = client.query(
outputs=[UserInfoListLookup2],
inputs=[Request.user_id],
input_dataframe=pd.DataFrame({"Request.user_id": [18232, 12345]}),
)

assert feature_df2.shape == (2, 4)
assert feature_df2["UserInfoListLookup2.country"].tolist() == [
["USA", "USA", "USA", "USA", "USA"],
[pd.NA, pd.NA, pd.NA, pd.NA, pd.NA],
]


@pytest.mark.integration
@mock
def test_chainedlist_lookup_with_default(client):
"""_summary_
In this test, we look up a list of categories from a user id, and then look up a list of values from the categories.
"""

@source(webhook.endpoint("HobbyDataset"), disorder="14d", cdc="upsert")
@dataset(index=True)
class HobbyDataset:
hobby: str = field(key=True)
category: str
ts: datetime

@featureset
class UserHobbies:
user_id: int
hobby: List[Optional[str]] = F(UserInfoDataset.hobbies, default=[])
categories: List[Optional[str]] = F(
HobbyDataset.category,
)

client.commit(
datasets=[HobbyDataset, UserInfoDataset],
featuresets=[UserHobbies],
message="Initial commit",
)

now = datetime.now(timezone.utc)
data = [
[18232, "John", 32, "USA", now, ["Reading", "Writing"]],
[18234, "Monica", 24, "Chile", now, ["Cooking", "Music"]],
[18235, "Rahul", 28, "India", now, ["Reading", "Football"]],
]
columns = ["user_id", "name", "age", "country", "timestamp", "hobbies"]
input_df = pd.DataFrame(data, columns=columns)
client.log("fennel_webhook", "UserInfoDataset", input_df)

client.sleep()

data = [
["Reading", "Productivity", now],
["Football", "Sports", now],
["Cooking", "Food", now],
]
columns = ["hobby", "category", "ts"]
input_df = pd.DataFrame(data, columns=columns)
client.log("fennel_webhook", "HobbyDataset", input_df)

client.sleep()

feature_df = client.query(
outputs=[UserHobbies],
inputs=[UserHobbies.user_id],
input_dataframe=pd.DataFrame(
{
"UserHobbies.user_id": [18232, 18234, 18235],
}
),
)

assert feature_df.shape == (3, 3)
assert feature_df["UserHobbies.hobby"].tolist() == [
["Reading", "Writing"],
["Cooking", "Music"],
["Reading", "Football"],
]
assert feature_df["UserHobbies.categories"].tolist() == [
["Productivity", pd.NA],
["Food", pd.NA],
["Productivity", "Sports"],
]


@pytest.mark.integration
@mock
def test_multiple_keyed_list_lookup(client):
@source(webhook.endpoint("KeyedDataset"), disorder="14d", cdc="upsert")
@dataset(index=True)
class KeyedDataset:
key1: int = field(key=True)
key2: int = field(key=True)
value: str
ts: datetime = field(timestamp=True)

@featureset
class KeyedFeatureset:
key1: List[int]
key2: List[int]
value: List[Optional[str]] = F(KeyedDataset.value)

client.commit(
datasets=[KeyedDataset], featuresets=[KeyedFeatureset], message="msg"
)
client.sleep()
# Log data
now = datetime.now(timezone.utc)
data = [
[1, 2, "a", now],
[3, 4, "b", now],
[5, 6, "c", now],
[7, 8, "d", now],
]
columns = ["key1", "key2", "value", "ts"]
input_df = pd.DataFrame(data, columns=columns)
client.log("fennel_webhook", "KeyedDataset", input_df)

client.sleep()

feature_df = client.query(
inputs=[KeyedFeatureset.key1, KeyedFeatureset.key2],
outputs=[KeyedFeatureset.value],
input_dataframe=pd.DataFrame(
{
"KeyedFeatureset.key1": [[1, 2, 3], [7, 5, 6]],
"KeyedFeatureset.key2": [[2, 8, 4], [8, 11, 12]],
}
),
)
assert feature_df.shape == (2, 1)
assert feature_df["KeyedFeatureset.value"].tolist() == [
["a", pd.NA, "b"],
["d", pd.NA, pd.NA],
]
Loading
Loading