Reviewing files that changed from the base of the PR and between b83e3cf and 8e3ecfe.

• components/clp-package-utils/poetry.lock is excluded by !**/*.lock

• components/clp-package-utils/clp_package_utils/scripts/native/search.py (3 hunks)
• components/clp-package-utils/pyproject.toml (1 hunks)

components/clp-package-utils/clp_package_utils/scripts/native/search.py (3)

11-11: LGTM!

The import of netifaces aligns with the dependency addition and is properly placed with other third-party imports.

---

153-157: LGTM!

The replacement of the previous IP discovery logic with the new helper function is well-implemented. The None-check provides proper error handling, and the early return prevents attempting to start a server without a valid address.

---

157-157: LGTM!

The debug logging provides valuable visibility into the selected host address, which will be helpful for troubleshooting network connectivity issues in Docker environments.

components/clp-package-utils/pyproject.toml (1)

15-15: Verified — netifaces 0.11.0 is available and compatible with Python 3.9. netifaces 0.11.0 publishes cp39 wheels (manylinux/macOS); keep the ^0.11.0 constraint.

Reviewing files that changed from the base of the PR and between 8e3ecfe and 01e0e1e.

• components/clp-package-utils/clp_package_utils/scripts/native/search.py (3 hunks)

• GitHub Check: package-image
• GitHub Check: lint-check (macos-15)

components/clp-package-utils/clp_package_utils/scripts/native/search.py (3)

41-43: Intent check: keep RFC1918 addresses eligible as “non‑local”.

Please confirm “non‑local” here means “non‑loopback”. Excluding RFC1918 ranges (10/8, 172.16/12, 192.168/16) would break container/VPN scenarios; the current implementation correctly treats them as valid candidates.

---

12-12: netifaces declared in pyproject.toml — OK

Found declaration: pyproject.toml (line 15): netifaces = "^0.11.0".

---

37-56: Harden IP detection: catch netifaces/ipaddress errors, skip link‑local, and clarify fallbacks.

Uncaught exceptions (interface enumeration, transient iface removal, malformed addr) can abort the search flow. Also, treating IPv4 link‑local (169.254/16) as “non‑local” is risky; prefer skipping those and falling back to loopback if needed. Improve warnings to state the actual fallback.

Apply:

 def _get_ipv4_address() -> str | None:
@@
-    local_ip = None
-
-    for interface in netifaces.interfaces():
-        for link in netifaces.ifaddresses(interface).get(netifaces.AF_INET, []):
-            ip = link["addr"]
-            if ipaddress.ip_address(ip) not in ipaddress.IPv4Network("127.0.0.0/8"):
-                return ip
-            if local_ip is None:
-                local_ip = ip
-
-    logger.warning("Couldn't find a non-local IP address for receiving search results.")
-    return local_ip
+    local_ip = None
+    try:
+        for interface in netifaces.interfaces():
+            try:
+                entries = netifaces.ifaddresses(interface).get(netifaces.AF_INET, [])
+            except Exception as e:
+                logger.debug(f"Skipping interface {interface}: {e}")
+                continue
+            for link in entries:
+                ip = link.get("addr")
+                if not ip:
+                    continue
+                try:
+                    addr = ipaddress.ip_address(ip)
+                except ValueError:
+                    logger.debug(f"Skipping invalid IPv4 address from {interface}: {ip}")
+                    continue
+                # Prefer non-loopback, non-link-local addresses for worker connectivity.
+                if addr.is_loopback:
+                    if local_ip is None:
+                        local_ip = ip
+                    continue
+                if addr.is_link_local:
+                    # Avoid selecting 169.254.0.0/16 unless nothing else exists.
+                    if local_ip is None:
+                        local_ip = ip
+                    continue
+                return ip
+    except Exception as e:
+        logger.warning(f"Failed to enumerate network interfaces: {e}")
+
+    if local_ip is not None and ipaddress.ip_address(local_ip).is_loopback:
+        logger.warning(
+            "Couldn't find a non-loopback IPv4 address for receiving search results. "
+            "Falling back to loopback."
+        )
+    elif local_ip is not None:
+        logger.warning(
+            "Couldn't find a routable IPv4 address; falling back to a non-routable address."
+        )
+    else:
+        logger.warning("Couldn't find any IPv4 address for receiving search results.")
+    return local_ip

Reviewing files that changed from the base of the PR and between 01e0e1e and 0777647.

• components/clp-package-utils/clp_package_utils/scripts/native/search.py (3 hunks)

• GitHub Check: package-image
• GitHub Check: lint-check (macos-15)
• GitHub Check: lint-check (ubuntu-24.04)

components/clp-package-utils/clp_package_utils/scripts/native/search.py (1)

120-140: Fix fallback logic bug and add robust error handling in _get_ipv4_address.

• The fallback line if ip is None: ip = ip is a no‑op; you never persist the first loopback IP. As written, the function returns the last iterated IP, contradicting the docstring.
• Missing try/except around netifaces/ipaddress calls can raise and abort the search flow.

Apply:

 def _get_ipv4_address() -> str | None:
     """
-    Retrieves an IPv4 address of the host for network communication.
-
-    :returns: The first non-loopback IPv4 address it finds.
-    If no non-loopback address is available, returns the first loopback IPv4 address.
-    If no IPv4 address is found, returns None.
+    Retrieve a host IPv4 address for network communication.
+    Preference: default-route interface's non-loopback address, otherwise the
+    first non-loopback across all interfaces, otherwise the first loopback.
+    Returns None if none found.
     """
-    ip = None
-
-    for interface in netifaces.interfaces():
-        for link in netifaces.ifaddresses(interface).get(netifaces.AF_INET, []):
-            ip = link["addr"]
-            if ipaddress.ip_address(ip) not in ipaddress.IPv4Network("127.0.0.0/8"):
-                return ip
-            if ip is None:
-                ip = ip
-
-    logger.warning("Couldn't find a non-loopback IP address for receiving search results.")
-    return ip
+    local_ip: str | None = None
+    try:
+        # Prefer interface used by the default IPv4 route when available
+        gws = getattr(netifaces, "gateways", None)
+        if callable(gws):
+            default_v4 = netifaces.gateways().get("default", {}).get(netifaces.AF_INET)
+            if default_v4:
+                _, iface = default_v4
+                for link in netifaces.ifaddresses(iface).get(netifaces.AF_INET, []):
+                    ip = link.get("addr")
+                    try:
+                        if ip and not ipaddress.ip_address(ip).is_loopback:
+                            return ip
+                    except (ValueError, ipaddress.AddressValueError, ipaddress.NetmaskValueError):
+                        logger.debug(f"Skipping invalid IP address on {iface}: {ip}")
+        # Scan all interfaces
+        for iface in netifaces.interfaces():
+            for link in netifaces.ifaddresses(iface).get(netifaces.AF_INET, []):
+                ip = link.get("addr")
+                try:
+                    if not ip:
+                        continue
+                    if not ipaddress.ip_address(ip).is_loopback:
+                        return ip
+                    if local_ip is None:
+                        local_ip = ip
+                except (ValueError, ipaddress.AddressValueError, ipaddress.NetmaskValueError):
+                    logger.debug(f"Skipping invalid IP address on {iface}: {ip}")
+                    continue
+    except Exception as e:
+        logger.warning(f"Failed to enumerate network interfaces: {e}")
+    if local_ip is not None:
+        logger.warning("No non-loopback IPv4 address found; falling back to loopback.")
+    else:
+        logger.warning("No IPv4 address found on any interface.")
+    return local_ip

Reviewing files that changed from the base of the PR and between 0777647 and 748d4d1.

• components/clp-package-utils/poetry.lock is excluded by !**/*.lock

