janction-render 0.3.1__tar.gz → 0.3.3__tar.gz

{janction_render-0.3.1 → janction_render-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janction-render
-Version: 0.3.1
+Version: 0.3.3
 Summary: Cloud GPU render farm for Blender, for AI agents: MCP server (remote + stdio) and CLI. Render Blender without a GPU from Claude, ChatGPT, Claude Code, Codex, Cursor.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -28,6 +28,13 @@ without a GPU, or when rendering locally is slow.
 - `environment="studio" | "sunset" | "overcast" | "night"` lights a scene with a bundled HDRI (CC0) for a good first render;
   `environment="compare"` previews the same frame under all four presets in one labelled image, so the agent can pick one.
 - A `.gltf` or `.obj` brings its `.bin` / `.mtl` / textures along automatically (from the same folder or the same URL folder).
+- `orbit=True` turns any scene or imported model into a turntable: an orbit camera circles it once (`orbit_frames`, default 24;
+  a preview shows 0/90/180/270 degrees, a final render without `frame_end` gives the whole turn as an MP4). Flat floors and
+  walls are ignored when framing; `orbit_target` (object name or `x,y,z`) and `orbit_distance` (multiplier) adjust the shot.
+- While the GPU is lent to another workload, tools answer right away with the queued job and a note instead of waiting.
+- While a job renders, `render_status` counts finished frames inside the running chunk, so the ETA updates every few seconds.
+- In hosts that support MCP Apps (Claude web and desktop, among others), previews, progress and download links also appear
+  as an interactive panel in the chat: the image, a progress bar, "Open MP4", and preset buttons after an `environment="compare"` preview.
 - `scene_info` reads the scene without rendering (cameras, frame range, missing files).
 - `render_preview` returns 1-4 low-cost frames tiled in one image within seconds, so the agent can look, fix, and repeat.
 - `render_estimate` says how long a render will take ("about 3 minutes") and whether it fits today's free quota.
@@ -111,8 +118,9 @@ Then, in Claude Code:
 | `billing()` | free-beta quota (used today, daily limit, reset time); later balance and top-up link |
 | `render_info()` | workers online or gated (GPU lent to another workload), queue, expected wait, supported inputs, environment presets, Blender versions |
 
-Options on `render_preview` / `render_final`: `environment` (`studio`, `sunset`, `overcast`, `night`; `environment_strength`,
-`environment_visible=False` for a flat grey backdrop with HDRI lighting), `blender` (`"5.2"`), and `assets` (stdio: local files
+Options on `render_preview` / `render_final`: `environment` (`studio`, `sunset`, `overcast`, `night`, `compare` on previews; `environment_strength`,
+`environment_visible=False` for a flat grey backdrop with HDRI lighting), `orbit` / `orbit_frames` / `orbit_elevation` (turntable),
+`blender` (`"5.2"`), and `assets` (stdio: local files
 sent with the scene, found in the script through `os.environ["JR_ASSETS_DIR"]`; a `.blend`'s external files are collected
 automatically with `pip install janction-render[blend]`) or `asset_urls` (remote).
 
@@ -145,7 +153,7 @@ POST /v1/files  multipart "file" (.blend|.py|.glb|.fbx|.usd|.obj|...)   -> {scen
 POST /v1/files/{id}/assets  multipart "files"   textures, glTF .bin ...   GET /v1/files/lookup?sha256=  reuse an upload
 POST /v1/estimate {kind, frames|frame_start/frame_end, width, height, samples, scene_id?} -> seconds, wall_seconds, human, quota
 POST /v1/jobs   {scene_id, kind: info|preview|final, frames|frame_start/frame_end, width, height, samples, camera, fps, output,
-                 environment, environment_strength, environment_visible, blender}
+                 environment, environment_strength, environment_visible, blender, orbit, orbit_frames, orbit_elevation}
 GET  /v1/jobs/{id}      status, progress, eta, artifacts[], cost, warnings, info    DELETE /v1/jobs/{id}  cancel
 GET  /v1/jobs/{id}/artifacts/{name}             PNG / MP4
 POST /mcp                                       remote MCP (Streamable HTTP; Bearer api key or OAuth)

{janction_render-0.3.1 → janction_render-0.3.3}/README.md

@@ -11,6 +11,13 @@ without a GPU, or when rendering locally is slow.
 - `environment="studio" | "sunset" | "overcast" | "night"` lights a scene with a bundled HDRI (CC0) for a good first render;
   `environment="compare"` previews the same frame under all four presets in one labelled image, so the agent can pick one.
 - A `.gltf` or `.obj` brings its `.bin` / `.mtl` / textures along automatically (from the same folder or the same URL folder).
+- `orbit=True` turns any scene or imported model into a turntable: an orbit camera circles it once (`orbit_frames`, default 24;
+  a preview shows 0/90/180/270 degrees, a final render without `frame_end` gives the whole turn as an MP4). Flat floors and
+  walls are ignored when framing; `orbit_target` (object name or `x,y,z`) and `orbit_distance` (multiplier) adjust the shot.
+- While the GPU is lent to another workload, tools answer right away with the queued job and a note instead of waiting.
+- While a job renders, `render_status` counts finished frames inside the running chunk, so the ETA updates every few seconds.
+- In hosts that support MCP Apps (Claude web and desktop, among others), previews, progress and download links also appear
+  as an interactive panel in the chat: the image, a progress bar, "Open MP4", and preset buttons after an `environment="compare"` preview.
 - `scene_info` reads the scene without rendering (cameras, frame range, missing files).
 - `render_preview` returns 1-4 low-cost frames tiled in one image within seconds, so the agent can look, fix, and repeat.
 - `render_estimate` says how long a render will take ("about 3 minutes") and whether it fits today's free quota.
@@ -94,8 +101,9 @@ Then, in Claude Code:
 | `billing()` | free-beta quota (used today, daily limit, reset time); later balance and top-up link |
 | `render_info()` | workers online or gated (GPU lent to another workload), queue, expected wait, supported inputs, environment presets, Blender versions |
 
-Options on `render_preview` / `render_final`: `environment` (`studio`, `sunset`, `overcast`, `night`; `environment_strength`,
-`environment_visible=False` for a flat grey backdrop with HDRI lighting), `blender` (`"5.2"`), and `assets` (stdio: local files
+Options on `render_preview` / `render_final`: `environment` (`studio`, `sunset`, `overcast`, `night`, `compare` on previews; `environment_strength`,
+`environment_visible=False` for a flat grey backdrop with HDRI lighting), `orbit` / `orbit_frames` / `orbit_elevation` (turntable),
+`blender` (`"5.2"`), and `assets` (stdio: local files
 sent with the scene, found in the script through `os.environ["JR_ASSETS_DIR"]`; a `.blend`'s external files are collected
 automatically with `pip install janction-render[blend]`) or `asset_urls` (remote).
 
@@ -128,7 +136,7 @@ POST /v1/files  multipart "file" (.blend|.py|.glb|.fbx|.usd|.obj|...)   -> {scen
 POST /v1/files/{id}/assets  multipart "files"   textures, glTF .bin ...   GET /v1/files/lookup?sha256=  reuse an upload
 POST /v1/estimate {kind, frames|frame_start/frame_end, width, height, samples, scene_id?} -> seconds, wall_seconds, human, quota
 POST /v1/jobs   {scene_id, kind: info|preview|final, frames|frame_start/frame_end, width, height, samples, camera, fps, output,
-                 environment, environment_strength, environment_visible, blender}
+                 environment, environment_strength, environment_visible, blender, orbit, orbit_frames, orbit_elevation}
 GET  /v1/jobs/{id}      status, progress, eta, artifacts[], cost, warnings, info    DELETE /v1/jobs/{id}  cancel
 GET  /v1/jobs/{id}/artifacts/{name}             PNG / MP4
 POST /mcp                                       remote MCP (Streamable HTTP; Bearer api key or OAuth)

{janction_render-0.3.1 → janction_render-0.3.3}/janction_render/__init__.py

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

{janction_render-0.3.1 → janction_render-0.3.3}/janction_render/mcp_server.py

@@ -51,6 +51,10 @@ mcp = MCPServer(
     ),
 )
 
+ORBIT_DOC = (" orbit=True: turntable; an orbit camera circles the scene once over orbit_frames frames (default 24, "
+             "elevation orbit_elevation deg, default 18). Flat floors/walls are ignored when framing; orbit_target = an "
+             "object name or 'x,y,z' centres on that, orbit_distance scales the distance (1.0). A preview without frames "
+             "shows 0/90/180/270 deg; a final without frame_end renders the whole turn as an MP4. Best for imported models.")
 ENV_DOC = ("environment: '' keeps the scene's own world; 'studio' | 'sunset' | 'overcast' | 'night' replaces it with a "
            "bundled HDRI (good first render for scenes without lighting work); 'compare' (render_preview only) renders the "
            "first frame under all four presets in one 2x2 image with labels, so you can pick one; environment_strength scales it (1.0); "
@@ -72,6 +76,27 @@ def _out_root() -> Path:
     return Path(os.environ.get("JANCTION_RENDER_OUT") or (Path.home() / "janction-render"))
 
 
+def _wait_unless_gated(c: Client, job: dict[str, Any], timeout: float) -> dict[str, Any]:
+    """仕事を待つ。ただし仕事を取れるワーカーが無い（GPU が貸し出し中）なら待たずに返し、hint で伝える。"""
+    if job["status"] in ("done", "failed", "canceled"):
+        return job
+    try:
+        q = c.health().get("queue") or {}
+        if int(q.get("workers_available") or 0) == 0 and job["status"] == "queued":
+            job["gated"] = True
+            return job
+    except Exception:  # noqa: BLE001
+        pass
+    return c.wait(job["job_id"], timeout=timeout)
+
+
+def _gated_hint(j: dict[str, Any], again: str) -> str:
+    if j.get("gated"):
+        return (f"the GPU is lent to another workload right now; the job stays queued and starts when the GPU returns. "
+                f"Tell the user and offer to check later with {again}; do not poll continuously")
+    return ""
+
+
 def _j(obj: Any) -> str:
     return json.dumps(obj, ensure_ascii=False, indent=2)
 
@@ -83,7 +108,7 @@ def _quota_block(exc: ClientError) -> Optional[dict[str, Any]]:
     x = exc.extra
     return {"quota_exceeded": True, "detail": exc.detail, "scope": x.get("scope"),
             "gpu_seconds_used_today": x.get("gpu_seconds_used_today"), "gpu_seconds_per_day": x.get("gpu_seconds_per_day"),
-            "resets_at": x.get("resets_at"),
+            "resets_at": x.get("resets_at_iso") or x.get("resets_at"),
             "next": "tell the user today's free GPU time is used up and when it resets; a smaller job (fewer frames, "
                     "lower resolution or samples) may still fit"}
 
@@ -171,12 +196,12 @@ def scene_info(scene_path: str = "", scene_id: str = "", scene_script: str = "",
         sid = _resolve_scene(c, scene_path, scene_id, scene_script, assets)
         j = c.submit(sid, kind="info", **_job_params("", 1.0, True, blender))
         if j["status"] != "done":
-            j = c.wait(j["job_id"], timeout=INFO_WAIT_S)
+            j = _wait_unless_gated(c, j, INFO_WAIT_S)
     except (ClientError, ValueError, FileNotFoundError) as exc:
         return _j({"ok": False, "error": str(exc)})
     if j["status"] != "done":
         b = _brief(j)
-        b["hint"] = "still queued (a GPU worker may be busy); call scene_info again in a moment" \
+        b["hint"] = (_gated_hint(j, "scene_info(scene_id)") or "still queued (a GPU worker may be busy); call scene_info again in a moment") \
             if j["status"] in ("queued", "running") else "fix the scene and try again"
         return _j(b)
     info = dict(j.get("info") or {})
@@ -209,6 +234,11 @@ def render_preview(
     environment_visible: bool = True,
     blender: str = "",
     assets: Optional[list[str]] = None,
+    orbit: bool = False,
+    orbit_frames: int = 24,
+    orbit_elevation: float = 18.0,
+    orbit_target: str = "",
+    orbit_distance: float = 1.0,
 ) -> list[Any]:
     """Render a fast, cheap preview of a Blender scene on a JANCTION GPU and show the image.
 
@@ -222,16 +252,18 @@ def render_preview(
     Look at the returned image, fix the scene, preview again; when it looks right, ask the user and
     call render_final. Returns scene_id (reuse it without re-uploading), job_id, saved PNG paths,
     Blender warnings (e.g. missing textures), GPU seconds, and the expiry time (24h after last use).
-    """ + ENV_DOC
+    """ + ENV_DOC + ORBIT_DOC
     c = _client()
     try:
-        frame_list = parse_frames(frames)
+        frame_list = parse_frames(frames) if (frames or not orbit) else None
         sid = _resolve_scene(c, scene_path, scene_id, scene_script, assets)
         j = c.submit(sid, kind="preview", frames=frame_list, camera=camera or None,
                      width=width, height=height, samples=samples,
-                     **_job_params(environment, environment_strength, environment_visible, blender))
+                     **_job_params(environment, environment_strength, environment_visible, blender),
+                     **({"orbit": True, "orbit_frames": orbit_frames, "orbit_elevation": orbit_elevation,
+                         "orbit_target": orbit_target, "orbit_distance": orbit_distance} if orbit else {}))
         _log(f"preview job {j['job_id']} submitted frames={frame_list}")
-        j = c.wait(j["job_id"], timeout=PREVIEW_WAIT_S)
+        j = _wait_unless_gated(c, j, PREVIEW_WAIT_S)
     except ClientError as exc:
         block = _payment_block(exc) or _quota_block(exc)
         return [_j(block if block else {"ok": False, "error": str(exc)})]
@@ -239,7 +271,7 @@ def render_preview(
         return [_j({"ok": False, "error": str(exc)})]
     brief = _brief(j)
     if j["status"] != "done":
-        brief["hint"] = ("still running: call render_status(job_id) and then render_download"
+        brief["hint"] = ((_gated_hint(j, "render_status(job_id)") or "still running: call render_status(job_id) and then render_download")
                          if j["status"] in ("queued", "running")
                          else "fix the scene and try again")
         return [_j(brief)]
@@ -305,6 +337,11 @@ def render_final(
     environment_visible: bool = True,
     blender: str = "",
     assets: Optional[list[str]] = None,
+    orbit: bool = False,
+    orbit_frames: int = 24,
+    orbit_elevation: float = 18.0,
+    orbit_target: str = "",
+    orbit_distance: float = 1.0,
 ) -> str:
     """Render the final frames (or a video) of a Blender scene on JANCTION GPUs.
 
@@ -314,14 +351,20 @@ def render_final(
     (output='png'; 'auto' picks). Use the same environment / blender as the approved preview. Returns job_id and a
     time estimate right away; the render runs in the background: poll with render_status, then fetch with
     render_download. Inputs and results are deleted 24 hours after last use, so download them.
-    """ + ENV_DOC
+    """ + ENV_DOC + ORBIT_DOC
     c = _client()
     try:
         sid = _resolve_scene(c, scene_path, scene_id, scene_script, assets)
+        extra: dict[str, Any] = {}
+        if orbit:
+            extra.update({"orbit": True, "orbit_frames": orbit_frames, "orbit_elevation": orbit_elevation,
+                          "orbit_target": orbit_target, "orbit_distance": orbit_distance})
+            if frame_end <= frame_start:
+                frame_end = None  # type: ignore[assignment]  # 1 周ぶんは受付が決める
         j = c.submit(sid, kind="final", frame_start=frame_start, frame_end=frame_end,
                      width=width, height=height, samples=samples, fps=fps, output=output,
                      camera=camera or None,
-                     **_job_params(environment, environment_strength, environment_visible, blender))
+                     **_job_params(environment, environment_strength, environment_visible, blender), **extra)
     except ClientError as exc:
         block = _payment_block(exc) or _quota_block(exc)
         return _j(block if block else {"ok": False, "error": str(exc)})

{janction_render-0.3.1 → janction_render-0.3.3}/janction_render.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janction-render
-Version: 0.3.1
+Version: 0.3.3
 Summary: Cloud GPU render farm for Blender, for AI agents: MCP server (remote + stdio) and CLI. Render Blender without a GPU from Claude, ChatGPT, Claude Code, Codex, Cursor.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -28,6 +28,13 @@ without a GPU, or when rendering locally is slow.
 - `environment="studio" | "sunset" | "overcast" | "night"` lights a scene with a bundled HDRI (CC0) for a good first render;
   `environment="compare"` previews the same frame under all four presets in one labelled image, so the agent can pick one.
 - A `.gltf` or `.obj` brings its `.bin` / `.mtl` / textures along automatically (from the same folder or the same URL folder).
+- `orbit=True` turns any scene or imported model into a turntable: an orbit camera circles it once (`orbit_frames`, default 24;
+  a preview shows 0/90/180/270 degrees, a final render without `frame_end` gives the whole turn as an MP4). Flat floors and
+  walls are ignored when framing; `orbit_target` (object name or `x,y,z`) and `orbit_distance` (multiplier) adjust the shot.
+- While the GPU is lent to another workload, tools answer right away with the queued job and a note instead of waiting.
+- While a job renders, `render_status` counts finished frames inside the running chunk, so the ETA updates every few seconds.
+- In hosts that support MCP Apps (Claude web and desktop, among others), previews, progress and download links also appear
+  as an interactive panel in the chat: the image, a progress bar, "Open MP4", and preset buttons after an `environment="compare"` preview.
 - `scene_info` reads the scene without rendering (cameras, frame range, missing files).
 - `render_preview` returns 1-4 low-cost frames tiled in one image within seconds, so the agent can look, fix, and repeat.
 - `render_estimate` says how long a render will take ("about 3 minutes") and whether it fits today's free quota.
@@ -111,8 +118,9 @@ Then, in Claude Code:
 | `billing()` | free-beta quota (used today, daily limit, reset time); later balance and top-up link |
 | `render_info()` | workers online or gated (GPU lent to another workload), queue, expected wait, supported inputs, environment presets, Blender versions |
 
-Options on `render_preview` / `render_final`: `environment` (`studio`, `sunset`, `overcast`, `night`; `environment_strength`,
-`environment_visible=False` for a flat grey backdrop with HDRI lighting), `blender` (`"5.2"`), and `assets` (stdio: local files
+Options on `render_preview` / `render_final`: `environment` (`studio`, `sunset`, `overcast`, `night`, `compare` on previews; `environment_strength`,
+`environment_visible=False` for a flat grey backdrop with HDRI lighting), `orbit` / `orbit_frames` / `orbit_elevation` (turntable),
+`blender` (`"5.2"`), and `assets` (stdio: local files
 sent with the scene, found in the script through `os.environ["JR_ASSETS_DIR"]`; a `.blend`'s external files are collected
 automatically with `pip install janction-render[blend]`) or `asset_urls` (remote).
 
@@ -145,7 +153,7 @@ POST /v1/files  multipart "file" (.blend|.py|.glb|.fbx|.usd|.obj|...)   -> {scen
 POST /v1/files/{id}/assets  multipart "files"   textures, glTF .bin ...   GET /v1/files/lookup?sha256=  reuse an upload
 POST /v1/estimate {kind, frames|frame_start/frame_end, width, height, samples, scene_id?} -> seconds, wall_seconds, human, quota
 POST /v1/jobs   {scene_id, kind: info|preview|final, frames|frame_start/frame_end, width, height, samples, camera, fps, output,
-                 environment, environment_strength, environment_visible, blender}
+                 environment, environment_strength, environment_visible, blender, orbit, orbit_frames, orbit_elevation}
 GET  /v1/jobs/{id}      status, progress, eta, artifacts[], cost, warnings, info    DELETE /v1/jobs/{id}  cancel
 GET  /v1/jobs/{id}/artifacts/{name}             PNG / MP4
 POST /mcp                                       remote MCP (Streamable HTTP; Bearer api key or OAuth)

{janction_render-0.3.1 → janction_render-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "janction-render"
-version = "0.3.1"
+version = "0.3.3"
 description = "Cloud GPU render farm for Blender, for AI agents: MCP server (remote + stdio) and CLI. Render Blender without a GPU from Claude, ChatGPT, Claude Code, Codex, Cursor."
 readme = "README.md"
 requires-python = ">=3.11"