dsh-h3-image 0.2.9 → 0.2.10

package/assets/stage_weights.py

@@ -12,12 +12,17 @@ returned without any network access, so the following engine run is instant
 for the main weights while still converting shard by shard as usual.
 
 Endpoint honesty: every endpoint is tried DIRECT first (proxies explicitly
-disabled — a proxy download would silently spend the user's proxy data). Only
-after every endpoint failed direct does one final round run through the system
-proxy, announced by its own line before it starts. Redirects (301/302/303/
-307/308) are followed by hand because urllib does not follow 308, which is
-exactly what a mirror answers for every file; the Range header is kept across
-hops so a resumed download stays resumed through a 308.
+disabled — a proxy download would silently spend the user's proxy data). The
+direct round runs twice: mirrors are often flaky in bursts, and a second
+direct round costs nothing next to silently spending proxy data. Only after
+both direct rounds fail does one final round run through the system proxy,
+announced by its own line before it starts. Redirects (301/302/303/307/308)
+are followed by hand because urllib does not follow 308, which is exactly
+what a mirror answers for every file; the Range header is kept across hops
+so a resumed download stays resumed through a 308. When a redirect chain
+lands on a different host than the endpoint asked for (a mirror bouncing
+users back to the origin), a note line says so — a slow file behind such a
+bounce is the mirror's doing, and the log should not hide it.
 
 File-list truth: imported from the engine script (--engine-script), so a pin
 bump needs no change here.
@@ -27,6 +32,8 @@ Progress contract (parsed by lib/jobs.js, all flushed):
     [stage n/N] placed <name>
     [stage n/N] skipped <name> (already present)
     [stage n/N] switched endpoint: <host>
+    [stage n/N] note: <name> redirected to <host>
+    stage: <name>: direct round failed (<err>); retrying direct once
     stage: retrying via system proxy (may count against proxy data)
     STAGE OK            (terminal, stdout)
     STAGE FAIL <rel>    (terminal, stderr, exit 1)
@@ -113,6 +120,12 @@ def attempt(opener, url: str, dest: Path, part: Path, size: int, sha, name: str,
         have = 0
     headers = {"Range": f"bytes={have}-"} if have else {}
     with open_following(opener, url, headers) as resp:
+        final_host = urllib.parse.urlsplit(resp.geturl()).hostname or host
+        if final_host != host:
+            # A mirror that bounces to another host (typically the origin) is
+            # still "via <mirror>" in the log above; say where the bytes
+            # actually come from so a slow/stalled transfer is attributed right.
+            print(f"[stage {index}/{total}] note: {name} redirected to {final_host}", flush=True)
         resume = bool(have) and getattr(resp, "status", 200) == 206
         with part.open("ab" if resume else "wb") as out:
             while True:
@@ -154,13 +167,19 @@ def stage_file(*, name: str, rel: str, dest: Path, size: int, sha, endpoints,
     last_error = None
     attempts = 0
     direct = build_opener(direct=True)
-    for endpoint in endpoints:
-        try:
-            attempt(direct, url_of(endpoint), dest, part, size, sha, name, index, total, first=attempts == 0)
-            return True
-        except Exception as error:  # noqa: BLE001 — any failure means: next endpoint
-            last_error = error
-            attempts += 1
+    # Two direct rounds before touching the proxy: mirror flakiness is bursty
+    # (a file that times out once often succeeds seconds later), and a second
+    # direct round is free while proxy bytes are not.
+    for round_no in (1, 2):
+        for endpoint in endpoints:
+            try:
+                attempt(direct, url_of(endpoint), dest, part, size, sha, name, index, total, first=attempts == 0)
+                return True
+            except Exception as error:  # noqa: BLE001 — any failure means: next endpoint
+                last_error = error
+                attempts += 1
+        if round_no == 1:
+            print(f"stage: {name}: direct round failed ({last_error}); retrying direct once", flush=True)
     print("stage: retrying via system proxy (may count against proxy data)", flush=True)
     proxied = build_opener(direct=False)
     for endpoint in endpoints:

package/locale/en.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "H3 Image (dsh-h3-image)",
-    "description": "Unofficial third-party plugin, not affiliated with MiniMax. On Apple Silicon, fully local text-to-image with the open-source MiniMax H3-Image (MLX engine). A one-time setup wizard downloads a fixed version of the engine and weights to your machine (the MiniMax community license and its region terms are shown before any download; you accept it yourself), then generation runs offline — no keys, no accounts, no network access. Long setup steps are background jobs that survive restarts and resume where they stopped. Requires Apple Silicon with 48 GB+ unified memory (32 GB is not guaranteed) and ~60 GB free disk during setup; Intel Macs and other platforms are declined up front. Current version (0.2.9): read-only environment check, setup wizard, and local generation (the community license must be explicitly accepted by you before the first image)."
+    "description": "Unofficial third-party plugin, not affiliated with MiniMax. On Apple Silicon, fully local text-to-image with the open-source MiniMax H3-Image (MLX engine). A one-time setup wizard downloads a fixed version of the engine and weights to your machine (the MiniMax community license and its region terms are shown before any download; you accept it yourself), then generation runs offline — no keys, no accounts, no network access. Long setup steps are background jobs that survive restarts and resume where they stopped. Requires Apple Silicon with 48 GB+ unified memory (32 GB is not guaranteed) and ~60 GB free disk during setup; Intel Macs and other platforms are declined up front. Current version (0.2.10): read-only environment check, setup wizard, and local generation (the community license must be explicitly accepted by you before the first image)."
   }
 }

package/locale/zh.json

@@ -1,6 +1,6 @@
 {
   "meta": {
     "title": "H3 本地生图 (dsh-h3-image)",
-    "description": "非官方第三方插件，与 MiniMax 无关联。在 Apple Silicon 上用开源 MiniMax H3-Image（MLX 引擎）做完全本地文生图。安装向导一次性把固定版本的引擎与权重下载到本机（下载前展示 MiniMax 社区许可及地域条款，由你本人确认接受）；之后生图全程离线——不用密钥、不用账号、不联网。安装中的长步骤是后台任务，DSH 重启不丢、断点续传。需 Apple Silicon、48GB 及以上统一内存（32GB 不保证）、安装期约 60GB 可用磁盘；Intel Mac 与其他平台在检查阶段即明确拒绝。当前版本（0.2.9）：只读环境体检 + 安装向导 + 本地产图（社区许可需你本人确认接受后才会出图）。"
+    "description": "非官方第三方插件，与 MiniMax 无关联。在 Apple Silicon 上用开源 MiniMax H3-Image（MLX 引擎）做完全本地文生图。安装向导一次性把固定版本的引擎与权重下载到本机（下载前展示 MiniMax 社区许可及地域条款，由你本人确认接受）；之后生图全程离线——不用密钥、不用账号、不联网。安装中的长步骤是后台任务，DSH 重启不丢、断点续传。需 Apple Silicon、48GB 及以上统一内存（32GB 不保证）、安装期约 60GB 可用磁盘；Intel Mac 与其他平台在检查阶段即明确拒绝。当前版本（0.2.10）：只读环境体检 + 安装向导 + 本地产图（社区许可需你本人确认接受后才会出图）。"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-h3-image",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "在 Apple Silicon 上用开源 MiniMax H3-Image（MLX 引擎）做完全本地文生图的 DeepSeek Harness 插件：一键安装向导 + 零出网本地生图。Fully local MiniMax H3-Image text-to-image on Apple Silicon MLX — a DeepSeek Harness plugin with a one-time setup wizard and no network access at generation.",
   "type": "module",
   "main": "./lib/index.js",