Skip to content

Commit 9c809fb

Browse files
committed
chore: handle empty newline content and other minor cleanup
1 parent 1a21199 commit 9c809fb

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/providers/bedrock/chatComplete.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ const getMessageContent = (message: Message) => {
156156
const inputContent: ContentType[] | string | undefined =
157157
message.content_blocks ?? message.content;
158158
// if message is a string, return a single element array with the text
159-
if (typeof inputContent === 'string') {
159+
if (typeof inputContent === 'string' && inputContent.trim()) {
160160
out.push({
161161
text: inputContent,
162162
});
163-
} else if (inputContent) {
163+
} else if (inputContent && Array.isArray(inputContent)) {
164164
inputContent.forEach((item) => {
165165
if (item.type === 'text') {
166166
out.push({
@@ -285,7 +285,9 @@ export const BedrockConverseChatCompleteConfig: ProviderConfig = {
285285
required: false,
286286
transform: (params: BedrockChatCompletionsParams) => {
287287
if (!params.messages) return;
288-
const systemMessages = params.messages.reduce(
288+
const systemMessages: Array<
289+
{ text: string } | { cachePoint: { type: string } }
290+
> = params.messages.reduce(
289291
(
290292
acc: Array<{ text: string } | { cachePoint: { type: string } }>,
291293
msg
@@ -326,7 +328,7 @@ export const BedrockConverseChatCompleteConfig: ProviderConfig = {
326328
}
327329
});
328330
const toolConfig = {
329-
tools: tools,
331+
tools,
330332
};
331333
let toolChoice = undefined;
332334
if (params.tool_choice) {
@@ -556,7 +558,7 @@ export const BedrockChatCompleteResponseTransform: (
556558
usage: {
557559
prompt_tokens: response.usage.inputTokens,
558560
completion_tokens: response.usage.outputTokens,
559-
total_tokens: response.usage.totalTokens,
561+
total_tokens: response.usage.totalTokens, // contains the cache usage as well
560562
...(shouldSendCacheUsage && {
561563
cache_read_input_tokens: response.usage.cacheReadInputTokens,
562564
cache_creation_input_tokens: response.usage.cacheWriteInputTokens,
@@ -871,7 +873,7 @@ export const BedrockCohereChatCompleteConfig: ProviderConfig = {
871873
required: true,
872874
transform: (params: Params) => {
873875
let prompt: string = '';
874-
if (!!params.messages) {
876+
if (params.messages) {
875877
let messages: Message[] = params.messages;
876878
messages.forEach((msg, index) => {
877879
if (index === 0 && SYSTEM_MESSAGE_ROLES.includes(msg.role)) {
@@ -1073,7 +1075,7 @@ export const BedrockAI21ChatCompleteConfig: ProviderConfig = {
10731075
required: true,
10741076
transform: (params: Params) => {
10751077
let prompt: string = '';
1076-
if (!!params.messages) {
1078+
if (params.messages) {
10771079
let messages: Message[] = params.messages;
10781080
messages.forEach((msg, index) => {
10791081
if (index === 0 && SYSTEM_MESSAGE_ROLES.includes(msg.role)) {

0 commit comments

Comments
 (0)