sarvam-ai-sdk 0.3.1 → 0.3.4

package/README.md

@@ -1,5 +1,5 @@
-<a href="https://github.com/rajatsandeepsen/sarvam-ai-sdk">
-    <img alt="cover" src="https://github.com/rajatsandeepsen/sarvam-ai-sdk/blob/master/cover.png?raw=true" />
+<a href="https://github.com/sarvamai/sarvam-ai-sdk">
+    <img alt="cover" src="https://github.com/sarvamai/sarvam-ai-sdk/blob/master/cover.png?raw=true" />
 </a>
 
 # AI SDK - Sarvam Provider

package/dist/index.cjs

@@ -41,6 +41,20 @@ const sarvamFailedResponseHandler = (0, __ai_sdk_provider_utils.createJsonErrorR
 
 //#endregion
 //#region src/chat/convert-to-chat-messages.ts
+function getToolResultContent(output) {
+	switch (output.type) {
+		case "text":
+		case "error-text": return output.value;
+		case "json":
+		case "error-json":
+		case "content": return JSON.stringify(output.value);
+		case "execution-denied": return output.reason ?? "Tool execution was denied.";
+		default: {
+			const _exhaustiveCheck = output;
+			return JSON.stringify(_exhaustiveCheck);
+		}
+	}
+}
 function convertToChatMessages(prompt) {
 	const messages = [];
 	for (const message of prompt) switch (message.role) {
@@ -112,7 +126,7 @@ function convertToChatMessages(prompt) {
 			for (const part of message.content) if (part.type === "tool-result") messages.push({
 				role: "tool",
 				tool_call_id: part.toolCallId,
-				content: JSON.stringify(part.output)
+				content: getToolResultContent(part.output)
 			});
 			break;
 		default: {
@@ -367,18 +381,16 @@ var SarvamChatLanguageModel = class {
 			type: "reasoning",
 			text: choice.message.reasoning_content
 		});
-		if (choice.message.tool_calls && choice.message.tool_calls.length > 0) for (const toolCall of choice.message.tool_calls) {
-			if (isJSON) content.push({
-				type: "text",
-				text: toolCall.function.arguments
-			});
-			content.push({
-				type: "tool-call",
-				toolCallId: toolCall.id ?? (this.config.generateId ?? __ai_sdk_provider_utils.generateId)(),
-				toolName: toolCall.function.name,
-				input: toolCall.function.arguments
-			});
-		}
+		if (choice.message.tool_calls && choice.message.tool_calls.length > 0) for (const toolCall of choice.message.tool_calls) if (isJSON) content.push({
+			type: "text",
+			text: toolCall.function.arguments
+		});
+		else content.push({
+			type: "tool-call",
+			toolCallId: toolCall.id ?? (this.config.generateId ?? __ai_sdk_provider_utils.generateId)(),
+			toolName: toolCall.function.name,
+			input: toolCall.function.arguments
+		});
 		return {
 			content,
 			finishReason: {
@@ -539,12 +551,21 @@ var SarvamChatLanguageModel = class {
 							};
 							const toolCall$1 = toolCalls[index];
 							if (toolCall$1.name != null && toolCall$1.arguments != null) {
+								controller.enqueue({
+									type: "tool-input-start",
+									id: toolCall$1.id,
+									toolName: toolCall$1.name
+								});
 								if (toolCall$1.arguments.length > 0) controller.enqueue({
 									type: "tool-input-delta",
 									id: toolCall$1.id,
 									delta: toolCall$1.arguments
 								});
 								if ((0, __ai_sdk_provider_utils.isParsableJson)(toolCall$1.arguments)) {
+									controller.enqueue({
+										type: "tool-input-end",
+										id: toolCall$1.id
+									});
 									controller.enqueue({
 										type: "tool-call",
 										toolCallId: toolCall$1.id,
@@ -565,6 +586,10 @@ var SarvamChatLanguageModel = class {
 							delta: toolCallDelta.function.arguments ?? ""
 						});
 						if (toolCall.name != null && toolCall.arguments != null && (0, __ai_sdk_provider_utils.isParsableJson)(toolCall.arguments)) {
+							controller.enqueue({
+								type: "tool-input-end",
+								id: toolCall.id
+							});
 							controller.enqueue({
 								type: "tool-call",
 								toolCallId: toolCall.id,
@@ -1047,8 +1072,7 @@ var SarvamTranslationModel = class {
 			schema: translationSettingsSchema
 		});
 		if (!sarvamOptions) throw new Error("Translation Settings is not provided");
-		const from = sarvamOptions.from ?? "auto";
-		const to = sarvamOptions.to;
+		const { from = "auto", to,...restOptions } = sarvamOptions;
 		if (from === to) throw new Error("Source and target languages code must be different.");
 		if (this.modelId === "sarvam-translate:v1") {
 			if ((sarvamOptions.mode ?? "formal") !== "formal") throw new Error("Sarvam 'sarvam-translate:v1' only support mode formal.");
@@ -1058,7 +1082,7 @@ var SarvamTranslationModel = class {
 			args: {
 				input: convertPromptToInput(prompt),
 				model: this.modelId,
-				...sarvamOptions,
+				...restOptions,
 				source_language_code: from,
 				target_language_code: to
 			},
@@ -1164,8 +1188,7 @@ var SarvamTransliterateModel = class {
 			schema: transliterateSettingsSchema
 		});
 		if (!sarvamOptions) throw new Error("Transliterate Settings is not provided");
-		const from = sarvamOptions.from ?? "auto";
-		const to = sarvamOptions.to;
+		const { from = "auto", to,...restOptions } = sarvamOptions;
 		if (from !== "auto") {
 			if (to !== "en-IN" && from !== "en-IN") {
 				if (to !== from) throw new Error("Sarvam doesn't support Indic-Indic Transliteration yet");
@@ -1174,7 +1197,7 @@ var SarvamTransliterateModel = class {
 		return {
 			args: {
 				input: convertPromptToInput(prompt),
-				...sarvamOptions,
+				...restOptions,
 				source_language_code: from,
 				target_language_code: to,
 				spoken_form_numerals_language: sarvamOptions.spoken_form ? sarvamOptions.spoken_form_numerals_language ?? "english" : void 0

package/dist/index.js

@@ -15,6 +15,20 @@ const sarvamFailedResponseHandler = createJsonErrorResponseHandler({
 
 //#endregion
 //#region src/chat/convert-to-chat-messages.ts
+function getToolResultContent(output) {
+	switch (output.type) {
+		case "text":
+		case "error-text": return output.value;
+		case "json":
+		case "error-json":
+		case "content": return JSON.stringify(output.value);
+		case "execution-denied": return output.reason ?? "Tool execution was denied.";
+		default: {
+			const _exhaustiveCheck = output;
+			return JSON.stringify(_exhaustiveCheck);
+		}
+	}
+}
 function convertToChatMessages(prompt) {
 	const messages = [];
 	for (const message of prompt) switch (message.role) {
@@ -86,7 +100,7 @@ function convertToChatMessages(prompt) {
 			for (const part of message.content) if (part.type === "tool-result") messages.push({
 				role: "tool",
 				tool_call_id: part.toolCallId,
-				content: JSON.stringify(part.output)
+				content: getToolResultContent(part.output)
 			});
 			break;
 		default: {
@@ -341,18 +355,16 @@ var SarvamChatLanguageModel = class {
 			type: "reasoning",
 			text: choice.message.reasoning_content
 		});
-		if (choice.message.tool_calls && choice.message.tool_calls.length > 0) for (const toolCall of choice.message.tool_calls) {
-			if (isJSON) content.push({
-				type: "text",
-				text: toolCall.function.arguments
-			});
-			content.push({
-				type: "tool-call",
-				toolCallId: toolCall.id ?? (this.config.generateId ?? generateId)(),
-				toolName: toolCall.function.name,
-				input: toolCall.function.arguments
-			});
-		}
+		if (choice.message.tool_calls && choice.message.tool_calls.length > 0) for (const toolCall of choice.message.tool_calls) if (isJSON) content.push({
+			type: "text",
+			text: toolCall.function.arguments
+		});
+		else content.push({
+			type: "tool-call",
+			toolCallId: toolCall.id ?? (this.config.generateId ?? generateId)(),
+			toolName: toolCall.function.name,
+			input: toolCall.function.arguments
+		});
 		return {
 			content,
 			finishReason: {
@@ -513,12 +525,21 @@ var SarvamChatLanguageModel = class {
 							};
 							const toolCall$1 = toolCalls[index];
 							if (toolCall$1.name != null && toolCall$1.arguments != null) {
+								controller.enqueue({
+									type: "tool-input-start",
+									id: toolCall$1.id,
+									toolName: toolCall$1.name
+								});
 								if (toolCall$1.arguments.length > 0) controller.enqueue({
 									type: "tool-input-delta",
 									id: toolCall$1.id,
 									delta: toolCall$1.arguments
 								});
 								if (isParsableJson(toolCall$1.arguments)) {
+									controller.enqueue({
+										type: "tool-input-end",
+										id: toolCall$1.id
+									});
 									controller.enqueue({
 										type: "tool-call",
 										toolCallId: toolCall$1.id,
@@ -539,6 +560,10 @@ var SarvamChatLanguageModel = class {
 							delta: toolCallDelta.function.arguments ?? ""
 						});
 						if (toolCall.name != null && toolCall.arguments != null && isParsableJson(toolCall.arguments)) {
+							controller.enqueue({
+								type: "tool-input-end",
+								id: toolCall.id
+							});
 							controller.enqueue({
 								type: "tool-call",
 								toolCallId: toolCall.id,
@@ -1021,8 +1046,7 @@ var SarvamTranslationModel = class {
 			schema: translationSettingsSchema
 		});
 		if (!sarvamOptions) throw new Error("Translation Settings is not provided");
-		const from = sarvamOptions.from ?? "auto";
-		const to = sarvamOptions.to;
+		const { from = "auto", to,...restOptions } = sarvamOptions;
 		if (from === to) throw new Error("Source and target languages code must be different.");
 		if (this.modelId === "sarvam-translate:v1") {
 			if ((sarvamOptions.mode ?? "formal") !== "formal") throw new Error("Sarvam 'sarvam-translate:v1' only support mode formal.");
@@ -1032,7 +1056,7 @@ var SarvamTranslationModel = class {
 			args: {
 				input: convertPromptToInput(prompt),
 				model: this.modelId,
-				...sarvamOptions,
+				...restOptions,
 				source_language_code: from,
 				target_language_code: to
 			},
@@ -1138,8 +1162,7 @@ var SarvamTransliterateModel = class {
 			schema: transliterateSettingsSchema
 		});
 		if (!sarvamOptions) throw new Error("Transliterate Settings is not provided");
-		const from = sarvamOptions.from ?? "auto";
-		const to = sarvamOptions.to;
+		const { from = "auto", to,...restOptions } = sarvamOptions;
 		if (from !== "auto") {
 			if (to !== "en-IN" && from !== "en-IN") {
 				if (to !== from) throw new Error("Sarvam doesn't support Indic-Indic Transliteration yet");
@@ -1148,7 +1171,7 @@ var SarvamTransliterateModel = class {
 		return {
 			args: {
 				input: convertPromptToInput(prompt),
-				...sarvamOptions,
+				...restOptions,
 				source_language_code: from,
 				target_language_code: to,
 				spoken_form_numerals_language: sarvamOptions.spoken_form ? sarvamOptions.spoken_form_numerals_language ?? "english" : void 0

package/package.json

@@ -2,7 +2,7 @@
 	"name": "sarvam-ai-sdk",
 	"type": "module",
 	"description": "Sarvam provider support for Vercel's AI-SDK",
-	"version": "0.3.1",
+	"version": "0.3.4",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -14,7 +14,7 @@
 		"build:watch": "tsdown --watch",
 		"type-check": "tsc --noEmit",
 		"check": "biome check",
-		"test": "tsx --env-file=.env test/index.ts"
+		"test": "bun test"
 	},
 	"exports": {
 		"./package.json": "./package.json",