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(flags): Update relative date op names #113

Merged
merged 7 commits into from
Jan 26, 2024
Merged

fix(flags): Update relative date op names #113

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ef576e
fix(flags): Update relative date op names
neilkakkar Jan 23, 2024
dd5a282
fix(flags): Update relative date op names
neilkakkar Jan 23, 2024
8897db2
fix warning
neilkakkar Jan 26, 2024
db553aa
prep for release
neilkakkar Jan 26, 2024
8134bf2
black
neilkakkar Jan 26, 2024
00da261
new black
neilkakkar Jan 26, 2024
e193277
debug
neilkakkar Jan 26, 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
2 changes: 1 addition & 1 deletion posthog/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ def feature_flag_definitions(self):
return self.feature_flags

def _add_local_person_and_group_properties(self, distinct_id, groups, person_properties, group_properties):
all_person_properties = {"$current_distinct_id": distinct_id, **(person_properties or {})}
all_person_properties = {"distinct_id": distinct_id, **(person_properties or {})}

all_group_properties = {}
if groups:
Expand Down
16 changes: 8 additions & 8 deletions posthog/feature_flags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ def compare(lhs, rhs, operator):
else:
return compare(str(override_value), str(value), operator)

if operator in ["is_date_before", "is_date_after", "is_relative_date_before", "is_relative_date_after"]:
if operator in ["is_date_before", "is_date_after"]:
try:
if operator in ["is_relative_date_before", "is_relative_date_after"]:
parsed_date = relative_date_parse_for_feature_flag_matching(str(value))
else:
parsed_date = relative_date_parse_for_feature_flag_matching(str(value))

if not parsed_date:
parsed_date = parser.parse(str(value))
parsed_date = convert_to_datetime_aware(parsed_date)
except Exception as e:
Expand All @@ -190,20 +190,20 @@ def compare(lhs, rhs, operator):

if isinstance(override_value, datetime.datetime):
override_date = convert_to_datetime_aware(override_value)
if operator in ("is_date_before", "is_relative_date_before"):
if operator == "is_date_before":
return override_date < parsed_date
else:
return override_date > parsed_date
elif isinstance(override_value, datetime.date):
if operator in ("is_date_before", "is_relative_date_before"):
if operator == "is_date_before":
return override_value < parsed_date.date()
else:
return override_value > parsed_date.date()
elif isinstance(override_value, str):
try:
override_date = parser.parse(override_value)
override_date = convert_to_datetime_aware(override_date)
if operator in ("is_date_before", "is_relative_date_before"):
if operator == "is_date_before":
return override_date < parsed_date
else:
return override_date > parsed_date
Expand Down Expand Up @@ -302,7 +302,7 @@ def match_property_group(property_group, property_values, cohort_properties) ->


