janction-render 0.4.63__tar.gz → 0.4.65__tar.gz

{janction_render-0.4.63 → janction_render-0.4.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janction-render
-Version: 0.4.63
+Version: 0.4.65
 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.63 → janction_render-0.4.65}/janction_render/__init__.py

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

{janction_render-0.4.63 → janction_render-0.4.65}/janction_render/mcp_common.py

@@ -8,7 +8,7 @@
 受付の server/jobs.py もプリセットの名前はここから取る。"""
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, Optional
 
 PURPOSE_PRESETS = ("product", "turntable", "animation")
 FINAL_TOOL_DEFAULTS = {"width": 1920, "height": 1080, "samples": 128, "output": "auto"}
@@ -60,6 +60,110 @@ def job_params(environment: str, environment_strength: float, environment_visibl
     return out
 
 
+# ------------------------------------------------------------------ 見積もりとシーンの読み取りの返事（両方の道具で同じ）
+
+def estimate_body(kind: str, scene_id: str, frames: str, frame_start: int, frame_end: int, width: int, height: int, samples: int,
+                  cameras: Any, preset: str) -> tuple[dict[str, Any], bool]:
+    """render_estimate の引数から受付への本文を作る。戻り値は (本文, シーンの読み取りが先に要るか)。
+    preset='animation' でコマの指定が無ければ、呼ぶ側が scene_info を済ませてから見積もる。"""
+    from .client import parse_frames
+    body: dict[str, Any] = {"kind": kind, "width": width, "height": height, "samples": samples}
+    if scene_id:
+        body["scene_id"] = scene_id
+    if kind == "preview":
+        body["frames"] = parse_frames(frames) if (frames or not preset) else None
+    else:
+        body.update({"frame_start": frame_start, "frame_end": frame_end})
+    if cameras:
+        body["cameras"] = list(cameras)
+        if kind != "preview":
+            body.pop("frame_end", None)
+    needs_info = bool(preset == "animation" and scene_id
+                      and (body.get("frames") is None if kind == "preview" else frame_end <= frame_start))
+    body = {k: v for k, v in with_preset(body, preset, kind).items() if v is not None}
+    return body, needs_info
+
+
+def estimate_next(est: dict[str, Any]) -> str:
+    """見積もりの返事の next（エージェントへの次の一手）。上限の言い方は docs/60 BRAND-02 に合わせる。"""
+    q = est.get("quota") or {}
+    cost = est.get("cost") or {}
+    if q and q.get("fits_size") is False:
+        return (f"too big for one job: at most {q.get('max_frames_per_job')} frames per job part (1920x1080 on free time, 3840x2160 "
+                "on prepaid credit); the service splits longer instructions into parts under one job id, or lower the size")
+    if q and not q.get("fits_today", True) and q.get("mode") == "free_allowance":
+        # 有料モード: 無料枠を超えた分は残高から（10/8）。額と残高を言ってから
+        return (f"this goes past the free GPU time left: about {cost.get('estimated_yen')} JPY would be charged from credit "
+                f"(balance {cost.get('balance_yen')} JPY). Tell the user the time and the price and ask before "
+                "render_final; a smaller job (fewer frames, lower resolution or samples) may stay free")
+    if q and not q.get("fits_today", True):
+        return ("this does not fit today's remaining free GPU time; propose fewer frames, lower resolution or samples, "
+                "or wait until resets_at")
+    return "tell the user the estimate and ask before calling render_final"
+
+
+def scene_info_reply(j: dict[str, Any], assets_param: str) -> dict[str, Any]:
+    """scene_info の返事（info に scene_id・エンジンの注意・警告・欠けたファイルの案内・次の一手）。assets_param は素材の渡し方の文
+    （remote: 'asset_urls'、stdio: 'assets=[...]'）。"""
+    from .brief import scene_next, trim
+    info = dict(j.get("info") or {})
+    info["scene_id"] = j.get("scene_id")
+    if info.get("engine") and info["engine"] != "CYCLES":
+        info["engine_note"] = "JANCTION renders with CYCLES; the scene's engine setting is not used"
+    if j.get("warnings"):
+        info["blender_warnings"] = j["warnings"]
+    if info.get("missing_files"):
+        info["note"] = (f"missing_files will render pink/black; send them with {assets_param} (kept next to the scene), "
+                        "pack them into the .blend (File > External Data > Pack) or fix the paths")
+    if isinstance(info.get("object_names"), list):
+        info["object_names"] = trim(info["object_names"], 30)
+    info.update(scene_next(info))          # 次の一手: シーンの縦横比に合わせた試し描き（10/9）
+    return info
+
+
+def billing_reply(me: dict[str, Any], synced: Optional[dict[str, Any]] = None) -> dict[str, Any]:
+    """billing 道具の返事（GET /v1/me の形から）。無料ベータ / ようこそ / 毎日の無料枠 / 旧形 の 4 通りを両方の道具で同じに。"""
+    from .brief import plan_fields, welcome_billing
+    synced = synced or {}
+    q = me.get("quota") or {}
+    prefix = me.get("prefix")
+    if q and q.get("mode", "free_beta") == "free_beta":
+        return {"mode": "free_beta", "note": "no charges during the free beta; daily GPU-time quota per key",
+                "gpu_seconds_used_today": q["gpu_seconds_used_today"], "gpu_seconds_per_day": q["gpu_seconds_per_day"],
+                "gpu_seconds_left_today": max(0, q["gpu_seconds_per_day"] - q["gpu_seconds_used_today"]),
+                "resets_at": q["resets_at"], "max_frames_per_job": q["max_frames_per_job"], "max_pixels": q["max_pixels"],
+                **({"key_prefix": prefix} if prefix else {})}
+    if q and q.get("welcome"):
+        # ようこそクレジット（10/8 夜 本人の判断、docs/46）: 残りの円と期限、期間の後の試し描き、最初のチャージの特典
+        return welcome_billing(q["welcome"], me, synced)
+    if q:
+        # 有料（10/8〜）: 毎日の無料枠と、超えた分を払う残高の両方
+        yen = me["billing"]["yen_per_gpu_second"]
+        out = {"mode": "free_allowance",
+               "note": (f"the first {q['gpu_seconds_per_day'] // 60} GPU-minutes of each day are free; beyond that "
+                        f"{yen} JPY per GPU-second from prepaid credit (only the part over the free time is charged)"),
+               "gpu_seconds_used_today": q["gpu_seconds_used_today"], "gpu_seconds_per_day": q["gpu_seconds_per_day"],
+               "gpu_seconds_left_today": max(0, q["gpu_seconds_per_day"] - q["gpu_seconds_used_today"]),
+               "resets_at": q["resets_at"], "max_frames_per_job": q["max_frames_per_job"], "max_pixels": q["max_pixels"],
+               "balance_yen": me["balance_yen"], "held_yen": me.get("held_yen", 0), "held_jobs": me.get("held_jobs", 0),
+               "yen_per_gpu_second": yen, "min_topup_yen": me["billing"]["min_topup_yen"],
+               "pending_checkout_url": me["billing"]["pending_checkout_url"], "charged_yen_total": me["charged_yen_total"],
+               "topup_options": (me["billing"].get("topup_options") or {}).get("options"),
+               "just_credited": synced.get("credited", []), **plan_fields(me)}
+        if me.get("usd_indicative") is not None:
+            out["usd_indicative"] = me["usd_indicative"]
+        if prefix:
+            out["key_prefix"] = prefix
+        return out
+    out = {"balance_yen": me["balance_yen"], "free_previews_left": me["free_previews_left"],
+           "yen_per_gpu_second": me["billing"]["yen_per_gpu_second"], "min_topup_yen": me["billing"]["min_topup_yen"],
+           "billing_enabled": me["billing"]["enabled"], "just_credited": synced.get("credited", []),
+           "pending_checkout_url": me["billing"]["pending_checkout_url"], "charged_yen_total": me["charged_yen_total"]}
+    if prefix:
+        out["key_prefix"] = prefix
+    return out
+
+
 # ------------------------------------------------------------------ 引数の説明（道具の description の末尾に足す）
 
 _ENGINE_DOC = (" engine: '' or 'cycles' (path tracing, the default) | 'eevee' (Blender's real-time rasterizer: about half the "

{janction_render-0.4.63 → janction_render-0.4.65}/janction_render/mcp_server.py

@@ -29,7 +29,7 @@ except ImportError:  # mcp 1.x
     from mcp.server.fastmcp import FastMCP as MCPServer, Image  # type: ignore
 from mcp.types import ToolAnnotations
 
-from janction_render.brief import plan_fields, review_reply, scene_next, welcome_billing
+from janction_render.brief import review_reply
 from janction_render.brief import brief as _brief, estimate_brief, final_body_after_preview, followup_after_preview, \
     next_after_preview, trim, PRESENT_FIRST, preview_presentation, turntable_estimate
 from janction_render.client import Client, ClientError, parse_frames
@@ -390,18 +390,7 @@ def scene_info(scene_path: Annotated[str, D("scene_path", "")] = "",
         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 {})
-    info["scene_id"] = j["scene_id"]
-    if info.get("engine") and info["engine"] != "CYCLES":
-        info["engine_note"] = "JANCTION renders with CYCLES; the scene's engine setting is not used"
-    if j.get("warnings"):
-        info["blender_warnings"] = j["warnings"]
-    if info.get("missing_files"):
-        info["note"] = ("missing_files will render pink/black; send them with assets=[...] (kept next to the .blend), "
-                        "pack them into the .blend (File > External Data > Pack) or fix the paths")
-    if isinstance(info.get("object_names"), list):
-        info["object_names"] = trim(info["object_names"], 30)
-    info.update(scene_next(info))          # 次の一手: シーンの縦横比に合わせた試し描き（10/9）
+    info = mcp_common.scene_info_reply(j, "assets=[...]")
     return _j(_attach_upload_notes(info))
 
 
@@ -579,37 +568,16 @@ def render_estimate(scene_id: Annotated[str, D("scene_id", "")] = "",
     c = _client()
     try:
         preset = _preset_of(preset)
-        params: dict[str, Any] = {"kind": kind, "width": width, "height": height, "samples": samples}
-        if kind == "preview":
-            params["frames"] = parse_frames(frames) if (frames or not preset) else None
-        else:
-            params.update({"frame_start": frame_start, "frame_end": frame_end})
-        if cameras:
-            params["cameras"] = list(cameras)
-            if kind != "preview":
-                params.pop("frame_end", None)
-        if preset == "animation" and scene_id and (params.get("frames") is None if kind == "preview" else frame_end <= frame_start):
+        params, needs_info = mcp_common.estimate_body(kind, scene_id, frames, frame_start, frame_end, width, height, samples, cameras, preset)
+        params.pop("scene_id", None)
+        if needs_info:
             _ensure_scene_info(c, scene_id)
-        params = {k: v for k, v in _with_preset(params, preset, kind).items() if v is not None}
         est = c.estimate(scene_id or None, **params)
     except (ClientError, ValueError) as exc:
         return _j(_fail(exc))
     out = estimate_brief(est) or {}
     out["kind"] = kind
-    q = est.get("quota") or {}
-    cost = est.get("cost") or {}
-    if q and q.get("fits_size") is False:
-        out["next"] = f"too big for one job (max {q.get('max_frames_per_job')} frames and 1920x1080 per job); split it"
-    elif q and not q.get("fits_today", True) and q.get("mode") == "free_allowance":
-        # 有料モード（10/8〜）: 無料枠を超えた分は残高から。額と残高を言ってから
-        out["next"] = (f"this goes past the free GPU time left: about {cost.get('estimated_yen')} JPY would be charged from "
-                       f"credit (balance {cost.get('balance_yen')} JPY). Tell the user the time and the price and ask before "
-                       "render_final; a smaller job (fewer frames, lower resolution or samples) may stay free")
-    elif q and not q.get("fits_today", True):
-        out["next"] = ("this does not fit today's remaining free GPU time; propose fewer frames, lower resolution or "
-                       "samples, or wait until resets_at")
-    else:
-        out["next"] = "tell the user the estimate and ask before calling render_final"
+    out["next"] = mcp_common.estimate_next(est)
     return _j(out)
 
 
@@ -815,37 +783,7 @@ def billing(topup_yen: Annotated[int, D("topup_yen", 0)] = 0) -> str:
         if me["billing"]["enabled"]:
             synced = c.billing_sync()
             me = c.me()
-        q = me.get("quota") or {}
-        if q and q.get("mode", "free_beta") == "free_beta":
-            return _j({"mode": "free_beta", "note": "no charges during the free beta; daily GPU-time quota per key",
-                       "gpu_seconds_used_today": q["gpu_seconds_used_today"], "gpu_seconds_per_day": q["gpu_seconds_per_day"],
-                       "gpu_seconds_left_today": max(0, q["gpu_seconds_per_day"] - q["gpu_seconds_used_today"]),
-                       "resets_at": q["resets_at"], "max_frames_per_job": q["max_frames_per_job"],
-                       "max_pixels": q["max_pixels"]})
-        if q and q.get("welcome"):
-            # ようこそクレジット（10/8 夜 本人の判断、docs/46）: リモートの billing と同じ形
-            return _j(welcome_billing(q["welcome"], me, synced))
-        if q:
-            # 有料（10/8〜）: 毎日の無料枠と、超えた分を払う残高の両方
-            yen = me["billing"]["yen_per_gpu_second"]
-            return _j({"mode": "free_allowance",
-                       "note": (f"the first {q['gpu_seconds_per_day'] // 60} GPU-minutes of each day are free; beyond that "
-                                f"{yen} JPY per GPU-second from prepaid credit (only the part over the free time is charged)"),
-                       "gpu_seconds_used_today": q["gpu_seconds_used_today"], "gpu_seconds_per_day": q["gpu_seconds_per_day"],
-                       "gpu_seconds_left_today": max(0, q["gpu_seconds_per_day"] - q["gpu_seconds_used_today"]),
-                       "resets_at": q["resets_at"], "max_frames_per_job": q["max_frames_per_job"],
-                       "max_pixels": q["max_pixels"], "balance_yen": me["balance_yen"], "usd_indicative": me.get("usd_indicative"),
-                       "held_yen": me.get("held_yen", 0), "held_jobs": me.get("held_jobs", 0), "yen_per_gpu_second": yen,
-                       "min_topup_yen": me["billing"]["min_topup_yen"], "just_credited": synced.get("credited", []),
-                       "pending_checkout_url": me["billing"]["pending_checkout_url"],
-                       "topup_options": (me["billing"].get("topup_options") or {}).get("options"),
-                       "charged_yen_total": me["charged_yen_total"], **plan_fields(me)})
-        return _j({"balance_yen": me["balance_yen"], "free_previews_left": me["free_previews_left"],
-                   "yen_per_gpu_second": me["billing"]["yen_per_gpu_second"],
-                   "min_topup_yen": me["billing"]["min_topup_yen"], "billing_enabled": me["billing"]["enabled"],
-                   "just_credited": synced.get("credited", []),
-                   "pending_checkout_url": me["billing"]["pending_checkout_url"],
-                   "charged_yen_total": me["charged_yen_total"]})
+        return _j(mcp_common.billing_reply(me, synced))
     except ClientError as exc:
         return _j(_fail(exc))
 

{janction_render-0.4.63 → janction_render-0.4.65}/janction_render.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janction-render
-Version: 0.4.63
+Version: 0.4.65
 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.63 → janction_render-0.4.65}/pyproject.toml

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