rui40000andClaude Opus 4.6
4254f1d887
核心问题：ComfyUI的前端会将STRING/下拉框中的 :// 及后续内容 当作注释吞掉，导致URL丢失主机名。之前两次修复都没解决，因为 下拉框值 "https://" 本身也含有 :// 。 彻底重写方案 —— 所有控件值中不出现 :// ： - protocol下拉框: ["https", "http"] 纯单词，不含任何特殊字符 - api_url默认值: "api.openai.com/v1/chat/completions" 不含协议 - proxy_url: 用户只需填 IP:端口，代码自动补协议 - _build_full_url() 在纯Python中拼接 "://" ，唯一产生此字符串的位置 - _sanitize_url() 清理各种可能的协议残留碎片 - _build_proxy_url() 智能处理代理地址格式 其他改进： - 无图像时正常调用API进行纯文本对话 - 细分异常类型：连接失败/超时/HTTP错误分别提示 - 超时时间从60s提升到120s - 清理 __pycache__ 确保新代码生效 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
267 lines
8.8 KiB
Python
267 lines
8.8 KiB
Python
import numpy as np
|
||
import requests
|
||
import json
|
||
import base64
|
||
import io
|
||
import os
|
||
import re
|
||
from PIL import Image
|
||
|
||
|
||
def _clear_proxy_env():
|
||
"""
|
||
清除可能导致 requests 连接错误的代理环境变量。
|
||
仅在本模块加载时执行一次。
|
||
"""
|
||
for key in ('HTTP_PROXY', 'HTTPS_PROXY', 'http_proxy', 'https_proxy'):
|
||
os.environ.pop(key, None)
|
||
|
||
_clear_proxy_env()
|
||
|
||
|
||
def _sanitize_url(raw: str) -> str:
|
||
"""
|
||
清理用户输入的 URL 片段：
|
||
去除被 ComfyUI 前端残留的协议碎片、多余斜杠等，只保留 host/path 部分。
|
||
"""
|
||
s = raw.strip()
|
||
# 移除各种可能的协议残留: "https:" / "http:" / "https://" / "http://"
|
||
s = re.sub(r'^https?\s*:\s*/*/?\s*', '', s, flags=re.IGNORECASE)
|
||
s = s.strip('/')
|
||
return s
|
||
|
||
|
||
def _build_full_url(protocol: str, api_url: str) -> str:
|
||
"""
|
||
用下拉框的协议名和文本框的地址拼出完整 URL。
|
||
protocol 只会是 "https" 或 "http"（不含冒号和斜杠）。
|
||
"""
|
||
host_path = _sanitize_url(api_url)
|
||
if not host_path:
|
||
host_path = 'api.openai.com/v1/chat/completions'
|
||
# 唯一拼接 :// 的地方——纯 Python 字符串，不经过前端
|
||
return protocol + '://' + host_path
|
||
|
||
|
||
def _build_proxy_url(raw_proxy: str) -> str:
|
||
"""
|
||
用户可能输入 '127.0.0.1:7890' 或 'http://127.0.0.1:7890'，
|
||
统一处理成带协议前缀的地址。
|
||
"""
|
||
s = raw_proxy.strip()
|
||
if not s:
|
||
return ''
|
||
# 已经有完整协议
|
||
if re.match(r'^https?://', s, flags=re.IGNORECASE):
|
||
return s
|
||
# 移除残留碎片
|
||
s = re.sub(r'^https?\s*:\s*/*/?\s*', '', s, flags=re.IGNORECASE)
|
||
s = s.strip('/')
|
||
if not s:
|
||
return ''
|
||
return 'http://' + s
|
||
|
||
|
||
class OpenAINode:
|
||
"""
|
||
OpenAI API 连接节点
|
||
==================
|
||
支持 OpenAI 及兼容协议的 API（DeepSeek、Moonshot、本地 Ollama 等）。
|
||
- 纯文本模式：仅填写 user_prompt，进行对话生成
|
||
- 多模态模式：连接 image_1~6，进行图像理解
|
||
"""
|
||
|
||
# ────────── 输入定义 ──────────
|
||
@classmethod
|
||
def INPUT_TYPES(cls):
|
||
return {
|
||
"required": {
|
||
# 下拉框只含纯英文单词，不含 :// ，杜绝被前端吞掉
|
||
"protocol": (["https", "http"], {
|
||
"default": "https"
|
||
}),
|
||
# 默认值不含任何协议前缀，杜绝被前端吞掉
|
||
"api_url": ("STRING", {
|
||
"default": "api.openai.com/v1/chat/completions",
|
||
"multiline": False,
|
||
}),
|
||
"api_key": ("STRING", {
|
||
"default": "",
|
||
"multiline": False,
|
||
}),
|
||
"model": ("STRING", {
|
||
"default": "gpt-4o",
|
||
"multiline": False,
|
||
}),
|
||
"system_prompt": ("STRING", {
|
||
"default": "You are a helpful assistant.",
|
||
"multiline": True,
|
||
}),
|
||
"user_prompt": ("STRING", {
|
||
"default": "",
|
||
"multiline": True,
|
||
}),
|
||
"seed": ("INT", {
|
||
"default": 0,
|
||
"min": 0,
|
||
"max": 0xffffffffffffffff,
|
||
}),
|
||
},
|
||
"optional": {
|
||
"image_1": ("IMAGE",),
|
||
"image_2": ("IMAGE",),
|
||
"image_3": ("IMAGE",),
|
||
"image_4": ("IMAGE",),
|
||
"image_5": ("IMAGE",),
|
||
"image_6": ("IMAGE",),
|
||
"temperature": ("FLOAT", {
|
||
"default": 0.3,
|
||
"min": 0.0,
|
||
"max": 2.0,
|
||
"step": 0.1,
|
||
}),
|
||
"max_tokens": ("INT", {
|
||
"default": 500,
|
||
"min": 1,
|
||
"max": 8192,
|
||
}),
|
||
"detail": (["low", "high", "auto"], {
|
||
"default": "auto",
|
||
}),
|
||
"image_max_size": ("INT", {
|
||
"default": 1024,
|
||
"min": 256,
|
||
"max": 4096,
|
||
"step": 64,
|
||
}),
|
||
# 代理地址也不带协议前缀，只填 IP:端口 即可
|
||
"proxy_url": ("STRING", {
|
||
"default": "",
|
||
"multiline": False,
|
||
}),
|
||
},
|
||
}
|
||
|
||
RETURN_TYPES = ("STRING",)
|
||
RETURN_NAMES = ("text",)
|
||
FUNCTION = "generate_content"
|
||
CATEGORY = "Rui-Node🐶/AI模型🤖"
|
||
|
||
# ────────── 图像编码 ──────────
|
||
@staticmethod
|
||
def _encode_image(img_tensor, max_size):
|
||
"""将单张图像张量 [H,W,C] 编码为 base64 JPEG 字符串。"""
|
||
img_np = img_tensor.cpu().numpy()
|
||
img_np = np.clip(img_np, 0, 1)
|
||
pil = Image.fromarray((img_np * 255).astype(np.uint8), 'RGB')
|
||
w, h = pil.size
|
||
if max(w, h) > max_size:
|
||
r = max_size / max(w, h)
|
||
pil = pil.resize((max(1, int(w * r)), max(1, int(h * r))), Image.LANCZOS)
|
||
buf = io.BytesIO()
|
||
pil.save(buf, format='JPEG', quality=85)
|
||
return base64.b64encode(buf.getvalue()).decode('utf-8')
|
||
|
||
# ────────── 主函数 ──────────
|
||
def generate_content(
|
||
self,
|
||
protocol,
|
||
api_url,
|
||
api_key,
|
||
model,
|
||
system_prompt,
|
||
user_prompt,
|
||
seed,
|
||
image_1=None,
|
||
image_2=None,
|
||
image_3=None,
|
||
image_4=None,
|
||
image_5=None,
|
||
image_6=None,
|
||
temperature=0.3,
|
||
max_tokens=500,
|
||
detail="auto",
|
||
image_max_size=1024,
|
||
proxy_url="",
|
||
):
|
||
# ---- 1. 拼接 URL（唯一产生 :// 的地方） ----
|
||
full_url = _build_full_url(protocol, api_url)
|
||
print(f"[Rui-Node] OpenAI -> {full_url}")
|
||
|
||
# ---- 2. 收集图像 ----
|
||
images = [
|
||
img for img in (image_1, image_2, image_3, image_4, image_5, image_6)
|
||
if img is not None
|
||
]
|
||
|
||
# ---- 3. 构造 messages ----
|
||
messages = [{"role": "system", "content": system_prompt}]
|
||
|
||
if images:
|
||
# ===== 多模态模式 =====
|
||
parts = []
|
||
if user_prompt and user_prompt.strip():
|
||
parts.append({"type": "text", "text": user_prompt})
|
||
for img in images:
|
||
b64 = self._encode_image(img[0], image_max_size)
|
||
parts.append({
|
||
"type": "image_url",
|
||
"image_url": {
|
||
"url": f"data:image/jpeg;base64,{b64}",
|
||
"detail": detail,
|
||
},
|
||
})
|
||
if not parts:
|
||
parts.append({"type": "text", "text": " "})
|
||
messages.append({"role": "user", "content": parts})
|
||
else:
|
||
# ===== 纯文本模式 =====
|
||
text = (user_prompt or "").strip()
|
||
if not text:
|
||
return ("（错误：未提供图片也未提供提示词，请至少填写 user_prompt）",)
|
||
messages.append({"role": "user", "content": text})
|
||
|
||
# ---- 4. 请求 ----
|
||
headers = {
|
||
"Content-Type": "application/json",
|
||
"Authorization": f"Bearer {api_key}",
|
||
}
|
||
payload = {
|
||
"model": model,
|
||
"messages": messages,
|
||
"seed": seed,
|
||
"temperature": temperature,
|
||
"max_tokens": max_tokens,
|
||
}
|
||
|
||
proxies = None
|
||
p = _build_proxy_url(proxy_url)
|
||
if p:
|
||
proxies = {"http": p, "https": p}
|
||
|
||
try:
|
||
resp = requests.post(full_url, headers=headers, json=payload,
|
||
proxies=proxies, timeout=120)
|
||
resp.raise_for_status()
|
||
data = resp.json()
|
||
if "choices" in data and data["choices"]:
|
||
return (data["choices"][0]["message"]["content"],)
|
||
return (f"API 返回格式异常: {json.dumps(data, ensure_ascii=False)}",)
|
||
except requests.exceptions.ConnectionError as e:
|
||
return (f"连接失败（请检查 api_url 和网络）: {e}",)
|
||
except requests.exceptions.Timeout:
|
||
return ("请求超时（120s），请检查网络或 API 服务状态。",)
|
||
except requests.exceptions.HTTPError as e:
|
||
return (f"HTTP 错误 {resp.status_code}: {resp.text[:500]}",)
|
||
except Exception as e:
|
||
return (f"请求异常: {type(e).__name__}: {e}",)
|
||
|
||
|
||
# ────────── ComfyUI 注册 ──────────
|
||
NODE_CLASS_MAPPINGS = {
|
||
"OpenAIAPINode": OpenAINode,
|
||
}
|
||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||
"OpenAIAPINode": "OpenAI API 连接 / OpenAI API Connector",
|
||
}
|