Skip to content
Open
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
9 changes: 9 additions & 0 deletions .devcontainer/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"features": {
"ghcr.io/devcontainers-extra/features/bun:1": {
"version": "1.1.0",
"resolved": "ghcr.io/devcontainers-extra/features/bun@sha256:0624284ecaead9dd4c6654616a7f939cfa4ebcbc60593700a74e35b1767befa5",
"integrity": "sha256:0624284ecaead9dd4c6654616a7f939cfa4ebcbc60593700a74e35b1767befa5"
}
}
}
25 changes: 25 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
{
"name": "Node.js & TypeScript",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/typescript-node:5-24-trixie",
"features": {
"ghcr.io/devcontainers-extra/features/bun:1": {}
}

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ jobs:
# vCPUs across 5 packages' test tasks running at once — same
# contention issue typecheck.yml already caps for tsgo.
run: GITHUB_ACTIONS=false bun turbo test --concurrency=4

- name: Run mergeJsonRecords tests
working-directory: packages/llm
run: bun test test/schema.test.ts

- name: Check generated client
timeout-minutes: 5
Expand Down
36 changes: 0 additions & 36 deletions bun.lock

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

41 changes: 34 additions & 7 deletions packages/llm/src/schema/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,46 @@ import { JsonSchema, ModelID, ProviderID } from "./ids"
import type { AnyRoute } from "../route/client"
import { isRecord } from "../utils/record"

export const mergeJsonRecords = (
const mergeJsonRecordValue = (current: unknown, next: unknown): unknown => {
if (isRecord(current) && isRecord(next)){
return mergeJsonRecords(current, next)
}

return next
}

const mergeJsonRecordInto = (
result: Record<string, unknown>,
item: Record<string, unknown>,
):void => {
for (const [key, value] of Object.entries(item)){
if (value === undefined) continue
result[key] = mergeJsonRecordValue(result[key], value)
}
}


export const mergeJsonRecords = (
...items: ReadonlyArray<Record<string, unknown> | undefined>
): Record<string, unknown> | undefined => {
const defined = items.filter((item): item is Record<string, unknown> => item !== undefined)
const defined = items.filter(
(item): item is Record<string, unknown> => item !== undefined,
)

if (defined.length === 0) return undefined
if (defined.length === 1 && Object.values(defined[0]).every((value) => value !== undefined)) return defined[0]

if (defined.length === 1 &&
Object.values(defined[0]).every((value) => value !== undefined)
) {
return defined[0]
}

const result: Record<string, unknown> = {}

for (const item of defined) {
for (const [key, value] of Object.entries(item)) {
if (value === undefined) continue
result[key] = isRecord(result[key]) && isRecord(value) ? mergeJsonRecords(result[key], value) : value
}
mergeJsonRecordInto(result, item)
}

return Object.keys(result).length === 0 ? undefined : result
}

Expand Down
35 changes: 34 additions & 1 deletion packages/llm/test/schema.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { describe, expect, test } from "bun:test"
import { Schema } from "effect"
import * as OpenAIChat from "../src/protocols/openai-chat"
import * as OpenAIResponses from "../src/protocols/openai-responses"
import { ContentPart, LLMEvent, LLMRequest, Model, ModelID, ProviderID, Usage } from "../src/schema"
import { ContentPart, LLMEvent, LLMRequest, Model, ModelID, ProviderID, Usage, mergeJsonRecords} from "../src/schema"
import { ProviderShared } from "../src/protocols/shared"

const model = new Model({
Expand Down Expand Up @@ -58,6 +58,39 @@ describe("llm schema", () => {
})
})


describe("mergeJsonRecords", () =>{
test("returns undefined when all inputs are undefined", () => {
expect(mergeJsonRecords(undefined, undefined)).toBeUndefined()
})

test("returns a single defined record unchanged", ()=>{
const input = {a:1, b: "test"}

expect(mergeJsonRecords(input)).toBe(input)
})

test("recursively merges nested records", () => {
expect(
mergeJsonRecords(
{ config: { a: 1 } },
{ config: { b: 2 } },
),
).toEqual({
config: {
a: 1,
b: 2,
},
})
})

test("ignores undefined values when merging", () => {
expect(mergeJsonRecords({ a: 1 }, { a: undefined })).toEqual({
a: 1,
})
})
})

describe("LLM.Usage", () => {
test("subtractTokens clamps non-sensical breakdowns to zero", () => {
// Defense against a provider reporting cached_tokens > prompt_tokens or
Expand Down
Loading