Fix some tests

Author: cte

src/api/providers/__tests__/glama.test.ts

@@ -1,7 +1,6 @@
 // npx jest src/api/providers/__tests__/glama.test.ts
 
 import { Anthropic } from "@anthropic-ai/sdk"
-import axios from "axios"
 
 import { GlamaHandler } from "../glama"
 import { ApiHandlerOptions } from "../../../shared/api"
@@ -116,40 +115,15 @@ describe("GlamaHandler", () => {
 		]
 
 		it("should handle streaming responses", async () => {
-			// Mock axios for token usage request
-			const mockAxios = jest.spyOn(axios, "get").mockResolvedValueOnce({
-				data: {
-					tokenUsage: {
-						promptTokens: 10,
-						completionTokens: 5,
-						cacheCreationInputTokens: 0,
-						cacheReadInputTokens: 0,
-					},
-					totalCostUsd: "0.00",
-				},
-			})
-
 			const stream = handler.createMessage(systemPrompt, messages)
 			const chunks: any[] = []
+
 			for await (const chunk of stream) {
 				chunks.push(chunk)
 			}
 
-			expect(chunks.length).toBe(2) // Text chunk and usage chunk
-			expect(chunks[0]).toEqual({
-				type: "text",
-				text: "Test response",
-			})
-			expect(chunks[1]).toEqual({
-				type: "usage",
-				inputTokens: 10,
-				outputTokens: 5,
-				cacheWriteTokens: 0,
-				cacheReadTokens: 0,
-				totalCost: 0,
-			})
-
-			mockAxios.mockRestore()
+			expect(chunks.length).toBe(1)
+			expect(chunks[0]).toEqual({ type: "text", text: "Test response" })
 		})
 
 		it("should handle API errors", async () => {
@@ -204,16 +178,16 @@ describe("GlamaHandler", () => {
 			mockCreate.mockClear()
 
 			const nonAnthropicOptions = {
-				apiModelId: "openai/gpt-4",
-				glamaModelId: "openai/gpt-4",
 				glamaApiKey: "test-key",
+				glamaModelId: "openai/gpt-4o",
 			}
+
 			const nonAnthropicHandler = new GlamaHandler(nonAnthropicOptions)
 
 			await nonAnthropicHandler.completePrompt("Test prompt")
 			expect(mockCreate).toHaveBeenCalledWith(
 				expect.objectContaining({
-					model: "openai/gpt-4",
+					model: "openai/gpt-4o",
 					messages: [{ role: "user", content: "Test prompt" }],
 					temperature: 0,
 				}),

src/api/providers/__tests__/openrouter.test.ts

@@ -23,7 +23,7 @@ const mockOpenRouterModelInfo: ModelInfo = {
 describe("OpenRouterHandler", () => {
 	const mockOptions: ApiHandlerOptions = {
 		openRouterApiKey: "test-key",
-		openRouterModelId: "test-model",
+		openRouterModelId: "anthropic/claude-3.7-sonnet",
 	}
 
 	beforeEach(() => {
@@ -45,55 +45,54 @@ describe("OpenRouterHandler", () => {
 	})
 
 	describe("getModel", () => {
-		it("returns correct model info when options are provided", () => {
+		it("returns correct model info when options are provided", async () => {
 			const handler = new OpenRouterHandler(mockOptions)
-			const result = handler.getModel()
+			const result = await handler.fetchModel()
 
-			expect(result).toEqual({
+			expect(result).toMatchObject({
 				id: mockOptions.openRouterModelId,
-				maxTokens: 1000,
+				maxTokens: 8192,
 				thinking: undefined,
 				temperature: 0,
 				reasoningEffort: undefined,
 				topP: undefined,
 				promptCache: {
-					supported: false,
+					supported: true,
 					optional: false,
 				},
 			})
 		})
 
-		it("returns default model info when options are not provided", () => {
+		it("returns default model info when options are not provided", async () => {
 			const handler = new OpenRouterHandler({})
-			const result = handler.getModel()
-
+			const result = await handler.fetchModel()
 			expect(result.id).toBe("anthropic/claude-3.7-sonnet")
 			expect(result.info.supportsPromptCache).toBe(true)
 		})
 
-		it("honors custom maxTokens for thinking models", () => {
+		it("honors custom maxTokens for thinking models", async () => {
 			const handler = new OpenRouterHandler({
 				openRouterApiKey: "test-key",
-				openRouterModelId: "test-model",
+				openRouterModelId: "anthropic/claude-3.7-sonnet:thinking",
 				modelMaxTokens: 32_768,
 				modelMaxThinkingTokens: 16_384,
 			})
 
-			const result = handler.getModel()
+			const result = await handler.fetchModel()
 			expect(result.maxTokens).toBe(32_768)
 			expect(result.thinking).toEqual({ type: "enabled", budget_tokens: 16_384 })
 			expect(result.temperature).toBe(1.0)
 		})
 
-		it("does not honor custom maxTokens for non-thinking models", () => {
+		it("does not honor custom maxTokens for non-thinking models", async () => {
 			const handler = new OpenRouterHandler({
 				...mockOptions,
 				modelMaxTokens: 32_768,
 				modelMaxThinkingTokens: 16_384,
 			})
 
-			const result = handler.getModel()
-			expect(result.maxTokens).toBe(1000)
+			const result = await handler.fetchModel()
+			expect(result.maxTokens).toBe(8192)
 			expect(result.thinking).toBeUndefined()
 			expect(result.temperature).toBe(0)
 		})
@@ -106,7 +105,7 @@ describe("OpenRouterHandler", () => {
 			const mockStream = {
 				async *[Symbol.asyncIterator]() {
 					yield {
-						id: "test-id",
+						id: mockOptions.openRouterModelId,
 						choices: [{ delta: { content: "test response" } }],
 					}
 					yield {
@@ -139,16 +138,29 @@ describe("OpenRouterHandler", () => {
 			expect(chunks[0]).toEqual({ type: "text", text: "test response" })
 			expect(chunks[1]).toEqual({ type: "usage", inputTokens: 10, outputTokens: 20, totalCost: 0.001 })
 
-			// Verify OpenAI client was called with correct parameters
+			// Verify OpenAI client was called with correct parameters.
 			expect(mockCreate).toHaveBeenCalledWith(
 				expect.objectContaining({
-					model: mockOptions.openRouterModelId,
-					temperature: 0,
-					messages: expect.arrayContaining([
-						{ role: "system", content: systemPrompt },
-						{ role: "user", content: "test message" },
-					]),
+					max_tokens: 8192,
+					messages: [
+						{
+							content: [
+								{ cache_control: { type: "ephemeral" }, text: "test system prompt", type: "text" },
+							],
+							role: "system",
+						},
+						{
+							content: [{ cache_control: { type: "ephemeral" }, text: "test message", type: "text" }],
+							role: "user",
+						},
+					],
+					model: "anthropic/claude-3.7-sonnet",
 					stream: true,
+					stream_options: { include_usage: true },
+					temperature: 0,
+					thinking: undefined,
+					top_p: undefined,
+					transforms: ["middle-out"],
 				}),
 			)
 		})
@@ -255,7 +267,7 @@ describe("OpenRouterHandler", () => {
 
 			expect(mockCreate).toHaveBeenCalledWith({
 				model: mockOptions.openRouterModelId,
-				max_tokens: 1000,
+				max_tokens: 8192,
 				thinking: undefined,
 				temperature: 0,
 				messages: [{ role: "user", content: "test prompt" }],

src/api/providers/__tests__/unbound.test.ts

@@ -1,7 +1,11 @@
-import { UnboundHandler } from "../unbound"
-import { ApiHandlerOptions } from "../../../shared/api"
+// npx jest src/api/providers/__tests__/unbound.test.ts
+
 import { Anthropic } from "@anthropic-ai/sdk"
 
+import { ApiHandlerOptions } from "../../../shared/api"
+
+import { UnboundHandler } from "../unbound"
+
 // Mock OpenAI client
 const mockCreate = jest.fn()
 const mockWithResponse = jest.fn()

src/api/providers/glama.ts

@@ -21,7 +21,8 @@ export class GlamaHandler extends RouterProvider implements SingleCompletionHand
 			name: "unbound",
 			baseURL: "https://glama.ai/api/gateway/openai/v1",
 			apiKey: options.glamaApiKey,
-			modelId: options.glamaModelId ?? glamaDefaultModelId,
+			modelId: options.glamaModelId,
+			defaultModelId: glamaDefaultModelId,
 			defaultModelInfo: glamaDefaultModelInfo,
 		})
 	}

src/api/providers/openrouter.ts

@@ -193,7 +193,7 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
 		}
 	}
 
-	private async fetchModel() {
+	public async fetchModel() {
 		this.models = await getModels("openrouter")
 		return this.getModel()
 	}

src/api/providers/requesty.ts

@@ -35,7 +35,7 @@ export class RequestyHandler extends OpenAiHandler {
 
 	override async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
 		this.models = await getModels("requesty")
-		return super.createMessage(systemPrompt, messages)
+		yield* super.createMessage(systemPrompt, messages)
 	}
 
 	override getModel(): { id: string; info: ModelInfo } {

src/api/providers/router-provider.ts

@@ -8,7 +8,8 @@ type RouterProviderOptions = {
 	name: RouterName
 	baseURL: string
 	apiKey?: string
-	modelId: string
+	modelId?: string
+	defaultModelId: string
 	defaultModelInfo: ModelInfo
 	options: ApiHandlerOptions
 }
@@ -17,16 +18,26 @@ export abstract class RouterProvider extends BaseProvider {
 	protected readonly options: ApiHandlerOptions
 	protected readonly name: RouterName
 	protected models: ModelRecord = {}
-	protected readonly modelId: string
+	protected readonly modelId?: string
+	protected readonly defaultModelId: string
 	protected readonly defaultModelInfo: ModelInfo
 	protected readonly client: OpenAI
 
-	constructor({ options, name, baseURL, apiKey = "not-provided", modelId, defaultModelInfo }: RouterProviderOptions) {
+	constructor({
+		options,
+		name,
+		baseURL,
+		apiKey = "not-provided",
+		modelId,
+		defaultModelId,
+		defaultModelInfo,
+	}: RouterProviderOptions) {
 		super()
 
 		this.options = options
 		this.name = name
 		this.modelId = modelId
+		this.defaultModelId = defaultModelId
 		this.defaultModelInfo = defaultModelInfo
 
 		this.client = new OpenAI({ baseURL, apiKey })
@@ -38,7 +49,11 @@ export abstract class RouterProvider extends BaseProvider {
 	}
 
 	override getModel(): { id: string; info: ModelInfo } {
-		return { id: this.modelId, info: this.models[this.modelId] ?? this.defaultModelInfo }
+		const id = this.modelId ?? this.defaultModelId
+
+		return this.models[id]
+			? { id, info: this.models[id] }
+			: { id: this.defaultModelId, info: this.defaultModelInfo }
 	}
 
 	protected supportsTemperature(modelId: string): boolean {

src/api/providers/unbound.ts

@@ -23,7 +23,8 @@ export class UnboundHandler extends RouterProvider implements SingleCompletionHa
 			name: "unbound",
 			baseURL: "https://api.getunbound.ai/v1",
 			apiKey: options.unboundApiKey,
-			modelId: options.unboundModelId ?? unboundDefaultModelId,
+			modelId: options.unboundModelId,
+			defaultModelId: unboundDefaultModelId,
 			defaultModelInfo: unboundDefaultModelInfo,
 		})
 	}