fix: 优化内容
This commit is contained in:
@@ -3,9 +3,11 @@ from __future__ import annotations
|
||||
import argparse
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
import httpx
|
||||
import yaml
|
||||
|
||||
|
||||
def fetch_object_info(base_url: str, timeout_s: float = 5.0) -> dict[str, Any]:
|
||||
@@ -19,19 +21,40 @@ def fetch_object_info(base_url: str, timeout_s: float = 5.0) -> dict[str, Any]:
|
||||
return data
|
||||
|
||||
|
||||
def read_base_url_from_config(config_path: str) -> str | None:
|
||||
p = Path(config_path)
|
||||
if not p.exists():
|
||||
return None
|
||||
try:
|
||||
raw = yaml.safe_load(p.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
return None
|
||||
if not isinstance(raw, dict):
|
||||
return None
|
||||
app = raw.get("app")
|
||||
if not isinstance(app, dict):
|
||||
return None
|
||||
v = app.get("comfy_base_url")
|
||||
if isinstance(v, str) and v.strip():
|
||||
return v.strip()
|
||||
return None
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser(description="Check ComfyUI API connectivity")
|
||||
parser.add_argument(
|
||||
"--base-url",
|
||||
default="http://127.0.0.1:8188",
|
||||
help="ComfyUI base URL (default: http://127.0.0.1:8188)",
|
||||
default="",
|
||||
help="ComfyUI base URL (if empty, read from config app.comfy_base_url)",
|
||||
)
|
||||
parser.add_argument("--config", default="./configs/config.yaml", help="Config yaml path")
|
||||
parser.add_argument("--timeout", type=float, default=5.0, help="Request timeout seconds")
|
||||
parser.add_argument("--pretty", action="store_true", help="Pretty print JSON")
|
||||
args = parser.parse_args()
|
||||
|
||||
try:
|
||||
data = fetch_object_info(args.base_url, timeout_s=args.timeout)
|
||||
base_url = args.base_url.strip() or read_base_url_from_config(args.config) or "http://127.0.0.1:8188"
|
||||
data = fetch_object_info(base_url, timeout_s=args.timeout)
|
||||
out = json.dumps(data, ensure_ascii=False, indent=2 if args.pretty else None)
|
||||
sys.stdout.write(out + "\n")
|
||||
return 0
|
||||
|
||||
Reference in New Issue
Block a user