daemon: default client id = user@ip

daemon/client.py

@@ -20,6 +20,8 @@ import os
 import sys
 import time
 import signal
+import socket
+import getpass
 import threading
 import subprocess
 import uuid
@@ -27,10 +29,35 @@ import queue as queuelib
 
 from gradio_client import Client
 
+
+def _primary_ip() -> str:
+    """Best-effort local IP. The UDP 'connect' just picks the outbound route's
+    source address; no packets are sent and the host need not be reachable."""
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    try:
+        s.connect(("8.8.8.8", 80))
+        return s.getsockname()[0]
+    except OSError:
+        try:
+            return socket.gethostbyname(socket.gethostname())
+        except OSError:
+            return os.uname().nodename
+    finally:
+        s.close()
+
+
+def _default_client_id() -> str:
+    try:
+        user = getpass.getuser()
+    except Exception:
+        user = os.environ.get("USER") or "user"
+    return f"{user}@{_primary_ip()}"
+
+
 SPACE = os.environ.get("RELAY_SPACE", "")
 SECRET = os.environ.get("RELAY_SECRET", "")
 HF_TOKEN = os.environ.get("HF_TOKEN") or os.environ.get("HUGGINGFACE_TOKEN")
-CLIENT_ID = os.environ.get("CLIENT_ID") or os.uname().nodename
+CLIENT_ID = os.environ.get("CLIENT_ID") or _default_client_id()
 POLL_INTERVAL = float(os.environ.get("POLL_INTERVAL", "5"))
 DEFAULT_TIMEOUT = int(os.environ.get("CMD_TIMEOUT", "120"))
 MAX_OUTPUT_CHARS = 200_000