lager-cli 0.32.0__tar.gz → 0.32.1__tar.gz

{lager_cli-0.32.0/lager_cli.egg-info → lager_cli-0.32.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lager-cli
-Version: 0.32.0
+Version: 0.32.1
 Summary: Lager CLI - Box and Docker connectivity
 Home-page: https://github.com/lagerdata/lager
 Author: Lager Data

{lager_cli-0.32.0 → lager_cli-0.32.1}/__init__.py

@@ -7,4 +7,4 @@ Lager CLI
 A Command Line Interface for Lager Data
 """
 
-__version__ = '0.32.0'
+__version__ = '0.32.1'

{lager_cli-0.32.0 → lager_cli-0.32.1}/commands/box/nets.py

@@ -20,7 +20,7 @@ import shutil
 
 from ...context import get_default_box
 from ...core.net_group import NetGroupHelpMixin
-from ...core.net_helpers import NET_HTTP_PORT
+from ...core.net_helpers import NET_HTTP_PORT, echo_box_request_failure
 from ...errors import LagerError
 from ...sort_utils import natural_sort_key as _natural_sort_key
 from .net_tui import launch_tui
@@ -57,12 +57,8 @@ def _box_request(ctx: click.Context, box_ip: str, method: str, path: str,
                                 headers=auth_headers_for_box(box_ip),
                                 timeout=_NETS_HTTP_TIMEOUT)
         _check_gateway(resp, box_ip)
-    except (requests.ConnectionError, requests.Timeout):
-        click.secho(
-            f"Error: cannot reach box at {box_ip}:{NET_HTTP_PORT}. "
-            f"Check network/Tailscale and that the box is online and updated.",
-            fg="red", err=True,
-        )
+    except (requests.ConnectionError, requests.Timeout) as e:
+        echo_box_request_failure(box_ip, e, timeout=_NETS_HTTP_TIMEOUT)
         ctx.exit(1)
     except requests.RequestException as e:
         click.secho(f"Error: request to box failed: {e}", fg="red", err=True)

{lager_cli-0.32.0 → lager_cli-0.32.1}/commands/communication/usb.py

@@ -25,6 +25,7 @@ from ...core.net_helpers import (
     list_nets_by_role,
     display_nets_table,
     validate_net_exists,
+    echo_box_request_failure,
     NET_HTTP_PORT,
 )
 from ...context import get_default_net
@@ -67,20 +68,18 @@ def _invoke_remote(
     from ...box_storage import _check_gateway
 
     url = f"http://{target_box}:{NET_HTTP_PORT}/usb/command"
+    # First contact with an Acroname hub runs BrainStem USB discovery on the
+    # box, which can take well over 10s cold; budget for it.
     try:
         resp = requests.post(
             url,
             json={"netname": net_name, "action": command},
-            timeout=10,
+            timeout=30,
             headers=auth_headers_for_box(target_box),
         )
         _check_gateway(resp, target_box)
-    except (requests.ConnectionError, requests.Timeout):
-        click.secho(
-            f"Error: cannot reach box at {target_box}:{NET_HTTP_PORT}. "
-            f"Check network/Tailscale and that the box is online and updated.",
-            fg='red', err=True,
-        )
+    except (requests.ConnectionError, requests.Timeout) as e:
+        echo_box_request_failure(target_box, e, timeout=30)
         ctx.exit(1)
     except requests.RequestException as e:
         click.secho(f"Error: USB request to box failed: {e}", fg='red', err=True)

{lager_cli-0.32.0 → lager_cli-0.32.1}/commands/power/battery.py

@@ -25,6 +25,7 @@ from ...core.net_helpers import (
     resolve_box,
     validate_net,
     display_nets,
+    echo_box_request_failure,
     NET_HTTP_PORT,
     NET_ROLES,
 )
@@ -60,12 +61,8 @@ def _run_backend(ctx, box, action: str, **params):
         response = requests.post(url, json=payload, timeout=10,
                                  headers=auth_headers_for_box(box))
         _check_gateway(response, box)
-    except (requests.ConnectionError, requests.Timeout):
-        click.secho(
-            f"Error: cannot reach box at {box}:{NET_HTTP_PORT}. "
-            f"Check network/Tailscale and that the box is online and updated.",
-            fg='red', err=True,
-        )
+    except (requests.ConnectionError, requests.Timeout) as e:
+        echo_box_request_failure(box, e, timeout=10)
         raise SystemExit(1)
     except requests.RequestException as e:
         click.secho(f"Error: battery request to box failed: {e}", fg='red', err=True)

{lager_cli-0.32.0 → lager_cli-0.32.1}/commands/power/supply.py

@@ -29,6 +29,7 @@ from ...core.net_helpers import (
     validate_net,
     validate_net_exists,
     display_nets,
+    echo_box_request_failure,
     validate_positive_parameters,
     validate_protection_limits,
     parse_value_with_negatives,
@@ -106,12 +107,8 @@ def _run_backend(ctx, box, action: str, **params):
         response = requests.post(url, json=payload, timeout=10,
                                  headers=auth_headers_for_box(box))
         _check_gateway(response, box)
-    except (requests.ConnectionError, requests.Timeout):
-        click.secho(
-            f"Error: cannot reach box at {box}:{NET_HTTP_PORT}. "
-            f"Check network/Tailscale and that the box is online and updated.",
-            fg='red', err=True,
-        )
+    except (requests.ConnectionError, requests.Timeout) as e:
+        echo_box_request_failure(box, e, timeout=10)
         raise SystemExit(1)
     except requests.RequestException as e:
         click.secho(f"Error: supply request to box failed: {e}", fg='red', err=True)

{lager_cli-0.32.0 → lager_cli-0.32.1}/core/net_helpers.py

@@ -166,6 +166,34 @@ NET_HTTP_PORT = 9000
 _NET_HTTP_TIMEOUT = 10
 
 
+def echo_box_request_failure(box_ip: str, exc, timeout=None) -> None:
+    """Print the right diagnosis for a failed box HTTP call.
+
+    A read timeout means the box accepted the request but the operation
+    outran its budget (first contact with an instrument can take a while)
+    — telling the user to check their network sends them down the wrong
+    path, and the operation may still complete on the box. Anything else
+    (connection refused/reset, connect timeout) is a genuine
+    can't-reach-the-box condition.
+    """
+    import requests
+
+    if isinstance(exc, requests.ReadTimeout):
+        after = f" within {timeout:g}s" if timeout else ""
+        click.secho(
+            f"Error: the box at {box_ip}:{NET_HTTP_PORT} accepted the request "
+            f"but did not answer{after}. The operation may just be slow and "
+            f"may still complete on the box; try again in a moment.",
+            fg="red", err=True,
+        )
+    else:
+        click.secho(
+            f"Error: cannot reach box at {box_ip}:{NET_HTTP_PORT}. "
+            f"Check network/Tailscale and that the box is online and updated.",
+            fg="red", err=True,
+        )
+
+
 # Boxes we've already warned about being unreachable during a net listing;
 # once per CLI process so repeated fetch_nets calls (e.g. the TUI) don't spam.
 _fetch_nets_unreachable_warned: set[str] = set()
@@ -289,12 +317,8 @@ def post_net_command(
         resp = requests.post(url, json=payload, timeout=http_timeout,
                              headers=auth_headers_for_box(box_addr))
         _check_gateway(resp, box_addr)
-    except (requests.ConnectionError, requests.Timeout):
-        click.secho(
-            f"Error: cannot reach box at {box_addr}:{NET_HTTP_PORT}. "
-            f"Check network/Tailscale and that the box is online and updated.",
-            fg="red", err=True,
-        )
+    except (requests.ConnectionError, requests.Timeout) as e:
+        echo_box_request_failure(box_addr, e, timeout=http_timeout)
         raise SystemExit(1)
     except requests.RequestException as e:
         click.secho(f"Error: request to box failed: {e}", fg="red", err=True)
@@ -367,12 +391,8 @@ def post_box_command(
         resp = requests.post(url, json=payload, timeout=http_timeout,
                              headers=auth_headers_for_box(box_ip))
         _check_gateway(resp, box_ip)
-    except (requests.ConnectionError, requests.Timeout):
-        click.secho(
-            f"Error: cannot reach box at {box_ip}:{NET_HTTP_PORT}. "
-            f"Check network/Tailscale and that the box is online and updated.",
-            fg="red", err=True,
-        )
+    except (requests.ConnectionError, requests.Timeout) as e:
+        echo_box_request_failure(box_ip, e, timeout=http_timeout)
         raise SystemExit(1)
     except requests.RequestException as e:
         click.secho(f"Error: request to box failed: {e}", fg="red", err=True)

{lager_cli-0.32.0 → lager_cli-0.32.1/lager_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lager-cli
-Version: 0.32.0
+Version: 0.32.1
 Summary: Lager CLI - Box and Docker connectivity
 Home-page: https://github.com/lagerdata/lager
 Author: Lager Data