janction-render 0.4.97__tar.gz → 0.4.99__tar.gz

{janction_render-0.4.97 → janction_render-0.4.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janction-render
-Version: 0.4.97
+Version: 0.4.99
 Summary: Cloud GPU rendering for Blender scenes and 3D models (GLB, FBX, USD, OBJ, STL), built for AI agents: MCP server (remote + stdio), HTTP API and CLI. Product shots, 360-degree turntables, animations and stills; preview in seconds with a critic; no local Blender or GPU. A 100 JPY welcome credit for a new key (one per network every 30 days) and 400 JPY more for saving a card that is not charged, then 0.1 JPY per GPU-second.
 Author-email: "JasmyLab Inc." <contact@jasmylab.com>
 License-Expression: MIT

{janction_render-0.4.97 → janction_render-0.4.99}/janction_render/__init__.py

@@ -1,3 +1,3 @@
 """JANCTION Render — ターミナルの AI エージェントから GPU で 3DCG を描く。"""
 
-__version__ = "0.4.97"
+__version__ = "0.4.99"

{janction_render-0.4.97 → janction_render-0.4.99}/janction_render/cli.py

@@ -66,6 +66,11 @@ def _frames(s: str) -> tuple[int, int]:
         raise argparse.ArgumentTypeError("frames must look like 1-240 or 12")
 
 
+def _say_err(msg: str) -> None:
+    """受け取りの進み具合（10/14: 5 GB の受け取りが 4 分黙っていた）。標準出力は結果の JSON だけにしておく。"""
+    print(msg, file=sys.stderr)
+
+
 def _progress(j: dict[str, Any]) -> None:
     p = j["progress"]
     print(f"  {j['status']}: {p['frames_done']}/{p['frames_total']} frames"
@@ -119,7 +124,7 @@ def cmd_preview(c: Client, args: argparse.Namespace) -> int:
         print(_j({k: j.get(k) for k in ("job_id", "status", "error", "log_tail", "warnings")}))
         return 1
     out = Path(args.out) if args.out else Path("render_out") / j["job_id"]
-    paths = c.download(j["job_id"], out)
+    paths = c.download(j["job_id"], out, on_progress=_say_err)
     print(_j({"job_id": j["job_id"], "scene_id": sid, "frames": frames, "files": [str(p) for p in paths],
               "warnings": j.get("warnings") or [], "gpu_seconds": j["gpu_seconds"], "device": j["device"],
               "expires_at": j["expires_at"]}))
@@ -146,7 +151,7 @@ def cmd_render(c: Client, args: argparse.Namespace) -> int:
         print(_j({k: j.get(k) for k in ("job_id", "status", "error", "log_tail")}))
         return 1
     out = Path(args.out) if args.out else Path("render_out") / j["job_id"]
-    paths = c.download(j["job_id"], out)
+    paths = c.download(j["job_id"], out, on_progress=_say_err)
     print(_j({"job_id": j["job_id"], "scene_id": sid, "files": [str(p) for p in paths],
               "warnings": j.get("warnings") or [], "gpu_seconds": j["gpu_seconds"], "device": j["device"],
               "expires_at": j["expires_at"]}))
@@ -161,7 +166,7 @@ def cmd_status(c: Client, args: argparse.Namespace) -> int:
 def cmd_download(c: Client, args: argparse.Namespace) -> int:
     j = c.wait(args.job, timeout=args.wait, on_progress=_progress) if args.wait else c.job(args.job)
     out = Path(args.out) if args.out else Path("render_out") / args.job
-    paths = c.download(args.job, out)
+    paths = c.download(args.job, out, on_progress=_say_err)
     print(_j({"job_id": args.job, "status": j["status"], "files": [str(p) for p in paths]}))
     return 0 if j["status"] == "done" else 1
 
@@ -383,7 +388,7 @@ def _outcome(c: Client, args: argparse.Namespace, name: str, options: dict[str,
         print(_j({k: j.get(k) for k in ("job_id", "status", "error", "log_tail")}))
         return 1
     out = Path(args.out) if args.out else Path("render_out") / j["job_id"]
-    paths = c.download(j["job_id"], out, only=only)
+    paths = c.download(j["job_id"], out, only=only, on_progress=_say_err)
     print(_j({"job_id": j["job_id"], "scene_id": sid, "files": [str(p) for p in paths], "gpu_seconds": j["gpu_seconds"],
               "expires_at": j["expires_at"]}))
     return 0
@@ -408,7 +413,7 @@ def cmd_try(c: Client, args: argparse.Namespace) -> int:
         print(_j({k: j.get(k) for k in ("job_id", "status", "error", "log_tail")}))
         return 1
     out = Path(args.out) if args.out else Path("render_out") / j["job_id"]
-    paths = c.download(j["job_id"], out)
+    paths = c.download(j["job_id"], out, on_progress=_say_err)
     print(f"done: {j['gpu_seconds']} GPU seconds on {j.get('device') or 'GPU'} -> " + ", ".join(str(p) for p in paths))
     try:
         me = c.me()
@@ -606,8 +611,15 @@ def main(argv: list[str] | None = None) -> int:
         pay = exc.payment()
         if pay:
             print(f"payment required: {exc.detail}", file=sys.stderr)
-            print(f"open this page in a browser and pay, then run the command again: {pay['checkout_url']}",
-                  file=sys.stderr)
+            order = (pay.get("resume") or {}).get("order_id")
+            if order:
+                # 10/14: 払うと預かった仕事が自動で始まる。送り直すと同じ仕事が返る（2 本は描かない）
+                print(f"open this page in a browser and pay: {pay['checkout_url']}", file=sys.stderr)
+                print(f"the render then starts by itself (nothing to run again); follow it with: janction-render status {order}",
+                      file=sys.stderr)
+            else:
+                print(f"open this page in a browser and pay, then run the command again: {pay['checkout_url']}",
+                      file=sys.stderr)
             print(_j(pay))
             return 3
         print(f"error: {exc}", file=sys.stderr)

{janction_render-0.4.97 → janction_render-0.4.99}/janction_render/client.py

@@ -25,6 +25,9 @@ CACHE = Path.home() / ".janction-render.json"
 SCENE_SUFFIXES = (".blend", ".py", ".fbx", ".glb", ".gltf", ".obj", ".stl", ".ply", ".usd", ".usda", ".usdc", ".usdz", ".abc")
 ONLY_CHOICES = ("all", "mp4", "frames", "sheet", "output", "video")
 ARCHIVE_MIN_FILES = 8   # これ以上の数のファイルは zip で 1 回で取る（1 枚ずつだと入口の回数制限 429 に当たる、10/9）
+# zip は約 1 GiB ずつの区切りで取る（10/14 受け取り側の 5 GB 試験: 1 本の zip は途中から取り直せず、切れると全部を 1 枚ずつ取り直していた）
+ARCHIVE_PART_BYTES = 1 << 30
+DOWNLOAD_TRIES = 3
 # 公開の受付（render.janction.jp）の前に立つ Cloudflare は、1 回の送信を 100 MB までしか通さない（無料プラン）。超えると受付に
 # 届かず HTML の 413 になるので、送る前に断ってリンク（scene_url / asset_urls）で渡すよう言う。素材は 100 MB ずつに分けて送る
 # （10/12）。手元や自前の受付には掛けない。JANCTION_RENDER_MAX_UPLOAD_MB で変えられる（0 で見ない）
@@ -37,6 +40,15 @@ ASSET_LINK_MAX_BYTES = 128 * 1024 * 1024   # 受付の素材 1 つの上限（JR
 _FRAME_NAME_RE = re.compile(r"^(part-\d+_)?frame_")
 
 
+def _have(dest: Path, a: dict[str, Any]) -> bool:
+    """dest にもう同じ大きさのファイルがあるか（大きさの分からない古い受付では、無いものとして取り直す）。"""
+    n = a.get("size")
+    try:
+        return n is not None and dest.is_file() and dest.stat().st_size == int(n)
+    except (OSError, ValueError):
+        return False
+
+
 def select_artifacts(artifacts: list[dict[str, Any]], only: Optional[str] = None) -> list[dict[str, Any]]:
     """成果物の絞り込み: all / mp4（output.mp4 だけ）/ frames（PNG のコマだけ）/ sheet（4 コマ並べだけ）/ output（mp4 か sheet）。"""
     o = (only or "all").strip().lower()
@@ -273,7 +285,8 @@ class ClientError(RuntimeError):
                 out[k] = self.extra[k]
         # ようこそクレジット（docs/46）の受付なら付いてくる。card_offer はカード登録（0 円）で無料の GPU 時間が足される鍵の案内、
         # topup_options はチャージの選択肢（docs/62 P0-1: REST の 402 と同じものを AI に渡す）
-        for k in ("welcome", "first_topup_bonus", "card_offer", "topup_options", "topup_credit_yen"):
+        # resume: 402 で預かった注文（o_…）。払うとその仕事が自動で始まり、render_status(o_…) で追える（10/14）
+        for k in ("welcome", "first_topup_bonus", "card_offer", "topup_options", "topup_credit_yen", "resume"):
             if self.extra.get(k):
                 out[k] = self.extra[k]
         if self.extra.get("accepts"):
@@ -840,8 +853,11 @@ class Client:
                 return j
             time.sleep(interval)
 
-    def download(self, job_id: str, out_dir: str | Path, only: Optional[list[str] | str] = None) -> list[Path]:
-        """成果物を out_dir に落とす。only は名前の一覧か、'mp4' / 'frames' / 'sheet' / 'output' / 'all'。"""
+    def download(self, job_id: str, out_dir: str | Path, only: Optional[list[str] | str] = None,
+                 on_progress: Optional[Callable[[str], None]] = None) -> list[Path]:
+        """成果物を out_dir に落とす。only は名前の一覧か、'mp4' / 'frames' / 'sheet' / 'output' / 'all'。
+        on_progress は進み具合の 1 行（CLI は標準エラーに出す。10/14: 5 GB の受け取りが 4 分黙っていた）。"""
+        self._say = on_progress or (lambda _msg: None)
         j = self.job(job_id)
         out = Path(out_dir)
         out.mkdir(parents=True, exist_ok=True)
@@ -854,40 +870,114 @@ class Client:
             got = self._download_archive(job_id, out, wanted)
             if got is not None:
                 return got
-        for a in wanted:
+            self._say("the zip did not come through; fetching the files one by one")
+        last = time.monotonic()
+        for i, a in enumerate(wanted, 1):
+            dest = out / a["name"]
+            if _have(dest, a):            # 前の回（切れた zip・打ち直し）で届いている
+                paths.append(dest)
+                continue
+            if len(wanted) > 1 and time.monotonic() - last > 10:
+                last = time.monotonic()
+                self._say(f"downloading {i}/{len(wanted)} files")
             # 受付が返す URL は公開 URL の土台で組まれている。自分がつないだ先（SSH トンネルなど）でも
             # 落とせるように、パスだけを取り出して自分の server に付け直す
             parts = urlsplit(a["url"])
             path = parts.path + (f"?{parts.query}" if parts.query else "")
             url = f"{self.server}{path}" if parts.path.startswith("/v1/") else a["url"]
-            with self.s.get(url, headers=self._headers(), stream=True, timeout=600) as r:
-                self._raise(r)
-                dest = out / a["name"]
-                with dest.open("wb") as fh:
-                    for chunk in r.iter_content(1024 * 1024):
-                        fh.write(chunk)
+            self._download_file(url, dest)
             paths.append(dest)
         return paths
 
+    def _download_file(self, url: str, dest: Path) -> None:
+        """1 つのファイルを dest.part に受け取り、切れたら Range で続きから（10/14。受付の FileResponse は Range に答える）。"""
+        part = dest.with_name(dest.name + ".part")
+        for attempt in range(DOWNLOAD_TRIES):
+            have = part.stat().st_size if part.exists() else 0
+            headers = {**self._headers(), **({"Range": f"bytes={have}-"} if have else {})}
+            try:
+                with self.s.get(url, headers=headers, stream=True, timeout=600) as r:
+                    if r.status_code == 416:          # もう全部ある
+                        break
+                    self._raise(r)
+                    with part.open("ab" if r.status_code == 206 else "wb") as fh:
+                        for chunk in r.iter_content(1024 * 1024):
+                            fh.write(chunk)
+                break
+            except requests.RequestException:
+                if attempt == DOWNLOAD_TRIES - 1:
+                    raise
+                time.sleep(2.0 * (attempt + 1))
+        part.replace(dest)
+
     def _download_archive(self, job_id: str, out: Path, wanted: list[dict[str, Any]]) -> Optional[list[Path]]:
-        """まとめて zip（GET /v1/jobs/{id}/archive）で取り、欲しい名前だけを out に出す。受付が古くて口が無い・途中で切れた・
-        中身が足りないときは None（呼び手が 1 枚ずつに戻る）。"""
+        """まとめて zip（GET /v1/jobs/{id}/archive）で取り、欲しい名前だけを out に出す。大きいときは名前の順に約 1 GiB ずつの
+        区切り（first・last）で取り、届いた区切りは残して、切れた区切りだけを取り直す（10/14）。受付が古くて口が無い・取り直しても
+        届かない・中身が足りないときは None（呼び手が 1 枚ずつに戻り、届いているファイルは飛ばす）。"""
+        ordered = sorted(wanted, key=lambda a: a["name"])
+        groups: list[list[dict[str, Any]]] = []
+        size = 0
+        for a in ordered:
+            n = int(a.get("size") or 0)
+            if not groups or (size + n > ARCHIVE_PART_BYTES and groups[-1]):
+                groups.append([])
+                size = 0
+            groups[-1].append(a)
+            size += n
+        total_mb = sum(int(a.get("size") or 0) for a in wanted) / 1048576
+        if len(groups) == 1:
+            self._say(f"downloading {len(wanted)} files in one zip ({total_mb:.0f} MB)")
+            return self._fetch_archive(job_id, out, wanted)
+        self._say(f"downloading {len(wanted)} files ({total_mb / 1024:.1f} GB) in {len(groups)} zips of about 1 GB")
+        paths: list[Path] = []
+        for gi, g in enumerate(groups, 1):
+            if all(_have(out / a["name"], a) for a in g):
+                paths += [out / a["name"] for a in g]
+                continue
+            got: Any = None
+            for attempt in range(DOWNLOAD_TRIES):
+                self._say(f"zip {gi}/{len(groups)} ({len(g)} files, {sum(int(a.get('size') or 0) for a in g) / 1048576:.0f} MB)"
+                          + (f", again (try {attempt + 1})" if attempt else ""))
+                got = self._fetch_archive(job_id, out, g, (g[0]["name"], g[-1]["name"]))
+                if got is not None:
+                    break
+                time.sleep(2.0 * (attempt + 1))
+            if got == "unsliced":         # 区切りを知らない受付: 前のとおり 1 本で
+                return self._fetch_archive(job_id, out, wanted)
+            if got is None:
+                return None
+            paths += got
+        return paths
+
+    def _fetch_archive(self, job_id: str, out: Path, wanted: list[dict[str, Any]],
+                       span: Optional[tuple[str, str]] = None) -> Any:
+        """zip を 1 本取って欲しい名前を out に出す。span（最初と最後の名前）を渡すと、その一続きだけを頼む。
+        区切りを頼んだのに受付が X-Archive-Range を返さなければ "unsliced"。"""
         import shutil
         import tempfile
         import zipfile
+        from urllib.parse import urlencode
 
         names = {a["name"] for a in wanted}
         exts = sorted({Path(n).suffix.lstrip(".").lower() for n in names if Path(n).suffix})
-        url = f"{self.server}/v1/jobs/{job_id}/archive" + (f"?only={','.join(exts)}" if exts else "")
+        q = {**({"only": ",".join(exts)} if exts else {}), **({"first": span[0], "last": span[1]} if span else {})}
+        url = f"{self.server}/v1/jobs/{job_id}/archive" + (f"?{urlencode(q)}" if q else "")
         tmp: Optional[str] = None
         try:
             with self.s.get(url, headers=self._headers(), stream=True, timeout=1800) as r:
                 if r.status_code != 200:
                     return None
+                if span and not r.headers.get("X-Archive-Range"):
+                    return "unsliced"
                 fd, tmp = tempfile.mkstemp(suffix=".zip", dir=out)
+                got_b, last = 0, time.monotonic()
                 with os.fdopen(fd, "wb") as fh:
                     for chunk in r.iter_content(1024 * 1024):
                         fh.write(chunk)
+                        got_b += len(chunk)
+                        if time.monotonic() - last > 15:
+                            last = time.monotonic()
+                            getattr(self, "_say", lambda _m: None)(f"  {got_b // 1048576} MB")
             paths: list[Path] = []
             with zipfile.ZipFile(tmp) as zf:
                 if not names <= set(zf.namelist()):

{janction_render-0.4.97 → janction_render-0.4.99}/janction_render/mcp_server.py

@@ -236,17 +236,20 @@ def _payment_block(exc: ClientError) -> Optional[dict[str, Any]]:
     p = exc.payment()
     if p is None:
         return None
+    # 払ったあとは預かり（resume.order_id）から自動で始まる受付（0.4.98〜）なら、送り直させない（10/14）
+    after = ("after they paid (or registered the card) the render starts by itself: tell them so and follow it with "
+             "render_status(job_id=resume.order_id); do not upload or submit it again (a resend returns the same job)"
+             if p.get("resume") else "after they paid, call billing() to confirm the balance, then submit the same job again")
     if p.get("card_offer"):
         # 0 円のカード登録で無料の GPU 時間が足される鍵には、その道を先に（docs/62 P0-1）。チャージは代わりの道
         p["next"] = ("first tell the user card_offer.tell_user in their own language (registering a card costs nothing and adds free "
-                     "GPU time; they open card_offer.link in a browser), and offer the top-up at checkout_url as the other way; after "
-                     "either is done, call billing() to confirm, then submit the same job again")
+                     "GPU time; they open card_offer.link in a browser), and offer the top-up at checkout_url as the other way; " + after)
         return p
     p["next"] = (("relay tell_user to the user in their own language (what this render costs and what the top-up buys) "
                   "with checkout_url " if p.get("tell_user") else
                   "tell the user the job goes past the free GPU time left and what the top-up costs; show checkout_url ")
-                 + "and ask them to pay in a browser (Stripe; the rest stays as credit); after they paid, call billing() to "
-                 "confirm the balance, then submit the same job again (or render a smaller job that fits the free time)")
+                 + "and ask them to pay in a browser (Stripe; the rest stays as credit); " + after
+                 + " (or render a smaller job that fits the free time)")
     return p
 
 

{janction_render-0.4.97 → janction_render-0.4.99}/janction_render.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janction-render
-Version: 0.4.97
+Version: 0.4.99
 Summary: Cloud GPU rendering for Blender scenes and 3D models (GLB, FBX, USD, OBJ, STL), built for AI agents: MCP server (remote + stdio), HTTP API and CLI. Product shots, 360-degree turntables, animations and stills; preview in seconds with a critic; no local Blender or GPU. A 100 JPY welcome credit for a new key (one per network every 30 days) and 400 JPY more for saving a card that is not charged, then 0.1 JPY per GPU-second.
 Author-email: "JasmyLab Inc." <contact@jasmylab.com>
 License-Expression: MIT

{janction_render-0.4.97 → janction_render-0.4.99}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "janction-render"
-version = "0.4.97"
+version = "0.4.99"
 description = "Cloud GPU rendering for Blender scenes and 3D models (GLB, FBX, USD, OBJ, STL), built for AI agents: MCP server (remote + stdio), HTTP API and CLI. Product shots, 360-degree turntables, animations and stills; preview in seconds with a critic; no local Blender or GPU. A 100 JPY welcome credit for a new key (one per network every 30 days) and 400 JPY more for saving a card that is not charged, then 0.1 JPY per GPU-second."
 readme = "README.md"
 license = "MIT"