janction-render 0.3.0__tar.gz → 0.3.2__tar.gz

{janction_render-0.3.0 → janction_render-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janction-render
-Version: 0.3.0
+Version: 0.3.2
 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
@@ -25,7 +25,12 @@ without a GPU, or when rendering locally is slow.
 
 - Input: a `.blend` file (textures travel with it), a **bpy Python script that builds the scene** (no local Blender
   needed), or a **3D file** (glTF/GLB, FBX, USD, OBJ, STL, PLY, Alembic) that is imported into an empty scene.
-- `environment="studio" | "sunset" | "overcast" | "night"` lights a scene with a bundled HDRI (CC0) for a good first render.
+- `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).
+- While a job renders, `render_status` counts finished frames inside the running chunk, so the ETA updates every few seconds.
 - `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.
@@ -107,10 +112,11 @@ Then, in Claude Code:
 | `render_final(scene_id, frame_start, frame_end, width, height, samples, fps, output, environment?, blender?)` | PNG or MP4; returns job_id + estimate |
 | `render_status(job_id)` | progress and ETA (`eta.human`); `render_download(job_id, only="mp4" / "frames" / "all")` files or links; `render_cancel(job_id)` |
 | `billing()` | free-beta quota (used today, daily limit, reset time); later balance and top-up link |
-| `render_info()` | workers online, queue, expected wait, supported inputs, environment presets, Blender versions |
+| `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).
 
@@ -143,7 +149,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.0 → janction_render-0.3.2}/README.md

@@ -8,7 +8,12 @@ without a GPU, or when rendering locally is slow.
 
 - Input: a `.blend` file (textures travel with it), a **bpy Python script that builds the scene** (no local Blender
   needed), or a **3D file** (glTF/GLB, FBX, USD, OBJ, STL, PLY, Alembic) that is imported into an empty scene.
-- `environment="studio" | "sunset" | "overcast" | "night"` lights a scene with a bundled HDRI (CC0) for a good first render.
+- `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).
+- While a job renders, `render_status` counts finished frames inside the running chunk, so the ETA updates every few seconds.
 - `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.
@@ -90,10 +95,11 @@ Then, in Claude Code:
 | `render_final(scene_id, frame_start, frame_end, width, height, samples, fps, output, environment?, blender?)` | PNG or MP4; returns job_id + estimate |
 | `render_status(job_id)` | progress and ETA (`eta.human`); `render_download(job_id, only="mp4" / "frames" / "all")` files or links; `render_cancel(job_id)` |
 | `billing()` | free-beta quota (used today, daily limit, reset time); later balance and top-up link |
-| `render_info()` | workers online, queue, expected wait, supported inputs, environment presets, Blender versions |
+| `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).
 
@@ -126,7 +132,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.0 → janction_render-0.3.2}/janction_render/__init__.py

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

{janction_render-0.3.0 → janction_render-0.3.2}/janction_render/client.py

