@@ -46,15 +46,15 @@ internal sealed partial class BedrockChatClient : IChatClient
4646 /// Initializes a new instance of the <see cref="BedrockChatClient"/> class.
4747 /// </summary>
4848 /// <param name="runtime">The <see cref="IAmazonBedrockRuntime"/> instance to wrap.</param>
49- /// <param name="modelId ">Model ID to use as the default when no model ID is specified in a request.</param>
50- public BedrockChatClient ( IAmazonBedrockRuntime runtime , string ? modelId )
49+ /// <param name="defaultModelId ">Model ID to use as the default when no model ID is specified in a request.</param>
50+ public BedrockChatClient ( IAmazonBedrockRuntime runtime , string ? defaultModelId )
5151 {
5252 Debug . Assert ( runtime is not null ) ;
5353
5454 _runtime = runtime ! ;
55- _modelId = modelId ;
55+ _modelId = defaultModelId ;
5656
57- _metadata = new ( AmazonBedrockRuntimeExtensions . ProviderName , defaultModelId : modelId ) ;
57+ _metadata = new ( AmazonBedrockRuntimeExtensions . ProviderName , defaultModelId : defaultModelId ) ;
5858 }
5959
6060 public void Dispose ( )
@@ -85,7 +85,9 @@ public async Task<ChatResponse> GetResponseAsync(
8585
8686 ChatMessage result = new ( )
8787 {
88+ RawRepresentation = response . Output ? . Message ,
8889 Role = ChatRole . Assistant ,
90+ MessageId = Guid . NewGuid ( ) . ToString ( "N" ) ,
8991 } ;
9092
9193 if ( response . Output ? . Message ? . Content is { } contents )
@@ -94,27 +96,44 @@ public async Task<ChatResponse> GetResponseAsync(
9496 {
9597 if ( content . Text is string text )
9698 {
97- result . Contents . Add ( new TextContent ( text ) ) ;
99+ result . Contents . Add ( new TextContent ( text ) { RawRepresentation = content } ) ;
100+ }
101+
102+ if ( content . ReasoningContent is { ReasoningText . Text : not null } reasoningContent )
103+ {
104+ TextReasoningContent trc = new ( reasoningContent . ReasoningText . Text ) { RawRepresentation = content } ;
105+
106+ if ( reasoningContent . ReasoningText . Signature is string signature )
107+ {
108+ ( trc . AdditionalProperties ??= [ ] ) [ nameof ( reasoningContent . ReasoningText . Signature ) ] = signature ;
109+ }
110+
111+ if ( reasoningContent . RedactedContent is { } redactedContent )
112+ {
113+ ( trc . AdditionalProperties ??= [ ] ) [ nameof ( reasoningContent . RedactedContent ) ] = redactedContent . ToArray ( ) ;
114+ }
115+
116+ result . Contents . Add ( trc ) ;
98117 }
99118
100119 if ( content . Image is { Source . Bytes : { } imageBytes , Format : { } imageFormat } )
101120 {
102- result . Contents . Add ( new DataContent ( imageBytes . ToArray ( ) , GetMimeType ( imageFormat ) ) ) ;
121+ result . Contents . Add ( new DataContent ( imageBytes . ToArray ( ) , GetMimeType ( imageFormat ) ) { RawRepresentation = content } ) ;
103122 }
104123
105124 if ( content . Video is { Source . Bytes : { } videoBytes , Format : { } videoFormat } )
106125 {
107- result . Contents . Add ( new DataContent ( videoBytes . ToArray ( ) , GetMimeType ( videoFormat ) ) ) ;
126+ result . Contents . Add ( new DataContent ( videoBytes . ToArray ( ) , GetMimeType ( videoFormat ) ) { RawRepresentation = content } ) ;
108127 }
109128
110129 if ( content . Document is { Source . Bytes : { } documentBytes , Format : { } documentFormat } )
111130 {
112- result . Contents . Add ( new DataContent ( documentBytes . ToArray ( ) , GetMimeType ( documentFormat ) ) ) ;
131+ result . Contents . Add ( new DataContent ( documentBytes . ToArray ( ) , GetMimeType ( documentFormat ) ) { RawRepresentation = content } ) ;
113132 }
114133
115134 if ( content . ToolUse is { } toolUse )
116135 {
117- result . Contents . Add ( new FunctionCallContent ( toolUse . ToolUseId , toolUse . Name , DocumentToDictionary ( toolUse . Input ) ) ) ;
136+ result . Contents . Add ( new FunctionCallContent ( toolUse . ToolUseId , toolUse . Name , DocumentToDictionary ( toolUse . Input ) ) { RawRepresentation = content } ) ;
118137 }
119138 }
120139 }
@@ -126,13 +145,11 @@ public async Task<ChatResponse> GetResponseAsync(
126145
127146 return new ( result )
128147 {
148+ CreatedAt = DateTimeOffset . UtcNow ,
129149 FinishReason = response . StopReason is not null ? GetChatFinishReason ( response . StopReason ) : null ,
130- Usage = response . Usage is TokenUsage usage ? new ( )
131- {
132- InputTokenCount = usage . InputTokens ,
133- OutputTokenCount = usage . OutputTokens ,
134- TotalTokenCount = usage . TotalTokens ,
135- } : null ,
150+ RawRepresentation = response ,
151+ ResponseId = Guid . NewGuid ( ) . ToString ( "N" ) ,
152+ Usage = response . Usage is TokenUsage usage ? CreateUsageDetails ( usage ) : null ,
136153 } ;
137154 }
138155
@@ -161,13 +178,19 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
161178 string ? toolId = null ;
162179 StringBuilder ? toolInput = null ;
163180 ChatFinishReason ? finishReason = null ;
181+ string messageId = Guid . NewGuid ( ) . ToString ( "N" ) ;
182+ string responseId = Guid . NewGuid ( ) . ToString ( "N" ) ;
164183 await foreach ( var update in result . Stream . ConfigureAwait ( false ) )
165184 {
166185 switch ( update )
167186 {
168187 case MessageStartEvent messageStart :
169188 yield return new ( )
170189 {
190+ CreatedAt = DateTimeOffset . UtcNow ,
191+ MessageId = messageId ,
192+ RawRepresentation = update ,
193+ ResponseId = responseId ,
171194 Role = ChatRole . Assistant ,
172195 FinishReason = finishReason ,
173196 } ;
@@ -188,7 +211,35 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
188211 {
189212 yield return new ( ChatRole . Assistant , text )
190213 {
214+ CreatedAt = DateTimeOffset . UtcNow ,
215+ MessageId = messageId ,
216+ RawRepresentation = update ,
217+ FinishReason = finishReason ,
218+ ResponseId = responseId ,
219+ } ;
220+ }
221+
222+ if ( contentBlockDelta . Delta . ReasoningContent is { Text : not null } reasoningContent )
223+ {
224+ TextReasoningContent trc = new ( reasoningContent . Text ) ;
225+
226+ if ( reasoningContent . Signature is not null )
227+ {
228+ ( trc . AdditionalProperties ??= [ ] ) [ nameof ( reasoningContent . Signature ) ] = reasoningContent . Signature ;
229+ }
230+
231+ if ( reasoningContent . RedactedContent is { } redactedContent )
232+ {
233+ ( trc . AdditionalProperties ??= [ ] ) [ nameof ( reasoningContent . RedactedContent ) ] = redactedContent . ToArray ( ) ;
234+ }
235+
236+ yield return new ( ChatRole . Assistant , [ trc ] )
237+ {
238+ CreatedAt = DateTimeOffset . UtcNow ,
239+ MessageId = messageId ,
191240 FinishReason = finishReason ,
241+ RawRepresentation = update ,
242+ ResponseId = responseId ,
192243 } ;
193244 }
194245 break ;
@@ -199,9 +250,13 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
199250 Dictionary < string , object ? > ? inputs = ParseToolInputs ( toolInput ? . ToString ( ) , out Exception ? parseError ) ;
200251 yield return new ( )
201252 {
202- Role = ChatRole . Assistant ,
203- FinishReason = finishReason ,
204253 Contents = [ new FunctionCallContent ( toolId , toolName , inputs ) { Exception = parseError } ] ,
254+ CreatedAt = DateTimeOffset . UtcNow ,
255+ MessageId = messageId ,
256+ FinishReason = finishReason ,
257+ RawRepresentation = update ,
258+ ResponseId = responseId ,
259+ Role = ChatRole . Assistant ,
205260 } ;
206261 }
207262
@@ -224,26 +279,24 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
224279
225280 yield return new ( )
226281 {
227- Role = ChatRole . Assistant ,
228- FinishReason = finishReason ,
229282 AdditionalProperties = additionalProps ,
283+ CreatedAt = DateTimeOffset . UtcNow ,
284+ MessageId = messageId ,
285+ FinishReason = finishReason ,
286+ RawRepresentation = update ,
287+ ResponseId = responseId ,
288+ Role = ChatRole . Assistant ,
230289 } ;
231290 break ;
232291
233292 case ConverseStreamMetadataEvent metadata when metadata . Usage is TokenUsage usage :
234- yield return new ( )
293+ yield return new ( ChatRole . Assistant , [ new UsageContent ( CreateUsageDetails ( usage ) ) ] )
235294 {
236- Role = ChatRole . Assistant ,
295+ CreatedAt = DateTimeOffset . UtcNow ,
237296 FinishReason = finishReason ,
238- Contents =
239- [
240- new UsageContent ( new ( )
241- {
242- InputTokenCount = usage . InputTokens ,
243- OutputTokenCount = usage . OutputTokens ,
244- TotalTokenCount = usage . TotalTokens ,
245- } )
246- ] ,
297+ MessageId = messageId ,
298+ RawRepresentation = update ,
299+ ResponseId = responseId ,
247300 } ;
248301 break ;
249302 }
@@ -266,6 +319,29 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
266319 null ;
267320 }
268321
322+ /// <summary>Creates a <see cref="UsageDetails"/> from a <see cref="TokenUsage"/>.</summary>
323+ private static UsageDetails CreateUsageDetails ( TokenUsage usage )
324+ {
325+ UsageDetails ud = new ( )
326+ {
327+ InputTokenCount = usage . InputTokens ,
328+ OutputTokenCount = usage . OutputTokens ,
329+ TotalTokenCount = usage . TotalTokens ,
330+ } ;
331+
332+ if ( usage . CacheReadInputTokens is int cacheReadTokens )
333+ {
334+ ( ud . AdditionalCounts ??= [ ] ) . Add ( nameof ( usage . CacheReadInputTokens ) , cacheReadTokens ) ;
335+ }
336+
337+ if ( usage . CacheWriteInputTokens is int cacheWriteTokens )
338+ {
339+ ( ud . AdditionalCounts ??= [ ] ) . Add ( nameof ( usage . CacheWriteInputTokens ) , cacheWriteTokens ) ;
340+ }
341+
342+ return ud ;
343+ }
344+
269345 /// <summary>Converts a <see cref="StopReason"/> into a <see cref="ChatFinishReason"/>.</summary>
270346 private static ChatFinishReason GetChatFinishReason ( StopReason stopReason ) =>
271347 stopReason . Value switch
@@ -340,6 +416,21 @@ private static List<ContentBlock> CreateContents(ChatMessage message)
340416 contents . Add ( new ( ) { Text = tc . Text } ) ;
341417 break ;
342418
419+ case TextReasoningContent trc :
420+ contents . Add ( new ( )
421+ {
422+ ReasoningContent = new ( )
423+ {
424+ ReasoningText = new ( )
425+ {
426+ Text = trc . Text ,
427+ Signature = trc . AdditionalProperties ? [ nameof ( ReasoningContentBlock . ReasoningText . Signature ) ] as string ,
428+ } ,
429+ RedactedContent = trc . AdditionalProperties ? [ nameof ( ReasoningContentBlock . RedactedContent ) ] is byte [ ] array ? new ( array ) : null ,
430+ }
431+ } ) ;
432+ break ;
433+
343434 case DataContent dc :
344435 if ( GetImageFormat ( dc . MediaType ) is ImageFormat imageFormat )
345436 {
0 commit comments