newsdataapi 0.3.0__tar.gz → 0.3.2__tar.gz

{newsdataapi-0.3.0 → newsdataapi-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: newsdataapi
-Version: 0.3.0
+Version: 0.3.2
 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

{newsdataapi-0.3.0 → newsdataapi-0.3.2}/src/newsdataapi/__init__.py

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

{newsdataapi-0.3.0 → newsdataapi-0.3.2}/src/newsdataapi/client.py

@@ -47,6 +47,7 @@ _STRING_PARAMS = frozenset(
         "domain",
         "domainurl",
         "excludedomain",
+        "excludedomainurl",
         "timezone",
         "from_date",
         "to_date",
@@ -81,9 +82,11 @@ _MUTEX_GROUPS: tuple[tuple[str, ...], ...] = (
     ("country", "excludecountry"),
     ("category", "excludecategory"),
     ("language", "excludelanguage"),
-    ("domain", "domainurl", "excludedomain"),
+    ("domain", "domainurl", "excludedomain", "excludedomainurl"),
 )
 
+_QUOTA_EXHAUSTED_CODES = frozenset({"ApiKeyLimitExceeded", "ApiLimitExceeded"})
+
 
 def _validate_params(user_params: Mapping[str, Any]) -> dict[str, Any]:
     """Validate and normalize user-provided endpoint parameters.
@@ -101,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
@@ -298,6 +302,17 @@ def _parse_retry_after(value: str | None) -> int | None:
         return None
 
 
+def _extract_error_code(body: Any) -> str | None:
+    """Return the API error code from an error response body, if present."""
+    if isinstance(body, dict):
+        results = body.get("results")
+        if isinstance(results, dict):
+            code = results.get("code")
+            if isinstance(code, str):
+                return code
+    return None
+
+
 def _redact_url(url: str, param: str = "apikey") -> str:
     """Return ``url`` with the value of ``param`` replaced by ``REDACTED``.
 
@@ -467,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,
@@ -515,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,
@@ -558,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,
@@ -604,6 +622,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "prioritydomain": prioritydomain,
                 "timezone": timezone,
                 "size": size,
@@ -671,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,
@@ -710,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,
@@ -749,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,
@@ -794,6 +816,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "language": language,
                 "excludelanguage": excludelanguage,
                 "prioritydomain": prioritydomain,
@@ -841,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,
@@ -888,6 +912,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "full_content": full_content,
                 "image": image,
                 "video": video,
@@ -927,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,
@@ -965,6 +991,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "full_content": full_content,
                 "image": image,
                 "video": video,
@@ -998,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,
@@ -1042,6 +1070,7 @@ class NewsDataApiClient:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "language": language,
                 "excludelanguage": excludelanguage,
                 "full_content": full_content,
@@ -1201,7 +1230,10 @@ class NewsDataApiClient:
             # Rate limit.
             if response.status_code == 429:
                 retry_after = _parse_retry_after(response.headers.get("Retry-After"))
-                if attempt >= self.max_retries:
+                if (
+                    _extract_error_code(body) in _QUOTA_EXHAUSTED_CODES
+                    or attempt >= self.max_retries
+                ):
                     raise NewsdataRateLimitError(
                         body,
                         status_code=429,

{newsdataapi-0.3.0 → newsdataapi-0.3.2}/src/newsdataapi/websocket.py

@@ -177,6 +177,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 +213,7 @@ class NewsDataApiWebSocket:
                 "domain": domain,
                 "domainurl": domainurl,
                 "excludedomain": excludedomain,
+                "excludedomainurl": excludedomainurl,
                 "prioritydomain": prioritydomain,
                 "timezone": timezone,
                 "full_content": full_content,

{newsdataapi-0.3.0 → newsdataapi-0.3.2}/tests/test_unit.py

@@ -148,13 +148,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",
@@ -823,6 +833,22 @@ def test_429_exhausted_raises_rate_limit_with_retry_after(
     assert exc_info.value.retry_after == 5
 
 
+@pytest.mark.parametrize("code", ["ApiKeyLimitExceeded", "ApiLimitExceeded"])
+def test_429_quota_exhausted_raises_without_retry(
+    code: str,
+    client: NewsDataApiClient,
+    mocked_responses: responses.RequestsMock,
+    no_sleep: None,
+) -> None:
+    """A 429 whose error code means exhausted credits is never retried."""
+    body = {"status": "error", "results": {"message": "limit", "code": code}}
+    mocked_responses.get(LATEST_URL, json=body, status=429)
+    with pytest.raises(NewsdataRateLimitError) as exc_info:
+        client.latest_api()
+    assert len(mocked_responses.calls) == 1
+    assert exc_info.value.response_body == body
+
+
 def test_500_then_200_succeeds(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,
@@ -1269,6 +1295,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)
 # ===========================================================================
@@ -1351,6 +1422,23 @@ def test_websocket_register_raw_query_rejects_unknown_param(
         NewsDataApiWebSocket(client).websocket_register(raw_query="q=pizza&size=10")
 
 
+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
+
+
 def test_websocket_register_duplicate_409(
     client: NewsDataApiClient,
     mocked_responses: responses.RequestsMock,