newsdataapi 0.3.1__tar.gz → 0.3.3__tar.gz

{newsdataapi-0.3.1 → newsdataapi-0.3.3}/.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
     steps:
       - uses: actions/checkout@v4
 

{newsdataapi-0.3.1 → newsdataapi-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: newsdataapi
-Version: 0.3.1
+Version: 0.3.3
 Summary: Official Python client (SDK) for the Newsdata.io News API — fetch real-time, historical, crypto, and stock-market news via REST, with validation, retries, pagination, and typed exceptions.
 Project-URL: Homepage, https://newsdata.io
 Project-URL: Documentation, https://newsdata.io/documentation
@@ -35,6 +35,8 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -43,9 +45,9 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Python: >=3.10
+Requires-Python: >=3.8
 Requires-Dist: requests<3,>=2.25
-Requires-Dist: websockets<17,>=16
+Requires-Dist: websockets<17,>=16; python_version >= '3.10'
 Description-Content-Type: text/markdown
 
 <div align="center">
@@ -77,7 +79,7 @@ If you use [uv](https://github.com/astral-sh/uv):
 uv add newsdataapi
 ```
 
-Supports Python 3.10 through 3.14. The runtime dependencies are `requests` (REST) and `websockets` (real-time streaming).
+Supports Python 3.8 through 3.14. The runtime dependencies are `requests` (REST) and `websockets` (real-time streaming). `NewsDataApiWebSocket` requires Python 3.10 or newer, so `websockets` is only installed there; on 3.8 and 3.9 the REST client works as usual.
 
 ## Quickstart
 
@@ -139,7 +141,7 @@ for page in client.latest_api(q="news", paginate=True, max_pages=5):
 
 ## Real-time news (WebSocket)
 
-Register a query first — the returned `registration_id` identifies it from then on:
+Requires Python 3.10 or newer. Register a query first — the returned `registration_id` identifies it from then on:
 
 ```python
 from newsdataapi import NewsDataApiClient, NewsDataApiWebSocket

{newsdataapi-0.3.1 → newsdataapi-0.3.3}/README.md

@@ -27,7 +27,7 @@ If you use [uv](https://github.com/astral-sh/uv):
 uv add newsdataapi
 ```
 
-Supports Python 3.10 through 3.14. The runtime dependencies are `requests` (REST) and `websockets` (real-time streaming).
+Supports Python 3.8 through 3.14. The runtime dependencies are `requests` (REST) and `websockets` (real-time streaming). `NewsDataApiWebSocket` requires Python 3.10 or newer, so `websockets` is only installed there; on 3.8 and 3.9 the REST client works as usual.
 
 ## Quickstart
 
@@ -89,7 +89,7 @@ for page in client.latest_api(q="news", paginate=True, max_pages=5):
 
 ## Real-time news (WebSocket)
 
-Register a query first — the returned `registration_id` identifies it from then on:
+Requires Python 3.10 or newer. Register a query first — the returned `registration_id` identifies it from then on:
 
 ```python
 from newsdataapi import NewsDataApiClient, NewsDataApiWebSocket

{newsdataapi-0.3.1 → newsdataapi-0.3.3}/pyproject.toml

@@ -5,11 +5,13 @@ dynamic = ["version"]
 readme = "README.md"
 license = { file = "LICENSE" }
 authors = [{ name = "NewsData.io", email = "contact@newsdata.io" }]
-requires-python = ">=3.10"
+requires-python = ">=3.8"
 
 dependencies = [
     "requests>=2.25,<3",
-    "websockets>=16,<17",
+    # websockets 16 needs Python 3.10+. On 3.8/3.9 it is not installed: the
+    # REST client works there, and NewsDataApiWebSocket raises on construction.
+    "websockets>=16,<17; python_version >= '3.10'",
 ]
 
 keywords = [
@@ -37,6 +39,8 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -90,7 +94,7 @@ addopts = [
 
 [tool.ruff]
 line-length = 100
-target-version = "py310"
+target-version = "py38"
 
 [tool.ruff.lint]
 select = [
@@ -107,6 +111,7 @@ select = [
 ]
 
 [tool.mypy]
-python_version = "3.10"
+# mypy no longer accepts 3.8 as a target; the 3.8 CI job covers it at runtime.
+python_version = "3.9"
 strict = true
 files = ["src/newsdataapi"]

{newsdataapi-0.3.1 → newsdataapi-0.3.3}/src/newsdataapi/__init__.py

@@ -15,7 +15,7 @@ from .exceptions import (
 )
 from .websocket import NewsDataApiWebSocket
 
-__version__ = "0.3.1"
+__version__ = "0.3.3"
 
 __all__ = [
     "NewsDataApiClient",

{newsdataapi-0.3.1 → newsdataapi-0.3.3}/src/newsdataapi/client.py

@@ -47,6 +47,7 @@ _STRING_PARAMS = frozenset(
         "domain",
         "domainurl",
         "excludedomain",
+        "excludedomainurl",
         "timezone",
         "from_date",
         "to_date",
@@ -81,7 +82,7 @@ _MUTEX_GROUPS: tuple[tuple[str, ...], ...] = (
     ("country", "excludecountry"),
     ("category", "excludecategory"),
     ("language", "excludelanguage"),
-    ("domain", "domainurl", "excludedomain"),
+    ("domain", "domainurl", "excludedomain", "excludedomainurl"),
 )
 
 _QUOTA_EXHAUSTED_CODES = frozenset({"ApiKeyLimitExceeded", "ApiLimitExceeded"})
@@ -103,7 +104,8 @@ def _validate_params(user_params: Mapping[str, Any]) -> dict[str, Any]:
     * Server-side mutex groups (``q``/``qInTitle``/``qInMeta``,
       ``country``/``excludecountry``, ``category``/``excludecategory``,
       ``language``/``excludelanguage``, and
-      ``domain``/``domainurl``/``excludedomain``) are enforced client-side;
+      ``domain``/``domainurl``/``excludedomain``/``excludedomainurl``) are
+      enforced client-side;
       setting more than one from any group raises
       ``NewsdataValidationError`` before the request leaves.
     * ``sentiment_score`` requires ``sentiment`` to be set; passing
@@ -480,6 +482,7 @@ class NewsDataApiClient:
         domain: str | list[str] | None = None,
         domainurl: str | list[str] | None = None,
         excludedomain: str | list[str] | None = None,
+        excludedomainurl: str | list[str] | None = None,
         prioritydomain: str | None = None,
         timeframe: int | str | None = None,
         timezone: str | None = None,
@@ -528,6 +531,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "prioritydomain": prioritydomain,
                 "timeframe": str(timeframe) if timeframe is not None else None,
                 "timezone": timezone,
@@ -571,6 +575,7 @@ class NewsDataApiClient:
         domain: str | list[str] | None = None,
         domainurl: str | list[str] | None = None,
         excludedomain: str | list[str] | None = None,
+        excludedomainurl: str | list[str] | None = None,
         prioritydomain: str | None = None,
         timezone: str | None = None,
         size: int | None = None,
@@ -617,6 +622,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "prioritydomain": prioritydomain,
                 "timezone": timezone,
                 "size": size,
@@ -684,6 +690,7 @@ class NewsDataApiClient:
         domain: str | list[str] | None = None,
         domainurl: str | list[str] | None = None,
         excludedomain: str | list[str] | None = None,
+        excludedomainurl: str | list[str] | None = None,
         prioritydomain: str | None = None,
         timeframe: int | str | None = None,
         timezone: str | None = None,
@@ -723,6 +730,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "prioritydomain": prioritydomain,
                 "timeframe": str(timeframe) if timeframe is not None else None,
                 "timezone": timezone,
@@ -762,6 +770,7 @@ class NewsDataApiClient:
         domain: str | list[str] | None = None,
         domainurl: str | list[str] | None = None,
         excludedomain: str | list[str] | None = None,
+        excludedomainurl: str | list[str] | None = None,
         language: str | list[str] | None = None,
         excludelanguage: str | list[str] | None = None,
         prioritydomain: str | None = None,
@@ -807,6 +816,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "language": language,
                 "excludelanguage": excludelanguage,
                 "prioritydomain": prioritydomain,
@@ -854,6 +864,7 @@ class NewsDataApiClient:
         domain: str | list[str] | None = None,
         domainurl: str | list[str] | None = None,
         excludedomain: str | list[str] | None = None,
+        excludedomainurl: str | list[str] | None = None,
         full_content: bool | None = None,
         image: bool | None = None,
         video: bool | None = None,
@@ -901,6 +912,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "full_content": full_content,
                 "image": image,
                 "video": video,
@@ -940,6 +952,7 @@ class NewsDataApiClient:
         domain: str | list[str] | None = None,
         domainurl: str | list[str] | None = None,
         excludedomain: str | list[str] | None = None,
+        excludedomainurl: str | list[str] | None = None,
         full_content: bool | None = None,
         image: bool | None = None,
         video: bool | None = None,
@@ -978,6 +991,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "full_content": full_content,
                 "image": image,
                 "video": video,
@@ -1011,6 +1025,7 @@ class NewsDataApiClient:
         domain: str | list[str] | None = None,
         domainurl: str | list[str] | None = None,
         excludedomain: str | list[str] | None = None,
+        excludedomainurl: str | list[str] | None = None,
         language: str | list[str] | None = None,
         excludelanguage: str | list[str] | None = None,
         full_content: bool | None = None,
@@ -1055,6 +1070,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "language": language,
                 "excludelanguage": excludelanguage,
                 "full_content": full_content,

{newsdataapi-0.3.1 → newsdataapi-0.3.3}/src/newsdataapi/websocket.py

@@ -11,14 +11,11 @@ from __future__ import annotations
 import asyncio
 import json
 import logging
+import sys
 import time
 from collections.abc import AsyncIterator, Iterator
 from typing import Any
 
-from websockets.asyncio import client as _asyncio_client
-from websockets.exceptions import ConnectionClosedError, InvalidStatus
-from websockets.sync import client as _sync_client
-
 from . import constants
 from .client import NewsDataApiClient, _redact_url, _validate_params
 from .exceptions import (
@@ -27,6 +24,15 @@ from .exceptions import (
     NewsdataWebSocketError,
 )
 
+# websockets requires Python 3.10+ and is not installed on older versions,
+# where only the REST client is available.
+_WEBSOCKET_SUPPORTED = sys.version_info >= (3, 10)
+
+if _WEBSOCKET_SUPPORTED:
+    from websockets.asyncio import client as _asyncio_client
+    from websockets.exceptions import ConnectionClosedError, InvalidStatus
+    from websockets.sync import client as _sync_client
+
 logger = logging.getLogger(__name__)
 
 
@@ -109,6 +115,9 @@ class NewsDataApiWebSocket:
     always raises :class:`~newsdataapi.NewsdataWebSocketAuthError` and is
     never retried.
 
+    Requires Python 3.10 or newer; on older versions the constructor raises
+    :class:`~newsdataapi.NewsdataWebSocketError`.
+
     Args:
         api_client: The :class:`~newsdataapi.NewsDataApiClient` that supplies
             the API key and performs the management HTTP calls. Not closed by
@@ -147,6 +156,12 @@ class NewsDataApiWebSocket:
         additional_headers: dict[str, str] | None = None,
         proxy: str | None = None,
     ) -> None:
+        if not _WEBSOCKET_SUPPORTED:
+            raise NewsdataWebSocketError(
+                "NewsDataApiWebSocket requires Python 3.10 or newer (this is Python "
+                f"{sys.version_info.major}.{sys.version_info.minor}); "
+                "NewsDataApiClient works on Python 3.8+"
+            )
         self.api_client = api_client
         self._base_url = base_url
         self._reconnect = reconnect
@@ -177,6 +192,7 @@ class NewsDataApiWebSocket:
         domain: str | list[str] | None = None,
         domainurl: str | list[str] | None = None,
         excludedomain: str | list[str] | None = None,
+        excludedomainurl: str | list[str] | None = None,
         prioritydomain: str | None = None,
         timezone: str | None = None,
         full_content: bool | None = None,
@@ -212,6 +228,7 @@ class NewsDataApiWebSocket:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "prioritydomain": prioritydomain,
                 "timezone": timezone,
                 "full_content": full_content,

{newsdataapi-0.3.1 → newsdataapi-0.3.3}/tests/conftest.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import sys
 from collections.abc import Iterator
 
 import pytest
@@ -9,6 +10,9 @@ import responses
 
 from newsdataapi import NewsDataApiClient
 
+# test_websocket.py imports websockets, which is only installed on Python 3.10+.
+collect_ignore = ["test_websocket.py"] if sys.version_info < (3, 10) else []
+
 
 @pytest.fixture
 def mocked_responses() -> Iterator[responses.RequestsMock]:

{newsdataapi-0.3.1 → newsdataapi-0.3.3}/tests/test_unit.py

@@ -7,6 +7,7 @@ API key.
 
 from __future__ import annotations
 
+import sys
 from datetime import datetime, timedelta, timezone
 from email.utils import format_datetime
 from pathlib import Path
@@ -25,6 +26,7 @@ from newsdataapi import (
     NewsdataRateLimitError,
     NewsdataServerError,
     NewsdataValidationError,
+    NewsdataWebSocketError,
     save_to_csv,
 )
 from newsdataapi.client import (
@@ -148,13 +150,23 @@ def test_validate_size_negative_rejected() -> None:
         ({"country": "us", "excludecountry": "gb"}, "country"),
         ({"category": "business", "excludecategory": "sports"}, "category"),
         ({"language": "en", "excludelanguage": "fr"}, "language"),
-        # Domain 3-way mutex (any two of domain/domainurl/excludedomain)
+        # Domain 4-way mutex (any two of
+        # domain/domainurl/excludedomain/excludedomainurl)
         ({"domain": "cnn.com", "domainurl": "https://bbc.com"}, "domain"),
         ({"domain": "cnn.com", "excludedomain": "fox.com"}, "domain"),
         (
             {"domainurl": "https://bbc.com", "excludedomain": "fox.com"},
             "domainurl",
         ),
+        ({"domain": "cnn.com", "excludedomainurl": "fox.com"}, "domain"),
+        (
+            {"domainurl": "https://bbc.com", "excludedomainurl": "fox.com"},
+            "domainurl",
+        ),
+        (
+            {"excludedomain": "cnn.com", "excludedomainurl": "fox.com"},
+            "excludedomain",
+        ),
         (
             {
                 "domain": "cnn.com",
@@ -1285,6 +1297,51 @@ def test_count_endpoint_url_resolves(
     assert len(mocked_responses.calls) == 1
 
 
+@pytest.mark.parametrize(
+    ("method_name", "endpoint_path", "args"),
+    [
+        ("latest_api", "latest", ()),
+        ("archive_api", "archive", ()),
+        ("crypto_api", "crypto", ()),
+        ("market_api", "market", ()),
+        ("count_api", "count", ("2024-01-01", "2024-01-31")),
+        ("crypto_count_api", "crypto/count", ("2024-01-01", "2024-01-31")),
+        ("market_count_api", "market/count", ("2024-01-01", "2024-01-31")),
+    ],
+)
+def test_excludedomainurl_sent_as_csv(
+    client: NewsDataApiClient,
+    mocked_responses: responses.RequestsMock,
+    method_name: str,
+    endpoint_path: str,
+    args: tuple[str, ...],
+) -> None:
+    mocked_responses.get(
+        f"https://newsdata.io/api/1/{endpoint_path}",
+        json={"status": "success", "results": []},
+        status=200,
+    )
+    getattr(client, method_name)(*args, excludedomainurl=["bbc.com", "cnn.com"])
+    sent_url = mocked_responses.calls[0].request.url
+    assert sent_url is not None
+    assert "excludedomainurl=bbc.com%2Ccnn.com" in sent_url
+
+
+def test_raw_query_accepts_excludedomainurl(
+    client: NewsDataApiClient,
+    mocked_responses: responses.RequestsMock,
+) -> None:
+    mocked_responses.get(
+        LATEST_URL,
+        json={"status": "success", "results": []},
+        status=200,
+    )
+    client.latest_api(raw_query="excludedomainurl=bbc.com")
+    sent_url = mocked_responses.calls[0].request.url
+    assert sent_url is not None
+    assert "excludedomainurl=bbc.com" in sent_url
+
+
 # ===========================================================================
 # WebSocket query management (register / fetch / delete)
 # ===========================================================================
@@ -1293,7 +1350,23 @@ WS_REGISTER_URL = "https://newsdata.io/api/1/websocket/register"
 WS_FETCH_URL = "https://newsdata.io/api/1/websocket/fetch"
 WS_DELETE_URL = "https://newsdata.io/api/1/websocket/delete"
 
+# NewsDataApiWebSocket can't be constructed below Python 3.10.
+requires_websocket = pytest.mark.skipif(
+    sys.version_info < (3, 10), reason="WebSocket support requires Python 3.10+"
+)
+
+
+def test_websocket_requires_python_310(
+    client: NewsDataApiClient,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Below Python 3.10, construction fails up front with a clear error."""
+    monkeypatch.setattr("newsdataapi.websocket._WEBSOCKET_SUPPORTED", False)
+    with pytest.raises(NewsdataWebSocketError, match="requires Python 3.10"):
+        NewsDataApiWebSocket(client)
+
 
+@requires_websocket
 def test_websocket_register_posts_query_params(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1320,6 +1393,7 @@ def test_websocket_register_posts_query_params(
     assert not sent.body  # params travel in the query string, not a body
 
 
+@requires_websocket
 def test_websocket_register_always_sends_news_type_latest(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1335,6 +1409,7 @@ def test_websocket_register_always_sends_news_type_latest(
     assert "news_type=latest" in sent_url
 
 
+@requires_websocket
 def test_websocket_register_mutex_validation_applies(
     client: NewsDataApiClient,
 ) -> None:
@@ -1343,6 +1418,7 @@ def test_websocket_register_mutex_validation_applies(
         NewsDataApiWebSocket(client).websocket_register(q="a", qInTitle="b")
 
 
+@requires_websocket
 def test_websocket_register_raw_query(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1359,6 +1435,7 @@ def test_websocket_register_raw_query(
     assert "news_type=latest" in sent_url
 
 
+@requires_websocket
 def test_websocket_register_raw_query_rejects_unknown_param(
     client: NewsDataApiClient,
 ) -> None:
@@ -1367,6 +1444,25 @@ def test_websocket_register_raw_query_rejects_unknown_param(
         NewsDataApiWebSocket(client).websocket_register(raw_query="q=pizza&size=10")
 
 
+@requires_websocket
+def test_websocket_register_sends_excludedomainurl(
+    client: NewsDataApiClient,
+    mocked_responses: responses.RequestsMock,
+) -> None:
+    mocked_responses.post(
+        WS_REGISTER_URL,
+        json={"status": "success", "results": {"registration_id": "abc"}},
+        status=200,
+    )
+    NewsDataApiWebSocket(client).websocket_register(
+        q="pizza", excludedomainurl=["bbc.com", "cnn.com"]
+    )
+    sent_url = mocked_responses.calls[0].request.url
+    assert sent_url is not None
+    assert "excludedomainurl=bbc.com%2Ccnn.com" in sent_url
+
+
+@requires_websocket
 def test_websocket_register_duplicate_409(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1394,6 +1490,7 @@ def test_websocket_register_duplicate_409(
     assert len(mocked_responses.calls) == 1  # 4xx is never retried
 
 
+@requires_websocket
 def test_websocket_register_403_raises_auth(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1404,6 +1501,7 @@ def test_websocket_register_403_raises_auth(
         NewsDataApiWebSocket(client).websocket_register(q="pizza")
 
 
+@requires_websocket
 def test_websocket_register_429_exhausts_to_rate_limit(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1416,6 +1514,7 @@ def test_websocket_register_429_exhausts_to_rate_limit(
         NewsDataApiWebSocket(client).websocket_register(q="pizza")
 
 
+@requires_websocket
 def test_websocket_fetch_returns_queries(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1446,6 +1545,7 @@ def test_websocket_fetch_returns_queries(
     assert "apikey=test_key_xxx" in sent_url
 
 
+@requires_websocket
 def test_websocket_delete_sends_registration_id(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1465,6 +1565,7 @@ def test_websocket_delete_sends_registration_id(
     assert "registration_id=abc123" in sent_url
 
 
+@requires_websocket
 def test_websocket_delete_unknown_id_404(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1475,6 +1576,7 @@ def test_websocket_delete_unknown_id_404(
     assert exc_info.value.status_code == 404
 
 
+@requires_websocket
 @pytest.mark.parametrize("bad_id", ["", None, 123])
 def test_websocket_delete_rejects_bad_registration_id(
     client: NewsDataApiClient,