ima2-gen 1.1.6 → 1.1.7

package/.env.example

@@ -31,6 +31,11 @@
 # IMA2_GRAPH_MAX_NODES=500
 # IMA2_GRAPH_MAX_EDGES=1000
 
+# ── ComfyUI bridge ────────────────────────────────────────────────────
+# IMA2_COMFY_URL=http://127.0.0.1:8188
+# IMA2_COMFY_UPLOAD_TIMEOUT_MS=30000
+# IMA2_COMFY_MAX_UPLOAD_BYTES=52428800
+
 # ── IDs & TTLs ─────────────────────────────────────────────────────────
 # IMA2_GENERATED_HEX_BYTES=4
 # IMA2_NODE_HEX_BYTES=5

package/README.md

@@ -193,6 +193,9 @@ Start `ima2 serve`, then check `~/.ima2/server.json`. You can also run `ima2 pin
 **OAuth login does not work**
 Run `npx @openai/codex login`, confirm `ima2 status`, then restart `ima2 serve`.
 
+**`fetch failed` repeats on a proxy/VPN network**
+Check that the local OAuth proxy is reachable. On networks that require a proxy, enable your proxy client's TUN/TURN-style mode, then retry `npx openai-oauth --port 10531`. If it still fails, set `HTTP_PROXY` and `HTTPS_PROXY` in the same terminal that runs `ima2 serve` or `openai-oauth`.
+
 **Images fail with `APIKEY_DISABLED`**
 Use OAuth for generation. API-key image generation is intentionally disabled in this build.
 

package/config.js

@@ -50,6 +50,10 @@ function pickInt(envVal, fileVal, fallback) {
   const n = Number(candidate);
   return Number.isFinite(n) ? n : fallback;
 }
+function pickPositiveInt(envVal, fileVal, fallback) {
+  const n = pickInt(envVal, fileVal, fallback);
+  return Number.isFinite(n) && n > 0 ? n : fallback;
+}
 function pickStr(envVal, fileVal, fallback) {
   return firstDefined(envVal, fileVal) ?? fallback;
 }
@@ -83,6 +87,41 @@ export const config = {
     maxParallel: pickInt(env.IMA2_MAX_PARALLEL, fileCfg.limits?.maxParallel, 8),
     graphMaxNodes: pickInt(env.IMA2_GRAPH_MAX_NODES, fileCfg.limits?.graphMaxNodes, 500),
     graphMaxEdges: pickInt(env.IMA2_GRAPH_MAX_EDGES, fileCfg.limits?.graphMaxEdges, 1000),
+    promptImportMaxFileBytes: pickInt(
+      env.IMA2_PROMPT_IMPORT_MAX_FILE_BYTES,
+      fileCfg.limits?.promptImportMaxFileBytes,
+      512 * 1024,
+    ),
+    promptImportMaxCandidatesPerFile: pickInt(
+      env.IMA2_PROMPT_IMPORT_MAX_CANDIDATES_PER_FILE,
+      fileCfg.limits?.promptImportMaxCandidatesPerFile,
+      100,
+    ),
+    promptImportMaxCandidatesPerImport: pickInt(
+      env.IMA2_PROMPT_IMPORT_MAX_CANDIDATES_PER_IMPORT,
+      fileCfg.limits?.promptImportMaxCandidatesPerImport,
+      100,
+    ),
+    promptImportFetchTimeoutMs: pickInt(
+      env.IMA2_PROMPT_IMPORT_FETCH_TIMEOUT_MS,
+      fileCfg.limits?.promptImportFetchTimeoutMs,
+      8000,
+    ),
+    promptImportMaxCandidateChars: pickInt(
+      env.IMA2_PROMPT_IMPORT_MAX_CANDIDATE_CHARS,
+      fileCfg.limits?.promptImportMaxCandidateChars,
+      12000,
+    ),
+    promptImportMinCandidateChars: pickInt(
+      env.IMA2_PROMPT_IMPORT_MIN_CANDIDATE_CHARS,
+      fileCfg.limits?.promptImportMinCandidateChars,
+      40,
+    ),
+    promptImportMaxSourceCharsScanned: pickInt(
+      env.IMA2_PROMPT_IMPORT_MAX_SOURCE_CHARS_SCANNED,
+      fileCfg.limits?.promptImportMaxSourceCharsScanned,
+      512 * 1024,
+    ),
   },
   history: {
     defaultPageSize: pickInt(
@@ -146,6 +185,12 @@ export const config = {
     default: pickStr(env.IMA2_IMAGE_MODEL_DEFAULT, fileCfg.imageModels?.default, "gpt-5.4-mini"),
     valid: new Set(["gpt-5.5", "gpt-5.4", "gpt-5.4-mini"]),
     unsupported: new Set(["gpt-5.3-codex-spark"]),
+    reasoningEffort: pickStr(
+      env.IMA2_REASONING_EFFORT,
+      fileCfg.imageModels?.reasoningEffort,
+      "medium",
+    ),
+    validReasoningEfforts: new Set(["low", "medium", "high", "xhigh"]),
   },
   log: {
     level: pickStr(env.IMA2_LOG_LEVEL, fileCfg.log?.level, defaultLogLevelForEnv(env)),
@@ -164,6 +209,19 @@ export const config = {
       false,
     ),
   },
+  comfy: {
+    defaultUrl: pickStr(env.IMA2_COMFY_URL, fileCfg.comfy?.defaultUrl, "http://127.0.0.1:8188"),
+    uploadTimeoutMs: pickPositiveInt(
+      env.IMA2_COMFY_UPLOAD_TIMEOUT_MS,
+      fileCfg.comfy?.uploadTimeoutMs,
+      30_000,
+    ),
+    maxUploadBytes: pickPositiveInt(
+      env.IMA2_COMFY_MAX_UPLOAD_BYTES,
+      fileCfg.comfy?.maxUploadBytes,
+      50 * 1024 * 1024,
+    ),
+  },
   dev: {
     viteDevMode: pickBool(env.VITE_IMA2_DEV, fileCfg.dev?.viteDevMode, false),
   },

package/docs/FAQ.ko.md

@@ -17,6 +17,7 @@ English version: [FAQ.md](FAQ.md)
 | `gpt-5.5`만 실패함 | Codex CLI를 업데이트하고, 안정 대안으로 `gpt-5.4`를 사용합니다. |
 | 레퍼런스 업로드 실패 | JPEG/PNG로 변환하고 해상도를 낮춰 보세요. 레퍼런스는 최대 5장입니다. |
 | Windows에서 `10531` 포트 관련 OAuth/proxy 오류가 남 | `ima2 doctor`를 실행하고, 필요하면 `IMA2_OAUTH_PROXY_PORT=11531 ima2 serve`로 시작하세요. |
+| 프록시/VPN 환경에서 `fetch failed`가 반복됨 | 프록시 클라이언트의 TUN/TURN류 모드를 켜거나, 같은 터미널에 `HTTP_PROXY` / `HTTPS_PROXY`를 설정하세요. |
 
 ## 설치와 업데이트
 
@@ -224,6 +225,25 @@ ima2 ping
 
 필요하면 `ima2 serve`를 다시 시작합니다.
 
+### 프록시나 VPN 뒤에서 `fetch failed`가 계속 나면 어떻게 하나요?
+
+대부분 로컬 OAuth 프록시가 현재 네트워크 경로로 upstream 서비스에 닿지 못하는 상황입니다. `openai-oauth`는 보통 `10531` 포트의 localhost 프록시로 실행됩니다.
+
+먼저 시도하세요.
+
+```bash
+npx openai-oauth --port 10531
+```
+
+프록시가 필요한 네트워크라면 터미널 프로세스도 프록시를 타도록 프록시 클라이언트의 TUN/TURN류 모드를 켜세요. 그래도 안 되면 `openai-oauth` 또는 `ima2 serve`를 실행하는 같은 터미널에 프록시 환경 변수를 설정합니다.
+
+```bash
+export HTTP_PROXY=http://127.0.0.1:7890
+export HTTPS_PROXY=http://127.0.0.1:7890
+```
+
+호스트와 포트는 사용하는 프록시 클라이언트 값에 맞춰 바꾸세요. 로컬 OAuth 프록시가 접근 가능한 상태에서도 `ima2-gen`이 계속 실패하면, 새 이슈를 열 때 실행 명령, OS, 프록시 설정, 터미널 오류를 함께 남겨 주세요.
+
 ### 회사 컴퓨터에서는 무엇을 확인해야 하나요?
 
 OAuth는 OpenAI와 ChatGPT/Codex 관련 호스트 접근이 필요할 수 있습니다. 회사 방화벽, TLS 검사, VPN, 프록시가 흐름을 깨뜨릴 수 있습니다. 로그인 실패와 `failed to fetch`가 반복되면 다른 네트워크에서도 시도해 보세요.

package/docs/FAQ.md

@@ -17,6 +17,7 @@ For Korean, see [FAQ.ko.md](FAQ.ko.md).
 | `gpt-5.5` fails | Update Codex CLI first, then try `gpt-5.4` as the stable fallback. |
 | Reference upload fails | Use JPEG/PNG, lower the resolution, and keep references to 5 images or fewer. |
 | Windows reports OAuth/proxy failures around port `10531` | Run `ima2 doctor`; if needed start with `IMA2_OAUTH_PROXY_PORT=11531 ima2 serve`. |
+| `fetch failed` repeats on a proxy/VPN network | Enable proxy TUN/TURN-style mode, or set `HTTP_PROXY` / `HTTPS_PROXY` in the same terminal. |
 
 ## Install and update
 
@@ -232,6 +233,25 @@ ima2 ping
 
 Then restart `ima2 serve` if needed.
 
+### What if `fetch failed` keeps happening behind a proxy or VPN?
+
+This usually means the local OAuth proxy cannot reach the upstream service through your network path. `openai-oauth` runs as a local localhost proxy, commonly on port `10531`.
+
+Try:
+
+```bash
+npx openai-oauth --port 10531
+```
+
+If your network requires a proxy, enable your proxy client's TUN/TURN-style mode so terminal processes can use it. If that is not enough, set the proxy variables in the same terminal that runs `openai-oauth` or `ima2 serve`:
+
+```bash
+export HTTP_PROXY=http://127.0.0.1:7890
+export HTTPS_PROXY=http://127.0.0.1:7890
+```
+
+Use the host and port from your proxy client. If `ima2-gen` still fails after the local OAuth proxy is reachable, collect the exact command, OS, proxy setup, and terminal error before opening a new issue.
+
 ### What should I check on a company computer?
 
 OAuth may require access to OpenAI and ChatGPT/Codex-related hosts. A corporate firewall, TLS inspection, VPN, or proxy can break the flow. Try a different network if login and `failed to fetch` errors keep repeating.

package/docs/README.ko.md

@@ -160,6 +160,9 @@ environment variables > ~/.ima2/config.json > built-in defaults
 **OAuth 로그인이 안 돼요**
 `npx @openai/codex login`을 실행하고, `ima2 status`를 확인한 뒤 `ima2 serve`를 다시 시작하세요.
 
+**프록시/VPN 환경에서 `fetch failed`가 반복돼요**
+로컬 OAuth 프록시가 접근 가능한지 확인하세요. 프록시가 필요한 네트워크라면 프록시 클라이언트의 TUN/TURN류 모드를 켠 뒤 `npx openai-oauth --port 10531`을 다시 시도하세요. 그래도 실패하면 `ima2 serve` 또는 `openai-oauth`를 실행하는 같은 터미널에 `HTTP_PROXY`와 `HTTPS_PROXY`를 설정하세요.
+
 **이미지 생성이 `APIKEY_DISABLED`로 실패해요**
 현재 빌드에서는 OAuth로 생성해야 합니다. API-key 이미지 생성은 의도적으로 비활성화되어 있습니다.
 

package/docs/README.zh-CN.md

@@ -153,6 +153,9 @@ environment variables > ~/.ima2/config.json > built-in defaults
 **OAuth 登录失败**
 运行 `npx @openai/codex login`，用 `ima2 status` 确认状态，然后重启 `ima2 serve`。
 
+**在代理/VPN 网络下反复出现 `fetch failed`**
+请先确认本地 OAuth proxy 可以访问。如果你的网络需要代理，请在代理客户端里开启 TUN/TURN 类似的转发模式，然后重试 `npx openai-oauth --port 10531`。如果仍然失败，请在运行 `ima2 serve` 或 `openai-oauth` 的同一个终端里设置 `HTTP_PROXY` 和 `HTTPS_PROXY`。
+
 **生成图片时返回 `APIKEY_DISABLED`**
 当前 build 需要使用 OAuth 生成。API-key image generation 是有意关闭的。
 

package/integrations/comfyui/ima2_gen_bridge/README.md

@@ -0,0 +1,88 @@
+# ima2-gen ComfyUI Bridge
+
+This custom node lets ComfyUI call a running local `ima2-gen` server and return
+the generated image as a ComfyUI `IMAGE`.
+
+## Install
+
+Copy or symlink this folder into your ComfyUI custom nodes directory:
+
+```bash
+ComfyUI/custom_nodes/ima2_gen_bridge
+```
+
+For development from this repository:
+
+```bash
+ln -s /path/to/ima2-gen/integrations/comfyui/ima2_gen_bridge \
+  /path/to/ComfyUI/custom_nodes/ima2_gen_bridge
+```
+
+Restart ComfyUI after installing.
+
+## Prerequisite
+
+Start the ima2 server before queueing the node:
+
+```bash
+ima2 serve
+```
+
+The node never asks for OpenAI credentials. It only calls the local ima2 HTTP
+server you already started.
+
+## Node
+
+Add the node from:
+
+```text
+Add Node -> ima2-gen -> Ima2 Generate
+```
+
+Inputs:
+
+| Input | Description |
+| --- | --- |
+| `prompt` | Text prompt sent to ima2. |
+| `server_url` | Optional loopback ima2 server origin. Leave empty for auto-discovery. |
+| `quality` | `low`, `medium`, or `high`. |
+| `size` | Image size string such as `1024x1024`. |
+| `moderation` | `low` or `auto`. |
+| `timeout` | Request timeout in seconds. |
+| `model` | Optional ima2 image model override. |
+| `mode` | `auto` or `direct` prompt mode. |
+| `web_search` | Maps to ima2 `webSearchEnabled`. |
+
+Outputs:
+
+| Output | Description |
+| --- | --- |
+| `image` | Generated ComfyUI `IMAGE`. |
+| `filename` | Saved ima2 generated filename. |
+| `metadata` | JSON metadata string with request details. |
+
+## Server Discovery
+
+When `server_url` is empty, the node checks:
+
+1. `IMA2_SERVER`
+2. `IMA2_ADVERTISE_FILE`
+3. `IMA2_CONFIG_DIR/server.json`
+4. `~/.ima2/server.json`
+5. `http://127.0.0.1:3333`
+
+Only loopback HTTP origins are accepted:
+
+```text
+http://127.0.0.1:3333
+http://localhost:3333
+http://[::1]:3333
+```
+
+Remote hosts, credentials, paths, queries, fragments, and HTTPS URLs are
+rejected.
+
+## Scope
+
+This PR2 node is text-to-image only. Image input, edit, reference generation,
+and workflow automation are later follow-ups.

