dnaStreaming 2.4.0__tar.gz → 2.4.1__tar.gz

{dnastreaming-2.4.0 → dnastreaming-2.4.1}/CHANGELOG.md

@@ -149,4 +149,9 @@ the subscription *and* consuming it. Instead they will just consume an already e
 - [added] - Authentication via OAuth bearer token
 - [changed] - Upgraded to Python 3.14
 - [changed] - Upgraded dependencies
-- [changed] - Upgraded package to work with pyproject.toml
+- [changed] - Upgraded package to work with pyproject.toml
+
+2.4.1 / 2026-10-22
+==================
+- [changed] - Requests to the streaming credentials endpoint now include the `X-Subscription-Id` header with the subscription ID being listened to
+- [fixed] - Streaming credentials are now fetched once per listen call instead of once per Pub/Sub client plus once for the project ID (previously 2 requests for `listen`/`listen_async` and 3 for `listen_async_ha`)

{dnastreaming-2.4.0 → dnastreaming-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dnaStreaming
-Version: 2.4.0
+Version: 2.4.1
 Summary: A Python 3 library for Dow Jones customers to consume data from a Factiva Analytics Stream.
 Author-email: Zachary Kagan <zachary.kagan@dowjones.com>, Daniel Morales <daniel.morales@dowjones.com>, Alan Fuentes <alan.fuentes@dowjones.com>, Carlos Blazquez <carlos.blazquez@dowjones.com>, Carlos Niño <carlos.ninoalarcon@dowjones.com>
 License: MIT

{dnastreaming-2.4.0 → dnastreaming-2.4.1}/src/dnaStreaming/listener.py

@@ -48,8 +48,6 @@ class Listener(object):
         subscription_id="",
         batch_size=10,
     ):
-        pubsub_client = pubsub_service.get_client(self.config)
-
         subscription_id = subscription_id or self.config.subscription()
         if not subscription_id:
             raise Exception(
@@ -57,7 +55,12 @@ class Listener(object):
                 + "variable, a config file or by passing the value to the method."
             )
 
-        streaming_credentials = credentials_service.fetch_credentials(self.config)
+        streaming_credentials = credentials_service.fetch_credentials(
+            self.config, subscription_id
+        )
+        pubsub_client = pubsub_service.get_client(
+            self.config, subscription_id, streaming_credentials=streaming_credentials
+        )
         subscription_path = pubsub_client.subscription_path(
             streaming_credentials["project_id"], subscription_id
         )
@@ -119,7 +122,7 @@ class Listener(object):
                     "the stream again."
                 )
                 time.sleep(10)
-                pubsub_client = pubsub_service.get_client(self.config)
+                pubsub_client = pubsub_service.get_client(self.config, subscription_id)
 
     def listen_async(self, on_message_callback, subscription_id=""):
         def ack_message_and_callback(message):
@@ -131,8 +134,6 @@ class Listener(object):
             on_message_callback(news_msg, subscription_id)
             message.ack()
 
-        pubsub_client = pubsub_service.get_client(self.config)
-
         subscription_id = subscription_id or self.config.subscription()
 
         if not subscription_id:
@@ -141,7 +142,12 @@ class Listener(object):
                 "by passing the value to the method."
             )
 
-        streaming_credentials = credentials_service.fetch_credentials(self.config)
+        streaming_credentials = credentials_service.fetch_credentials(
+            self.config, subscription_id
+        )
+        pubsub_client = pubsub_service.get_client(
+            self.config, subscription_id, streaming_credentials=streaming_credentials
+        )
         subscription_path = pubsub_client.subscription_path(
             streaming_credentials["project_id"], subscription_id
         )
@@ -164,9 +170,6 @@ class Listener(object):
             on_message_callback(news_msg, short_subscription_id)
             message.ack()
 
-        main_pubsub_client = pubsub_service.get_client(self.config, MAIN_REGION)
-        backup_pubsub_client = pubsub_service.get_client(self.config, BACKUP_REGION)
-
         subscription_id = self.config.subscription()
 
         if not subscription_id:
@@ -175,7 +178,21 @@ class Listener(object):
                 "by passing the value to the method."
             )
 
-        streaming_credentials = credentials_service.fetch_credentials(self.config)
+        streaming_credentials = credentials_service.fetch_credentials(
+            self.config, subscription_id
+        )
+        main_pubsub_client = pubsub_service.get_client(
+            self.config,
+            subscription_id,
+            region=MAIN_REGION,
+            streaming_credentials=streaming_credentials,
+        )
+        backup_pubsub_client = pubsub_service.get_client(
+            self.config,
+            subscription_id,
+            region=BACKUP_REGION,
+            streaming_credentials=streaming_credentials,
+        )
 
         api_host = self.config.get_uri_context()
         user_key = self.config.get_user_key()

