rudder-sdk-python 2.1.3__tar.gz → 2.1.8__tar.gz

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rudder-sdk-python
-Version: 2.1.3
+Version: 2.1.8
 Summary: RudderStack is an open-source Segment alternative written in Go, built for the enterprise.
 Home-page: https://github.com/rudderlabs/rudder-sdk-python
 Author: RudderStack
@@ -25,17 +25,27 @@ Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: requests<3.0,>=2.32.3
-Requires-Dist: monotonic<2.0,>=1.6
 Requires-Dist: backoff<3.0,>=2.2.1
 Requires-Dist: python-dateutil<3.0,>=2.2
 Requires-Dist: python-dotenv<2.0.0,>=1.0.1
 Requires-Dist: deprecation<3.0.0,>=2.1.0
 Provides-Extra: test
-Requires-Dist: mock==4.0.3; extra == "test"
-Requires-Dist: flake8==7.1.0; extra == "test"
+Requires-Dist: mock==5.1.0; extra == "test"
+Requires-Dist: flake8==7.1.1; extra == "test"
+
+<p align="center">
+  <a href="https://rudderstack.com/">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/rudderlabs/rudder-sdk-js/develop/assets/rs-logo-full-dark.png">
+      <img alt="RudderStack" width="512" src="https://raw.githubusercontent.com/rudderlabs/rudder-sdk-js/develop/assets/rs-logo-full-light.jpg">
+    </picture>
+  </a>
+</p>
 
 # RudderStack Python SDK
 
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/rudderlabs/rudder-sdk-python)
+
 RudderStack’s Python SDK lets you track events from your Python application. Once enabled, the event requests hit the RudderStack servers. RudderStack then transforms and routes these events to your specified destination platforms.
 
 More details on the Python SDK can be found in our [**documentation**](https://docs.rudderstack.com/stream-sources/rudderstack-sdk-integration-guides/rudderstack-python-sdk)
@@ -79,6 +89,31 @@ analytics.track('user_id', 'Simple Track Event', anonymous_id='anonymousId',
 
 For more information on the supported calls, refer to the [**documentation**](https://docs.rudderstack.com/stream-sources/rudderstack-sdk-integration-guides/rudderstack-python-sdk#sending-events-from-rudderstack).
 
+## Proxy configuration
+
+Pass `proxies` when you create a `Client`. A Requests-style mapping is preferred:
+
+```python
+from rudderstack.analytics.client import Client
+
+client = Client(
+    'SOURCE_WRITE_KEY',
+    host='https://YOUR_DATA_PLANE_URL',
+    proxies={
+        'http': 'http://proxy.example:8080',
+        'https': 'http://proxy.example:8080',
+    },
+)
+```
+
+A legacy string such as `proxy.example:8080` is also supported. The SDK applies
+the string to both HTTP and HTTPS requests. If the string has no scheme, the SDK
+adds `http://`. An existing scheme is preserved.
+
+Configured proxies are now used for event requests. Earlier versions ignored
+this option. Check that any existing proxy configuration is reachable before
+upgrading.
+
 ## About RudderStack
 
 [**RudderStack**](https://rudderstack.com/) is a customer data platform for developers. Our tooling makes it easy to deploy pipelines that collect customer data from every app, website and SaaS platform, then activate it in your warehouse and business tools.

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/README.md

@@ -1,5 +1,16 @@
+<p align="center">
+  <a href="https://rudderstack.com/">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/rudderlabs/rudder-sdk-js/develop/assets/rs-logo-full-dark.png">
+      <img alt="RudderStack" width="512" src="https://raw.githubusercontent.com/rudderlabs/rudder-sdk-js/develop/assets/rs-logo-full-light.jpg">
+    </picture>
+  </a>
+</p>
+
 # RudderStack Python SDK
 
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/rudderlabs/rudder-sdk-python)
+
 RudderStack’s Python SDK lets you track events from your Python application. Once enabled, the event requests hit the RudderStack servers. RudderStack then transforms and routes these events to your specified destination platforms.
 
 More details on the Python SDK can be found in our [**documentation**](https://docs.rudderstack.com/stream-sources/rudderstack-sdk-integration-guides/rudderstack-python-sdk)
@@ -43,6 +54,31 @@ analytics.track('user_id', 'Simple Track Event', anonymous_id='anonymousId',
 
 For more information on the supported calls, refer to the [**documentation**](https://docs.rudderstack.com/stream-sources/rudderstack-sdk-integration-guides/rudderstack-python-sdk#sending-events-from-rudderstack).
 
+## Proxy configuration
+
+Pass `proxies` when you create a `Client`. A Requests-style mapping is preferred:
+
+```python
+from rudderstack.analytics.client import Client
+
+client = Client(
+    'SOURCE_WRITE_KEY',
+    host='https://YOUR_DATA_PLANE_URL',
+    proxies={
+        'http': 'http://proxy.example:8080',
+        'https': 'http://proxy.example:8080',
+    },
+)
+```
+
+A legacy string such as `proxy.example:8080` is also supported. The SDK applies
+the string to both HTTP and HTTPS requests. If the string has no scheme, the SDK
+adds `http://`. An existing scheme is preserved.
+
+Configured proxies are now used for event requests. Earlier versions ignored
+this option. Check that any existing proxy configuration is reachable before
+upgrading.
+
 ## About RudderStack
 
 [**RudderStack**](https://rudderstack.com/) is a customer data platform for developers. Our tooling makes it easy to deploy pipelines that collect customer data from every app, website and SaaS platform, then activate it in your warehouse and business tools.

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudder_sdk_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rudder-sdk-python
-Version: 2.1.3
+Version: 2.1.8
 Summary: RudderStack is an open-source Segment alternative written in Go, built for the enterprise.
 Home-page: https://github.com/rudderlabs/rudder-sdk-python
 Author: RudderStack
@@ -25,17 +25,27 @@ Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: requests<3.0,>=2.32.3
-Requires-Dist: monotonic<2.0,>=1.6
 Requires-Dist: backoff<3.0,>=2.2.1
 Requires-Dist: python-dateutil<3.0,>=2.2
 Requires-Dist: python-dotenv<2.0.0,>=1.0.1
 Requires-Dist: deprecation<3.0.0,>=2.1.0
 Provides-Extra: test
-Requires-Dist: mock==4.0.3; extra == "test"
-Requires-Dist: flake8==7.1.0; extra == "test"
+Requires-Dist: mock==5.1.0; extra == "test"
+Requires-Dist: flake8==7.1.1; extra == "test"
+
+<p align="center">
+  <a href="https://rudderstack.com/">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/rudderlabs/rudder-sdk-js/develop/assets/rs-logo-full-dark.png">
+      <img alt="RudderStack" width="512" src="https://raw.githubusercontent.com/rudderlabs/rudder-sdk-js/develop/assets/rs-logo-full-light.jpg">
+    </picture>
+  </a>
+</p>
 
 # RudderStack Python SDK
 
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/rudderlabs/rudder-sdk-python)
+
 RudderStack’s Python SDK lets you track events from your Python application. Once enabled, the event requests hit the RudderStack servers. RudderStack then transforms and routes these events to your specified destination platforms.
 
 More details on the Python SDK can be found in our [**documentation**](https://docs.rudderstack.com/stream-sources/rudderstack-sdk-integration-guides/rudderstack-python-sdk)
@@ -79,6 +89,31 @@ analytics.track('user_id', 'Simple Track Event', anonymous_id='anonymousId',
 
 For more information on the supported calls, refer to the [**documentation**](https://docs.rudderstack.com/stream-sources/rudderstack-sdk-integration-guides/rudderstack-python-sdk#sending-events-from-rudderstack).
 
+## Proxy configuration
+
+Pass `proxies` when you create a `Client`. A Requests-style mapping is preferred:
+
+```python
+from rudderstack.analytics.client import Client
+
+client = Client(
+    'SOURCE_WRITE_KEY',
+    host='https://YOUR_DATA_PLANE_URL',
+    proxies={
+        'http': 'http://proxy.example:8080',
+        'https': 'http://proxy.example:8080',
+    },
+)
+```
+
+A legacy string such as `proxy.example:8080` is also supported. The SDK applies
+the string to both HTTP and HTTPS requests. If the string has no scheme, the SDK
+adds `http://`. An existing scheme is preserved.
+
+Configured proxies are now used for event requests. Earlier versions ignored
+this option. Check that any existing proxy configuration is reachable before
+upgrading.
+
 ## About RudderStack
 
 [**RudderStack**](https://rudderstack.com/) is a customer data platform for developers. Our tooling makes it easy to deploy pipelines that collect customer data from every app, website and SaaS platform, then activate it in your warehouse and business tools.

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudder_sdk_python.egg-info/SOURCES.txt

@@ -20,5 +20,8 @@ rudderstack/analytics/test/test_client.py
 rudderstack/analytics/test/test_constants.py
 rudderstack/analytics/test/test_consumer.py
 rudderstack/analytics/test/test_module.py
+rudderstack/analytics/test/test_public_api_contract.py
+rudderstack/analytics/test/test_release_validation.py
 rudderstack/analytics/test/test_request.py
+rudderstack/analytics/test/test_request_options.py
 rudderstack/analytics/test/test_utils.py

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudder_sdk_python.egg-info/requires.txt

@@ -1,10 +1,9 @@
 requests<3.0,>=2.32.3
-monotonic<2.0,>=1.6
 backoff<3.0,>=2.2.1
 python-dateutil<3.0,>=2.2
 python-dotenv<2.0.0,>=1.0.1
 deprecation<3.0.0,>=2.1.0
 
 [test]
-mock==4.0.3
-flake8==7.1.0
+mock==5.1.0
+flake8==7.1.1

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudderstack/analytics/__init__.py

@@ -90,8 +90,7 @@ def join():
 
 def shutdown():
     """Flush all messages and cleanly shutdown the client"""
-    _proxy('flush')
-    _proxy('join')
+    _proxy('shutdown')
 
 
 def _proxy(method, *args, **kwargs):

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudderstack/analytics/client.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from uuid import uuid4
 import logging
 import numbers
@@ -245,7 +245,7 @@ class Client(object):
         """Push a new `msg` onto the queue, return `(success, msg)`"""
         timestamp = msg['timestamp']
         if timestamp is None:
-            timestamp = datetime.utcnow().replace(tzinfo=tzutc())
+            timestamp = datetime.now(timezone.utc).replace(tzinfo=tzutc())
         message_id = msg.get('messageId')
         if message_id is None:
             message_id = uuid4()

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudderstack/analytics/consumer.py

@@ -1,6 +1,6 @@
 import logging
+import time
 from threading import Thread
-import monotonic
 import backoff
 import json
 
@@ -8,11 +8,10 @@ from rudderstack.analytics.request import post, APIError, DatetimeSerializer
 
 from queue import Empty
 
-MAX_MSG_SIZE = 32 << 10
-
-# Our servers only accept batches less than 500KB. Here limit is set slightly
+# Our servers only accept payloads within this limit. Here limit is set slightly
 # lower to leave space for extra data that will be added later, eg. "sentAt".
-BATCH_SIZE_LIMIT = 475000
+MAX_MSG_SIZE = 4 << 10 << 10  ## 4 mb
+BATCH_SIZE_LIMIT = 4 << 10 << 10 ## 4 mb
 
 
 class Consumer(Thread):
@@ -80,11 +79,11 @@ class Consumer(Thread):
         queue = self.queue
         items = []
 
-        start_time = monotonic.monotonic()
+        start_time = time.monotonic()
         total_size = 0
 
         while len(items) < self.upload_size:
-            elapsed = monotonic.monotonic() - start_time
+            elapsed = time.monotonic() - start_time
             if elapsed >= self.upload_interval:
                 break
             try:
@@ -94,7 +93,7 @@ class Consumer(Thread):
                     item, cls=DatetimeSerializer).encode())
                 if item_size > MAX_MSG_SIZE:
                     self.log.error(
-                        'Item exceeds 32kb limit, dropping. (%s)', str(item))
+                        'Item exceeds 4mb limit, dropping. (%s)', str(item))
                     continue
                 items.append(item)
                 total_size += item_size

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudderstack/analytics/request.py

@@ -1,4 +1,4 @@
-from datetime import date, datetime
+from datetime import date, datetime, timezone
 from io import BytesIO
 from gzip import GzipFile
 import logging
@@ -17,7 +17,7 @@ def post(write_key, host=None, gzip=True, timeout=15, proxies=None, **kwargs):
     """Post the `kwargs` to the API"""
     log = logging.getLogger('rudderstack')
     body = kwargs
-    body["sentAt"] = datetime.utcnow().replace(tzinfo=tzutc()).isoformat()
+    body["sentAt"] = datetime.now(timezone.utc).replace(tzinfo=tzutc()).isoformat()
     url = remove_trailing_slash(host or 'https://api.rudderstack.com') + '/v1/batch'
     auth = HTTPBasicAuth(write_key, '')
     data = json.dumps(body, cls=DatetimeSerializer)
@@ -34,14 +34,17 @@ def post(write_key, host=None, gzip=True, timeout=15, proxies=None, **kwargs):
         "data": data,
         "auth": auth,
         "headers": headers,
-        "timeout": 15,
+        "timeout": timeout,
     }
 
     if proxies:
+        # Older SDK versions accepted a single proxy string.
+        if isinstance(proxies, str):
+            proxy_url = proxies if '://' in proxies else 'http://' + proxies
+            proxies = {'http': proxy_url, 'https': proxy_url}
         kwargs['proxies'] = proxies
 
-    res = _session.post(url, data=data, auth=auth,
-                        headers=headers, timeout=timeout)
+    res = _session.post(url, **kwargs)
 
     if res.status_code == 200:
         log.debug('data uploaded successfully')

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudderstack/analytics/test/test_client.py

@@ -325,10 +325,14 @@ class TestClient(unittest.TestCase):
 
     def test_user_defined_upload_size(self):
         client = Client(write_key = TEST_WRITE_KEY, on_error=self.fail,
-                        upload_size=10, upload_interval=3)
-        print("write_key", TEST_WRITE_KEY)
+                        upload_size=10, upload_interval=0.01)
+        consumer = client.consumers[0]
+        consumer.pause()
+        consumer.join()
+
+        batch_sizes = []
         def mock_post_fn(*args, **kwargs):
-            self.assertEqual(len(kwargs['batch']), 10)
+            batch_sizes.append(len(kwargs['batch']))
 
         # the post function should be called 2 times, with a batch size of 10
         # each time.
@@ -336,8 +340,10 @@ class TestClient(unittest.TestCase):
                 as mock_post:
             for _ in range(20):
                 client.identify('userId', {'trait': 'value'})
-            time.sleep(1)
+            consumer.upload()
+            consumer.upload()
             self.assertEqual(mock_post.call_count, 2)
+            self.assertEqual(batch_sizes, [10, 10])
 
     def test_user_defined_timeout(self):
         client = Client(TEST_WRITE_KEY, timeout=10)
@@ -350,6 +356,6 @@ class TestClient(unittest.TestCase):
             self.assertEqual(consumer.timeout, 15)
 
     def test_proxies(self):
-        client = Client(TEST_WRITE_KEY, proxies=TEST_PROXY)
-        success, msg = client.identify('userId', {'trait': 'value'})
-        self.assertTrue(success)
+        client = Client(TEST_WRITE_KEY, proxies=TEST_PROXY, send=False)
+
+        self.assertEqual(client.consumers[0].proxies, TEST_PROXY)

rudder_sdk_python-2.1.8/rudderstack/analytics/test/test_constants.py

@@ -0,0 +1,4 @@
+TEST_PROXY = {
+    'http': 'http://proxy.example:8080',
+    'https': 'http://proxy.example:8080',
+}

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudderstack/analytics/test/test_consumer.py

@@ -196,7 +196,7 @@ class TestConsumer(unittest.TestCase):
         }
         msg_size = len(json.dumps(track).encode())
         # number of messages in a maximum-size batch
-        n_msgs = int(475000 / msg_size)
+        n_msgs = int((4 << 10 << 10) / msg_size)
 
         def mock_post_fn(_, data, **kwargs):
             res = mock.Mock()
@@ -208,14 +208,17 @@ class TestConsumer(unittest.TestCase):
 
         with mock.patch('rudderstack.analytics.request._session.post',
                         side_effect=mock_post_fn) as mock_post:
-            consumer.start()
             for _ in range(0, n_msgs + 2):
                 q.put(track)
+            consumer.start()
             q.join()
+            consumer.pause()
+            consumer.join()
             self.assertEqual(mock_post.call_count, 2)
 
-    @classmethod
-    def test_proxies(cls):
+    @mock.patch('rudderstack.analytics.request._session.post')
+    def test_proxies(self, session_post):
+        session_post.return_value = mock.Mock(status_code=200)
         consumer = Consumer(None, host=TEST_DATA_PLANE_URL, 
         write_key=TEST_WRITE_KEY, proxies=TEST_PROXY)
         track = {
@@ -224,3 +227,6 @@ class TestConsumer(unittest.TestCase):
             'userId': 'userId'
         }
         consumer.request([track])
+
+        _, kwargs = session_post.call_args
+        self.assertEqual(kwargs['proxies'], TEST_PROXY)

rudder_sdk_python-2.1.8/rudderstack/analytics/test/test_public_api_contract.py

@@ -0,0 +1,96 @@
+"""Compatibility checks for the existing module and Client APIs."""
+
+import unittest
+from unittest import mock
+
+import rudderstack.analytics as analytics
+from rudderstack.analytics.client import Client
+
+
+EVENT_CALLS = (
+    ('track', ('user-id', 'test event')),
+    ('identify', ('user-id',)),
+    ('group', ('user-id', 'group-id')),
+    ('alias', ('previous-id', 'user-id')),
+    ('page', ('user-id',)),
+    ('screen', ('user-id',)),
+)
+
+
+class TestPublicApiContract(unittest.TestCase):
+    def test_module_discards_client_results(self):
+        client = mock.Mock()
+        with mock.patch.object(analytics, 'default_client', client):
+            for method, args in EVENT_CALLS:
+                with self.subTest(method=method):
+                    getattr(client, method).return_value = mock.sentinel.result
+                    self.assertIsNone(getattr(analytics, method)(
+                        *args, message_id='message-id'))
+                    getattr(client, method).assert_called_once_with(
+                        *args, message_id='message-id')
+            for method in ('flush', 'join', 'shutdown'):
+                with self.subTest(method=method):
+                    getattr(client, method).return_value = mock.sentinel.result
+                    self.assertIsNone(getattr(analytics, method)())
+
+    def test_module_returns_none_when_queue_accepts_or_rejects_event(self):
+        for method, args in EVENT_CALLS:
+            with self.subTest(method=method):
+                client = Client('test-key', send=False, max_queue_size=1)
+                # Enable enqueueing without starting a background consumer.
+                client.send = True
+                with mock.patch.object(analytics, 'default_client', client):
+                    self.assertIsNone(getattr(analytics, method)(*args))
+                    self.assertEqual(client.queue.qsize(), 1)
+                    self.assertIsNone(getattr(analytics, method)(*args))
+                    self.assertEqual(client.queue.qsize(), 1)
+
+    def test_client_returns_success_and_message(self):
+        for method, args in EVENT_CALLS:
+            with self.subTest(method=method):
+                client = Client('test-key', send=False)
+                result = getattr(client, method)(
+                    *args, message_id='message-id')
+                self.assertIsInstance(result, tuple)
+                self.assertEqual(len(result), 2)
+                success, message = result
+                self.assertIs(success, True)
+                self.assertEqual(message['type'], method)
+                self.assertEqual(message['messageId'], 'message-id')
+
+    def test_client_returns_false_and_message_when_queue_is_full(self):
+        for method, args in EVENT_CALLS:
+            with self.subTest(method=method):
+                client = Client('test-key', send=False, max_queue_size=1)
+                client.send = True
+                success, message = getattr(client, method)(*args)
+                self.assertIs(success, True)
+                self.assertEqual(client.queue.get_nowait(), message)
+                client.queue.task_done()
+                client.queue.put_nowait(message)
+                result = getattr(client, method)(*args)
+                self.assertIsInstance(result, tuple)
+                self.assertEqual(len(result), 2)
+                success, message = result
+                self.assertIs(success, False)
+                self.assertEqual(message['type'], method)
+
+    def test_module_preserves_validation_errors(self):
+        client = Client('test-key', send=False)
+        with mock.patch.object(analytics, 'default_client', client):
+            with self.assertRaises(AssertionError):
+                analytics.track('user-id', event=123)
+
+    def test_client_lifecycle_returns_none(self):
+        client = Client('test-key', send=False)
+        for method in ('flush', 'join', 'shutdown'):
+            with self.subTest(method=method):
+                self.assertIsNone(getattr(client, method)())
+
+
+class TestShutdownDelegation(unittest.TestCase):
+    def test_module_calls_client_shutdown_once(self):
+        client = mock.Mock()
+        with mock.patch.object(analytics, 'default_client', client):
+            self.assertIsNone(analytics.shutdown())
+        self.assertEqual(client.mock_calls, [mock.call.shutdown()])

rudder_sdk_python-2.1.8/rudderstack/analytics/test/test_release_validation.py

@@ -0,0 +1,62 @@
+import os
+import runpy
+import subprocess
+import textwrap
+from pathlib import Path
+
+import pytest
+
+
+REPOSITORY_ROOT = Path(__file__).resolve().parents[3]
+PUBLISH_WORKFLOW = REPOSITORY_ROOT / '.github' / 'workflows' / 'publish-pypi.yml'
+VERSION_FILE = REPOSITORY_ROOT / 'rudderstack' / 'analytics' / 'version.py'
+VERSION = runpy.run_path(str(VERSION_FILE))['VERSION']
+
+
+def release_validation_script():
+    workflow = PUBLISH_WORKFLOW.read_text(encoding='utf-8')
+    validation_step = workflow.split(
+        '      - name: Validate release tag and package version\n', 1
+    )[1].split('\n      - name:', 1)[0]
+    script = validation_step.split('        run: |\n', 1)[1]
+    return textwrap.dedent(script)
+
+
+def run_validation(release_tag, check_syntax=False):
+    command = ['bash', '-n'] if check_syntax else ['bash']
+    return subprocess.run(
+        command,
+        check=False,
+        capture_output=True,
+        cwd=REPOSITORY_ROOT,
+        env={**os.environ, 'RELEASE_TAG': release_tag},
+        input=release_validation_script(),
+        text=True,
+    )
+
+
+def test_release_validation_script_has_valid_shell_syntax():
+    result = run_validation('v{}'.format(VERSION), check_syntax=True)
+
+    assert result.returncode == 0
+
+
+def test_current_package_version_matches_release_tag():
+    result = run_validation('v{}'.format(VERSION))
+
+    assert result.returncode == 0
+
+
+@pytest.mark.parametrize('release_tag', ['2.1.7', 'v2.1', 'release-v2.1.7'])
+def test_invalid_release_tag_is_rejected(release_tag):
+    result = run_validation(release_tag)
+
+    assert result.returncode == 1
+    assert 'Invalid release tag' in result.stderr
+
+
+def test_release_tag_must_match_package_version():
+    result = run_validation('v999.0.0')
+
+    assert result.returncode == 1
+    assert 'does not match package version' in result.stderr

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudderstack/analytics/test/test_request.py

@@ -1,5 +1,6 @@
 from datetime import datetime, date
 import unittest
+from unittest import mock
 import json
 import requests
 
@@ -67,11 +68,15 @@ class TestRequests(unittest.TestCase):
         data = json.dumps(body, cls=DatetimeSerializer)
         self.assertTrue(len(data) > len(_gzip_json(data = data)))
 
-    def test_proxies(self):
-        res = post(TEST_WRITE_KEY,host=TEST_DATA_PLANE_URL, batch=[{
-            'userId': 'userId',
-            'event': 'python event',
-            'type': 'track',
-            'proxies': TEST_PROXY
-        }])
-        self.assertEqual(res.status_code, 200)
+    @mock.patch('rudderstack.analytics.request._session.post')
+    def test_passes_proxy_and_timeout_to_session(self, session_post):
+        response = mock.Mock(status_code=200)
+        session_post.return_value = response
+
+        self.assertIs(
+            post(TEST_WRITE_KEY, host=TEST_DATA_PLANE_URL, proxies=TEST_PROXY,
+                 timeout=7.5, batch=[]),
+            response)
+        _, kwargs = session_post.call_args
+        self.assertEqual(kwargs['proxies'], TEST_PROXY)
+        self.assertEqual(kwargs['timeout'], 7.5)

rudder_sdk_python-2.1.8/rudderstack/analytics/test/test_request_options.py

@@ -0,0 +1,136 @@
+"""Request option tests without credentials or external network access."""
+
+from http.server import BaseHTTPRequestHandler, HTTPServer
+import gzip
+import json
+import socket
+from threading import Thread
+import unittest
+from unittest import mock
+
+import requests
+
+from rudderstack.analytics.client import Client
+from rudderstack.analytics.consumer import Consumer
+from rudderstack.analytics.request import post
+
+
+class TestRequestOptions(unittest.TestCase):
+    def setUp(self):
+        patcher = mock.patch('rudderstack.analytics.request._session.post')
+        self.session_post = patcher.start()
+        self.addCleanup(patcher.stop)
+        self.session_post.return_value = mock.Mock(status_code=200)
+
+    def test_legacy_proxy_strings(self):
+        for value, expected in (
+            ('proxy.example:8080', 'http://proxy.example:8080'),
+            ('http://proxy.example:8080', 'http://proxy.example:8080'),
+            ('https://proxy.example:8080', 'https://proxy.example:8080'),
+            ('socks5://proxy.example:1080', 'socks5://proxy.example:1080'),
+        ):
+            with self.subTest(proxy=value):
+                post('test-key', proxies=value, batch=[])
+                self.assertEqual(self.session_post.call_args.kwargs['proxies'],
+                                 {'http': expected, 'https': expected})
+
+    def test_proxy_mapping_is_not_modified(self):
+        proxies = {'http': 'http://proxy.example:8080',
+                   'https': 'http://secure-proxy.example:8080'}
+        original = proxies.copy()
+        post('test-key', proxies=proxies, batch=[])
+        self.assertIs(self.session_post.call_args.kwargs['proxies'], proxies)
+        self.assertEqual(proxies, original)
+
+    def test_empty_proxy_configuration_is_omitted(self):
+        for proxies in (None, '', {}):
+            with self.subTest(proxies=proxies):
+                post('test-key', proxies=proxies, batch=[])
+                self.assertNotIn('proxies', self.session_post.call_args.kwargs)
+
+    def test_default_and_custom_timeouts(self):
+        post('test-key', batch=[])
+        self.assertEqual(self.session_post.call_args.kwargs['timeout'], 15)
+        post('test-key', timeout=7.5, batch=[])
+        self.assertEqual(self.session_post.call_args.kwargs['timeout'], 7.5)
+
+    def test_sync_client_forwards_legacy_proxy_and_timeout(self):
+        client = Client('test-key', sync_mode=True,
+                        proxies='proxy.example:8080', timeout=7.5)
+        success, message = client.track('user-id', 'test event')
+        self.assertIs(success, True)
+        self.assertEqual(message['type'], 'track')
+        self.assertEqual(self.session_post.call_args.kwargs['proxies'],
+                         {'http': 'http://proxy.example:8080',
+                          'https': 'http://proxy.example:8080'})
+        self.assertEqual(self.session_post.call_args.kwargs['timeout'], 7.5)
+
+    def test_consumer_forwards_legacy_proxy_and_timeout(self):
+        consumer = Consumer(None, 'test-key', proxies='proxy.example:8080',
+                            timeout=7.5, retries=0)
+        consumer.request([{'type': 'track', 'event': 'test event'}])
+        self.assertEqual(self.session_post.call_args.kwargs['proxies'],
+                         {'http': 'http://proxy.example:8080',
+                          'https': 'http://proxy.example:8080'})
+        self.assertEqual(self.session_post.call_args.kwargs['timeout'], 7.5)
+
+
+class TestProxyTransport(unittest.TestCase):
+    def test_real_requests_routes_through_proxy(self):
+        received = []
+        getaddrinfo = socket.getaddrinfo
+
+        def local_only(host, *args, **kwargs):
+            self.assertEqual(host, '127.0.0.1',
+                             'Unexpected external connection')
+            return getaddrinfo(host, *args, **kwargs)
+
+        patcher = mock.patch('socket.getaddrinfo', side_effect=local_only)
+        patcher.start()
+        self.addCleanup(patcher.stop)
+
+        class ProxyHandler(BaseHTTPRequestHandler):
+            def do_POST(self):
+                body = self.rfile.read(int(self.headers['Content-Length']))
+                if self.headers.get('Content-Encoding') == 'gzip':
+                    body = gzip.decompress(body)
+                received.append((self.path, json.loads(body)))
+                self.send_response(200)
+                self.end_headers()
+                self.wfile.write(b'{}')
+
+            def log_message(self, *args):
+                pass
+
+        server = HTTPServer(('127.0.0.1', 0), ProxyHandler)
+        thread = Thread(target=server.serve_forever,
+                        kwargs={'poll_interval': 0.01}, daemon=True)
+        thread.start()
+        try:
+            address = '127.0.0.1:{}'.format(server.server_port)
+            with requests.Session() as session:
+                session.trust_env = False
+                with mock.patch('rudderstack.analytics.request._session',
+                                session):
+                    for proxies in (address, 'http://' + address,
+                                    {'http': 'http://' + address}):
+                        for compressed in (False, True):
+                            with self.subTest(proxies=proxies,
+                                              gzip=compressed):
+                                response = post(
+                                    'test-key', host='http://data.example',
+                                    proxies=proxies, timeout=2,
+                                    gzip=compressed, batch=[])
+                                self.assertEqual(response.status_code, 200)
+                                path, payload = received[-1]
+                                self.assertEqual(
+                                    path, 'http://data.example/v1/batch')
+                                self.assertEqual(payload['batch'], [])
+                                self.assertIn('sentAt', payload)
+                                self.assertNotIn('proxies', payload)
+                                self.assertNotIn('timeout', payload)
+            self.assertEqual(len(received), 6)
+        finally:
+            server.shutdown()
+            thread.join(timeout=2)
+            server.server_close()

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/rudderstack/analytics/test/test_utils.py

@@ -1,4 +1,4 @@
-from datetime import date, datetime, timedelta
+from datetime import date, datetime, timedelta, timezone
 from decimal import Decimal
 import unittest
 
@@ -51,7 +51,7 @@ class TestUtils(unittest.TestCase):
     def test_clean_with_dates(self):
         dict_with_dates = {
             'birthdate': date(1980, 1, 1),
-            'registration': datetime.utcnow(),
+            'registration': datetime.now(timezone.utc),
         }
         self.assertEqual(dict_with_dates, utils.clean(dict_with_dates))
 

rudder_sdk_python-2.1.8/rudderstack/analytics/version.py

@@ -0,0 +1 @@
+VERSION = '2.1.8'  # x-release-please-version

{rudder_sdk_python-2.1.3 → rudder_sdk_python-2.1.8}/setup.py

@@ -10,7 +10,6 @@ long_description = (Path(__file__).resolve().parent / 'README.md').read_text(enc
 
 install_requires = [
     "requests>=2.32.3,<3.0",
-    "monotonic>=1.6,<2.0",
     "backoff>=2.2.1,<3.0",
     "python-dateutil>=2.2,<3.0",
     "python-dotenv>=1.0.1,<2.0.0",
@@ -18,8 +17,8 @@ install_requires = [
 ]
 
 tests_require = [
-    "mock==4.0.3",
-    "flake8==7.1.0",
+    "mock==5.1.0",
+    "flake8==7.1.1",
 ]
 
 setup(
@@ -30,7 +29,6 @@ setup(
     author_email='sdk@rudderstack.com',
     maintainer='RudderStack',
     maintainer_email='sdk@rudderstack.com',
-    test_suite='rudderstack.analytics.test.all',
     packages=['rudderstack.analytics', 'rudderstack.analytics.test'],
     python_requires='>=3.8.0',
     license='MIT License',

rudder_sdk_python-2.1.3/rudderstack/analytics/test/test_constants.py

@@ -1 +0,0 @@
-TEST_PROXY = '203.243.63.16:80'

rudder_sdk_python-2.1.3/rudderstack/analytics/version.py

@@ -1 +0,0 @@
-VERSION = '2.1.3'