Skip to content

Commit 8a95caa

Browse files
committed
Merge branch 'main' into feat/openai-realtime-api
2 parents 13732ad + b53a2ad commit 8a95caa

File tree

4 files changed

+47
-1
lines changed

4 files changed

+47
-1
lines changed

src/providers/bedrock/chatComplete.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,31 @@ export const BedrockConverseChatCompleteConfig: ProviderConfig = {
149149
required: true,
150150
transform: (params: BedrockChatCompletionsParams) => {
151151
if (!params.messages) return [];
152-
return params.messages
152+
const transformedMessages = params.messages
153153
.filter((msg) => msg.role !== 'system')
154154
.map((msg) => {
155155
return {
156156
role: msg.role === 'assistant' ? 'assistant' : 'user',
157157
content: getMessageContent(msg),
158158
};
159159
});
160+
let prevRole = '';
161+
// combine user messages in succession
162+
const combinedMessages = transformedMessages.reduce(
163+
(acc: typeof transformedMessages, msg) => {
164+
if (msg.role === 'user' && prevRole === 'user') {
165+
const lastMessage = acc[acc.length - 1];
166+
const newContent = [...lastMessage.content, ...msg.content];
167+
lastMessage.content = newContent as typeof lastMessage.content;
168+
} else {
169+
acc.push(msg);
170+
}
171+
prevRole = msg.role;
172+
return acc;
173+
},
174+
[]
175+
);
176+
return combinedMessages;
160177
},
161178
},
162179
{

src/providers/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import { UpstageConfig } from './upstage';
4747
import { LAMBDA } from '../globals';
4848
import { LambdaProviderConfig } from './lambda';
4949
import { DashScopeConfig } from './dashscope';
50+
import QdrantConfig from './qdrant';
5051

5152
const Providers: { [key: string]: ProviderConfigs } = {
5253
openai: OpenAIConfig,
@@ -94,6 +95,7 @@ const Providers: { [key: string]: ProviderConfigs } = {
9495
upstage: UpstageConfig,
9596
[LAMBDA]: LambdaProviderConfig,
9697
dashscope: DashScopeConfig,
98+
qdrant: QdrantConfig,
9799
};
98100

99101
export default Providers;

src/providers/qdrant/api.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { ProviderAPIConfig } from '../types';
2+
3+
const QdrantAPIConfig: ProviderAPIConfig = {
4+
getBaseURL: ({ providerOptions }) => {
5+
return providerOptions.customHost || '';
6+
},
7+
headers: ({ providerOptions }) => {
8+
return { 'api-key': `Bearer ${providerOptions.apiKey}` };
9+
},
10+
getEndpoint: ({ fn }) => {
11+
switch (fn) {
12+
default:
13+
return '';
14+
}
15+
},
16+
};
17+
18+
export default QdrantAPIConfig;

src/providers/qdrant/index.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { ProviderConfigs } from '../types';
2+
import QdrantAPIConfig from './api';
3+
4+
const QdrantConfig: ProviderConfigs = {
5+
api: QdrantAPIConfig,
6+
responseTransforms: {},
7+
};
8+
9+
export default QdrantConfig;

0 commit comments

Comments
 (0)