{dnastreaming-2.4.0 → dnastreaming-2.4.1}/src/dnaStreaming/services/credentials_service.py

@@ -4,11 +4,18 @@ import json
 
 import requests
 
+SUBSCRIPTION_ID_HEADER = "X-Subscription-Id"
+
+
+def fetch_credentials(config, subscription_id=None):
+    # Copy the cached auth headers so the per-subscription header is not persisted in the config.
+    headers = dict(config.get_headers())
+    if subscription_id:
+        headers[SUBSCRIPTION_ID_HEADER] = subscription_id
 
-def fetch_credentials(config):
     response = requests.get(
         config.get_uri_context() + "/sns-accounts/streaming-credentials",
-        headers=config.get_headers(),
+        headers=headers,
     )
 
     if response.status_code == 401:

{dnastreaming-2.4.0 → dnastreaming-2.4.1}/src/dnaStreaming/services/pubsub_service.py

@@ -6,8 +6,11 @@ from dnaStreaming.services import authentication_service, credentials_service
 from dnaStreaming.services.availability_service import BACKUP_REGION, MAIN_REGION
 
 
-def get_client(config, region=None):
-    streaming_credentials = credentials_service.fetch_credentials(config)
+def get_client(config, subscription_id=None, region=None, streaming_credentials=None):
+    if streaming_credentials is None:
+        streaming_credentials = credentials_service.fetch_credentials(
+            config, subscription_id
+        )
     credentials = authentication_service.get_authenticated_oauth_credentials(
         streaming_credentials
     )

{dnastreaming-2.4.0 → dnastreaming-2.4.1}/src/dnaStreaming.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dnaStreaming
-Version: 2.4.0
+Version: 2.4.1
 Summary: A Python 3 library for Dow Jones customers to consume data from a Factiva Analytics Stream.
 Author-email: Zachary Kagan <zachary.kagan@dowjones.com>, Daniel Morales <daniel.morales@dowjones.com>, Alan Fuentes <alan.fuentes@dowjones.com>, Carlos Blazquez <carlos.blazquez@dowjones.com>, Carlos Niño <carlos.ninoalarcon@dowjones.com>
 License: MIT

{dnastreaming-2.4.0 → dnastreaming-2.4.1}/src/dnaStreaming.egg-info/SOURCES.txt

@@ -17,6 +17,8 @@ src/dnaStreaming.egg-info/PKG-INFO
 src/dnaStreaming.egg-info/SOURCES.txt
 src/dnaStreaming.egg-info/dependency_links.txt
 src/dnaStreaming.egg-info/requires.txt
+src/dnaStreaming.egg-info/scm_file_list.json
+src/dnaStreaming.egg-info/scm_version.json
 src/dnaStreaming.egg-info/top_level.txt
 src/dnaStreaming/services/__init__.py
 src/dnaStreaming/services/authentication_service.py
@@ -24,4 +26,5 @@ src/dnaStreaming/services/availability_service.py
 src/dnaStreaming/services/credentials_service.py
 src/dnaStreaming/services/pubsub_service.py
 tests/test_async.py
+tests/test_credentials_service.py
 tests/test_sync.py

dnastreaming-2.4.1/src/dnaStreaming.egg-info/scm_file_list.json

@@ -0,0 +1,27 @@
+{
+  "files": [
+    ".github/workflows/publish.yaml",
+    ".gitignore",
+    "CHANGELOG.md",
+    "LICENSE",
+    "README.md",
+    "demo/__init__.py",
+    "demo/pubsub_stream.py",
+    "demo/show_ha_stream_async.py",
+    "demo/show_stream.py",
+    "demo/show_stream_async.py",
+    "pyproject.toml",
+    "src/dnaStreaming/__init__.py",
+    "src/dnaStreaming/config.py",
+    "src/dnaStreaming/customer_config.json",
+    "src/dnaStreaming/listener.py",
+    "src/dnaStreaming/services/__init__.py",
+    "src/dnaStreaming/services/authentication_service.py",
+    "src/dnaStreaming/services/availability_service.py",
+    "src/dnaStreaming/services/credentials_service.py",
+    "src/dnaStreaming/services/pubsub_service.py",
+    "tests/test_async.py",
+    "tests/test_credentials_service.py",
+    "tests/test_sync.py"
+  ]
+}

dnastreaming-2.4.1/src/dnaStreaming.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.4.1",
+  "distance": 0,
+  "node": "gef8c5b450a4056c35d9900c67c45c72dbfc910a2",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-22"
+}

dnastreaming-2.4.1/tests/test_credentials_service.py

