datamarket 0.7.107__py3-none-any.whl → 0.7.108__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of datamarket might be problematic. Click here for more details.

Files changed (5) hide show
  1. datamarket/interfaces/proxy.py +12 -0
  2. {datamarket-0.7.107.dist-info → datamarket-0.7.108.dist-info}/METADATA +1 -1
  3. {datamarket-0.7.107.dist-info → datamarket-0.7.108.dist-info}/RECORD +5 -5
  4. {datamarket-0.7.107.dist-info → datamarket-0.7.108.dist-info}/LICENSE +0 -0
  5. {datamarket-0.7.107.dist-info → datamarket-0.7.108.dist-info}/WHEEL +0 -0
datamarket/interfaces/proxy.py CHANGED
@@ -1,3 +1,6 @@
1
+ ########################################################################################################################
2
+ # IMPORTS
3
+
1
4
  import logging
2
5
  import random
3
6
  import time
@@ -10,12 +13,18 @@ from stem.control import Controller
10
13
 
11
14
  from datamarket.exceptions import EnsureNewIPTimeoutError, NoWorkingProxiesError
12
15
 
16
+ ########################################################################################################################
17
+ # SETUP
18
+
13
19
  logger = logging.getLogger(__name__)
14
20
  logging.getLogger("stem").setLevel(logging.WARNING)
15
21
 
16
22
  PROXY_ROTATION_INTERVAL = timedelta(minutes=10)
17
23
  PROXY_ROTATION_TIMEOUT_SECONDS = int(PROXY_ROTATION_INTERVAL.total_seconds())
18
24
 
25
+ ########################################################################################################################
26
+ # CLASSES
27
+
19
28
 
20
29
  class ProxyInterface:
21
30
  """
@@ -249,7 +258,9 @@ class ProxyInterface:
249
258
  # Handle both timedelta and numeric seconds for backward compatibility
250
259
  if proxy_rotation_interval:
251
260
  retrying = tenacity.Retrying(
261
+ wait=tenacity.wait_fixed(cooldown_seconds),
252
262
  stop=tenacity.stop_after_delay(proxy_rotation_interval),
263
+ before_sleep=tenacity.before_sleep_log(logger, logging.INFO),
253
264
  reraise=True,
254
265
  )
255
266
  entry = retrying(_find_working_entry)
@@ -321,6 +332,7 @@ class ProxyInterface:
321
332
  raise NoWorkingProxiesError("No working proxies available")
322
333
 
323
334
  def _wait_for_new_ip(self, entry, baseline, timeout, interval, check_timeout):
335
+ logger.info("Refreshing proxy IP...")
324
336
  start = time.time()
325
337
  while time.time() - start < timeout:
326
338
  host, port, user, pwd = entry
{datamarket-0.7.107.dist-info → datamarket-0.7.108.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: datamarket
3
- Version: 0.7.107
3
+ Version: 0.7.108
4
4
  Summary: Utilities that integrate advanced scraping knowledge into just one library.
5
5
  License: GPL-3.0-or-later
6
6
  Author: DataMarket
{datamarket-0.7.107.dist-info → datamarket-0.7.108.dist-info}/RECORD RENAMED
@@ -9,7 +9,7 @@ datamarket/interfaces/drive.py,sha256=3nhx3THr2SHNWKYwme9F2nPpvsqyEMFIxz0whF2FjH
9
9
  datamarket/interfaces/ftp.py,sha256=LH3Oz19k_xUNhzDXcrq5Ofb4c3uiph5pWUqpgiaDvHI,2671
10
10
  datamarket/interfaces/nominatim.py,sha256=xizT94tVum7QPppfDgI5sEhx1mAXT-SM3JyPl8CDxxU,15148
11
11
  datamarket/interfaces/peerdb.py,sha256=sO451wEGNb_0DDwchZ6eBVYKltqHM5XKau-WsfspXzA,23640
12
- datamarket/interfaces/proxy.py,sha256=Hxwmkii3wP3oplg4yMhr_NF6ru8tmz7z8jHld4SfPRw,14325
12
+ datamarket/interfaces/proxy.py,sha256=T5imj-f2-ZIy7TM8UhkkUWAAdlEbJG95KHohoYgpZEo,14903
13
13
  datamarket/interfaces/tinybird.py,sha256=cNG-kAPTdQn2inlNX9LPf-VVdtnLud947ApLVO40Now,2594
14
14
  datamarket/params/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
15
15
  datamarket/params/nominatim.py,sha256=S9TEB4FxmffvFyK9KffWl20TfXzWX69IAdbEehKar1I,11920
@@ -29,7 +29,7 @@ datamarket/utils/strings/obfuscation.py,sha256=Jo-x3f2Cb75983smmpcdPqUlBrLCTyrnm
29
29
  datamarket/utils/strings/standardization.py,sha256=j_NbT-O1XnxDvDhct8panfkrfAC8R5OX6XM5fYBZ4RU,1496
30
30
  datamarket/utils/typer.py,sha256=geWuwMwGQjBQhxo27hX0vEAeRl1j1TS0u2oFVfpAs5I,816
31
31
  datamarket/utils/types.py,sha256=vxdQZdwdXrfPR4Es52gBgol-tMRIOD6oK9cBo3rB0JQ,74
32
- datamarket-0.7.107.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
33
- datamarket-0.7.107.dist-info/METADATA,sha256=F0zxym6rN2EWf3jh_1ilKdrIXMqdd_D4py1MzuYzuLA,7382
34
- datamarket-0.7.107.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
35
- datamarket-0.7.107.dist-info/RECORD,,
32
+ datamarket-0.7.108.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
33
+ datamarket-0.7.108.dist-info/METADATA,sha256=nFR_qzIVAlSc3L_0P2D1fWN7GdQTTINVZ_AkCDmymgc,7382
34
+ datamarket-0.7.108.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
35
+ datamarket-0.7.108.dist-info/RECORD,,