def relative_date_parse_for_feature_flag_matching(value: str) -> Optional[datetime.datetime]:
regex = r"^(?P<number>[0-9]+)(?P<interval>[a-z])$"
regex = r"^-?(?P<number>[0-9]+)(?P<interval>[a-z])$"
match = re.search(regex, value)
parsed_dt = datetime.datetime.now(datetime.timezone.utc)
if match:
Expand Down
14 changes: 7 additions & 7 deletions posthog/test/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ def test_disable_geoip_default_on_decide(self, patch_decide):
timeout=10,
distinct_id="some_id",
groups={},
person_properties={"$current_distinct_id": "some_id"},
person_properties={"distinct_id": "some_id"},
group_properties={},
disable_geoip=True,
)
Expand All @@ -795,7 +795,7 @@ def test_disable_geoip_default_on_decide(self, patch_decide):
timeout=10,
distinct_id="feature_enabled_distinct_id",
groups={},
person_properties={"$current_distinct_id": "feature_enabled_distinct_id"},
person_properties={"distinct_id": "feature_enabled_distinct_id"},
group_properties={},
disable_geoip=True,
)
Expand All @@ -807,7 +807,7 @@ def test_disable_geoip_default_on_decide(self, patch_decide):
timeout=10,
distinct_id="all_flags_payloads_id",
groups={},
person_properties={"$current_distinct_id": "all_flags_payloads_id"},
person_properties={"distinct_id": "all_flags_payloads_id"},
group_properties={},
disable_geoip=False,
)
Expand Down Expand Up @@ -843,7 +843,7 @@ def test_default_properties_get_added_properly(self, patch_decide):
timeout=10,
distinct_id="some_id",
groups={"company": "id:5", "instance": "app.posthog.com"},
person_properties={"$current_distinct_id": "some_id", "x1": "y1"},
person_properties={"distinct_id": "some_id", "x1": "y1"},
group_properties={
"company": {"$group_key": "id:5", "x": "y"},
"instance": {"$group_key": "app.posthog.com"},
Expand All @@ -856,7 +856,7 @@ def test_default_properties_get_added_properly(self, patch_decide):
"random_key",
"some_id",
groups={"company": "id:5", "instance": "app.posthog.com"},
person_properties={"$current_distinct_id": "override"},
person_properties={"distinct_id": "override"},
group_properties={
"company": {
"$group_key": "group_override",
Expand All @@ -869,7 +869,7 @@ def test_default_properties_get_added_properly(self, patch_decide):
timeout=10,
distinct_id="some_id",
groups={"company": "id:5", "instance": "app.posthog.com"},
person_properties={"$current_distinct_id": "override"},
person_properties={"distinct_id": "override"},
group_properties={
"company": {"$group_key": "group_override"},
"instance": {"$group_key": "app.posthog.com"},
Expand All @@ -886,7 +886,7 @@ def test_default_properties_get_added_properly(self, patch_decide):
timeout=10,
distinct_id="some_id",
groups={},
person_properties={"$current_distinct_id": "some_id"},
person_properties={"distinct_id": "some_id"},
group_properties={},
disable_geoip=False,
)
32 changes: 16 additions & 16 deletions posthog/test/test_feature_flags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,7 +1873,7 @@ def test_match_property_date_operators(self):

@freeze_time("2022-05-01")
def test_match_property_relative_date_operators(self):
property_a = self.property(key="key", value="6h", operator="is_relative_date_before")
property_a = self.property(key="key", value="-6h", operator="is_date_before")
self.assertTrue(match_property(property_a, {"key": "2022-03-01"}))
self.assertTrue(match_property(property_a, {"key": "2022-04-30"}))
self.assertTrue(match_property(property_a, {"key": datetime.datetime(2022, 4, 30, 1, 2, 3)}))
Expand All @@ -1898,7 +1898,7 @@ def test_match_property_relative_date_operators(self):
with self.assertRaises(InconclusiveMatchError):
match_property(property_a, {"key": "abcdef"})

property_b = self.property(key="key", value="1h", operator="is_relative_date_after")
property_b = self.property(key="key", value="1h", operator="is_date_after")
self.assertTrue(match_property(property_b, {"key": "2022-05-02"}))
self.assertTrue(match_property(property_b, {"key": "2022-05-30"}))
self.assertTrue(match_property(property_b, {"key": datetime.datetime(2022, 5, 30)}))
Expand All @@ -1910,16 +1910,16 @@ def test_match_property_relative_date_operators(self):
self.assertFalse(match_property(property_b, {"key": "abcdef"}))

# Invalid flag property
property_c = self.property(key="key", value=1234, operator="is_relative_date_after")
property_c = self.property(key="key", value=1234, operator="is_date_after")

with self.assertRaises(InconclusiveMatchError):
self.assertFalse(match_property(property_c, {"key": 1}))

with self.assertRaises(InconclusiveMatchError):
self.assertFalse(match_property(property_c, {"key": "2022-05-30"}))
# parsed as 1234-05-01 for some reason?
self.assertTrue(match_property(property_c, {"key": "2022-05-30"}))

# # Timezone aware property
property_d = self.property(key="key", value="12d", operator="is_relative_date_before")
property_d = self.property(key="key", value="12d", operator="is_date_before")
self.assertFalse(match_property(property_d, {"key": "2022-05-30"}))

self.assertTrue(match_property(property_d, {"key": "2022-03-30"}))
Expand All @@ -1929,45 +1929,45 @@ def test_match_property_relative_date_operators(self):
self.assertFalse(match_property(property_d, {"key": "2022-04-19 02:00:01+02:00"}))

# Try all possible relative dates
property_e = self.property(key="key", value="1h", operator="is_relative_date_before")
property_e = self.property(key="key", value="1h", operator="is_date_before")
self.assertFalse(match_property(property_e, {"key": "2022-05-01 00:00:00"}))
self.assertTrue(match_property(property_e, {"key": "2022-04-30 22:00:00"}))

property_f = self.property(key="key", value="1d", operator="is_relative_date_before")
property_f = self.property(key="key", value="-1d", operator="is_date_before")
self.assertTrue(match_property(property_f, {"key": "2022-04-29 23:59:00"}))
self.assertFalse(match_property(property_f, {"key": "2022-04-30 00:00:01"}))

property_g = self.property(key="key", value="1w", operator="is_relative_date_before")
property_g = self.property(key="key", value="1w", operator="is_date_before")
self.assertTrue(match_property(property_g, {"key": "2022-04-23 00:00:00"}))
self.assertFalse(match_property(property_g, {"key": "2022-04-24 00:00:00"}))
self.assertFalse(match_property(property_g, {"key": "2022-04-24 00:00:01"}))

property_h = self.property(key="key", value="1m", operator="is_relative_date_before")
property_h = self.property(key="key", value="1m", operator="is_date_before")
self.assertTrue(match_property(property_h, {"key": "2022-03-01 00:00:00"}))
self.assertFalse(match_property(property_h, {"key": "2022-04-05 00:00:00"}))

property_i = self.property(key="key", value="1y", operator="is_relative_date_before")
property_i = self.property(key="key", value="1y", operator="is_date_before")
self.assertTrue(match_property(property_i, {"key": "2021-04-28 00:00:00"}))
self.assertFalse(match_property(property_i, {"key": "2021-05-01 00:00:01"}))

property_j = self.property(key="key", value="122h", operator="is_relative_date_after")
property_j = self.property(key="key", value="122h", operator="is_date_after")
self.assertTrue(match_property(property_j, {"key": "2022-05-01 00:00:00"}))
self.assertFalse(match_property(property_j, {"key": "2022-04-23 01:00:00"}))

property_k = self.property(key="key", value="2d", operator="is_relative_date_after")
property_k = self.property(key="key", value="2d", operator="is_date_after")
self.assertTrue(match_property(property_k, {"key": "2022-05-01 00:00:00"}))
self.assertTrue(match_property(property_k, {"key": "2022-04-29 00:00:01"}))
self.assertFalse(match_property(property_k, {"key": "2022-04-29 00:00:00"}))

property_l = self.property(key="key", value="02w", operator="is_relative_date_after")
property_l = self.property(key="key", value="-02w", operator="is_date_after")
self.assertTrue(match_property(property_l, {"key": "2022-05-01 00:00:00"}))
self.assertFalse(match_property(property_l, {"key": "2022-04-16 00:00:00"}))

property_m = self.property(key="key", value="1m", operator="is_relative_date_after")
property_m = self.property(key="key", value="1m", operator="is_date_after")
self.assertTrue(match_property(property_m, {"key": "2022-04-01 00:00:01"}))
self.assertFalse(match_property(property_m, {"key": "2022-04-01 00:00:00"}))

property_n = self.property(key="key", value="1y", operator="is_relative_date_after")
property_n = self.property(key="key", value="1y", operator="is_date_after")
self.assertTrue(match_property(property_n, {"key": "2022-05-01 00:00:00"}))
self.assertTrue(match_property(property_n, {"key": "2021-05-01 00:00:01"}))
self.assertFalse(match_property(property_n, {"key": "2021-05-01 00:00:00"}))
Expand Down
Loading