chore: upgrade the vercel sdk, use new azure URL and remove ollama

Author: kmruiz

.github/workflows/accuracy-tests.yml

@@ -21,7 +21,7 @@ jobs:
       MDB_OPEN_AI_API_KEY: ${{ secrets.ACCURACY_OPEN_AI_API_KEY }}
       MDB_GEMINI_API_KEY: ${{ secrets.ACCURACY_GEMINI_API_KEY }}
       MDB_AZURE_OPEN_AI_API_KEY: ${{ secrets.ACCURACY_AZURE_OPEN_AI_API_KEY }}
-      MDB_AZURE_OPEN_AI_API_URL: ${{ vars.ACCURACY_AZURE_OPEN_AI_API_URL }}
+      MDB_AZURE_OPEN_AI_API_URL: ${{ vars.ACCURACY_AZURE_OPEN_AI_API_URL_V2 }}
       MDB_ACCURACY_MDB_URL: ${{ secrets.ACCURACY_MDB_CONNECTION_STRING }}
       MDB_ACCURACY_MDB_DB: ${{ vars.ACCURACY_MDB_DB }}
       MDB_ACCURACY_MDB_COLLECTION: ${{ vars.ACCURACY_MDB_COLLECTION }}

package-lock.json

@@ -84,7 +84,6 @@
     "knip": "^5.63.1",
     "mongodb": "^6.19.0",
     "mongodb-runner": "^5.9.2",
-    "ollama-ai-provider": "^1.2.0",
     "openapi-types": "^12.1.3",
     "openapi-typescript": "^7.9.1",
     "prettier": "^3.6.2",

package.json

@@ -1,5 +1,5 @@
-import type { LanguageModelV1, experimental_createMCPClient } from "ai";
-import { generateText } from "ai";
+import type { LanguageModel, experimental_createMCPClient } from "ai";
+import { stepCountIs, generateText } from "ai";
 import type { Model } from "./models.js";
 
 const systemPrompt = [
@@ -39,11 +39,11 @@ export interface Agent<Model = unknown, Tools = unknown, Result = unknown> {
 
 export function getVercelToolCallingAgent(
     requestedSystemPrompt?: string
-): Agent<Model<LanguageModelV1>, VercelMCPClientTools, VercelAgentPromptResult> {
+): Agent<Model<LanguageModel>, VercelMCPClientTools, VercelAgentPromptResult> {
     return {
         async prompt(
             prompt: PromptDefinition,
-            model: Model<LanguageModelV1>,
+            model: Model<LanguageModel>,
             tools: VercelMCPClientTools
         ): Promise<VercelAgentPromptResult> {
             let prompts: string[];
@@ -70,15 +70,15 @@ export function getVercelToolCallingAgent(
                     system: [...systemPrompt, requestedSystemPrompt].filter(Boolean).join("\n"),
                     prompt: p,
                     tools,
-                    maxSteps: 100,
+                    stopWhen: stepCountIs(100),
                 });
 
                 result.text += intermediateResult.text;
                 result.messages.push(...intermediateResult.response.messages);
                 result.respondingModel = intermediateResult.response.modelId;
-                result.tokensUsage.completionTokens += intermediateResult.usage.completionTokens;
-                result.tokensUsage.promptTokens += intermediateResult.usage.promptTokens;
-                result.tokensUsage.totalTokens += intermediateResult.usage.totalTokens;
+                result.tokensUsage.completionTokens += intermediateResult.usage.outputTokens ?? 0;
+                result.tokensUsage.promptTokens += intermediateResult.usage.inputTokens ?? 0;
+                result.tokensUsage.totalTokens += intermediateResult.usage.totalTokens ?? 0;
             }
 
             return result;

tests/accuracy/sdk/agent.ts

@@ -1,10 +1,9 @@
-import type { LanguageModelV1 } from "ai";
+import type { LanguageModel } from "ai";
 import { createGoogleGenerativeAI } from "@ai-sdk/google";
 import { createAzure } from "@ai-sdk/azure";
 import { createOpenAI } from "@ai-sdk/openai";
-import { ollama } from "ollama-ai-provider";
 
-export interface Model<VercelModel extends LanguageModelV1 = LanguageModelV1> {
+export interface Model<VercelModel extends LanguageModel = LanguageModel> {
     readonly modelName: string;
     readonly provider: string;
     readonly displayName: string;
@@ -24,7 +23,7 @@ export class OpenAIModel implements Model {
         return !!process.env.MDB_OPEN_AI_API_KEY;
     }
 
-    getModel(): LanguageModelV1 {
+    getModel(): LanguageModel {
         return createOpenAI({
             apiKey: process.env.MDB_OPEN_AI_API_KEY,
         })(this.modelName);
@@ -43,10 +42,11 @@ export class AzureOpenAIModel implements Model {
         return !!process.env.MDB_AZURE_OPEN_AI_API_KEY && !!process.env.MDB_AZURE_OPEN_AI_API_URL;
     }
 
-    getModel(): LanguageModelV1 {
+    getModel(): LanguageModel {
         return createAzure({
             baseURL: process.env.MDB_AZURE_OPEN_AI_API_URL,
             apiKey: process.env.MDB_AZURE_OPEN_AI_API_KEY,
+            useDeploymentBasedUrls: true,
             apiVersion: "2024-12-01-preview",
         })(this.modelName);
     }
@@ -64,30 +64,13 @@ export class GeminiModel implements Model {
         return !!process.env.MDB_GEMINI_API_KEY;
     }
 
-    getModel(): LanguageModelV1 {
+    getModel(): LanguageModel {
         return createGoogleGenerativeAI({
             apiKey: process.env.MDB_GEMINI_API_KEY,
         })(this.modelName);
     }
 }
 
-export class OllamaModel implements Model {
-    readonly provider = "Ollama";
-    readonly displayName: string;
-
-    constructor(readonly modelName: string) {
-        this.displayName = `${this.provider} - ${modelName}`;
-    }
-
-    isAvailable(): boolean {
-        return true;
-    }
-
-    getModel(): LanguageModelV1 {
-        return ollama(this.modelName);
-    }
-}
-
 const ALL_TESTABLE_MODELS: Model[] = [new AzureOpenAIModel("gpt-4o")];
 
 export function getAvailableModels(): Model[] {