package/integrations/comfyui/ima2_gen_bridge/__init__.py

@@ -0,0 +1,3 @@
+from .nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
+
+__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]

package/integrations/comfyui/ima2_gen_bridge/nodes.py

@@ -0,0 +1,238 @@
+from __future__ import annotations
+
+import base64
+import json
+import os
+from io import BytesIO
+from pathlib import Path
+from urllib.error import HTTPError, URLError
+from urllib.parse import urlparse
+from urllib.request import Request, urlopen
+
+import numpy as np
+import torch
+from PIL import Image
+
+
+DEFAULT_SERVER_URL = "http://127.0.0.1:3333"
+IMA2_CLIENT_HEADER = "comfyui/bridge"
+ALLOWED_LOOPBACK_HOSTS = {"127.0.0.1", "localhost", "::1"}
+MODEL_OPTIONS = ["", "gpt-5.5", "gpt-5.4", "gpt-5.4-mini"]
+
+
+class Ima2BridgeError(Exception):
+    pass
+
+
+def _normalize_loopback_url(raw):
+    value = str(raw or "").strip()
+    if not value:
+        raise Ima2BridgeError("ima2 server URL is required")
+
+    parsed = urlparse(value)
+    if parsed.scheme != "http":
+        raise Ima2BridgeError("ima2 server URL must use http")
+    if parsed.username or parsed.password:
+        raise Ima2BridgeError("ima2 server URL must not include credentials")
+    if parsed.path not in ("", "/") or parsed.params or parsed.query or parsed.fragment:
+        raise Ima2BridgeError("ima2 server URL must be an origin only")
+
+    hostname = (parsed.hostname or "").lower()
+    if hostname not in ALLOWED_LOOPBACK_HOSTS:
+        raise Ima2BridgeError("ima2 server URL must point to a loopback host")
+
+    try:
+        port = parsed.port
+    except ValueError as exc:
+        raise Ima2BridgeError("ima2 server URL port is invalid") from exc
+    if port is None:
+        raise Ima2BridgeError("ima2 server URL must include a port")
+
+    host = f"[{hostname}]" if hostname == "::1" else hostname
+    return f"http://{host}:{port}"
+
+
+def _read_json_file(path):
+    try:
+        if not path or not Path(path).is_file():
+            return None
+        return json.loads(Path(path).read_text(encoding="utf-8"))
+    except Exception:
+        return None
+
+
+def _read_advertise_file():
+    explicit = os.environ.get("IMA2_ADVERTISE_FILE")
+    if explicit:
+        data = _read_json_file(explicit)
+        if data:
+            return data
+
+    config_dir = os.environ.get("IMA2_CONFIG_DIR")
+    candidates = []
+    if config_dir:
+        candidates.append(Path(config_dir) / "server.json")
+    candidates.append(Path.home() / ".ima2" / "server.json")
+
+    for path in candidates:
+        data = _read_json_file(path)
+        if data:
+            return data
+    return None
+
+
+def _candidate_server_urls(server_url):
+    if str(server_url or "").strip():
+        return [server_url]
+
+    candidates = []
+    env_url = os.environ.get("IMA2_SERVER")
+    if env_url:
+        candidates.append(env_url)
+
+    advertised = _read_advertise_file()
+    if isinstance(advertised, dict):
+        backend = advertised.get("backend")
+        if isinstance(backend, dict) and backend.get("url"):
+            candidates.append(backend["url"])
+        if advertised.get("url"):
+            candidates.append(advertised["url"])
+        if advertised.get("port"):
+            candidates.append(f"http://127.0.0.1:{advertised['port']}")
+
+    candidates.append(DEFAULT_SERVER_URL)
+    return candidates
+
+
+def _resolve_server_url(server_url=""):
+    candidates = _candidate_server_urls(server_url)
+    if str(server_url or "").strip():
+        return _normalize_loopback_url(candidates[0])
+
+    for candidate in candidates:
+        try:
+            return _normalize_loopback_url(candidate)
+        except Ima2BridgeError:
+            continue
+    raise Ima2BridgeError("No valid local ima2 server URL was found")
+
+
+def _post_generate(base_url, payload, timeout):
+    body = json.dumps(payload).encode("utf-8")
+    request = Request(
+        f"{base_url}/api/generate",
+        data=body,
+        method="POST",
+        headers={
+            "Content-Type": "application/json",
+            "X-ima2-client": IMA2_CLIENT_HEADER,
+        },
+    )
+    try:
+        with urlopen(request, timeout=timeout) as response:
+            text = response.read().decode("utf-8")
+    except HTTPError as exc:
+        text = exc.read().decode("utf-8", errors="replace")
+        raise Ima2BridgeError(f"ima2 server returned HTTP {exc.code}: {text}") from exc
+    except URLError as exc:
+        raise Ima2BridgeError(f"ima2 server is unreachable: {exc.reason}") from exc
+
+    try:
+        return json.loads(text)
+    except json.JSONDecodeError as exc:
+        raise Ima2BridgeError("ima2 server returned invalid JSON") from exc
+
+
+def _decode_data_url_to_tensor(data_url):
+    if not isinstance(data_url, str) or "," not in data_url:
+        raise Ima2BridgeError("ima2 response did not include an image data URL")
+    header, encoded = data_url.split(",", 1)
+    if not header.startswith("data:image/") or ";base64" not in header:
+        raise Ima2BridgeError("ima2 response image must be a base64 image data URL")
+
+    try:
+        raw = base64.b64decode(encoded, validate=True)
+    except Exception as exc:
+        raise Ima2BridgeError("ima2 response image base64 is invalid") from exc
+
+    image = Image.open(BytesIO(raw)).convert("RGB")
+    array = np.asarray(image).astype(np.float32) / 255.0
+    return torch.from_numpy(array)[None,]
+
+
+class Ima2Generate:
+    CATEGORY = "ima2-gen"
+    RETURN_TYPES = ("IMAGE", "STRING", "STRING")
+    RETURN_NAMES = ("image", "filename", "metadata")
+    FUNCTION = "generate"
+
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "prompt": ("STRING", {"multiline": True, "default": ""}),
+                "server_url": ("STRING", {"default": ""}),
+                "quality": (["low", "medium", "high"], {"default": "medium"}),
+                "size": ("STRING", {"default": "1024x1024"}),
+                "moderation": (["low", "auto"], {"default": "low"}),
+                "timeout": ("INT", {"default": 180, "min": 5, "max": 600}),
+            },
+            "optional": {
+                "model": (MODEL_OPTIONS,),
+                "mode": (["auto", "direct"], {"default": "auto"}),
+                "web_search": ("BOOLEAN", {"default": True}),
+            },
+        }
+
+    def generate(
+        self,
+        prompt,
+        server_url="",
+        quality="medium",
+        size="1024x1024",
+        moderation="low",
+        timeout=180,
+        model="",
+        mode="auto",
+        web_search=True,
+    ):
+        clean_prompt = str(prompt or "").strip()
+        if not clean_prompt:
+            raise Ima2BridgeError("prompt is required")
+
+        base_url = _resolve_server_url(server_url)
+        payload = {
+            "prompt": clean_prompt,
+            "quality": quality,
+            "size": size,
+            "n": 1,
+            "format": "png",
+            "moderation": moderation,
+            "mode": mode,
+            "webSearchEnabled": bool(web_search),
+        }
+        if model:
+            payload["model"] = model
+
+        response = _post_generate(base_url, payload, int(timeout))
+        image_data = response.get("image")
+        filename = response.get("filename") or ""
+        image = _decode_data_url_to_tensor(image_data)
+        metadata = {
+            "filename": filename,
+            "requestId": response.get("requestId"),
+            "elapsed": response.get("elapsed"),
+            "serverUrl": base_url,
+            "model": response.get("model") or model or None,
+            "size": response.get("size") or size,
+        }
+        return (image, filename, json.dumps(metadata, ensure_ascii=False, sort_keys=True))
+
+
+NODE_CLASS_MAPPINGS = {
+    "Ima2Generate": Ima2Generate,
+}
+
+NODE_DISPLAY_NAME_MAPPINGS = {
+    "Ima2Generate": "Ima2 Generate",
+}