* feat: local passthrough for Responses tools via responses_tools + responses_tool_choice (behind CHATMOCK_ALLOW_RESPONSES_TOOLS)
* feat: gate Responses tools passthrough behind CHATMOCK_ALLOW_RESPONSES_TOOLS (default OFF)
* test(docs): add pytest for Responses tools passthrough (default off), and README usage section
* feat: responses tools hardening (fallback on 400, host allowlist, size guard, tool_choice strings only); tests updated
* feat: enable Responses tools passthrough by default; remove env gate
- Tools forwarded whenever is present
- Keep size guard and optional MCP host allowlist
- Accept strings unconditionally
Tests:
- Update to cover default passthrough and baseline (no responses_tools)
Docs:
- README: update instructions; move Star History to bottom
* chore: clean imports/comments; use gpt-5 in examples and tests
* docs: tighten Responses tools README; fix gpt-5 example\nchore: remove feature-specific test per review; trim comments/imports
* chore: remove __pycache__/ and bytecode; add .gitignore
* chore: add .gitignore for caches and bytecode
* Update README.md
* fix: remove MCP passthrough; allow only web_search in responses_tools
- Reject non-`web_search` types with 400 (`RESPONSES_TOOL_UNSUPPORTED`).
- Drop MCP host allowlist logic and related import.
- Keep size guard via `RESPONSES_TOOLS_MAX_BYTES` and fallback retry without extras.
- Docs: update README to state web_search-only passthrough.
Runtime verified locally with a stubbed upstream:
- OK: `responses_tools: [{"type": "web_search"}]` -> 200.
- BAD: `responses_tools: [{"type": "mcp"}]` -> 400 `RESPONSES_TOOL_UNSUPPORTED`.
* feat: forward Responses web_search tool via Chat Completions; fallback on rejection
- Accept `responses_tools` array and filter to `type: web_search` only.
- Enforce size guard `RESPONSES_TOOLS_MAX_BYTES` (default 32768).
- Fallback: if upstream rejects tools, retry without extras; otherwise return `RESPONSES_TOOLS_REJECTED`.
- README: document web_search-only passthrough and example.
- Headers: hint experimental features in OpenAI-Beta (responses; web-search).
* chore: remove local test-only forcing flag (CHATMOCK_FORCE_WEB_SEARCH)
* fix: restore full routes_openai (web_search-only passthrough + endpoints)
- Undo accidental large deletion from prior cleanup.
- Keep `web_search` passthrough, size guard, and fallback.
- Preserve `/v1/completions` and `/v1/models` endpoints and SSE handling.
* Update upstream.py
* Update upstream.py
* Update README.md
* Update README.md
* Update routes_openai.py
* feat(openai): default-enable web_search; accept preview; quiet retry; rm env knob
- Injects responses_tools=[{"type":"web_search"}] when client omits tools; explicit opt-out via responses_tool_choice:"none".
- Allowlist accepts "web_search" and "web_search_preview"; others rejected with RESPONSES_TOOL_UNSUPPORTED.
- Replaces env max-bytes knob with MAX_TOOLS_BYTES=32768.
- Retry on upstream rejection is silent; logs only under verbose.
* feat(stream): surface web_search_call as tool_calls; aggregate args; verbose-only logs
- Translates Responses web_search_call.* and output_item.done into OpenAI-style delta.tool_calls.
- Aggregates parameters by call_id (query/q, recency/time_range/days, domains/include/include_domains/include, max_results/topn/limit).
- No inference; arguments remain "{}" if upstream provides none. Logs only when verbose.
* feat(responses-tools): web_search passthrough; flag; fallback; Ollama parity; stable indexes
- Add --enable-web-search (default OFF) to inject web_search when requests omit responses_tools
- Allow tool types: web_search and web_search_preview; 32,768-byte cap on serialized responses_tools
- OpenAI /v1/chat/completions: passthrough + retry without extras on upstream rejection; return retry status
- Streaming: function.arguments always JSON; stable tool_calls index per call_id
- Ollama /api/chat: same passthrough + fallback behavior
- README updated to match behavior and limits
* Update README.md
* Update README.md
* Update routes_ollama.py
* Update routes_openai.py
* Update utils.py
---------
Co-authored-by: alexx-ftw <alexx-ftw@users.noreply.github.com>
Co-authored-by: Game_Time <108236317+RayBytes@users.noreply.github.com>
230 lines
8.5 KiB
Python
230 lines
8.5 KiB
Python
from __future__ import annotations
|
|
|
|
import argparse
|
|
import json
|
|
import errno
|
|
import os
|
|
import sys
|
|
import webbrowser
|
|
|
|
from .app import create_app
|
|
from .config import CLIENT_ID_DEFAULT
|
|
from .oauth import OAuthHTTPServer, OAuthHandler, REQUIRED_PORT, URL_BASE
|
|
from .utils import eprint, get_home_dir, load_chatgpt_tokens, parse_jwt_claims, read_auth_file
|
|
import os
|
|
|
|
|
|
def cmd_login(no_browser: bool, verbose: bool) -> int:
|
|
home_dir = get_home_dir()
|
|
client_id = CLIENT_ID_DEFAULT
|
|
if not client_id:
|
|
eprint("ERROR: No OAuth client id configured. Set CHATGPT_LOCAL_CLIENT_ID.")
|
|
return 1
|
|
|
|
try:
|
|
bind_host = os.getenv("CHATGPT_LOCAL_LOGIN_BIND", "127.0.0.1")
|
|
httpd = OAuthHTTPServer((bind_host, REQUIRED_PORT), OAuthHandler, home_dir=home_dir, client_id=client_id, verbose=verbose)
|
|
except OSError as e:
|
|
eprint(f"ERROR: {e}")
|
|
if e.errno == errno.EADDRINUSE:
|
|
return 13
|
|
return 1
|
|
|
|
auth_url = httpd.auth_url()
|
|
with httpd:
|
|
eprint(f"Starting local login server on {URL_BASE}")
|
|
if not no_browser:
|
|
try:
|
|
webbrowser.open(auth_url, new=1, autoraise=True)
|
|
except Exception as e:
|
|
eprint(f"Failed to open browser: {e}")
|
|
eprint(f"If your browser did not open, navigate to:\n{auth_url}")
|
|
|
|
def _stdin_paste_worker() -> None:
|
|
try:
|
|
eprint(
|
|
"If the browser can't reach this machine, paste the full redirect URL here and press Enter (or leave blank to keep waiting):"
|
|
)
|
|
line = sys.stdin.readline().strip()
|
|
if not line:
|
|
return
|
|
try:
|
|
from urllib.parse import urlparse, parse_qs
|
|
|
|
parsed = urlparse(line)
|
|
params = parse_qs(parsed.query)
|
|
code = (params.get("code") or [None])[0]
|
|
state = (params.get("state") or [None])[0]
|
|
if not code:
|
|
eprint("Input did not contain an auth code. Ignoring.")
|
|
return
|
|
if state and state != httpd.state:
|
|
eprint("State mismatch. Ignoring pasted URL for safety.")
|
|
return
|
|
eprint("Received redirect URL. Completing login without callback…")
|
|
bundle, _ = httpd.exchange_code(code)
|
|
if httpd.persist_auth(bundle):
|
|
httpd.exit_code = 0
|
|
eprint("Login successful. Tokens saved.")
|
|
else:
|
|
eprint("ERROR: Unable to persist auth file.")
|
|
httpd.shutdown()
|
|
except Exception as exc:
|
|
eprint(f"Failed to process pasted redirect URL: {exc}")
|
|
except Exception:
|
|
pass
|
|
|
|
try:
|
|
import threading
|
|
|
|
threading.Thread(target=_stdin_paste_worker, daemon=True).start()
|
|
except Exception:
|
|
pass
|
|
try:
|
|
httpd.serve_forever()
|
|
except KeyboardInterrupt:
|
|
eprint("\nKeyboard interrupt received, exiting.")
|
|
return httpd.exit_code
|
|
|
|
|
|
def cmd_serve(
|
|
host: str,
|
|
port: int,
|
|
verbose: bool,
|
|
reasoning_effort: str,
|
|
reasoning_summary: str,
|
|
reasoning_compat: str,
|
|
debug_model: str | None,
|
|
expose_reasoning_models: bool,
|
|
default_web_search: bool,
|
|
) -> int:
|
|
app = create_app(
|
|
verbose=verbose,
|
|
reasoning_effort=reasoning_effort,
|
|
reasoning_summary=reasoning_summary,
|
|
reasoning_compat=reasoning_compat,
|
|
debug_model=debug_model,
|
|
expose_reasoning_models=expose_reasoning_models,
|
|
default_web_search=default_web_search,
|
|
)
|
|
|
|
app.run(host=host, debug=False, use_reloader=False, port=port, threaded=True)
|
|
return 0
|
|
|
|
|
|
def main() -> None:
|
|
parser = argparse.ArgumentParser(description="ChatGPT Local: login & OpenAI-compatible proxy")
|
|
sub = parser.add_subparsers(dest="command", required=True)
|
|
|
|
p_login = sub.add_parser("login", help="Authorize with ChatGPT and store tokens")
|
|
p_login.add_argument("--no-browser", action="store_true", help="Do not open the browser automatically")
|
|
p_login.add_argument("--verbose", action="store_true", help="Enable verbose logging")
|
|
|
|
p_serve = sub.add_parser("serve", help="Run local OpenAI-compatible server")
|
|
p_serve.add_argument("--host", default="127.0.0.1")
|
|
p_serve.add_argument("--port", type=int, default=8000)
|
|
p_serve.add_argument("--verbose", action="store_true", help="Enable verbose logging")
|
|
p_serve.add_argument(
|
|
"--debug-model",
|
|
dest="debug_model",
|
|
default=os.getenv("CHATGPT_LOCAL_DEBUG_MODEL"),
|
|
help="Forcibly override requested 'model' with this value",
|
|
)
|
|
p_serve.add_argument(
|
|
"--reasoning-effort",
|
|
choices=["minimal", "low", "medium", "high"],
|
|
default=os.getenv("CHATGPT_LOCAL_REASONING_EFFORT", "medium").lower(),
|
|
help="Reasoning effort level for Responses API (default: medium)",
|
|
)
|
|
p_serve.add_argument(
|
|
"--reasoning-summary",
|
|
choices=["auto", "concise", "detailed", "none"],
|
|
default=os.getenv("CHATGPT_LOCAL_REASONING_SUMMARY", "auto").lower(),
|
|
help="Reasoning summary verbosity (default: auto)",
|
|
)
|
|
p_serve.add_argument(
|
|
"--reasoning-compat",
|
|
choices=["legacy", "o3", "think-tags", "current"],
|
|
default=os.getenv("CHATGPT_LOCAL_REASONING_COMPAT", "think-tags").lower(),
|
|
help=(
|
|
"Compatibility mode for exposing reasoning to clients (legacy|o3|think-tags). "
|
|
"'current' is accepted as an alias for 'legacy'"
|
|
),
|
|
)
|
|
p_serve.add_argument(
|
|
"--expose-reasoning-models",
|
|
action="store_true",
|
|
default=os.getenv("CHATGPT_LOCAL_EXPOSE_REASONING_MODELS", "").strip().lower() in ("1", "true", "yes", "on"),
|
|
help=(
|
|
"Expose gpt-5 reasoning effort variants (minimal|low|medium|high) as separate models from /v1/models. "
|
|
"This allows choosing effort via model selection in compatible UIs."
|
|
),
|
|
)
|
|
p_serve.add_argument(
|
|
"--enable-web-search",
|
|
action="store_true",
|
|
help="Enable default web_search tool when a request omits responses_tools (off by default)",
|
|
)
|
|
|
|
p_info = sub.add_parser("info", help="Print current stored tokens and derived account id")
|
|
p_info.add_argument("--json", action="store_true", help="Output raw auth.json contents")
|
|
|
|
args = parser.parse_args()
|
|
|
|
if args.command == "login":
|
|
sys.exit(cmd_login(no_browser=args.no_browser, verbose=args.verbose))
|
|
elif args.command == "serve":
|
|
sys.exit(
|
|
cmd_serve(
|
|
host=args.host,
|
|
port=args.port,
|
|
verbose=args.verbose,
|
|
reasoning_effort=args.reasoning_effort,
|
|
reasoning_summary=args.reasoning_summary,
|
|
reasoning_compat=args.reasoning_compat,
|
|
debug_model=args.debug_model,
|
|
expose_reasoning_models=args.expose_reasoning_models,
|
|
default_web_search=args.enable_web_search,
|
|
)
|
|
)
|
|
elif args.command == "info":
|
|
auth = read_auth_file()
|
|
if getattr(args, "json", False):
|
|
print(json.dumps(auth or {}, indent=2))
|
|
sys.exit(0)
|
|
access_token, account_id, id_token = load_chatgpt_tokens()
|
|
if not access_token or not id_token:
|
|
print("👤 Account")
|
|
print(" • Not signed in")
|
|
print(" • Run: python3 chatmock.py login")
|
|
sys.exit(0)
|
|
|
|
id_claims = parse_jwt_claims(id_token) or {}
|
|
access_claims = parse_jwt_claims(access_token) or {}
|
|
|
|
email = id_claims.get("email") or id_claims.get("preferred_username") or "<unknown>"
|
|
plan_raw = (access_claims.get("https://api.openai.com/auth") or {}).get("chatgpt_plan_type") or "unknown"
|
|
plan_map = {
|
|
"plus": "Plus",
|
|
"pro": "Pro",
|
|
"free": "Free",
|
|
"team": "Team",
|
|
"enterprise": "Enterprise",
|
|
}
|
|
plan = plan_map.get(str(plan_raw).lower(), str(plan_raw).title() if isinstance(plan_raw, str) else "Unknown")
|
|
|
|
print("👤 Account")
|
|
print(" • Signed in with ChatGPT")
|
|
print(f" • Login: {email}")
|
|
print(f" • Plan: {plan}")
|
|
if account_id:
|
|
print(f" • Account ID: {account_id}")
|
|
sys.exit(0)
|
|
else:
|
|
parser.error("Unknown command")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|
|
|