mirror of
https://github.com/QwenLM/qwen-code.git
synced 2026-04-28 11:41:04 +00:00
* Codex worktree snapshot: startup-cleanup Co-authored-by: Codex * Add Python SDK real smoke test Adds a repository-only real E2E smoke script for the Python SDK, plus npm and developer documentation entry points. Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): address review findings — bugs, type safety, and test coverage - Fix prepare_spawn_info: JS files now use "node" instead of sys.executable - Fix protocol.py: correct total=False misuse on 7 TypedDicts (required fields were optional) - Fix query.py: add _closed guard in _ensure_started, suppress exceptions in close() - Fix sync_query.py: prevent close() deadlock, add context manager, add timeouts - Fix transport.py: handle malformed JSON lines, add _closed guard in start() - Fix validation.py: use uuid.RFC_4122 instead of magic UUID - Fix __init__.py: export TextBlock, widen query_sync signature - Remove dead code: ensure_not_aborted, write_json_line, _thread_error - Add 12 new tests (29 → 41): context managers, JSON skip, closed guards, spawn info, timeouts Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): address wenshao review — session_id, bool validation, debug stderr - Fix continue_session=True generating a wrong random session_id - Add _as_optional_bool helper for strict type validation on bool fields - Default debug stderr to sys.stderr when no custom callback is provided Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): address remaining wenshao review feedback Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * test(cli): harden settings dialog restart prompt test Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): review fixes — UUID compat, stderr fallback, sync cleanup - Remove UUID version restriction to support v6/v7/v8 (RFC 9562) - Always write to sys.stderr when stderr callback raises (was silent when debug=False) - Prevent duplicate _STOP sentinel in SyncQuery.close() via _stop_sent flag - Add ruff format --check to CI workflow - Fix smoke_real.py version guard: fail early before imports instead of NameError - Apply ruff format to existing files Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): remaining review fixes — exit_code attr, guard strictness, sync timeout - Add exit_code attribute to ProcessExitError for programmatic access - Strengthen is_control_response/is_control_cancel guards to require payload fields, preventing misrouting of malformed messages - Expose control_request_timeout property on Query so SyncQuery uses the configured timeout instead of a hardcoded 30s default - Use dataclasses.replace() instead of direct mutation on frozen-style QueryOptions in query() factory - Add ResourceWarning in SyncQuery.__del__ when not properly closed Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): add exit_code default and guard __del__ against partial GC - Give ProcessExitError.exit_code a default value (-1) so user code can construct the exception with just a message string - Wrap SyncQuery.__del__ in try/except AttributeError to prevent crashes when the object is partially garbage-collected Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): review fixes — resource leak, type safety, CI matrix, docs - Fix SyncQuery.__del__ to call close() on GC instead of only warning - Replace hasattr duck-type check with isinstance(prompt, AsyncIterable) - Type-validate permission_mode/auth_type in QueryOptions.from_mapping - Use TypeGuard return types on all is_sdk_*/is_control_* predicates - Add 5s margin to sync wrapper timeouts to prevent error type masking - Expand CI matrix to test Python 3.10, 3.11, 3.12 - Change ProcessExitError.exit_code default from -1 to None - Add stderr to docs QueryOptions listing - Update README sync example to use context manager pattern Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): preserve iterator exhaustion state and suppress detached task warning - Add _exhausted flag to Query.__anext__ and SyncQuery.__next__ so repeated iteration after end-of-stream raises Stop(Async)Iteration instead of blocking forever. - Remove re-raise in _initialize() to prevent asyncio "Task exception was never retrieved" warning on detached tasks; the error is already surfaced via _finish_with_error(). Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): reject mcp_servers at validation time and add iterator/init tests - Reject mcp_servers in validate_query_options() with a clear error instead of advertising MCP support to the CLI and then failing at runtime when mcp_message arrives. - Remove dead mcp_servers branch from _initialize(). - Add tests for async/sync iterator exhaustion, detached init task warning suppression, and mcp_servers validation. Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * fix(sdk-python): fix ruff lint errors in new tests - Use ControlRequestTimeoutError instead of bare Exception (B017) - Fix import sorting for stdlib vs third-party (I001) - Break long line to stay within 88-char limit (E501) Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> * style(sdk-python): apply ruff format to new tests Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com> --------- Co-authored-by: jinye.djy <jinye.djy@alibaba-inc.com> Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
94 lines
3.1 KiB
Python
94 lines
3.1 KiB
Python
"""Validation helpers for query options."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from collections.abc import Callable
|
|
from uuid import RFC_4122, UUID
|
|
|
|
from .errors import ValidationError
|
|
from .types import (
|
|
QueryOptions,
|
|
_validate_can_use_tool_callable,
|
|
_validate_stderr_callable,
|
|
)
|
|
|
|
_VALID_PERMISSION_MODES = {"default", "plan", "auto-edit", "yolo"}
|
|
_VALID_AUTH_TYPES = {"openai", "anthropic", "qwen-oauth", "gemini", "vertex-ai"}
|
|
|
|
|
|
def validate_query_options(options: QueryOptions) -> None:
|
|
if (
|
|
options.permission_mode
|
|
and options.permission_mode not in _VALID_PERMISSION_MODES
|
|
):
|
|
raise ValidationError(
|
|
f"Invalid permission_mode: {options.permission_mode!r}. "
|
|
"Expected one of: default, plan, auto-edit, yolo."
|
|
)
|
|
|
|
if options.auth_type and options.auth_type not in _VALID_AUTH_TYPES:
|
|
raise ValidationError(
|
|
f"Invalid auth_type: {options.auth_type!r}. "
|
|
"Expected one of: openai, anthropic, qwen-oauth, gemini, vertex-ai."
|
|
)
|
|
|
|
_validate_optional_callable(options.can_use_tool, _validate_can_use_tool_callable)
|
|
_validate_optional_callable(options.stderr, _validate_stderr_callable)
|
|
|
|
if options.resume and options.continue_session:
|
|
raise ValidationError(
|
|
"Cannot use resume together with continue_session. "
|
|
"Use continue_session for latest session "
|
|
"or resume for a specific session ID."
|
|
)
|
|
|
|
if options.session_id and (options.resume or options.continue_session):
|
|
raise ValidationError(
|
|
"Cannot use session_id with resume or continue_session. "
|
|
"session_id starts a new session, "
|
|
"resume/continue_session restore existing sessions."
|
|
)
|
|
|
|
if options.session_id:
|
|
validate_session_id(options.session_id, "session_id")
|
|
|
|
if options.resume:
|
|
validate_session_id(options.resume, "resume")
|
|
|
|
if options.max_session_turns is not None and options.max_session_turns < -1:
|
|
raise ValidationError("max_session_turns must be -1 or a non-negative integer")
|
|
|
|
if (
|
|
options.path_to_qwen_executable is not None
|
|
and not options.path_to_qwen_executable.strip()
|
|
):
|
|
raise ValidationError("path_to_qwen_executable cannot be empty")
|
|
|
|
if options.mcp_servers:
|
|
raise ValidationError(
|
|
"mcp_servers is not supported in Python SDK v1. "
|
|
"Remove the mcp_servers option or use the TypeScript SDK."
|
|
)
|
|
|
|
|
|
def _validate_optional_callable(
|
|
value: object,
|
|
validator: Callable[[object, type[ValidationError]], None],
|
|
) -> None:
|
|
if value is None:
|
|
return
|
|
validator(value, ValidationError)
|
|
|
|
|
|
def validate_session_id(value: str, param_name: str) -> None:
|
|
try:
|
|
parsed = UUID(value)
|
|
except ValueError as exc:
|
|
raise ValidationError(
|
|
f"Invalid {param_name}: {value!r}. Must be a valid UUID."
|
|
) from exc
|
|
|
|
if parsed.variant != RFC_4122:
|
|
raise ValidationError(
|
|
f"Invalid {param_name}: {value!r}. UUID variant must be RFC 4122."
|
|
)
|