Skip to content

SRA streaming fix (BedrockRuntime::InvokeModel) #3696

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

Merged
sbaluja merged 2 commits into from
Jan 22, 2026
+30 −7
Merged

SRA streaming fix (BedrockRuntime::InvokeModel) #3696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a164fbd
Fix streaming bug for SRA clients
sbaluja Jan 22, 2026
2efbd7c
Update clients & add test for BedrockRuntime::InvokeModel
sbaluja Jan 22, 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
13 changes: 7 additions & 6 deletions generated/src/aws-cpp-sdk-bedrock-runtime/source/BedrockRuntimeClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,12 +373,13 @@ InvokeModelOutcome BedrockRuntimeClient::InvokeModel(const InvokeModelRequest& r
smithy::components::tracing::SpanKind::CLIENT);
return TracingUtils::MakeCallWithTiming<InvokeModelOutcome>(
[&]() -> InvokeModelOutcome {
return InvokeModelOutcome(MakeRequestDeserialize(&request, request.GetServiceRequestName(), Aws::Http::HttpMethod::HTTP_POST,
[&](Aws::Endpoint::AWSEndpoint& resolvedEndpoint) -> void {
resolvedEndpoint.AddPathSegments("/model/");
resolvedEndpoint.AddPathSegment(request.GetModelId());
resolvedEndpoint.AddPathSegments("/invoke");
}));
return InvokeModelOutcome(MakeRequestWithUnparsedResponse(&request, request.GetServiceRequestName(),
Aws::Http::HttpMethod::HTTP_POST,
[&](Aws::Endpoint::AWSEndpoint& resolvedEndpoint) -> void {
resolvedEndpoint.AddPathSegments("/model/");
resolvedEndpoint.AddPathSegment(request.GetModelId());
resolvedEndpoint.AddPathSegments("/invoke");
}));
},
TracingUtils::SMITHY_CLIENT_DURATION_METRIC, *meter,
{{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()},
Expand Down
18 changes: 18 additions & 0 deletions tests/aws-cpp-sdk-bedrock-runtime-integration-tests/IntegrationTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <aws/bedrock-runtime/model/ConverseStreamRequest.h>
#include <aws/bedrock-runtime/model/ConverseStreamHandler.h>
#include <aws/core/client/CoreErrors.h>
#include <aws/bedrock-runtime/model/InvokeModelRequest.h>
#include <aws/core/utils/json/JsonSerializer.h>
#include <aws/core/utils/Outcome.h>
#include <aws/testing/TestingEnvironment.h>
Expand Down Expand Up @@ -74,4 +75,21 @@ TEST_F(BedrockRuntimeTests, TestStreaming)
return responseReceived; });
ASSERT_TRUE(responseReceived);
}

TEST_F(BedrockRuntimeTests, TestInvokeModel)
{
auto bedrockRequest = Aws::BedrockRuntime::Model::InvokeModelRequest{}.WithModelId("us.anthropic.claude-3-5-sonnet-20241022-v2:0").WithAccept("application/json") ;

bedrockRequest.SetBody(Aws::MakeShared<Aws::StringStream>(
"BedrockRuntimeTests::TestInvokeModel",
R"({"anthropic_version":"bedrock-2023-05-31","max_tokens":1024,"messages":[{"role":"user","content":"Why is the Mets baseball team so bad?"}]})"));
bedrockRequest.SetContentType("application/json");

Aws::BedrockRuntime::Model::InvokeModelOutcome outcome = m_client->InvokeModel(bedrockRequest);
ASSERT_TRUE(outcome.IsSuccess());
Aws::StringStream ss;
ss << outcome.GetResult().GetBody().rdbuf();
ASSERT_FALSE(ss.str().empty());
}

}
6 changes: 5 additions & 1 deletion ...om/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyServiceOperationsSource.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ ${operation.name}Outcome ${className}::${operation.name}(${constText}${operation
});
}
#end
return ${operation.name}Outcome(MakeRequestDeserialize(&request, request.GetServiceRequestName(), Aws::Http::HttpMethod::HTTP_${operation.http.method}, [&#if($hasEndPointOverrides) , endpointOverrides #end](Aws::Endpoint::AWSEndpoint& resolvedEndpoint) -> void {
#if($operation.result && $operation.result.shape.hasStreamMembers())
return ${operation.name}Outcome(MakeRequestWithUnparsedResponse(&request, request.GetServiceRequestName(), Aws::Http::HttpMethod::HTTP_${operation.http.method}, [&#if($hasEndPointOverrides) , endpointOverrides #end](Aws::Endpoint::AWSEndpoint& resolvedEndpoint) -> void {
#else
return ${operation.name}Outcome(MakeRequestDeserialize(&request, request.GetServiceRequestName(), Aws::Http::HttpMethod::HTTP_${operation.http.method}, [&#if($hasEndPointOverrides) , endpointOverrides #end](Aws::Endpoint::AWSEndpoint& resolvedEndpoint) -> void {
#end
#parse("/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyEndpointClosure.vm")
}));
},
Expand Down
Loading