datamarket 0.7.100__tar.gz → 0.7.102__tar.gz

{datamarket-0.7.100 → datamarket-0.7.102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.7.100
+Version: 0.7.102
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 License: GPL-3.0-or-later
 Author: DataMarket

{datamarket-0.7.100 → datamarket-0.7.102}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.7.100"
+version = "0.7.102"
 description = "Utilities that integrate advanced scraping knowledge into just one library."
 authors = ["DataMarket <techsupport@datamarket.es>"]
 license = "GPL-3.0-or-later"

datamarket-0.7.102/src/datamarket/exceptions/main.py

@@ -0,0 +1,33 @@
+########################################################################################################################
+# CLASSES
+
+
+import requests
+
+
+class RedirectionDetectedError(Exception):
+    def __init__(self, message="Redirection detected!"):
+        self.message = message
+        super().__init__(self.message)
+
+
+class NotFoundError(Exception):
+    def __init__(self, message="Not found!"):
+        self.message = message
+        super().__init__(self.message)
+
+
+class BadRequestError(Exception):
+    def __init__(self, message="Bad request!"):
+        self.message = message
+        super().__init__(self.message)
+        
+class ManagedHTTPError(Exception):
+    """Signal that this HTTP status was handled and should not be retried."""
+    def __init__(self, response: requests.Response, *, url: str | None = None, message: str | None = None):
+        self.response = response
+        self.request = getattr(response, "request", None)
+        self.status_code = getattr(response, "status_code", None)
+        self.url = url or (self.request.url if self.request is not None else None)
+        self.message = message
+        super().__init__(message or f"HTTP {self.status_code} for {self.url}")

{datamarket-0.7.100 → datamarket-0.7.102}/src/datamarket/utils/main.py

@@ -3,12 +3,14 @@
 
 import asyncio
 import configparser
+from datetime import timedelta
 import logging
 import random
 import re
 import shlex
 import subprocess
 import time
+from typing import Sequence
 from babel.numbers import parse_decimal
 
 from bs4 import BeautifulSoup
@@ -25,7 +27,9 @@ from tenacity import (
     wait_exponential,
 )
 
-from ..exceptions import RedirectionDetectedError, NotFoundError
+from datamarket.exceptions.main import ManagedHTTPError
+
+from ..exceptions import RedirectionDetectedError, NotFoundError, BadRequestError
 from ..interfaces.proxy import ProxyInterface
 
 ########################################################################################################################
@@ -131,7 +135,9 @@ def parse_field(dict_struct, field_path, format_method=None):
 
 
 @retry(
-    retry=retry_if_not_exception_type((NotFoundError, RedirectionDetectedError, ProxyError)),
+    retry=retry_if_not_exception_type(
+        (NotFoundError, BadRequestError, RedirectionDetectedError, ProxyError, ManagedHTTPError)
+    ),
     wait=wait_exponential(exp_base=3, multiplier=3, max=60),
     stop=stop_after_attempt(5),
     before_sleep=before_sleep_log(logger, logging.WARNING),
@@ -144,9 +150,38 @@ def get_data(
     sleep: tuple = (6, 3),
     proxy_interface: ProxyInterface = None,
     use_auth_proxies: bool = False,
-    max_proxy_delay: int = 1800,
+    max_proxy_delay: timedelta = timedelta(minutes=10),
+    ignored_status_codes: Sequence[int] = (),
     **kwargs,
 ):
+    """
+    Fetches data from a given URL using HTTP requests, with support for proxy configuration, retries, and flexible output formats.
+
+    Args:
+        url (str): The target URL to fetch data from.
+        method (str, optional): HTTP method to use (e.g., 'GET', 'POST'). Defaults to 'GET'.
+        output (str, optional): Output format ('json', 'text', 'soup', 'response'). Defaults to 'json'.
+        sleep (tuple, optional): Tuple specifying max and min sleep times (seconds) after request. Defaults to (6, 3).
+        proxy_interface (ProxyInterface, optional): Proxy provider. If None, no proxy is used. Defaults to None.
+        use_auth_proxies (bool, optional): Whether to use authenticated proxies. Defaults to False.
+        max_proxy_delay (timedelta, optional): Maximum delay for proxy retry logic. Defaults to 10 minutes.
+        ignored_status_codes (Sequence[int], optional): Status codes to ignore and return response for. Defaults to ().
+        **kwargs: Additional arguments passed to the requests method.
+
+    Returns:
+        Depends on the 'output' argument:
+            - 'json': Parsed JSON response.
+            - 'text': Response text.
+            - 'soup': BeautifulSoup-parsed HTML.
+            - 'response': Raw requests.Response object.
+
+    Raises:
+        ManagedHTTPError: If a response status code is in `ignored_status_codes`.
+        NotFoundError: If a 404 status code is returned.
+        BadRequestError: If a 400 status code is returned.
+        RedirectionDetectedError, ProxyError: On specific error conditions.
+        requests.HTTPError: For other HTTP errors if not ignored.
+    """
     retry_type = retry_if_exception_type(ProxyError)
     wait = wait_exponential(exp_base=3, multiplier=3, max=60)
     stop = stop_after_delay(max_proxy_delay)
@@ -173,9 +208,15 @@ def get_data(
 
     ban_sleep(*sleep)
 
+    if r.status_code in ignored_status_codes:
+        raise ManagedHTTPError(r, url=url, message=f"Status {r.status_code} in ignored_status_codes for URL {url}")
     if r.status_code == 404:
         raise NotFoundError(f"404 Not Found error for {url}")
+    if r.status_code == 400:
+        raise BadRequestError(f"400 Bad Request error for {url}")
+
     r.raise_for_status()
+
     r.encoding = "utf-8"
 
     if output == "json":

datamarket-0.7.100/src/datamarket/exceptions/main.py

@@ -1,14 +0,0 @@
-########################################################################################################################
-# CLASSES
-
-
-class RedirectionDetectedError(Exception):
-    def __init__(self, message="Redirection detected!"):
-        self.message = message
-        super().__init__(self.message)
-
-
-class NotFoundError(Exception):
-    def __init__(self, message="Not found!"):
-        self.message = message
-        super().__init__(self.message)