diff --git a/posthog/__init__.py b/posthog/__init__.py index dff0dfa..5b0cc7f 100644 --- a/posthog/__init__.py +++ b/posthog/__init__.py @@ -36,7 +36,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] @@ -69,7 +68,6 @@ def capture( distinct_id=distinct_id, event=event, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, groups=groups, @@ -81,7 +79,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] disable_geoip=None, # type: Optional[bool] @@ -106,7 +103,6 @@ def identify( "identify", distinct_id=distinct_id, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, disable_geoip=disable_geoip, @@ -116,7 +112,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] disable_geoip=None, # type: Optional[bool] @@ -141,7 +136,6 @@ def set( "set", distinct_id=distinct_id, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, disable_geoip=disable_geoip, @@ -151,7 +145,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] disable_geoip=None, # type: Optional[bool] @@ -176,7 +169,6 @@ def set_once( "set_once", distinct_id=distinct_id, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, disable_geoip=disable_geoip, @@ -187,7 +179,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] disable_geoip=None, # type: Optional[bool] @@ -213,7 +204,6 @@ def group_identify( group_type=group_type, group_key=group_key, properties=properties, - context=context, timestamp=timestamp, uuid=uuid, disable_geoip=disable_geoip, @@ -223,7 +213,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] disable_geoip=None, # type: Optional[bool] @@ -249,7 +238,6 @@ def alias( "alias", previous_id=previous_id, distinct_id=distinct_id, - context=context, timestamp=timestamp, uuid=uuid, disable_geoip=disable_geoip, diff --git a/posthog/client.py b/posthog/client.py index 2e2dbd4..303c204 100644 --- a/posthog/client.py +++ b/posthog/client.py @@ -146,15 +146,13 @@ def __init__( if send: consumer.start() - def identify(self, distinct_id=None, properties=None, context=None, timestamp=None, uuid=None, disable_geoip=None): + def identify(self, distinct_id=None, properties=None, timestamp=None, uuid=None, disable_geoip=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", @@ -211,7 +209,6 @@ def capture( distinct_id=None, event=None, properties=None, - context=None, timestamp=None, uuid=None, groups=None, @@ -219,7 +216,6 @@ def capture( disable_geoip=None, ): properties = properties or {} - context = context or {} require("distinct_id", distinct_id, ID_TYPES) require("properties", properties, dict) require("event", event, string_types) @@ -227,7 +223,6 @@ def capture( msg = { "properties": properties, "timestamp": timestamp, - "context": context, "distinct_id": distinct_id, "event": event, "uuid": uuid, @@ -263,15 +258,13 @@ def capture( return self._enqueue(msg, disable_geoip) - def set(self, distinct_id=None, properties=None, context=None, timestamp=None, uuid=None, disable_geoip=None): + def set(self, distinct_id=None, properties=None, timestamp=None, uuid=None, disable_geoip=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", @@ -280,15 +273,13 @@ def set(self, distinct_id=None, properties=None, context=None, timestamp=None, u return self._enqueue(msg, disable_geoip) - def set_once(self, distinct_id=None, properties=None, context=None, timestamp=None, uuid=None, disable_geoip=None): + def set_once(self, distinct_id=None, properties=None, timestamp=None, uuid=None, disable_geoip=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", @@ -302,14 +293,12 @@ def group_identify( group_type=None, group_key=None, properties=None, - context=None, timestamp=None, uuid=None, disable_geoip=None, distinct_id=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) @@ -328,15 +317,12 @@ def group_identify( }, "distinct_id": distinct_id, "timestamp": timestamp, - "context": context, "uuid": uuid, } return self._enqueue(msg, disable_geoip) - def alias(self, previous_id=None, distinct_id=None, context=None, timestamp=None, uuid=None, disable_geoip=None): - context = context or {} - + def alias(self, previous_id=None, distinct_id=None, timestamp=None, uuid=None, disable_geoip=None): require("previous_id", previous_id, ID_TYPES) require("distinct_id", distinct_id, ID_TYPES) @@ -346,18 +332,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, disable_geoip) - def page( - self, distinct_id=None, url=None, properties=None, context=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 {} - context = context or {} require("distinct_id", distinct_id, ID_TYPES) require("properties", properties, dict) @@ -369,7 +351,6 @@ def page( "event": "$pageview", "properties": properties, "timestamp": timestamp, - "context": context, "distinct_id": distinct_id, "uuid": uuid, } @@ -446,7 +427,6 @@ def _enqueue(self, msg, disable_geoip): timestamp = datetime.now(tz=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 9f0dab5..ef772c2 100644 --- a/posthog/test/test_client.py +++ b/posthog/test/test_client.py @@ -581,7 +581,6 @@ def test_advanced_capture(self): "distinct_id", "python test event", {"property": "value"}, - {"ip": "192.168.0.1"}, datetime(2014, 9, 3), "new-uuid", ) @@ -590,7 +589,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) @@ -622,14 +620,11 @@ 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" - ) + success, msg = client.identify("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) @@ -651,14 +646,11 @@ 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" - ) + success, msg = client.set("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) @@ -680,14 +672,11 @@ 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" - ) + success, msg = client.set_once("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) @@ -736,7 +725,7 @@ def test_basic_group_identify_with_distinct_id(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) @@ -754,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", @@ -783,7 +770,6 @@ def test_advanced_group_identify_with_distinct_id(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 @@ -819,7 +805,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", ) @@ -827,7 +812,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 20ac2ac..c784d8c 100644 --- a/posthog/version.py +++ b/posthog/version.py @@ -1,4 +1,4 @@ -VERSION = "3.11.0" +VERSION = "3.12.0" if __name__ == "__main__": print(VERSION, end="") # noqa: T201