datamarket 0.7.100__tar.gz → 0.7.101__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.7.100
+Version: 0.7.101
 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.101}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.7.100"
+version = "0.7.101"
 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.100 → datamarket-0.7.101}/src/datamarket/exceptions/main.py

@@ -12,3 +12,9 @@ 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)

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

@@ -3,6 +3,7 @@
 
 import asyncio
 import configparser
+from datetime import timedelta
 import logging
 import random
 import re
@@ -25,7 +26,7 @@ from tenacity import (
     wait_exponential,
 )
 
-from ..exceptions import RedirectionDetectedError, NotFoundError
+from ..exceptions import RedirectionDetectedError, NotFoundError, BadRequestError
 from ..interfaces.proxy import ProxyInterface
 
 ########################################################################################################################
@@ -131,7 +132,7 @@ 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)),
     wait=wait_exponential(exp_base=3, multiplier=3, max=60),
     stop=stop_after_attempt(5),
     before_sleep=before_sleep_log(logger, logging.WARNING),
@@ -144,7 +145,7 @@ 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),
     **kwargs,
 ):
     retry_type = retry_if_exception_type(ProxyError)
@@ -175,6 +176,8 @@ def get_data(
 
     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"