• components/clp-package-utils/clp_package_utils/scripts/native/search.py (3 hunks)
• components/clp-package-utils/pyproject.toml (1 hunks)

• GitHub Check: package-image
• GitHub Check: lint-check (macos-15)
• GitHub Check: lint-check (ubuntu-24.04)

components/clp-package-utils/pyproject.toml (1)

15-15: Excellent choice of replacement for netifaces.

The psutil library is actively maintained, has pre-built wheels for CPython 3.6+, and is cross-platform. This addresses the reviewers' concerns about the abandoned netifaces library whilst maintaining the same functionality for IP address discovery.

components/clp-package-utils/clp_package_utils/scripts/native/search.py (2)

12-12: LGTM - Proper library replacement.

The switch from netifaces to psutil addresses the maintainer's concerns and aligns with reviewer recommendations.

---

156-160: Improve grammar and log the actual bound address.

The current approach has two issues:

1. Grammar error in Line 158: "a IPv4" should be "an IPv4"
2. The debug log at Line 160 shows only the host before port assignment

Apply this diff to fix both issues:

     host = _get_ipv4_address()
     if host is None:
-        logger.error("Couldn't find a IPv4 address for receiving search results.")
+        logger.error("Couldn't find an IPv4 address for receiving search results.")
         return
-    logger.debug(f"Listening on {host} for search results.")
 
     server = await asyncio.start_server(
         client_connected_cb=get_worker_connection_handler(raw_output),
         host=host,
         port=0,
         family=socket.AF_INET,
     )
 
     port = int(server.sockets[0].getsockname()[1])
