datamarket 0.7.104__tar.gz → 0.7.105__tar.gz

{datamarket-0.7.104 → datamarket-0.7.105}/PKG-INFO

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

{datamarket-0.7.104 → datamarket-0.7.105}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.7.104"
+version = "0.7.105"
 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.104 → datamarket-0.7.105}/src/datamarket/interfaces/proxy.py

@@ -179,13 +179,13 @@ class ProxyInterface:
             return
 
         try:
-            logger.info(f"Current IP: {self.check_current_ip()}")
+            logger.debug(f"Current IP: {self.check_current_ip()}")
             with Controller.from_port(port=9051) as controller:
                 controller.authenticate(password=self.tor_password)
                 controller.signal(Signal.NEWNYM)
 
             time.sleep(5)
-            logger.info(f"New IP: {self.check_current_ip()}")
+            logger.debug(f"New IP: {self.check_current_ip()}")
         except Exception as ex:
             logger.error("Failed to renew Tor IP")
             logger.error(ex)
@@ -231,6 +231,11 @@ class ProxyInterface:
         pool = self._build_pool(use_auth)
         candidates = self._get_candidates(pool, randomize)
 
+        # Capture baseline before any health checks that might set it
+        baseline_before = None
+        if len(candidates) == 1:
+            baseline_before = self._health.get(candidates[0], {}).get("last_ip")
+
         def _find_working_entry():
             if not self.entries:
                 raise NoWorkingProxiesError("No proxies available")
@@ -246,13 +251,16 @@ class ProxyInterface:
             entry = _find_working_entry()
 
         if ensure_new_ip and len(pool) == 1:
-            logger.info(f"ensure_new_ip=True and single proxy, waiting for IP change: {entry[0]}:{entry[1]}")
+            logger.debug(f"ensure_new_ip=True and single proxy, handling IP change check: {entry[0]}:{entry[1]}")
             baseline = self._health.get(entry, {}).get("last_ip")
-            if not baseline:
-                if not self.is_entry_alive(entry, timeout=check_timeout):
-                    raise NoWorkingProxiesError("Proxy became unavailable during ensure_new_ip")
-                baseline = self._health.get(entry, {}).get("last_ip")
-            entry = self._wait_for_new_ip(entry, baseline, ensure_new_ip_timeout, ensure_new_ip_interval, check_timeout)
+            if not baseline_before:
+                # First time seeing this proxy: it was already checked in _find_working_entry, so return immediately
+                logger.debug("No baseline IP found; returning first-working proxy without waiting for IP change")
+            else:
+                # There is a baseline: wait for the IP to change
+                entry = self._wait_for_new_ip(
+                    entry, baseline, ensure_new_ip_timeout, ensure_new_ip_interval, check_timeout
+                )
 
         return entry
 
@@ -327,7 +335,7 @@ class ProxyInterface:
 
             if current_ip and current_ip != baseline:
                 self.mark_entry_status(entry, True, last_ip=current_ip)
-                logger.info(f"IP changed from {baseline} to {current_ip}")
+                logger.debug(f"IP changed from {baseline} to {current_ip}")
                 return entry
 
             time.sleep(interval)