From 46f0b437827744ac80b0c35a8d53b0aa0d293b4f Mon Sep 17 00:00:00 2001 From: Marius Andra Date: Wed, 30 Mar 2022 09:05:18 +0200 Subject: [PATCH 1/5] remove "context" --- posthog/__init__.py | 12 ------------ posthog/client.py | 30 +++++++----------------------- posthog/test/test_client.py | 16 ++++------------ posthog/version.py | 2 +- 4 files changed, 12 insertions(+), 48 deletions(-) diff --git a/posthog/__init__.py b/posthog/__init__.py index a5b97bee..c79f19a4 100644 --- a/posthog/__init__.py +++ b/posthog/__init__.py @@ -23,7 +23,6 @@ def capture( distinct_id, # type: str event, # type: str properties=None, # type: Optional[Dict] - context=None, # type: Optional[Dict] timestamp=None, # type: Optional[datetime.datetime] uuid=None, # type: Optional[str] groups=None, # type: Optional[Dict] @@ -54,7 +53,6 @@ def capture( distinct_id=distinct_id, event=event, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, groups=groups, @@ -64,7 +62,6 @@ def capture( def identify( distinct_id, # type: str properties=None, # type: Optional[Dict] - context=None, # type: Optional[Dict] timestamp=None, # type: Optional[datetime.datetime] uuid=None, # type: Optional[str] ): @@ -88,7 +85,6 @@ def identify( "identify", distinct_id=distinct_id, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, ) @@ -97,7 +93,6 @@ def identify( def set( distinct_id, # type: str, properties=None, # type: Optional[Dict] - context=None, # type: Optional[Dict] timestamp=None, # type: Optional[datetime.datetime] uuid=None, # type: Optional[str] ): @@ -121,7 +116,6 @@ def set( "set", distinct_id=distinct_id, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, ) @@ -130,7 +124,6 @@ def set( def set_once( distinct_id, # type: str, properties=None, # type: Optional[Dict] - context=None, # type: Optional[Dict] timestamp=None, # type: Optional[datetime.datetime] uuid=None, # type: Optional[str] ): @@ -154,7 +147,6 @@ def set_once( "set_once", distinct_id=distinct_id, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, ) @@ -164,7 +156,6 @@ def group_identify( group_type, # type: str group_key, # type: str properties=None, # type: Optional[Dict] - context=None, # type: Optional[Dict] timestamp=None, # type: Optional[datetime.datetime] uuid=None, # type: Optional[str] ): @@ -189,7 +180,6 @@ def group_identify( group_type=group_type, group_key=group_key, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, ) @@ -198,7 +188,6 @@ def group_identify( def alias( previous_id, # type: str, distinct_id, # type: str, - context=None, # type: Optional[Dict] timestamp=None, # type: Optional[datetime.datetime] uuid=None, # type: Optional[str] ): @@ -223,7 +212,6 @@ def alias( "alias", previous_id=previous_id, distinct_id=distinct_id, - context=context, timestamp=timestamp, uuid=uuid, ) diff --git a/posthog/client.py b/posthog/client.py index fe68fd60..ac364f26 100644 --- a/posthog/client.py +++ b/posthog/client.py @@ -103,15 +103,13 @@ def __init__( if send: consumer.start() - def identify(self, distinct_id=None, properties=None, context=None, timestamp=None, uuid=None): + def identify(self, distinct_id=None, properties=None, timestamp=None, uuid=None): properties = properties or {} - context = context or {} require("distinct_id", distinct_id, ID_TYPES) require("properties", properties, dict) msg = { "timestamp": timestamp, - "context": context, "distinct_id": distinct_id, "$set": properties, "event": "$identify", @@ -121,10 +119,9 @@ def identify(self, distinct_id=None, properties=None, context=None, timestamp=No return self._enqueue(msg) def capture( - self, distinct_id=None, event=None, properties=None, context=None, timestamp=None, uuid=None, groups=None + self, distinct_id=None, event=None, properties=None, timestamp=None, uuid=None, groups=None ): properties = properties or {} - context = context or {} require("distinct_id", distinct_id, ID_TYPES) require("properties", properties, dict) require("event", event, string_types) @@ -132,7 +129,6 @@ def capture( msg = { "properties": properties, "timestamp": timestamp, - "context": context, "distinct_id": distinct_id, "event": event, "uuid": uuid, @@ -144,15 +140,13 @@ def capture( return self._enqueue(msg) - def set(self, distinct_id=None, properties=None, context=None, timestamp=None, uuid=None): + def set(self, distinct_id=None, properties=None, timestamp=None, uuid=None): properties = properties or {} - context = context or {} require("distinct_id", distinct_id, ID_TYPES) require("properties", properties, dict) msg = { "timestamp": timestamp, - "context": context, "distinct_id": distinct_id, "$set": properties, "event": "$set", @@ -161,15 +155,13 @@ def set(self, distinct_id=None, properties=None, context=None, timestamp=None, u return self._enqueue(msg) - def set_once(self, distinct_id=None, properties=None, context=None, timestamp=None, uuid=None): + def set_once(self, distinct_id=None, properties=None, timestamp=None, uuid=None): properties = properties or {} - context = context or {} require("distinct_id", distinct_id, ID_TYPES) require("properties", properties, dict) msg = { "timestamp": timestamp, - "context": context, "distinct_id": distinct_id, "$set_once": properties, "event": "$set_once", @@ -178,9 +170,8 @@ def set_once(self, distinct_id=None, properties=None, context=None, timestamp=No return self._enqueue(msg) - def group_identify(self, group_type=None, group_key=None, properties=None, context=None, timestamp=None, uuid=None): + def group_identify(self, group_type=None, group_key=None, properties=None, timestamp=None, uuid=None): properties = properties or {} - context = context or {} require("group_type", group_type, ID_TYPES) require("group_key", group_key, ID_TYPES) require("properties", properties, dict) @@ -194,15 +185,12 @@ def group_identify(self, group_type=None, group_key=None, properties=None, conte }, "distinct_id": "${}_{}".format(group_type, group_key), "timestamp": timestamp, - "context": context, "uuid": uuid, } return self._enqueue(msg) - def alias(self, previous_id=None, distinct_id=None, context=None, timestamp=None, uuid=None): - context = context or {} - + def alias(self, previous_id=None, distinct_id=None, timestamp=None, uuid=None): require("previous_id", previous_id, ID_TYPES) require("distinct_id", distinct_id, ID_TYPES) @@ -212,16 +200,14 @@ def alias(self, previous_id=None, distinct_id=None, context=None, timestamp=None "alias": distinct_id, }, "timestamp": timestamp, - "context": context, "event": "$create_alias", "distinct_id": previous_id, } return self._enqueue(msg) - def page(self, distinct_id=None, url=None, properties=None, context=None, timestamp=None, uuid=None): + def page(self, distinct_id=None, url=None, properties=None, timestamp=None, uuid=None): properties = properties or {} - context = context or {} require("distinct_id", distinct_id, ID_TYPES) require("properties", properties, dict) @@ -233,7 +219,6 @@ def page(self, distinct_id=None, url=None, properties=None, context=None, timest "event": "$pageview", "properties": properties, "timestamp": timestamp, - "context": context, "distinct_id": distinct_id, "uuid": uuid, } @@ -247,7 +232,6 @@ def _enqueue(self, msg): timestamp = datetime.utcnow().replace(tzinfo=tzutc()) require("timestamp", timestamp, datetime) - require("context", msg["context"], dict) # add common timestamp = guess_timezone(timestamp) diff --git a/posthog/test/test_client.py b/posthog/test/test_client.py index 127d1611..fa729702 100644 --- a/posthog/test/test_client.py +++ b/posthog/test/test_client.py @@ -91,7 +91,6 @@ def test_advanced_capture(self): "distinct_id", "python test event", {"property": "value"}, - {"ip": "192.168.0.1"}, datetime(2014, 9, 3), "new-uuid", ) @@ -100,7 +99,6 @@ def test_advanced_capture(self): self.assertEqual(msg["timestamp"], "2014-09-03T00:00:00+00:00") self.assertEqual(msg["properties"]["property"], "value") - self.assertEqual(msg["context"]["ip"], "192.168.0.1") self.assertEqual(msg["event"], "python test event") self.assertEqual(msg["properties"]["$lib"], "posthog-python") self.assertEqual(msg["properties"]["$lib_version"], VERSION) @@ -133,13 +131,12 @@ def test_basic_identify(self): def test_advanced_identify(self): client = self.client success, msg = client.identify( - "distinct_id", {"trait": "value"}, {"ip": "192.168.0.1"}, datetime(2014, 9, 3), "new-uuid" + "distinct_id", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid" ) self.assertTrue(success) self.assertEqual(msg["timestamp"], "2014-09-03T00:00:00+00:00") - self.assertEqual(msg["context"]["ip"], "192.168.0.1") self.assertEqual(msg["$set"]["trait"], "value") self.assertEqual(msg["properties"]["$lib"], "posthog-python") self.assertEqual(msg["properties"]["$lib_version"], VERSION) @@ -162,13 +159,12 @@ def test_basic_set(self): def test_advanced_set(self): client = self.client success, msg = client.set( - "distinct_id", {"trait": "value"}, {"ip": "192.168.0.1"}, datetime(2014, 9, 3), "new-uuid" + "distinct_id", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid" ) self.assertTrue(success) self.assertEqual(msg["timestamp"], "2014-09-03T00:00:00+00:00") - self.assertEqual(msg["context"]["ip"], "192.168.0.1") self.assertEqual(msg["$set"]["trait"], "value") self.assertEqual(msg["properties"]["$lib"], "posthog-python") self.assertEqual(msg["properties"]["$lib_version"], VERSION) @@ -191,13 +187,12 @@ def test_basic_set_once(self): def test_advanced_set_once(self): client = self.client success, msg = client.set_once( - "distinct_id", {"trait": "value"}, {"ip": "192.168.0.1"}, datetime(2014, 9, 3), "new-uuid" + "distinct_id", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid" ) self.assertTrue(success) self.assertEqual(msg["timestamp"], "2014-09-03T00:00:00+00:00") - self.assertEqual(msg["context"]["ip"], "192.168.0.1") self.assertEqual(msg["$set_once"]["trait"], "value") self.assertEqual(msg["properties"]["$lib"], "posthog-python") self.assertEqual(msg["properties"]["$lib_version"], VERSION) @@ -226,7 +221,7 @@ def test_basic_group_identify(self): def test_advanced_group_identify(self): success, msg = self.client.group_identify( - "organization", "id:5", {"trait": "value"}, {"ip": "192.168.0.1"}, datetime(2014, 9, 3), "new-uuid" + "organization", "id:5", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid" ) self.assertTrue(success) @@ -243,7 +238,6 @@ def test_advanced_group_identify(self): }, ) self.assertEqual(msg["timestamp"], "2014-09-03T00:00:00+00:00") - self.assertEqual(msg["context"]["ip"], "192.168.0.1") def test_basic_alias(self): client = self.client @@ -279,7 +273,6 @@ def test_advanced_page(self): "distinct_id", "https://posthog.com/contact", {"property": "value"}, - {"ip": "192.168.0.1"}, datetime(2014, 9, 3), "new-uuid", ) @@ -287,7 +280,6 @@ def test_advanced_page(self): self.assertTrue(success) self.assertEqual(msg["timestamp"], "2014-09-03T00:00:00+00:00") - self.assertEqual(msg["context"]["ip"], "192.168.0.1") self.assertEqual(msg["properties"]["$current_url"], "https://posthog.com/contact") self.assertEqual(msg["properties"]["property"], "value") self.assertEqual(msg["properties"]["$lib"], "posthog-python") diff --git a/posthog/version.py b/posthog/version.py index 2edd5680..852fb764 100644 --- a/posthog/version.py +++ b/posthog/version.py @@ -1,4 +1,4 @@ -VERSION = "1.4.6" +VERSION = "1.5.0" if __name__ == "__main__": print(VERSION, end="") From 5297b338b640e88208803e056b82c3c5d91544e1 Mon Sep 17 00:00:00 2001 From: James Greenhill Date: Fri, 24 Jun 2022 22:51:18 -0700 Subject: [PATCH 2/5] black formatting --- posthog/client.py | 4 +--- posthog/test/test_client.py | 12 +++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/posthog/client.py b/posthog/client.py index ac364f26..757c1118 100644 --- a/posthog/client.py +++ b/posthog/client.py @@ -118,9 +118,7 @@ def identify(self, distinct_id=None, properties=None, timestamp=None, uuid=None) return self._enqueue(msg) - def capture( - self, distinct_id=None, event=None, properties=None, timestamp=None, uuid=None, groups=None - ): + def capture(self, distinct_id=None, event=None, properties=None, timestamp=None, uuid=None, groups=None): properties = properties or {} require("distinct_id", distinct_id, ID_TYPES) require("properties", properties, dict) diff --git a/posthog/test/test_client.py b/posthog/test/test_client.py index fa729702..196f7e37 100644 --- a/posthog/test/test_client.py +++ b/posthog/test/test_client.py @@ -130,9 +130,7 @@ def test_basic_identify(self): def test_advanced_identify(self): client = self.client - success, msg = client.identify( - "distinct_id", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid" - ) + success, msg = client.identify("distinct_id", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid") self.assertTrue(success) @@ -158,9 +156,7 @@ def test_basic_set(self): def test_advanced_set(self): client = self.client - success, msg = client.set( - "distinct_id", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid" - ) + success, msg = client.set("distinct_id", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid") self.assertTrue(success) @@ -186,9 +182,7 @@ def test_basic_set_once(self): def test_advanced_set_once(self): client = self.client - success, msg = client.set_once( - "distinct_id", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid" - ) + success, msg = client.set_once("distinct_id", {"trait": "value"}, datetime(2014, 9, 3), "new-uuid") self.assertTrue(success) From ee54a188c62c339b732342418c973f46b651a690 Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Wed, 5 Feb 2025 17:42:19 +0900 Subject: [PATCH 3/5] Reformat using black . --- posthog/client.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/posthog/client.py b/posthog/client.py index c8639f8d..1e5f5270 100644 --- a/posthog/client.py +++ b/posthog/client.py @@ -340,9 +340,7 @@ def alias(self, previous_id=None, distinct_id=None, timestamp=None, uuid=None, d return self._enqueue(msg, disable_geoip) - def page( - self, distinct_id=None, url=None, properties=None, timestamp=None, uuid=None, disable_geoip=None - ): + def page(self, distinct_id=None, url=None, properties=None, timestamp=None, uuid=None, disable_geoip=None): properties = properties or {} require("distinct_id", distinct_id, ID_TYPES) From 0045acd784b028a351050398d5333fbfb19e781f Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Wed, 5 Feb 2025 17:54:55 +0900 Subject: [PATCH 4/5] Remove context --- posthog/client.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/posthog/client.py b/posthog/client.py index 1e5f5270..303c2044 100644 --- a/posthog/client.py +++ b/posthog/client.py @@ -323,8 +323,6 @@ def group_identify( return self._enqueue(msg, disable_geoip) def alias(self, previous_id=None, distinct_id=None, timestamp=None, uuid=None, disable_geoip=None): - context = context or {} - require("previous_id", previous_id, ID_TYPES) require("distinct_id", distinct_id, ID_TYPES) From 5d73f272a458828638c4e34e75520c5249174400 Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Wed, 5 Feb 2025 19:22:13 +0900 Subject: [PATCH 5/5] Fix unit test --- posthog/test/test_client.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/posthog/test/test_client.py b/posthog/test/test_client.py index 70fb3a43..ef772c2e 100644 --- a/posthog/test/test_client.py +++ b/posthog/test/test_client.py @@ -743,14 +743,12 @@ def test_advanced_group_identify(self): }, ) self.assertEqual(msg["timestamp"], "2014-09-03T00:00:00+00:00") - self.assertEqual(msg["context"]["ip"], "192.168.0.1") def test_advanced_group_identify_with_distinct_id(self): success, msg = self.client.group_identify( "organization", "id:5", {"trait": "value"}, - {"ip": "192.168.0.1"}, datetime(2014, 9, 3), "new-uuid", distinct_id="distinct_id",