lmin/zmo-cli
1
0
Fork 0
Code Issues Pull Requests Actions 80 Packages Projects Releases Wiki Activity

Migrate provider lookup tests to instance fixtures

Browse Source 
Migrate provider env precedence, model lookup, and default model tests to Effect-aware instance fixtures while keeping behavior unchanged.
This commit is contained in:
Kit Langton
2026-05-18 18:01:53 +00:00
committed by GitHub
parent ae2ecd1ed3
commit 88681d389b
2 changed files with 52 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/opencode/test/provider/provider.test.ts
+51 -104
View File
@@ -87,10 +87,6 @@ async function getModel(providerID: ProviderID, modelID: ModelID, ctx: InstanceC
return run(ctx, (provider) => provider.getModel(providerID, modelID)) return run(ctx, (provider) => provider.getModel(providerID, modelID))
} }
async function getLanguage(model: Provider.Model, ctx: InstanceContext) {
return run(ctx, (provider) => provider.getLanguage(model))
}
async function closest(providerID: ProviderID, query: string[], ctx: InstanceContext) { async function closest(providerID: ProviderID, query: string[], ctx: InstanceContext) {
return run(ctx, (provider) => provider.closest(providerID, query)) return run(ctx, (provider) => provider.closest(providerID, query))
} }
@@ -99,10 +95,6 @@ async function getSmallModel(providerID: ProviderID, ctx: InstanceContext) {
return run(ctx, (provider) => provider.getSmallModel(providerID)) return run(ctx, (provider) => provider.getSmallModel(providerID))
} }
async function defaultModel(ctx: InstanceContext) {
return run(ctx, (provider) => provider.defaultModel())
}
function paid(providers: Awaited<ReturnType<typeof list>>) { function paid(providers: Awaited<ReturnType<typeof list>>) {
const item = providers[ProviderID.make("opencode")] const item = providers[ProviderID.make("opencode")]
expect(item).toBeDefined() expect(item).toBeDefined()
@@ -361,62 +353,42 @@ it.instance(
}, },
) )
test("env variable takes precedence, config merges options", async () => { it.instance(
await using tmp = await tmpdir({ "env variable takes precedence, config merges options",
init: async (dir) => { Effect.gen(function* () {
await Bun.write( yield* setProcessEnv("ANTHROPIC_API_KEY", "env-api-key")
path.join(dir, "opencode.json"), const providers = yield* Provider.Service.use((provider) => provider.list())
JSON.stringify({ expect(providers[ProviderID.anthropic]).toBeDefined()
$schema: "https://opencode.ai/config.json", // Config options should be merged
provider: { expect(providers[ProviderID.anthropic].options.timeout).toBe(60000)
anthropic: { expect(providers[ProviderID.anthropic].options.chunkTimeout).toBe(15000)
options: { }),
timeout: 60000, {
chunkTimeout: 15000, config: {
}, provider: {
}, anthropic: {
options: {
timeout: 60000,
chunkTimeout: 15000,
}, },
}), },
) },
}, },
}) },
await withTestInstance({ )
directory: tmp.path,
fn: async (ctx) => {
await set(ctx, "ANTHROPIC_API_KEY", "env-api-key")
const providers = await list(ctx)
expect(providers[ProviderID.anthropic]).toBeDefined()
// Config options should be merged
expect(providers[ProviderID.anthropic].options.timeout).toBe(60000)
expect(providers[ProviderID.anthropic].options.chunkTimeout).toBe(15000)
},
})
})
test("getModel returns model for valid provider/model", async () => { it.instance("getModel returns model for valid provider/model", () =>
await using tmp = await tmpdir({ Effect.gen(function* () {
init: async (dir) => { yield* setProcessEnv("ANTHROPIC_API_KEY", "test-api-key")
await Bun.write( const provider = yield* Provider.Service
path.join(dir, "opencode.json"), const model = yield* provider.getModel(ProviderID.anthropic, ModelID.make("claude-sonnet-4-20250514"))
JSON.stringify({ expect(model).toBeDefined()
$schema: "https://opencode.ai/config.json", expect(String(model.providerID)).toBe("anthropic")
}), expect(String(model.id)).toBe("claude-sonnet-4-20250514")
) const language = yield* provider.getLanguage(model)
}, expect(language).toBeDefined()
}) }),
await withTestInstance({ )
directory: tmp.path,
fn: async (ctx) => {
await set(ctx, "ANTHROPIC_API_KEY", "test-api-key")
const model = await getModel(ProviderID.anthropic, ModelID.make("claude-sonnet-4-20250514"), ctx)
expect(model).toBeDefined()
expect(String(model.providerID)).toBe("anthropic")
expect(String(model.id)).toBe("claude-sonnet-4-20250514")
const language = await getLanguage(model, ctx)
expect(language).toBeDefined()
},
})
})
test("getModel throws ModelNotFoundError for invalid model", async () => { test("getModel throws ModelNotFoundError for invalid model", async () => {
await using tmp = await tmpdir({ await using tmp = await tmpdir({
@@ -469,50 +441,25 @@ test("parseModel handles model IDs with slashes", () => {
expect(String(result.modelID)).toBe("anthropic/claude-3-opus") expect(String(result.modelID)).toBe("anthropic/claude-3-opus")
}) })
test("defaultModel returns first available model when no config set", async () => { it.instance("defaultModel returns first available model when no config set", () =>
await using tmp = await tmpdir({ Effect.gen(function* () {
init: async (dir) => { yield* setProcessEnv("ANTHROPIC_API_KEY", "test-api-key")
await Bun.write( const model = yield* Provider.Service.use((provider) => provider.defaultModel())
path.join(dir, "opencode.json"), expect(model.providerID).toBeDefined()
JSON.stringify({ expect(model.modelID).toBeDefined()
$schema: "https://opencode.ai/config.json", }),
}), )
)
},
})
await withTestInstance({
directory: tmp.path,
fn: async (ctx) => {
await set(ctx, "ANTHROPIC_API_KEY", "test-api-key")
const model = await defaultModel(ctx)
expect(model.providerID).toBeDefined()
expect(model.modelID).toBeDefined()
},
})
})
test("defaultModel respects config model setting", async () => { it.instance(
await using tmp = await tmpdir({ "defaultModel respects config model setting",
init: async (dir) => { Effect.gen(function* () {
await Bun.write( yield* setProcessEnv("ANTHROPIC_API_KEY", "test-api-key")
path.join(dir, "opencode.json"), const model = yield* Provider.Service.use((provider) => provider.defaultModel())
JSON.stringify({ expect(String(model.providerID)).toBe("anthropic")
$schema: "https://opencode.ai/config.json", expect(String(model.modelID)).toBe("claude-sonnet-4-20250514")
model: "anthropic/claude-sonnet-4-20250514", }),
}), { config: { model: "anthropic/claude-sonnet-4-20250514" } },
) )
},
})
await withTestInstance({
directory: tmp.path,
fn: async (ctx) => {
await set(ctx, "ANTHROPIC_API_KEY", "test-api-key")
const model = await defaultModel(ctx)
expect(String(model.providerID)).toBe("anthropic")
expect(String(model.modelID)).toBe("claude-sonnet-4-20250514")
},
})
})
it.instance( it.instance(
"provider with baseURL from config", "provider with baseURL from config",
perf/test-suite.md
+1
View File
@@ -70,6 +70,7 @@ Repeated setup work, long sleeps/timeouts, serial integration tests, filesystem/
| File watcher readiness can write before async native subscriptions are active | Retried short readiness writes and accepted symlink-realpath HEAD events | failed | 4.62s | keep | Three sequential focused watcher runs passed: 4.62s, 4.57s, 4.64s; full suite no longer failed in `watcher.test.ts`. | | File watcher readiness can write before async native subscriptions are active | Retried short readiness writes and accepted symlink-realpath HEAD events | failed | 4.62s | keep | Three sequential focused watcher runs passed: 4.62s, 4.57s, 4.64s; full suite no longer failed in `watcher.test.ts`. |
| First provider config/env/filtering block can use Effect-aware instance fixtures | Migrated six `tmpdir` + `withTestInstance` cases to `it.instance` | 6.06s | 6.07s | keep | Neutral timing, but removes manual config file writes and instance plumbing; use as the pattern for later provider slices. | | First provider config/env/filtering block can use Effect-aware instance fixtures | Migrated six `tmpdir` + `withTestInstance` cases to `it.instance` | 6.06s | 6.07s | keep | Neutral timing, but removes manual config file writes and instance plumbing; use as the pattern for later provider slices. |
| Custom provider/model config cases can use Effect-aware instance fixtures | Migrated three more config-heavy provider cases to `it.instance` | 6.07s | 6.12s | keep | Neutral timing within noise, but continues removing manual config file writes on top of the first provider fixture PR. | | Custom provider/model config cases can use Effect-aware instance fixtures | Migrated three more config-heavy provider cases to `it.instance` | 6.07s | 6.12s | keep | Neutral timing within noise, but continues removing manual config file writes on top of the first provider fixture PR. |
| Provider env precedence and model lookup cases can use Effect-aware instance fixtures | Migrated four more provider lookup/default-model cases to `it.instance` | 6.12s | 6.36s | keep | Noisy 5-run median; kept as a small stacked cleanup slice but do not claim speedup from this migration. |
## Profiling Results ## Profiling Results