Skip to content

Return ContentThinking objects from stream_text() #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonpcouch wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Return ContentThinking objects from stream_text() #909

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b443b80
Return `ContentThinking` objects from `stream_text()`
simonpcouch Dec 19, 2025
1463749
format `chat.R` with air
simonpcouch Dec 19, 2025
41267fa
add NEWS entry [no ci]
simonpcouch Dec 19, 2025
fef20b8
correct thinking json translation
simonpcouch Dec 19, 2025
9cb50e1
wrap stream_text in new stream_content
simonpcouch Jan 7, 2026
b6bfa82
`stream_text` -> `stream_content`
simonpcouch Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Suggests:
withr
VignetteBuilder:
knitr
Remotes: posit-dev/shinychat/pkg-r#167
Config/Needs/website: tidyverse/tidytemplate, rmarkdown
Config/testthat/edition: 3
Config/testthat/parallel: true
Expand Down
22 changes: 16 additions & 6 deletions R/chat.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,11 +606,16 @@ Chat <- R6::R6Class(
if (stream) {
result <- NULL
for (chunk in response) {
text <- stream_text(private$provider, chunk)
if (!is.null(text)) {
content <- stream_text(private$provider, chunk)
if (!is.null(content)) {
text <- switch(class(content)[1],
"ellmer::ContentThinking" = content@thinking,
"ellmer::ContentText" = content@text,
if (S7_inherits(content, Content)) format(content) else content
)
Copy link
Collaborator Author

@simonpcouch simonpcouch Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if using switch on S7 objects is considered bad practice, but the control flow was gnarly otherwise😅

Copy link
Member

@hadley hadley Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should have a stream_data() that returns the object and then stream_text() would contain this code to extract out just the text?

Copy link
Member

@hadley hadley Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or stream_content()?

emit(text)
if (yield_as_content) {
yield(ContentText(text))
yield(if (S7_inherits(content, Content)) content else ContentText(text))
} else {
yield(text)
}
Expand Down Expand Up @@ -688,11 +693,16 @@ Chat <- R6::R6Class(
if (stream) {
result <- NULL
for (chunk in await_each(response)) {
text <- stream_text(private$provider, chunk)
if (!is.null(text)) {
content <- stream_text(private$provider, chunk)
if (!is.null(content)) {
text <- switch(class(content)[1],
"ellmer::ContentThinking" = content@thinking,
"ellmer::ContentText" = content@text,
if (S7_inherits(content, Content)) format(content) else content
)
emit(text)
if (yield_as_content) {
yield(ContentText(text))
yield(if (S7_inherits(content, Content)) content else ContentText(text))
} else {
yield(text)
}
Expand Down
5 changes: 4 additions & 1 deletion R/provider-claude.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,10 @@ method(stream_parse, ProviderAnthropic) <- function(provider, event) {
}
method(stream_text, ProviderAnthropic) <- function(provider, event) {
if (event$type == "content_block_delta") {
event$delta$text %||% event$delta$thinking
if (identical(event$delta$type, "thinking_delta")) {
return(ContentThinking(event$delta$thinking))
}
event$delta$text
}
}
method(stream_merge_chunks, ProviderAnthropic) <- function(
Expand Down
16 changes: 14 additions & 2 deletions R/provider-google.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,17 @@ method(stream_parse, ProviderGoogleGemini) <- function(provider, event) {
}
}
method(stream_text, ProviderGoogleGemini) <- function(provider, event) {
event$candidates[[1]]$content$parts[[1]]$text
parts <- event$candidates[[1]]$content$parts
if (is.null(parts) || length(parts) == 0) {
return(NULL)
}

part <- parts[[1]]
if (isTRUE(part$thought) && !is.null(part$text)) {
ContentThinking(part$text)
} else if (!is.null(part$text)) {
part$text
}
}
method(stream_merge_chunks, ProviderGoogleGemini) <- function(
provider,
Expand Down Expand Up @@ -320,7 +330,9 @@ method(value_turn, ProviderGoogleGemini) <- function(
message <- result$candidates[[1]]$content

contents <- lapply(message$parts, function(content) {
if (has_name(content, "text")) {
if (isTRUE(content$thought) && has_name(content, "text")) {
ContentThinking(content$text)
} else if (has_name(content, "text")) {
if (has_type) {
ContentJson(string = content$text)
} else {
Expand Down
4 changes: 2 additions & 2 deletions R/provider-openai.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,10 @@ method(stream_text, ProviderOpenAI) <- function(provider, event) {
event$delta
} else if (event$type == "response.reasoning_summary_text.delta") {
# https://platform.openai.com/docs/api-reference/responses-streaming/response/reasoning_summary_text/delta
event$delta
ContentThinking(event$delta)
} else if (event$type == "response.reasoning_summary_text.done") {
# https://platform.openai.com/docs/api-reference/responses-streaming/response/reasoning_summary_text/done
"\n\n"
NULL
}
}
method(stream_merge_chunks, ProviderOpenAI) <- function(
Expand Down
Loading