+    logger.debug(f"Listening for search results on {host}:{port}.")

Reviewing files that changed from the base of the PR and between 748d4d1 and 35a4e21.

• components/clp-package-utils/clp_package_utils/scripts/native/search.py (3 hunks)

• GitHub Check: package-image
• GitHub Check: lint-check (macos-15)

components/clp-package-utils/clp_package_utils/scripts/native/search.py (2)

136-146: Log the actual host:port after bind (move the log).

Defer the log until the OS assigns the port.

-    logger.debug(f"Listening on {host} for search results.")
@@
-    port = int(server.sockets[0].getsockname()[1])
+    port = int(server.sockets[0].getsockname()[1])
+    logger.debug(f"Listening for search results on {host}:{port}.")

---

341-364: Harden _get_ipv4_address: prefer default-route IP and add robust error handling.

Prevents crashes on malformed addresses, prefers a routable IP on multi‑NIC hosts, and makes fallback behaviour explicit.

 def _get_ipv4_address() -> str | None:
-    """
-    Retrieves an IPv4 address of the host for network communication.
-
-    :returns: The first non-loopback IPv4 address it finds.
-    If no non-loopback address is available, returns the first loopback IPv4 address.
-    If no IPv4 address is found, returns None.
-    """
-    fallback_ip = None
-
-    for _, addresses in psutil.net_if_addrs().items():
-        for addr in addresses:
-            if addr.family != socket.AF_INET:
-                continue
-            ip = addr.address
-            if not ipaddress.ip_address(ip).is_loopback:
-                return ip
-            if fallback_ip is None:
-                fallback_ip = ip
-
-    if fallback_ip is not None:
-        logger.warning("Couldn't find a non-loopback IP address for receiving search results.")
-    return fallback_ip
+    """
+    Retrieve an IPv4 address of the host for network communication.
+    Preference order:
+      1) Address selected by the system's default IPv4 route (best reachability).
+      2) First non-loopback IPv4 discovered on any interface (via psutil).
+      3) First loopback IPv4 (fallback).
+      4) None if nothing is found.
+    """
+    # 1) Try to infer the default-route address without sending traffic.
+    try:
+        with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
+            s.connect(("8.8.8.8", 53))  # UDP connect does not transmit packets
+            ip = s.getsockname()[0]
+            try:
+                ip_obj = ipaddress.ip_address(ip)
+                if not ip_obj.is_loopback:
+                    return ip
+            except ValueError as ve:
+                logger.debug(f"Skipping invalid default-route IP '{ip}': {ve}")
+    except Exception as e:
+        logger.debug(f"Default-route probe failed: {e}")
+
+    fallback_ip: str | None = None
+
+    # 2) Enumerate interfaces via psutil (if available).
+    try:
+        if psutil is not None:
+            for _, addresses in psutil.net_if_addrs().items():
+                for addr in addresses:
+                    if addr.family != socket.AF_INET:
+                        continue
+                    ip = addr.address
+                    try:
+                        if not ipaddress.ip_address(ip).is_loopback:
+                            return ip
+                        if fallback_ip is None:
+                            fallback_ip = ip
+                    except ValueError as ve:
+                        logger.debug(f"Skipping invalid IP address '{ip}': {ve}")
+                        continue
+        else:
+            logger.debug("psutil is unavailable; skipping interface enumeration.")
+    except Exception as e:
+        logger.warning(f"Failed to enumerate network interfaces: {e}")
+
+    if fallback_ip is not None:
+        logger.warning(
+            "Couldn't find a non-loopback IPv4 address for receiving search results. Falling back to loopback."
+        )
+    else:
+        logger.warning("Couldn't find any IPv4 address for receiving search results.")
+    return fallback_ip