@@ -0,0 +1,141 @@
+import json
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from dnaStreaming.config import Config
+from dnaStreaming.services import credentials_service, pubsub_service
+from dnaStreaming.services.availability_service import MAIN_REGION
+from dnaStreaming.services.credentials_service import SUBSCRIPTION_ID_HEADER
+
+STREAMING_CREDENTIALS = {"project_id": "p"}
+
+
+@pytest.fixture(autouse=True)
+def clean_env(monkeypatch):
+    for var in (
+        Config.ENV_VAR_OAUTH_TOKEN,
+        Config.ENV_VAR_USER_KEY,
+        Config.ENV_VAR_SERVICE_ACCOUNT_ID,
+        Config.ENV_VAR_API_HOST,
+    ):
+        monkeypatch.delenv(var, raising=False)
+
+
+@pytest.fixture
+def config():
+    return Config(oauth_token="tok")
+
+
+@pytest.fixture
+def mock_get():
+    response = MagicMock()
+    response.status_code = 200
+    response.text = json.dumps(
+        {
+            "data": {
+                "attributes": {
+                    "streaming_credentials": json.dumps(STREAMING_CREDENTIALS)
+                }
+            }
+        }
+    )
+    with patch.object(
+        credentials_service.requests, "get", return_value=response
+    ) as mocked:
+        yield mocked
+
+
+def test_fetch_credentials_sends_subscription_id_header(config, mock_get):
+    result = credentials_service.fetch_credentials(config, "sub-123")
+
+    url = mock_get.call_args.args[0]
+    headers = mock_get.call_args.kwargs["headers"]
+    assert url.endswith("/sns-accounts/streaming-credentials")
+    assert headers["Authorization"] == "Bearer tok"
+    assert headers[SUBSCRIPTION_ID_HEADER] == "sub-123"
+    assert result == STREAMING_CREDENTIALS
+
+
+def test_fetch_credentials_does_not_mutate_cached_headers(config, mock_get):
+    credentials_service.fetch_credentials(config, "sub-123")
+    assert SUBSCRIPTION_ID_HEADER not in config.get_headers()
+
+    credentials_service.fetch_credentials(config, "sub-456")
+    headers = mock_get.call_args.kwargs["headers"]
+    assert headers[SUBSCRIPTION_ID_HEADER] == "sub-456"
+
+
+def test_fetch_credentials_without_subscription_id_omits_header(config, mock_get):
+    credentials_service.fetch_credentials(config)
+
+    headers = mock_get.call_args.kwargs["headers"]
+    assert SUBSCRIPTION_ID_HEADER not in headers
+    assert headers["Authorization"] == "Bearer tok"
+
+
+def test_get_client_passes_subscription_id(config):
+    with (
+        patch.object(
+            pubsub_service.credentials_service,
+            "fetch_credentials",
+            return_value=STREAMING_CREDENTIALS,
+        ) as mock_fetch,
+        patch.object(
+            pubsub_service.authentication_service,
+            "get_authenticated_oauth_credentials",
+        ),
+        patch.object(pubsub_service, "SubscriberClient") as mock_client,
+    ):
+        pubsub_service.get_client(config, "sub-123", region=MAIN_REGION)
+
+    mock_fetch.assert_called_once_with(config, "sub-123")
+    assert mock_client.call_args.kwargs["client_options"] == {
+        "api_endpoint": f"{MAIN_REGION}-pubsub.googleapis.com:443"
+    }
+
+
+def test_get_client_uses_provided_credentials_without_fetching(config):
+    with (
+        patch.object(
+            pubsub_service.credentials_service, "fetch_credentials"
+        ) as mock_fetch,
+        patch.object(
+            pubsub_service.authentication_service,
+            "get_authenticated_oauth_credentials",
+        ) as mock_auth,
+        patch.object(pubsub_service, "SubscriberClient"),
+    ):
+        pubsub_service.get_client(
+            config, "sub-123", streaming_credentials=STREAMING_CREDENTIALS
+        )
+
+    mock_fetch.assert_not_called()
+    mock_auth.assert_called_once_with(STREAMING_CREDENTIALS)
+
+
+@pytest.mark.parametrize("method", ["listen", "listen_async", "listen_async_ha"])
+def test_listener_fetches_credentials_once(config, mock_get, monkeypatch, method):
+    from dnaStreaming import listener as listener_module
+    from dnaStreaming.listener import Listener
+
+    monkeypatch.setattr(config, "subscription", lambda: "sub-123")
+    listener = Listener.__new__(Listener)
+    listener._initialize(config)
+
+    with (
+        patch.object(
+            pubsub_service.authentication_service,
+            "get_authenticated_oauth_credentials",
+        ),
+        patch.object(pubsub_service, "SubscriberClient"),
+        patch.object(listener_module, "Thread"),
+    ):
+        if method == "listen":
+            listener.listen(lambda msg, sub: False, maximum_messages=0)
+        else:
+            getattr(listener, method)(lambda msg, sub: None)
+
+    assert mock_get.call_count == 1
+    headers = mock_get.call_args.kwargs["headers"]
+    assert headers[SUBSCRIPTION_ID_HEADER] == "sub-123"