PLUS: бесплатные ssh-туннели (добавлен провайдер по 443) и автоустановка ssh

plus/serve_muscriptor.py

@@ -25,7 +25,7 @@ import urllib.request
 LINKS_FILE = "muscriptor_links.txt"
 DEFAULT_MODEL = "hf://Nokia123543/muscriptor-large-fork/model.safetensors"
 PACKAGE = "muscriptor"
-TUNNEL_ORDER = ("localhostrun", "serveo", "cloudflared")
+TUNNEL_ORDER = ("localhostrun", "pinggy", "serveo", "cloudflared")
 
 
 def say(text: str) -> None:
@@ -41,6 +41,27 @@ def ensure_package() -> None:
     subprocess.run([sys.executable, "-m", "pip", "install", "-q", PACKAGE], check=False)
 
 
+def ensure_ssh() -> str | None:
+    """ssh есть в большинстве образов; если нет, пробуем доставить."""
+    found = shutil.which("ssh")
+    if found:
+        return found
+    say("ssh не найден, пробую доставить openssh-client")
+    for command in (["apt-get", "install", "-y", "-q", "openssh-client"],
+                    [sys.executable, "-m", "pip", "install", "-q", "sshtunnel"]):
+        try:
+            subprocess.run(command, check=False, timeout=300,
+                           stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        except Exception:
+            pass
+        found = shutil.which("ssh")
+        if found:
+            say("ssh установлен: " + found)
+            return found
+    say("ssh поставить не удалось: останутся http-туннели")
+    return None
+
+
 def healthy(port: int, timeout: float = 3.0) -> bool:
     try:
         with urllib.request.urlopen("http://127.0.0.1:%d/health" % port, timeout=timeout) as answer:
@@ -135,6 +156,9 @@ def specs(port: int) -> list[tuple[str, list[str], str]]:
          ["ssh", "-T", *SSH_OPTS, "-R", "80:127.0.0.1:%d" % port, "serveo.net"],
          r"https://[a-z0-9-]+(?:\.[a-z0-9-]+)*\."
          r"(?:serveousercontent|serveo)\.[a-z]+"),
+        ("pinggy",
+         ["ssh", "-T", *SSH_OPTS, "-p", "443", "-R0:127.0.0.1:%d" % port, "a.pinggy.io"],
+         r"https://[a-z0-9-]+\.(?:a\.)?pinggy\.(?:link|online)"),
         ("cloudflared",
          ["cloudflared", "tunnel", "--url", "http://127.0.0.1:%d" % port, "--no-autoupdate"],
          r"https://[a-z0-9-]+\.trycloudflare\.com"),
@@ -211,6 +235,7 @@ def main(argv: list[str] | None = None) -> int:
         CUSTOM_SSH = args.ssh
 
     ensure_package()
+    ensure_ssh()
     server = start_server(args.port, args.model, args.device, args.dtype)
     say("[1/2] сервер отвечает: http://127.0.0.1:%d" % args.port)