@@ -39,6 +39,53 @@ def select_artifacts(artifacts: list[dict[str, Any]], only: Optional[str] = None
     raise ValueError("only must be one of: " + ", ".join(ONLY_CHOICES))
 
 
+def companion_refs(kind: str, text: str) -> list[str]:
+    """glTF（JSON）か OBJ の中で参照している外部ファイルの相対パス（data: URI と絶対パスは除く）。
+    OBJ は mtllib の .mtl だけを返す（.mtl の中の画像は mtl_refs で）。"""
+    import json as _json
+    import re as _re
+
+    out: list[str] = []
+
+    def add(ref: str) -> None:
+        ref = (ref or "").strip().replace("\\", "/")
+        if not ref or ref.startswith(("data:", "http://", "https://", "/")) or ".." in ref.split("/"):
+            return
+        if ref not in out:
+            out.append(ref)
+
+    if kind == "gltf":
+        try:
+            doc = _json.loads(text)
+        except ValueError:
+            return out
+        for key in ("buffers", "images"):
+            for item in doc.get(key) or []:
+                if isinstance(item, dict) and isinstance(item.get("uri"), str):
+                    add(item["uri"])
+        return out
+    if kind == "obj":
+        for line in text.splitlines():
+            parts = line.strip().split(None, 1)
+            if len(parts) == 2 and parts[0].lower() == "mtllib":
+                for name in parts[1].split():
+                    add(name)
+        return out
+    if kind == "mtl":
+        for line in text.splitlines():
+            parts = line.strip().split()
+            if len(parts) >= 2 and parts[0].lower() in ("map_kd", "map_ks", "map_ka", "map_ns", "map_d", "map_bump", "bump",
+                                                        "disp", "decal", "norm", "map_ke", "refl"):
+                add(parts[-1])
+        return out
+    return out
+
+
+def companion_kind(name: str) -> str:
+    ext = Path(name).suffix.lower()
+    return {".gltf": "gltf", ".obj": "obj", ".mtl": "mtl"}.get(ext, "")
+
+
 def sha256_of(path: Path) -> str:
     import hashlib
 
@@ -263,6 +310,25 @@ class Client:
         missing: list[str] = []
         if p.suffix.lower() == ".blend" and trace_assets:
             items, missing = trace_blend_assets(p)
+        elif companion_kind(p.name) in ("gltf", "obj") and trace_assets:
+            # glTF の .bin と画像、OBJ の .mtl とその画像を、ファイルの横から集める
+            base = p.parent
+            queue = companion_refs(companion_kind(p.name), p.read_text(encoding="utf-8", errors="replace"))
+            seen: set[str] = set()
+            while queue:
+                rel = queue.pop(0)
+                if rel in seen:
+                    continue
+                seen.add(rel)
+                fp = base / rel
+                if not fp.is_file():
+                    missing.append(rel)
+                    continue
+                items.append((rel, fp))
+                if companion_kind(rel) == "mtl":
+                    folder = Path(rel).parent.as_posix()
+                    for sub in companion_refs("mtl", fp.read_text(encoding="utf-8", errors="replace")):
+                        queue.append(sub if folder in ("", ".") else f"{folder}/{sub}")
         for a in assets or []:
             ap = Path(a)
             if not ap.is_file():

{janction_render-0.3.0 → janction_render-0.3.2}/janction_render/mcp_server.py

@@ -51,8 +51,12 @@ 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). 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 (.glb/.fbx/.obj).")
 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); environment_strength scales it (1.0); "
+           "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); "
            "environment_visible=False hides the HDRI from the camera (flat grey backdrop, HDRI lighting only). "
            "blender: '' (5.0) or '5.2' to render with Blender 5.2 when available. assets: local files (images, glTF "
            ".bin, ...) sent along with the scene; a .blend finds them through relative paths, a script through "
@@ -82,7 +86,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"}
 
@@ -208,6 +212,9 @@ 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,
 ) -> list[Any]:
     """Render a fast, cheap preview of a Blender scene on a JANCTION GPU and show the image.
 
@@ -221,14 +228,15 @@ 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} if orbit else {}))
         _log(f"preview job {j['job_id']} submitted frames={frame_list}")
         j = c.wait(j["job_id"], timeout=PREVIEW_WAIT_S)
     except ClientError as exc:
@@ -304,6 +312,9 @@ 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,
 ) -> str:
     """Render the final frames (or a video) of a Blender scene on JANCTION GPUs.
 
@@ -313,14 +324,19 @@ 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})
+            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.0 → janction_render-0.3.2}/janction_render.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janction-render
-Version: 0.3.0
+Version: 0.3.2
 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
@@ -25,7 +25,12 @@ without a GPU, or when rendering locally is slow.
 
 - Input: a `.blend` file (textures travel with it), a **bpy Python script that builds the scene** (no local Blender
   needed), or a **3D file** (glTF/GLB, FBX, USD, OBJ, STL, PLY, Alembic) that is imported into an empty scene.
-- `environment="studio" | "sunset" | "overcast" | "night"` lights a scene with a bundled HDRI (CC0) for a good first render.
+- `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).
+- While a job renders, `render_status` counts finished frames inside the running chunk, so the ETA updates every few seconds.
 - `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.
@@ -107,10 +112,11 @@ Then, in Claude Code:
 | `render_final(scene_id, frame_start, frame_end, width, height, samples, fps, output, environment?, blender?)` | PNG or MP4; returns job_id + estimate |
 | `render_status(job_id)` | progress and ETA (`eta.human`); `render_download(job_id, only="mp4" / "frames" / "all")` files or links; `render_cancel(job_id)` |
 | `billing()` | free-beta quota (used today, daily limit, reset time); later balance and top-up link |
-| `render_info()` | workers online, queue, expected wait, supported inputs, environment presets, Blender versions |
+| `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).
 
@@ -143,7 +149,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.0 → janction_render-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "janction-render"
-version = "0.3.0"
+version = "0.3.2"
 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"