文件历史

提交图

9 次代码提交

作者 SHA1 备注 提交日期
Simon Willison 842ab2a93f response.messages is a method, matching .text() / .json() / .tool_calls()
Sync: response.messages() forces execution if not drained, so callers
no longer have to remember to call .text() first. Async: `await
response.messages()` awaits the force.

Internal sync paths (_response_to_dict, _chain_for_tool_results,
_build_full_chain, Response.reply, AsyncResponse.reply) use a new
private _messages_now() helper that assumes the response is already
drained, so they don't have to await on async responses.

Drops the now-obsolete "accessing .messages on un-awaited
AsyncResponse raises" parity test — that constraint goes away with
the method form.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-28 14:04:35 -07:00
Simon Willison a2547d8183 Drop token_count from ReasoningPart, use redacted marker StreamEvent
ReasoningPart.token_count duplicated info already on response.token_details
(reasoning_tokens), and the side-channel `response._reasoning_token_count`
attribute with its set_usage ordering footgun was the wrong shape. Replaced
with a clean StreamEvent.redacted=True marker that plugins yield like any
other event. The framework hoists redacted reasoning Parts to the start of
the assembled message so UIs render them before content, even though the
opaque count typically arrives at the end of the stream.

Also fix parallel tool calls emitted without tool_call_id (e.g. Gemini):
a fresh tool_call_name now always allocates a new index instead of falling
through to the prior tool-call group, so N parallel calls produce N
distinct ToolCallParts instead of one with concatenated names and args.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-28 13:28:55 -07:00
Simon Willison 5a92cdfc6e Improved some comments
Had a different model review them for accuracy
2026-04-22 08:55:38 -07:00
Simon Willison 211e678e07 Cleaned up tests and comments
Removed all mentions of 'phase'
2026-04-22 08:43:33 -07:00
Simon Willison 65b8e37c79 Ran Black 2026-04-21 21:10:13 -07:00
Simon Willison 63cdf94fbe Phase 7: to_dict/from_dict/reply + full-chain invariant
Three new Response primitives that make conversation persistence
outside SQLite ergonomic — and a clarified invariant that
response.prompt.messages is always exactly what the model was sent.

response.reply(text, **kwargs) -> Response
  Builds next-turn chain = self.prompt.messages + self.messages +
  [user(text)] and calls self.model.prompt(messages=chain, ...).
  Works from any Response, regardless of origin (conversation,
  standalone model.prompt, or from_dict-rehydrated).

response.to_dict() / Response.from_dict(data, *, model=None)
  JSON-safe serialization. to_dict captures model_id, input chain
  (prompt.messages — full), assembled output (response.messages
  including reasoning parts and provider_metadata signatures),
  options, and optional audit fields (id, usage, datetime_utc).
  from_dict rehydrates a _done=True Response where text() returns
  the answer and messages returns the full structured view without
  re-running the assembler. Async variants likewise.

Full-chain invariant: response.prompt.messages == what was sent.
  - Conversation.prompt / AsyncConversation.prompt now pre-compute
    the full chain (last response's prompt.messages + last
    response's messages + new user turn, or tool_results for
    chain loops) and pass it as messages= into the Prompt.
  - Prompt.messages, when _explicit_messages is set, returns that
    list verbatim. The previous "combine with prompt= trailing
    user" behavior is dropped (was Phase 3 scaffolding, no user
    ever wants a partial chain).
  - _BaseConversation._build_full_chain is the shared builder.

OpenAI adapter simplified: build_messages now reads only
prompt.messages and ignores conversation.responses. Under the
invariant, prompt.messages already has the full history baked in;
walking conversation would double-emit.

response.messages now short-circuits to _loaded_messages when set
(rehydrated responses don't re-run the assembler).

The persistence pattern becomes:

    response = model.prompt("Hi", thinking=True)
    response.text()
    Path("chat.json").write_text(json.dumps(response.to_dict()))

    # Later, any process:
    data = json.loads(Path("chat.json").read_text())
    response = llm.Response.from_dict(data)
    response = response.reply("Follow up")
    print(response.text())

Reasoning signatures (Anthropic extended thinking, Gemini
thoughtSignature) round-trip via provider_metadata on the
ReasoningPart / ToolCallPart — so multi-turn extended thinking
works across process boundaries for free.

19 new tests + 2 tightened existing tests; 600 total pass.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-21 08:17:31 -07:00
Simon Willison 9f0d72ac03 Phase 4c: OpenAI reasoning token count → redacted ReasoningPart
Capture usage.completion_tokens_details.reasoning_tokens and store it
on response._reasoning_token_count BEFORE set_usage runs — set_usage
pops top-level keys and then simplify_usage_dict strips zero-valued
entries, both of which would lose the count.

Phase 2's _build_parts() picks up _reasoning_token_count and prepends
a ReasoningPart(redacted=True, token_count=N, text="") to the
assembled output messages. That gives CLI and client code a hook to
render "GPT-5 used N reasoning tokens here" without the model
actually streaming any reasoning text (which OpenAI's reasoning
models don't expose).

Both Chat.execute (sync) and AsyncChat.execute do this.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-20 09:40:28 -07:00
Simon Willison 8ae9644016 Phase 4b: OpenAI execute() yields StreamEvent objects
Replace string yields with typed StreamEvent yields in both sync
Chat.execute and async AsyncChat.execute, for both streaming and
non-streaming code paths.

Event shape:
  - Text chunks emit StreamEvent(type="text", part_index=0).
    Empty-string content (OpenAI's first role=assistant delta) is
    now skipped as noise.
  - Each tool call gets its own part_index past any text that
    preceded it (text is always part_index=0, tool calls start at
    1). A new tool call emits tool_call_name with name+id, and each
    tool-call-args delta emits tool_call_args with the partial
    JSON. Callers see arguments build up live via stream_events().
  - Non-streaming path emits one StreamEvent per content block:
    tool calls first (each with name + args events), then the final
    text if present.

response.add_tool_call() is still invoked for every tool call so
existing code paths (response.tool_calls(), chain execution) keep
working. The new event stream is additive.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-20 09:39:00 -07:00
Simon Willison 94837936df Phase 4a: OpenAI build_messages reads prompt.messages
Rewrite the OpenAI _Shared.build_messages() to consume prompt.messages
(the canonical structured input) and dispatch per Part subtype into
OpenAI's wire format. Prior-turn input history also comes from
prev_response.prompt.messages; prior-turn output continues to use
the flat text_or_raise() / tool_calls_or_raise() accessors since
those tolerate plugin-specific quirks that _build_parts rejects.

Per-Part translation:
  - TextPart        → message content (string) or {"type": "text", ...}
                      entry inside attachment-bearing array content
  - AttachmentPart  → passed through _attachment() for image/audio/pdf
  - ToolCallPart    → tool_calls[] entry on an assistant message
                      (content=null when only tool_calls, no text)
  - ToolResultPart  → one {"role": "tool", tool_call_id, content} per
                      result (Message role="tool" can carry several)

System dedup: consecutive identical system prompts emit once. The
legacy prompt=/system=/attachments=/tool_results= path continues to
work unchanged because Prompt.messages synthesizes those into the
same Message list the new code reads.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-20 09:36:23 -07:00