Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "langtail",
"version": "0.13.1",
"version": "0.13.2",
"description": "",
"main": "./Langtail.js",
"packageManager": "pnpm@8.15.6",
Expand Down Expand Up @@ -103,8 +103,8 @@
"react": "=>18.2.0"
},
"dependencies": {
"@ai-sdk/provider": "^0.0.5",
"@ai-sdk/provider-utils": "^0.0.8",
"@ai-sdk/provider": "^0.0.24",
"@ai-sdk/provider-utils": "^1.0.20",
"@langtail/handlebars-evalless": "^0.1.2",
"commander": "^12.1.0",
"date-fns": "^3.6.0",
Expand Down
24 changes: 12 additions & 12 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/bin/generateTools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ const fetchTools = async <P extends PromptSlug, E extends Environment<P> = undef
return Object.fromEntries(prompt.state.tools.map(tool => [
tool.function.name, {
description: tool.function.description,
parameters: jsonSchemaToZod(tool.function.parameters)
parameters: jsonSchemaToZod(tool.function.parameters),
...(tool.function.handler?.enabled === true && { hosted: tool.function.handler.enabled })
}
]));
}
Expand Down Expand Up @@ -139,7 +140,7 @@ const generateTools = async ({ out }: GenerateToolsOptions) => {
.replace('// @ts-ignore\n', '')
.replace(
REPLACE_LINE,
`const toolsObject = ${stringifyToolsObject(toolsObject)};`
`const toolsObject = ${stringifyToolsObject(toolsObject)} as const;`
);

fs.writeFileSync(outputFile, fileString, 'utf8');
Expand Down
2 changes: 1 addition & 1 deletion src/bin/langtailTools.ts.template
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type ChatModelInterface<P extends PromptSlug, E extends Environment<P>, V extend
}

type ToolOverrides<P extends PromptSlug, E extends Environment<P>, V extends Version<P, E>> = {
[K in keyof ToolsType[P][E][V]]?: ToolsType[P][E][V][K] extends { parameters: z.ZodTypeAny } ? Partial<VercelAITool<ToolsType[P][E][V][K]['parameters']>> : never
[K in keyof ToolsType[P][E][V]]?: ToolsType[P][E][V][K] extends { parameters: z.ZodTypeAny } ? (ToolsType[P][E][V][K] extends { hosted: true } ? never : Partial<VercelAITool<ToolsType[P][E][V][K]['parameters']>>) : never
};

function tools<P extends PromptSlug, E extends Environment<P>, V extends Version<P, E>, OVERRIDES extends ToolOverrides<P, E, V>>(
Expand Down
3 changes: 3 additions & 0 deletions src/schemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ export interface Functions {
description: string
parameters: Record<string, unknown>
id?: string
handler?: {
enabled: boolean
}
}

export interface Tools {
Expand Down
29 changes: 25 additions & 4 deletions src/vercel-ai/convert-to-openai-chat-messages.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
import { LanguageModelV1Prompt } from '@ai-sdk/provider';
import {
LanguageModelV1Prompt,
UnsupportedFunctionalityError,
} from '@ai-sdk/provider';
import { convertUint8ArrayToBase64 } from '@ai-sdk/provider-utils';
import { OpenAIChatPrompt } from './openai-chat-prompt';

export function convertToOpenAIChatMessages(
prompt: LanguageModelV1Prompt,
): OpenAIChatPrompt {
export function convertToOpenAIChatMessages({
prompt
}: {
prompt: LanguageModelV1Prompt;
}): OpenAIChatPrompt {
const messages: OpenAIChatPrompt = [];

for (const { role, content } of prompt) {
Expand All @@ -15,6 +20,11 @@ export function convertToOpenAIChatMessages(
}

case 'user': {
if (content.length === 1 && content[0].type === 'text') {
messages.push({ role: 'user', content: content[0].text });
break;
}

messages.push({
role: 'user',
content: content.map(part => {
Expand All @@ -31,12 +41,21 @@ export function convertToOpenAIChatMessages(
? part.image.toString()
: `data:${part.mimeType ?? 'image/jpeg'
};base64,${convertUint8ArrayToBase64(part.image)}`,

// OpenAI specific extension: image detail
detail: part.providerMetadata?.openai?.imageDetail,
},
};
}
case 'file': {
throw new UnsupportedFunctionalityError({
functionality: 'File content parts in user messages',
});
}
}
}),
});

break;
}

Expand Down Expand Up @@ -78,6 +97,7 @@ export function convertToOpenAIChatMessages(
tool_calls: toolCalls.length > 0 ? toolCalls : undefined,
});


break;
}

Expand All @@ -88,6 +108,7 @@ export function convertToOpenAIChatMessages(
tool_call_id: toolResponse.toolCallId,
content: JSON.stringify(toolResponse.result),
});

}
break;
}
Expand Down
Loading