@browserbasehq/orca 3.1.0-patch.4 → 3.2.0-middleware.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/lib/inference.js +1 -4
- package/dist/cjs/lib/inference.js.map +1 -1
- package/dist/cjs/lib/utils.d.ts +1 -0
- package/dist/cjs/lib/utils.js +4 -0
- package/dist/cjs/lib/utils.js.map +1 -1
- package/dist/cjs/lib/v3/agent/AgentClient.d.ts +8 -0
- package/dist/cjs/lib/v3/agent/AgentClient.js +13 -0
- package/dist/cjs/lib/v3/agent/AgentClient.js.map +1 -1
- package/dist/cjs/lib/v3/agent/AgentProvider.js +0 -1
- package/dist/cjs/lib/v3/agent/AgentProvider.js.map +1 -1
- package/dist/cjs/lib/v3/agent/AnthropicCUAClient.js +6 -7
- package/dist/cjs/lib/v3/agent/AnthropicCUAClient.js.map +1 -1
- package/dist/cjs/lib/v3/agent/GoogleCUAClient.js +6 -7
- package/dist/cjs/lib/v3/agent/GoogleCUAClient.js.map +1 -1
- package/dist/cjs/lib/v3/agent/MicrosoftCUAClient.js +1 -0
- package/dist/cjs/lib/v3/agent/MicrosoftCUAClient.js.map +1 -1
- package/dist/cjs/lib/v3/agent/OpenAICUAClient.d.ts +4 -4
- package/dist/cjs/lib/v3/agent/OpenAICUAClient.js +67 -8
- package/dist/cjs/lib/v3/agent/OpenAICUAClient.js.map +1 -1
- package/dist/cjs/lib/v3/agent/prompts/agentSystemPrompt.d.ts +4 -2
- package/dist/cjs/lib/v3/agent/prompts/agentSystemPrompt.js +7 -7
- package/dist/cjs/lib/v3/agent/prompts/agentSystemPrompt.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/act.d.ts +1 -1
- package/dist/cjs/lib/v3/agent/tools/act.js +11 -4
- package/dist/cjs/lib/v3/agent/tools/act.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/ariaTree.d.ts +8 -1
- package/dist/cjs/lib/v3/agent/tools/ariaTree.js +49 -22
- package/dist/cjs/lib/v3/agent/tools/ariaTree.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/{search.js → braveSearch.js} +1 -1
- package/dist/cjs/lib/v3/agent/tools/braveSearch.js.map +1 -0
- package/dist/cjs/lib/v3/agent/tools/browserbaseSearch.d.ts +13 -0
- package/dist/cjs/lib/v3/agent/tools/browserbaseSearch.js +70 -0
- package/dist/cjs/lib/v3/agent/tools/browserbaseSearch.js.map +1 -0
- package/dist/cjs/lib/v3/agent/tools/click.js +23 -31
- package/dist/cjs/lib/v3/agent/tools/click.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/clickAndHold.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/dragAndDrop.js +22 -30
- package/dist/cjs/lib/v3/agent/tools/dragAndDrop.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/extract.d.ts +2 -2
- package/dist/cjs/lib/v3/agent/tools/extract.js +7 -3
- package/dist/cjs/lib/v3/agent/tools/extract.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/fillFormVision.js +30 -30
- package/dist/cjs/lib/v3/agent/tools/fillFormVision.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/fillform.d.ts +7 -2
- package/dist/cjs/lib/v3/agent/tools/fillform.js +56 -45
- package/dist/cjs/lib/v3/agent/tools/fillform.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/index.d.ts +19 -3
- package/dist/cjs/lib/v3/agent/tools/index.js +63 -11
- package/dist/cjs/lib/v3/agent/tools/index.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/keys.d.ts +1 -1
- package/dist/cjs/lib/v3/agent/tools/keys.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/screenshot.d.ts +8 -0
- package/dist/cjs/lib/v3/agent/tools/screenshot.js +32 -15
- package/dist/cjs/lib/v3/agent/tools/screenshot.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/scroll.js +12 -0
- package/dist/cjs/lib/v3/agent/tools/scroll.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/type.js +23 -31
- package/dist/cjs/lib/v3/agent/tools/type.js.map +1 -1
- package/dist/cjs/lib/v3/agent/tools/wait.js +6 -0
- package/dist/cjs/lib/v3/agent/tools/wait.js.map +1 -1
- package/dist/cjs/lib/v3/agent/utils/captchaSolver.d.ts +76 -0
- package/dist/cjs/lib/v3/agent/utils/captchaSolver.js +175 -0
- package/dist/cjs/lib/v3/agent/utils/captchaSolver.js.map +1 -0
- package/dist/cjs/lib/v3/agent/utils/handleDoneToolCall.js +4 -0
- package/dist/cjs/lib/v3/agent/utils/handleDoneToolCall.js.map +1 -1
- package/dist/cjs/lib/v3/api.d.ts +2 -2
- package/dist/cjs/lib/v3/api.js +1 -1
- package/dist/cjs/lib/v3/api.js.map +1 -1
- package/dist/cjs/lib/v3/cache/ActCache.d.ts +0 -1
- package/dist/cjs/lib/v3/cache/ActCache.js +2 -18
- package/dist/cjs/lib/v3/cache/ActCache.js.map +1 -1
- package/dist/cjs/lib/v3/flowlogger/EventEmitter.d.ts +7 -0
- package/dist/cjs/lib/v3/flowlogger/EventEmitter.js +30 -0
- package/dist/cjs/lib/v3/flowlogger/EventEmitter.js.map +1 -0
- package/dist/cjs/lib/v3/flowlogger/EventSink.d.ts +44 -0
- package/dist/cjs/lib/v3/flowlogger/EventSink.js +217 -0
- package/dist/cjs/lib/v3/flowlogger/EventSink.js.map +1 -0
- package/dist/cjs/lib/v3/flowlogger/EventStore.d.ts +26 -0
- package/dist/cjs/lib/v3/flowlogger/EventStore.js +135 -0
- package/dist/cjs/lib/v3/flowlogger/EventStore.js.map +1 -0
- package/dist/cjs/lib/v3/flowlogger/FlowLogger.d.ts +99 -0
- package/dist/cjs/lib/v3/flowlogger/FlowLogger.js +591 -0
- package/dist/cjs/lib/v3/flowlogger/FlowLogger.js.map +1 -0
- package/dist/cjs/lib/v3/flowlogger/prettify.d.ts +6 -0
- package/dist/cjs/lib/v3/flowlogger/prettify.js +395 -0
- package/dist/cjs/lib/v3/flowlogger/prettify.js.map +1 -0
- package/dist/cjs/lib/v3/handlers/actHandler.js +1 -2
- package/dist/cjs/lib/v3/handlers/actHandler.js.map +1 -1
- package/dist/cjs/lib/v3/handlers/extractHandler.js +2 -2
- package/dist/cjs/lib/v3/handlers/extractHandler.js.map +1 -1
- package/dist/cjs/lib/v3/handlers/handlerUtils/actHandlerUtils.js +43 -57
- package/dist/cjs/lib/v3/handlers/handlerUtils/actHandlerUtils.js.map +1 -1
- package/dist/cjs/lib/v3/handlers/observeHandler.js +1 -2
- package/dist/cjs/lib/v3/handlers/observeHandler.js.map +1 -1
- package/dist/cjs/lib/v3/handlers/v3AgentHandler.d.ts +2 -5
- package/dist/cjs/lib/v3/handlers/v3AgentHandler.js +130 -91
- package/dist/cjs/lib/v3/handlers/v3AgentHandler.js.map +1 -1
- package/dist/cjs/lib/v3/handlers/v3CuaAgentHandler.d.ts +5 -0
- package/dist/cjs/lib/v3/handlers/v3CuaAgentHandler.js +134 -14
- package/dist/cjs/lib/v3/handlers/v3CuaAgentHandler.js.map +1 -1
- package/dist/cjs/lib/v3/index.d.ts +2 -1
- package/dist/cjs/lib/v3/launch/browserbase.d.ts +1 -1
- package/dist/cjs/lib/v3/launch/browserbase.js +4 -9
- package/dist/cjs/lib/v3/launch/browserbase.js.map +1 -1
- package/dist/cjs/lib/v3/llm/LLMProvider.d.ts +5 -2
- package/dist/cjs/lib/v3/llm/LLMProvider.js +13 -11
- package/dist/cjs/lib/v3/llm/LLMProvider.js.map +1 -1
- package/dist/cjs/lib/v3/llm/aisdk.js +11 -17
- package/dist/cjs/lib/v3/llm/aisdk.js.map +1 -1
- package/dist/cjs/lib/v3/runtimePaths.js +2 -1
- package/dist/cjs/lib/v3/runtimePaths.js.map +1 -1
- package/dist/cjs/lib/v3/shutdown/supervisor.js +2 -2
- package/dist/cjs/lib/v3/shutdown/supervisor.js.map +1 -1
- package/dist/cjs/lib/v3/timeoutConfig.d.ts +1 -1
- package/dist/cjs/lib/v3/timeoutConfig.js +5 -0
- package/dist/cjs/lib/v3/timeoutConfig.js.map +1 -1
- package/dist/cjs/lib/v3/types/private/cache.d.ts +0 -1
- package/dist/cjs/lib/v3/types/private/cache.js.map +1 -1
- package/dist/cjs/lib/v3/types/private/shutdown.d.ts +1 -1
- package/dist/cjs/lib/v3/types/private/shutdown.js.map +1 -1
- package/dist/cjs/lib/v3/types/public/agent.d.ts +28 -3
- package/dist/cjs/lib/v3/types/public/agent.js +0 -1
- package/dist/cjs/lib/v3/types/public/agent.js.map +1 -1
- package/dist/cjs/lib/v3/types/public/api.d.ts +7 -0
- package/dist/cjs/lib/v3/types/public/api.js +9 -0
- package/dist/cjs/lib/v3/types/public/api.js.map +1 -1
- package/dist/cjs/lib/v3/types/public/model.d.ts +12 -3
- package/dist/cjs/lib/v3/types/public/model.js.map +1 -1
- package/dist/cjs/lib/v3/types/public/options.d.ts +8 -0
- package/dist/cjs/lib/v3/types/public/options.js.map +1 -1
- package/dist/cjs/lib/v3/understudy/cdp.d.ts +8 -13
- package/dist/cjs/lib/v3/understudy/cdp.js +180 -20
- package/dist/cjs/lib/v3/understudy/cdp.js.map +1 -1
- package/dist/cjs/lib/v3/understudy/context.d.ts +1 -0
- package/dist/cjs/lib/v3/understudy/context.js +142 -60
- package/dist/cjs/lib/v3/understudy/context.js.map +1 -1
- package/dist/cjs/lib/v3/understudy/frame.js +23 -6
- package/dist/cjs/lib/v3/understudy/frame.js.map +1 -1
- package/dist/cjs/lib/v3/understudy/page.d.ts +13 -0
- package/dist/cjs/lib/v3/understudy/page.js +84 -21
- package/dist/cjs/lib/v3/understudy/page.js.map +1 -1
- package/dist/cjs/lib/v3/understudy/screenshotUtils.d.ts +0 -1
- package/dist/cjs/lib/v3/understudy/screenshotUtils.js +0 -18
- package/dist/cjs/lib/v3/understudy/screenshotUtils.js.map +1 -1
- package/dist/cjs/lib/v3/v3.d.ts +26 -3
- package/dist/cjs/lib/v3/v3.js +242 -180
- package/dist/cjs/lib/v3/v3.js.map +1 -1
- package/dist/cjs/lib/version.d.ts +1 -1
- package/dist/cjs/lib/version.js +1 -1
- package/dist/cjs/lib/version.js.map +1 -1
- package/dist/cjs/tests/integration/agent-captcha-autosolve.spec.js +56 -0
- package/dist/cjs/tests/integration/agent-captcha-autosolve.spec.js.map +1 -0
- package/dist/cjs/tests/integration/agent-hybrid-mode.spec.js +6 -6
- package/dist/cjs/tests/integration/agent-hybrid-mode.spec.js.map +1 -1
- package/dist/cjs/tests/integration/cdp-session-detached.spec.js +1 -1
- package/dist/cjs/tests/integration/cdp-session-detached.spec.js.map +1 -1
- package/dist/cjs/tests/integration/context-addInitScript.spec.js +104 -11
- package/dist/cjs/tests/integration/context-addInitScript.spec.js.map +1 -1
- package/dist/cjs/tests/integration/flowLogger.spec.js +714 -0
- package/dist/cjs/tests/integration/flowLogger.spec.js.map +1 -0
- package/dist/cjs/tests/integration/iframe-ctx-addInitScript-race.spec.d.ts +1 -0
- package/dist/cjs/tests/integration/iframe-ctx-addInitScript-race.spec.js +219 -0
- package/dist/cjs/tests/integration/iframe-ctx-addInitScript-race.spec.js.map +1 -0
- package/dist/cjs/tests/integration/page-extra-http-headers.spec.d.ts +1 -0
- package/dist/cjs/tests/integration/page-extra-http-headers.spec.js +85 -0
- package/dist/cjs/tests/integration/page-extra-http-headers.spec.js.map +1 -0
- package/dist/cjs/tests/integration/page-screenshot.spec.js +1 -1
- package/dist/cjs/tests/integration/page-screenshot.spec.js.map +1 -1
- package/dist/cjs/tests/integration/testUtils.d.ts +33 -0
- package/dist/cjs/tests/integration/testUtils.js +144 -0
- package/dist/cjs/tests/integration/testUtils.js.map +1 -1
- package/dist/cjs/tests/integration/timeouts.spec.js +278 -0
- package/dist/cjs/tests/integration/timeouts.spec.js.map +1 -1
- package/dist/cjs/tests/unit/agent-captcha-hooks.test.d.ts +1 -0
- package/dist/cjs/tests/unit/agent-captcha-hooks.test.js +285 -0
- package/dist/cjs/tests/unit/agent-captcha-hooks.test.js.map +1 -0
- package/dist/cjs/tests/unit/agent-execution-model.test.js +1 -1
- package/dist/cjs/tests/unit/agent-execution-model.test.js.map +1 -1
- package/dist/cjs/tests/unit/browserbase-session-accessors.test.js +20 -0
- package/dist/cjs/tests/unit/browserbase-session-accessors.test.js.map +1 -1
- package/dist/cjs/tests/unit/captcha-solver.test.d.ts +1 -0
- package/dist/cjs/tests/unit/captcha-solver.test.js +154 -0
- package/dist/cjs/tests/unit/captcha-solver.test.js.map +1 -0
- package/dist/cjs/tests/unit/flowlogger-capturing-cdp.test.d.ts +1 -0
- package/dist/cjs/tests/unit/flowlogger-capturing-cdp.test.js +95 -0
- package/dist/cjs/tests/unit/flowlogger-capturing-cdp.test.js.map +1 -0
- package/dist/cjs/tests/unit/flowlogger-capturing-llm.test.d.ts +1 -0
- package/dist/cjs/tests/unit/flowlogger-capturing-llm.test.js +43 -0
- package/dist/cjs/tests/unit/flowlogger-capturing-llm.test.js.map +1 -0
- package/dist/cjs/tests/unit/flowlogger-eventstore.test.d.ts +1 -0
- package/dist/cjs/tests/unit/flowlogger-eventstore.test.js +250 -0
- package/dist/cjs/tests/unit/flowlogger-eventstore.test.js.map +1 -0
- package/dist/cjs/tests/unit/llm-middleware.test.d.ts +1 -0
- package/dist/cjs/tests/unit/llm-middleware.test.js +495 -0
- package/dist/cjs/tests/unit/llm-middleware.test.js.map +1 -0
- package/dist/cjs/tests/unit/model-deprecation.test.js +5 -8
- package/dist/cjs/tests/unit/model-deprecation.test.js.map +1 -1
- package/dist/cjs/tests/unit/openai-cua-client.test.d.ts +1 -0
- package/dist/cjs/tests/unit/openai-cua-client.test.js +71 -0
- package/dist/cjs/tests/unit/openai-cua-client.test.js.map +1 -0
- package/dist/cjs/tests/unit/page-extra-http-headers.test.d.ts +1 -0
- package/dist/cjs/tests/unit/page-extra-http-headers.test.js +92 -0
- package/dist/cjs/tests/unit/page-extra-http-headers.test.js.map +1 -0
- package/dist/cjs/tests/unit/public-api/llm-and-agents.test.js +13 -1
- package/dist/cjs/tests/unit/public-api/llm-and-agents.test.js.map +1 -1
- package/dist/cjs/tests/unit/public-api/public-types.test.js.map +1 -1
- package/dist/esm/lib/inference.js +1 -4
- package/dist/esm/lib/inference.js.map +1 -1
- package/dist/esm/lib/utils.d.ts +1 -0
- package/dist/esm/lib/utils.js +3 -0
- package/dist/esm/lib/utils.js.map +1 -1
- package/dist/esm/lib/v3/agent/AgentClient.d.ts +8 -0
- package/dist/esm/lib/v3/agent/AgentClient.js +13 -0
- package/dist/esm/lib/v3/agent/AgentClient.js.map +1 -1
- package/dist/esm/lib/v3/agent/AgentProvider.js +0 -1
- package/dist/esm/lib/v3/agent/AgentProvider.js.map +1 -1
- package/dist/esm/lib/v3/agent/AnthropicCUAClient.js +6 -7
- package/dist/esm/lib/v3/agent/AnthropicCUAClient.js.map +1 -1
- package/dist/esm/lib/v3/agent/GoogleCUAClient.js +6 -7
- package/dist/esm/lib/v3/agent/GoogleCUAClient.js.map +1 -1
- package/dist/esm/lib/v3/agent/MicrosoftCUAClient.js +1 -0
- package/dist/esm/lib/v3/agent/MicrosoftCUAClient.js.map +1 -1
- package/dist/esm/lib/v3/agent/OpenAICUAClient.d.ts +4 -4
- package/dist/esm/lib/v3/agent/OpenAICUAClient.js +67 -8
- package/dist/esm/lib/v3/agent/OpenAICUAClient.js.map +1 -1
- package/dist/esm/lib/v3/agent/prompts/agentSystemPrompt.d.ts +4 -2
- package/dist/esm/lib/v3/agent/prompts/agentSystemPrompt.js +7 -7
- package/dist/esm/lib/v3/agent/prompts/agentSystemPrompt.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/act.d.ts +1 -1
- package/dist/esm/lib/v3/agent/tools/act.js +11 -4
- package/dist/esm/lib/v3/agent/tools/act.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/ariaTree.d.ts +8 -1
- package/dist/esm/lib/v3/agent/tools/ariaTree.js +49 -22
- package/dist/esm/lib/v3/agent/tools/ariaTree.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/{search.js → braveSearch.js} +1 -1
- package/dist/esm/lib/v3/agent/tools/braveSearch.js.map +1 -0
- package/dist/esm/lib/v3/agent/tools/browserbaseSearch.d.ts +13 -0
- package/dist/esm/lib/v3/agent/tools/browserbaseSearch.js +66 -0
- package/dist/esm/lib/v3/agent/tools/browserbaseSearch.js.map +1 -0
- package/dist/esm/lib/v3/agent/tools/click.js +23 -31
- package/dist/esm/lib/v3/agent/tools/click.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/clickAndHold.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/dragAndDrop.js +22 -30
- package/dist/esm/lib/v3/agent/tools/dragAndDrop.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/extract.d.ts +2 -2
- package/dist/esm/lib/v3/agent/tools/extract.js +7 -3
- package/dist/esm/lib/v3/agent/tools/extract.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/fillFormVision.js +30 -30
- package/dist/esm/lib/v3/agent/tools/fillFormVision.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/fillform.d.ts +7 -2
- package/dist/esm/lib/v3/agent/tools/fillform.js +56 -45
- package/dist/esm/lib/v3/agent/tools/fillform.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/index.d.ts +19 -3
- package/dist/esm/lib/v3/agent/tools/index.js +63 -11
- package/dist/esm/lib/v3/agent/tools/index.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/keys.d.ts +1 -1
- package/dist/esm/lib/v3/agent/tools/keys.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/screenshot.d.ts +8 -0
- package/dist/esm/lib/v3/agent/tools/screenshot.js +32 -15
- package/dist/esm/lib/v3/agent/tools/screenshot.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/scroll.js +12 -0
- package/dist/esm/lib/v3/agent/tools/scroll.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/type.js +23 -31
- package/dist/esm/lib/v3/agent/tools/type.js.map +1 -1
- package/dist/esm/lib/v3/agent/tools/wait.js +6 -0
- package/dist/esm/lib/v3/agent/tools/wait.js.map +1 -1
- package/dist/esm/lib/v3/agent/utils/captchaSolver.d.ts +76 -0
- package/dist/esm/lib/v3/agent/utils/captchaSolver.js +171 -0
- package/dist/esm/lib/v3/agent/utils/captchaSolver.js.map +1 -0
- package/dist/esm/lib/v3/agent/utils/handleDoneToolCall.js +4 -0
- package/dist/esm/lib/v3/agent/utils/handleDoneToolCall.js.map +1 -1
- package/dist/esm/lib/v3/api.d.ts +2 -2
- package/dist/esm/lib/v3/api.js +1 -1
- package/dist/esm/lib/v3/api.js.map +1 -1
- package/dist/esm/lib/v3/cache/ActCache.d.ts +0 -1
- package/dist/esm/lib/v3/cache/ActCache.js +2 -18
- package/dist/esm/lib/v3/cache/ActCache.js.map +1 -1
- package/dist/esm/lib/v3/flowlogger/EventEmitter.d.ts +7 -0
- package/dist/esm/lib/v3/flowlogger/EventEmitter.js +26 -0
- package/dist/esm/lib/v3/flowlogger/EventEmitter.js.map +1 -0
- package/dist/esm/lib/v3/flowlogger/EventSink.d.ts +44 -0
- package/dist/esm/lib/v3/flowlogger/EventSink.js +206 -0
- package/dist/esm/lib/v3/flowlogger/EventSink.js.map +1 -0
- package/dist/esm/lib/v3/flowlogger/EventStore.d.ts +26 -0
- package/dist/esm/lib/v3/flowlogger/EventStore.js +127 -0
- package/dist/esm/lib/v3/flowlogger/EventStore.js.map +1 -0
- package/dist/esm/lib/v3/flowlogger/FlowLogger.d.ts +99 -0
- package/dist/esm/lib/v3/flowlogger/FlowLogger.js +583 -0
- package/dist/esm/lib/v3/flowlogger/FlowLogger.js.map +1 -0
- package/dist/esm/lib/v3/flowlogger/prettify.d.ts +6 -0
- package/dist/esm/lib/v3/flowlogger/prettify.js +389 -0
- package/dist/esm/lib/v3/flowlogger/prettify.js.map +1 -0
- package/dist/esm/lib/v3/handlers/actHandler.js +1 -2
- package/dist/esm/lib/v3/handlers/actHandler.js.map +1 -1
- package/dist/esm/lib/v3/handlers/extractHandler.js +2 -2
- package/dist/esm/lib/v3/handlers/extractHandler.js.map +1 -1
- package/dist/esm/lib/v3/handlers/handlerUtils/actHandlerUtils.js +43 -57
- package/dist/esm/lib/v3/handlers/handlerUtils/actHandlerUtils.js.map +1 -1
- package/dist/esm/lib/v3/handlers/observeHandler.js +1 -2
- package/dist/esm/lib/v3/handlers/observeHandler.js.map +1 -1
- package/dist/esm/lib/v3/handlers/v3AgentHandler.d.ts +2 -5
- package/dist/esm/lib/v3/handlers/v3AgentHandler.js +131 -92
- package/dist/esm/lib/v3/handlers/v3AgentHandler.js.map +1 -1
- package/dist/esm/lib/v3/handlers/v3CuaAgentHandler.d.ts +5 -0
- package/dist/esm/lib/v3/handlers/v3CuaAgentHandler.js +134 -14
- package/dist/esm/lib/v3/handlers/v3CuaAgentHandler.js.map +1 -1
- package/dist/esm/lib/v3/index.d.ts +2 -1
- package/dist/esm/lib/v3/launch/browserbase.d.ts +1 -1
- package/dist/esm/lib/v3/launch/browserbase.js +4 -9
- package/dist/esm/lib/v3/launch/browserbase.js.map +1 -1
- package/dist/esm/lib/v3/llm/LLMProvider.d.ts +5 -2
- package/dist/esm/lib/v3/llm/LLMProvider.js +14 -12
- package/dist/esm/lib/v3/llm/LLMProvider.js.map +1 -1
- package/dist/esm/lib/v3/llm/aisdk.js +11 -17
- package/dist/esm/lib/v3/llm/aisdk.js.map +1 -1
- package/dist/esm/lib/v3/runtimePaths.js +2 -1
- package/dist/esm/lib/v3/runtimePaths.js.map +1 -1
- package/dist/esm/lib/v3/shutdown/supervisor.js +2 -2
- package/dist/esm/lib/v3/shutdown/supervisor.js.map +1 -1
- package/dist/esm/lib/v3/timeoutConfig.d.ts +1 -1
- package/dist/esm/lib/v3/timeoutConfig.js +5 -0
- package/dist/esm/lib/v3/timeoutConfig.js.map +1 -1
- package/dist/esm/lib/v3/types/private/cache.d.ts +0 -1
- package/dist/esm/lib/v3/types/private/cache.js.map +1 -1
- package/dist/esm/lib/v3/types/private/shutdown.d.ts +1 -1
- package/dist/esm/lib/v3/types/private/shutdown.js.map +1 -1
- package/dist/esm/lib/v3/types/public/agent.d.ts +28 -3
- package/dist/esm/lib/v3/types/public/agent.js +0 -1
- package/dist/esm/lib/v3/types/public/agent.js.map +1 -1
- package/dist/esm/lib/v3/types/public/api.d.ts +7 -0
- package/dist/esm/lib/v3/types/public/api.js +9 -0
- package/dist/esm/lib/v3/types/public/api.js.map +1 -1
- package/dist/esm/lib/v3/types/public/model.d.ts +12 -3
- package/dist/esm/lib/v3/types/public/model.js.map +1 -1
- package/dist/esm/lib/v3/types/public/options.d.ts +8 -0
- package/dist/esm/lib/v3/types/public/options.js.map +1 -1
- package/dist/esm/lib/v3/understudy/cdp.d.ts +8 -13
- package/dist/esm/lib/v3/understudy/cdp.js +181 -21
- package/dist/esm/lib/v3/understudy/cdp.js.map +1 -1
- package/dist/esm/lib/v3/understudy/context.d.ts +1 -0
- package/dist/esm/lib/v3/understudy/context.js +142 -60
- package/dist/esm/lib/v3/understudy/context.js.map +1 -1
- package/dist/esm/lib/v3/understudy/frame.js +23 -6
- package/dist/esm/lib/v3/understudy/frame.js.map +1 -1
- package/dist/esm/lib/v3/understudy/page.d.ts +13 -0
- package/dist/esm/lib/v3/understudy/page.js +86 -23
- package/dist/esm/lib/v3/understudy/page.js.map +1 -1
- package/dist/esm/lib/v3/understudy/screenshotUtils.d.ts +0 -1
- package/dist/esm/lib/v3/understudy/screenshotUtils.js +0 -17
- package/dist/esm/lib/v3/understudy/screenshotUtils.js.map +1 -1
- package/dist/esm/lib/v3/v3.d.ts +26 -3
- package/dist/esm/lib/v3/v3.js +242 -181
- package/dist/esm/lib/v3/v3.js.map +1 -1
- package/dist/esm/lib/version.d.ts +1 -1
- package/dist/esm/lib/version.js +1 -1
- package/dist/esm/lib/version.js.map +1 -1
- package/dist/esm/tests/integration/agent-captcha-autosolve.spec.d.ts +1 -0
- package/dist/esm/tests/integration/agent-captcha-autosolve.spec.js +54 -0
- package/dist/esm/tests/integration/agent-captcha-autosolve.spec.js.map +1 -0
- package/dist/esm/tests/integration/agent-hybrid-mode.spec.js +6 -6
- package/dist/esm/tests/integration/agent-hybrid-mode.spec.js.map +1 -1
- package/dist/esm/tests/integration/cdp-session-detached.spec.js +1 -1
- package/dist/esm/tests/integration/cdp-session-detached.spec.js.map +1 -1
- package/dist/esm/tests/integration/context-addInitScript.spec.js +104 -11
- package/dist/esm/tests/integration/context-addInitScript.spec.js.map +1 -1
- package/dist/esm/tests/integration/flowLogger.spec.d.ts +1 -0
- package/dist/esm/tests/integration/flowLogger.spec.js +712 -0
- package/dist/esm/tests/integration/flowLogger.spec.js.map +1 -0
- package/dist/esm/tests/integration/iframe-ctx-addInitScript-race.spec.d.ts +1 -0
- package/dist/esm/tests/integration/iframe-ctx-addInitScript-race.spec.js +217 -0
- package/dist/esm/tests/integration/iframe-ctx-addInitScript-race.spec.js.map +1 -0
- package/dist/esm/tests/integration/page-extra-http-headers.spec.d.ts +1 -0
- package/dist/esm/tests/integration/page-extra-http-headers.spec.js +83 -0
- package/dist/esm/tests/integration/page-extra-http-headers.spec.js.map +1 -0
- package/dist/esm/tests/integration/page-screenshot.spec.js +1 -1
- package/dist/esm/tests/integration/page-screenshot.spec.js.map +1 -1
- package/dist/esm/tests/integration/testUtils.d.ts +33 -0
- package/dist/esm/tests/integration/testUtils.js +138 -0
- package/dist/esm/tests/integration/testUtils.js.map +1 -1
- package/dist/esm/tests/integration/timeouts.spec.js +278 -0
- package/dist/esm/tests/integration/timeouts.spec.js.map +1 -1
- package/dist/esm/tests/unit/agent-captcha-hooks.test.d.ts +1 -0
- package/dist/esm/tests/unit/agent-captcha-hooks.test.js +283 -0
- package/dist/esm/tests/unit/agent-captcha-hooks.test.js.map +1 -0
- package/dist/esm/tests/unit/agent-execution-model.test.js +1 -1
- package/dist/esm/tests/unit/agent-execution-model.test.js.map +1 -1
- package/dist/esm/tests/unit/browserbase-session-accessors.test.js +20 -0
- package/dist/esm/tests/unit/browserbase-session-accessors.test.js.map +1 -1
- package/dist/esm/tests/unit/captcha-solver.test.d.ts +1 -0
- package/dist/esm/tests/unit/captcha-solver.test.js +152 -0
- package/dist/esm/tests/unit/captcha-solver.test.js.map +1 -0
- package/dist/esm/tests/unit/flowlogger-capturing-cdp.test.d.ts +1 -0
- package/dist/esm/tests/unit/flowlogger-capturing-cdp.test.js +93 -0
- package/dist/esm/tests/unit/flowlogger-capturing-cdp.test.js.map +1 -0
- package/dist/esm/tests/unit/flowlogger-capturing-llm.test.d.ts +1 -0
- package/dist/esm/tests/unit/flowlogger-capturing-llm.test.js +41 -0
- package/dist/esm/tests/unit/flowlogger-capturing-llm.test.js.map +1 -0
- package/dist/esm/tests/unit/flowlogger-eventstore.test.d.ts +1 -0
- package/dist/esm/tests/unit/flowlogger-eventstore.test.js +248 -0
- package/dist/esm/tests/unit/flowlogger-eventstore.test.js.map +1 -0
- package/dist/esm/tests/unit/llm-middleware.test.d.ts +1 -0
- package/dist/esm/tests/unit/llm-middleware.test.js +460 -0
- package/dist/esm/tests/unit/llm-middleware.test.js.map +1 -0
- package/dist/esm/tests/unit/model-deprecation.test.js +5 -8
- package/dist/esm/tests/unit/model-deprecation.test.js.map +1 -1
- package/dist/esm/tests/unit/openai-cua-client.test.d.ts +1 -0
- package/dist/esm/tests/unit/openai-cua-client.test.js +69 -0
- package/dist/esm/tests/unit/openai-cua-client.test.js.map +1 -0
- package/dist/esm/tests/unit/page-extra-http-headers.test.d.ts +1 -0
- package/dist/esm/tests/unit/page-extra-http-headers.test.js +90 -0
- package/dist/esm/tests/unit/page-extra-http-headers.test.js.map +1 -0
- package/dist/esm/tests/unit/public-api/llm-and-agents.test.js +13 -1
- package/dist/esm/tests/unit/public-api/llm-and-agents.test.js.map +1 -1
- package/dist/esm/tests/unit/public-api/public-types.test.js.map +1 -1
- package/package.json +5 -3
- package/dist/cjs/lib/v3/agent/tools/search.js.map +0 -1
- package/dist/cjs/lib/v3/flowLogger.d.ts +0 -139
- package/dist/cjs/lib/v3/flowLogger.js +0 -881
- package/dist/cjs/lib/v3/flowLogger.js.map +0 -1
- package/dist/cjs/tests/unit/rerender-missing-shadows.test.js +0 -209
- package/dist/cjs/tests/unit/rerender-missing-shadows.test.js.map +0 -1
- package/dist/esm/lib/v3/agent/tools/search.js.map +0 -1
- package/dist/esm/lib/v3/flowLogger.d.ts +0 -139
- package/dist/esm/lib/v3/flowLogger.js +0 -868
- package/dist/esm/lib/v3/flowLogger.js.map +0 -1
- package/dist/esm/tests/unit/rerender-missing-shadows.test.js +0 -207
- package/dist/esm/tests/unit/rerender-missing-shadows.test.js.map +0 -1
- /package/dist/cjs/lib/v3/agent/tools/{search.d.ts → braveSearch.d.ts} +0 -0
- /package/dist/cjs/tests/{unit/rerender-missing-shadows.test.d.ts → integration/agent-captcha-autosolve.spec.d.ts} +0 -0
- /package/dist/{esm/tests/unit/rerender-missing-shadows.test.d.ts → cjs/tests/integration/flowLogger.spec.d.ts} +0 -0
- /package/dist/esm/lib/v3/agent/tools/{search.d.ts → braveSearch.d.ts} +0 -0
|
@@ -0,0 +1,460 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { getAISDKLanguageModel, LLMProvider, } from "../../lib/v3/llm/LLMProvider.js";
|
|
3
|
+
import { resolveModelConfiguration } from "../../lib/v3/v3.js";
|
|
4
|
+
/**
|
|
5
|
+
* Creates a recording middleware that captures every doGenerate / doStream
|
|
6
|
+
* invocation along with the model identity and returned usage data.
|
|
7
|
+
*/
|
|
8
|
+
function createRecordingMiddleware() {
|
|
9
|
+
const calls = [];
|
|
10
|
+
const middleware = {
|
|
11
|
+
wrapGenerate: async ({ doGenerate, model }) => {
|
|
12
|
+
const result = await doGenerate();
|
|
13
|
+
calls.push({
|
|
14
|
+
type: "generate",
|
|
15
|
+
modelId: model.modelId,
|
|
16
|
+
provider: model.provider,
|
|
17
|
+
usage: {
|
|
18
|
+
inputTokens: result.usage.inputTokens ?? undefined,
|
|
19
|
+
outputTokens: result.usage.outputTokens ?? undefined,
|
|
20
|
+
},
|
|
21
|
+
});
|
|
22
|
+
return result;
|
|
23
|
+
},
|
|
24
|
+
wrapStream: async ({ doStream, model }) => {
|
|
25
|
+
const result = await doStream();
|
|
26
|
+
calls.push({
|
|
27
|
+
type: "stream",
|
|
28
|
+
modelId: model.modelId,
|
|
29
|
+
provider: model.provider,
|
|
30
|
+
});
|
|
31
|
+
return result;
|
|
32
|
+
},
|
|
33
|
+
};
|
|
34
|
+
return { middleware, calls };
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Creates a minimal mock LanguageModelV2 that returns canned results
|
|
38
|
+
* without hitting any real provider. Useful for testing the wrapping
|
|
39
|
+
* mechanics in isolation.
|
|
40
|
+
*/
|
|
41
|
+
function createMockLanguageModel(modelId, provider) {
|
|
42
|
+
return {
|
|
43
|
+
specificationVersion: "v2",
|
|
44
|
+
provider,
|
|
45
|
+
modelId,
|
|
46
|
+
defaultObjectGenerationMode: "json",
|
|
47
|
+
doGenerate: vi.fn().mockResolvedValue({
|
|
48
|
+
content: [{ type: "text", text: "mock response" }],
|
|
49
|
+
finishReason: "stop",
|
|
50
|
+
usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
|
|
51
|
+
warnings: [],
|
|
52
|
+
}),
|
|
53
|
+
doStream: vi.fn().mockResolvedValue({
|
|
54
|
+
stream: new ReadableStream({
|
|
55
|
+
start(controller) {
|
|
56
|
+
controller.enqueue({
|
|
57
|
+
type: "finish",
|
|
58
|
+
finishReason: "stop",
|
|
59
|
+
usage: { inputTokens: 8, outputTokens: 3, totalTokens: 11 },
|
|
60
|
+
});
|
|
61
|
+
controller.close();
|
|
62
|
+
},
|
|
63
|
+
}),
|
|
64
|
+
}),
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
// ---------------------------------------------------------------------------
|
|
68
|
+
// getAISDKLanguageModel with middleware
|
|
69
|
+
// ---------------------------------------------------------------------------
|
|
70
|
+
describe("getAISDKLanguageModel with middleware", () => {
|
|
71
|
+
it("returns a model when no middleware is provided", () => {
|
|
72
|
+
const model = getAISDKLanguageModel("ollama", "llama3.2");
|
|
73
|
+
expect(model).toBeDefined();
|
|
74
|
+
expect(model.modelId).toBe("llama3.2");
|
|
75
|
+
});
|
|
76
|
+
it("returns a wrapped model when middleware is provided", () => {
|
|
77
|
+
const { middleware } = createRecordingMiddleware();
|
|
78
|
+
const model = getAISDKLanguageModel("ollama", "llama3.2", undefined, middleware);
|
|
79
|
+
expect(model).toBeDefined();
|
|
80
|
+
// wrapLanguageModel preserves modelId
|
|
81
|
+
expect(model.modelId).toBe("llama3.2");
|
|
82
|
+
});
|
|
83
|
+
it("wrapped model preserves doGenerate and doStream methods", () => {
|
|
84
|
+
const { middleware } = createRecordingMiddleware();
|
|
85
|
+
const model = getAISDKLanguageModel("ollama", "llama3.2", undefined, middleware);
|
|
86
|
+
expect(typeof model.doGenerate).toBe("function");
|
|
87
|
+
expect(typeof model.doStream).toBe("function");
|
|
88
|
+
expect(model.provider).toContain("ollama");
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
// ---------------------------------------------------------------------------
|
|
92
|
+
// LLMProvider with middleware
|
|
93
|
+
// ---------------------------------------------------------------------------
|
|
94
|
+
describe("LLMProvider with middleware", () => {
|
|
95
|
+
const noop = () => { };
|
|
96
|
+
it("creates an AISdkClient without middleware", () => {
|
|
97
|
+
const provider = new LLMProvider(noop);
|
|
98
|
+
const client = provider.getClient("openai/gpt-4o");
|
|
99
|
+
expect(client).toBeDefined();
|
|
100
|
+
expect(client.type).toBe("aisdk");
|
|
101
|
+
});
|
|
102
|
+
it("creates an AISdkClient that carries middleware-wrapped model", () => {
|
|
103
|
+
const { middleware } = createRecordingMiddleware();
|
|
104
|
+
const provider = new LLMProvider(noop, middleware);
|
|
105
|
+
const client = provider.getClient("ollama/llama3.2");
|
|
106
|
+
expect(client).toBeDefined();
|
|
107
|
+
expect(client.type).toBe("aisdk");
|
|
108
|
+
const languageModel = client.getLanguageModel();
|
|
109
|
+
expect(languageModel).toBeDefined();
|
|
110
|
+
// Wrapped models should still expose the original modelId
|
|
111
|
+
expect(languageModel.modelId).toBe("llama3.2");
|
|
112
|
+
});
|
|
113
|
+
it("applies the same middleware to different models from getClient", () => {
|
|
114
|
+
const { middleware } = createRecordingMiddleware();
|
|
115
|
+
const provider = new LLMProvider(noop, middleware);
|
|
116
|
+
const clientA = provider.getClient("ollama/llama3.2");
|
|
117
|
+
const clientB = provider.getClient("ollama/mistral");
|
|
118
|
+
expect(clientA.getLanguageModel()).toBeDefined();
|
|
119
|
+
expect(clientB.getLanguageModel()).toBeDefined();
|
|
120
|
+
expect(clientA.getLanguageModel().modelId).toBe("llama3.2");
|
|
121
|
+
expect(clientB.getLanguageModel().modelId).toBe("mistral");
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
// ---------------------------------------------------------------------------
|
|
125
|
+
// Middleware captures usage across act/extract/observe/agent code paths
|
|
126
|
+
// ---------------------------------------------------------------------------
|
|
127
|
+
describe("middleware captures usage from doGenerate and doStream", () => {
|
|
128
|
+
it("wrapGenerate fires and captures usage on doGenerate", async () => {
|
|
129
|
+
const { middleware, calls } = createRecordingMiddleware();
|
|
130
|
+
const mockModel = createMockLanguageModel("gpt-4o", "openai.chat");
|
|
131
|
+
// Simulate what wrapLanguageModel does: import and wrap
|
|
132
|
+
const { wrapLanguageModel } = await import("ai");
|
|
133
|
+
const wrapped = wrapLanguageModel({ model: mockModel, middleware });
|
|
134
|
+
await wrapped.doGenerate({
|
|
135
|
+
prompt: [
|
|
136
|
+
{
|
|
137
|
+
role: "user",
|
|
138
|
+
content: [{ type: "text", text: "act: click button" }],
|
|
139
|
+
},
|
|
140
|
+
],
|
|
141
|
+
});
|
|
142
|
+
expect(calls).toHaveLength(1);
|
|
143
|
+
expect(calls[0].type).toBe("generate");
|
|
144
|
+
expect(calls[0].modelId).toBe("gpt-4o");
|
|
145
|
+
expect(calls[0].usage).toEqual({ inputTokens: 10, outputTokens: 5 });
|
|
146
|
+
});
|
|
147
|
+
it("wrapStream fires on doStream", async () => {
|
|
148
|
+
const { middleware, calls } = createRecordingMiddleware();
|
|
149
|
+
const mockModel = createMockLanguageModel("gpt-4o", "openai.chat");
|
|
150
|
+
const { wrapLanguageModel } = await import("ai");
|
|
151
|
+
const wrapped = wrapLanguageModel({ model: mockModel, middleware });
|
|
152
|
+
const result = await wrapped.doStream({
|
|
153
|
+
prompt: [
|
|
154
|
+
{ role: "user", content: [{ type: "text", text: "stream this" }] },
|
|
155
|
+
],
|
|
156
|
+
});
|
|
157
|
+
// Consume the stream to trigger the finish chunk
|
|
158
|
+
const reader = result.stream.getReader();
|
|
159
|
+
while (true) {
|
|
160
|
+
const { done } = await reader.read();
|
|
161
|
+
if (done)
|
|
162
|
+
break;
|
|
163
|
+
}
|
|
164
|
+
expect(calls).toHaveLength(1);
|
|
165
|
+
expect(calls[0].type).toBe("stream");
|
|
166
|
+
expect(calls[0].modelId).toBe("gpt-4o");
|
|
167
|
+
});
|
|
168
|
+
it("middleware fires for each separate doGenerate call (simulates act + extract + observe)", async () => {
|
|
169
|
+
const { middleware, calls } = createRecordingMiddleware();
|
|
170
|
+
const mockModel = createMockLanguageModel("gpt-4o", "openai.chat");
|
|
171
|
+
const { wrapLanguageModel } = await import("ai");
|
|
172
|
+
const wrapped = wrapLanguageModel({ model: mockModel, middleware });
|
|
173
|
+
const callOpts = {
|
|
174
|
+
prompt: [
|
|
175
|
+
{
|
|
176
|
+
role: "user",
|
|
177
|
+
content: [{ type: "text", text: "test" }],
|
|
178
|
+
},
|
|
179
|
+
],
|
|
180
|
+
};
|
|
181
|
+
// Simulate act call
|
|
182
|
+
await wrapped.doGenerate(callOpts);
|
|
183
|
+
// Simulate extract call
|
|
184
|
+
await wrapped.doGenerate(callOpts);
|
|
185
|
+
// Simulate observe call
|
|
186
|
+
await wrapped.doGenerate(callOpts);
|
|
187
|
+
expect(calls).toHaveLength(3);
|
|
188
|
+
expect(calls.every((c) => c.type === "generate")).toBe(true);
|
|
189
|
+
expect(calls.every((c) => c.modelId === "gpt-4o")).toBe(true);
|
|
190
|
+
});
|
|
191
|
+
it("middleware fires for agent multi-step calls (sequential doGenerate)", async () => {
|
|
192
|
+
const { middleware, calls } = createRecordingMiddleware();
|
|
193
|
+
const mockModel = createMockLanguageModel("openai/gpt-4.1", "gateway.openai");
|
|
194
|
+
const { wrapLanguageModel } = await import("ai");
|
|
195
|
+
const wrapped = wrapLanguageModel({ model: mockModel, middleware });
|
|
196
|
+
const callOpts = {
|
|
197
|
+
prompt: [
|
|
198
|
+
{
|
|
199
|
+
role: "user",
|
|
200
|
+
content: [{ type: "text", text: "agent step" }],
|
|
201
|
+
},
|
|
202
|
+
],
|
|
203
|
+
};
|
|
204
|
+
// Simulate multiple agent reasoning steps
|
|
205
|
+
await wrapped.doGenerate(callOpts);
|
|
206
|
+
await wrapped.doGenerate(callOpts);
|
|
207
|
+
await wrapped.doGenerate(callOpts);
|
|
208
|
+
await wrapped.doGenerate(callOpts);
|
|
209
|
+
await wrapped.doGenerate(callOpts);
|
|
210
|
+
expect(calls).toHaveLength(5);
|
|
211
|
+
calls.forEach((c) => {
|
|
212
|
+
expect(c.usage).toEqual({ inputTokens: 10, outputTokens: 5 });
|
|
213
|
+
});
|
|
214
|
+
});
|
|
215
|
+
});
|
|
216
|
+
// ---------------------------------------------------------------------------
|
|
217
|
+
// ModelConfiguration-level middleware (the user-facing shape)
|
|
218
|
+
// ---------------------------------------------------------------------------
|
|
219
|
+
describe("middleware inside ModelConfiguration", () => {
|
|
220
|
+
it("resolveModelConfiguration extracts middleware from object config", () => {
|
|
221
|
+
const { middleware: mw } = createRecordingMiddleware();
|
|
222
|
+
const result = resolveModelConfiguration({
|
|
223
|
+
modelName: "openai/gpt-4o",
|
|
224
|
+
apiKey: "sk-test",
|
|
225
|
+
middleware: mw,
|
|
226
|
+
});
|
|
227
|
+
expect(result.modelName).toBe("openai/gpt-4o");
|
|
228
|
+
expect(result.middleware).toBe(mw);
|
|
229
|
+
expect(result.clientOptions).toEqual({ apiKey: "sk-test" });
|
|
230
|
+
expect(result.clientOptions && "middleware" in result.clientOptions).toBe(false);
|
|
231
|
+
});
|
|
232
|
+
it("string ModelConfiguration has no middleware", () => {
|
|
233
|
+
const result = resolveModelConfiguration("openai/gpt-4o");
|
|
234
|
+
expect(result.modelName).toBe("openai/gpt-4o");
|
|
235
|
+
expect(result.middleware).toBeUndefined();
|
|
236
|
+
expect(result.clientOptions).toBeUndefined();
|
|
237
|
+
});
|
|
238
|
+
it("middleware is separated from clientOptions when resolving per-method overrides", () => {
|
|
239
|
+
const { middleware: mw } = createRecordingMiddleware();
|
|
240
|
+
const result = resolveModelConfiguration({
|
|
241
|
+
modelName: "anthropic/claude-sonnet-4-20250514",
|
|
242
|
+
apiKey: "sk-ant-test",
|
|
243
|
+
middleware: mw,
|
|
244
|
+
});
|
|
245
|
+
expect(result.modelName).toBe("anthropic/claude-sonnet-4-20250514");
|
|
246
|
+
expect(result.middleware).toBe(mw);
|
|
247
|
+
expect(result.clientOptions).toEqual({ apiKey: "sk-ant-test" });
|
|
248
|
+
expect(result.clientOptions && "middleware" in result.clientOptions).toBe(false);
|
|
249
|
+
});
|
|
250
|
+
});
|
|
251
|
+
// ---------------------------------------------------------------------------
|
|
252
|
+
// Practical middleware behaviors
|
|
253
|
+
// ---------------------------------------------------------------------------
|
|
254
|
+
describe("middleware that tracks duration", () => {
|
|
255
|
+
it("measures wall-clock time of doGenerate", async () => {
|
|
256
|
+
const durations = [];
|
|
257
|
+
const timingMiddleware = {
|
|
258
|
+
wrapGenerate: async ({ doGenerate }) => {
|
|
259
|
+
const start = performance.now();
|
|
260
|
+
const result = await doGenerate();
|
|
261
|
+
durations.push(performance.now() - start);
|
|
262
|
+
return result;
|
|
263
|
+
},
|
|
264
|
+
};
|
|
265
|
+
const mockModel = createMockLanguageModel("gpt-4o", "openai.chat");
|
|
266
|
+
const { wrapLanguageModel } = await import("ai");
|
|
267
|
+
const wrapped = wrapLanguageModel({
|
|
268
|
+
model: mockModel,
|
|
269
|
+
middleware: timingMiddleware,
|
|
270
|
+
});
|
|
271
|
+
await wrapped.doGenerate({
|
|
272
|
+
prompt: [{ role: "user", content: [{ type: "text", text: "time me" }] }],
|
|
273
|
+
});
|
|
274
|
+
expect(durations).toHaveLength(1);
|
|
275
|
+
expect(durations[0]).toBeGreaterThanOrEqual(0);
|
|
276
|
+
});
|
|
277
|
+
});
|
|
278
|
+
describe("middleware that aggregates token usage", () => {
|
|
279
|
+
it("sums tokens across multiple calls like a billing tracker", async () => {
|
|
280
|
+
let totalInput = 0;
|
|
281
|
+
let totalOutput = 0;
|
|
282
|
+
const billingMiddleware = {
|
|
283
|
+
wrapGenerate: async ({ doGenerate }) => {
|
|
284
|
+
const result = await doGenerate();
|
|
285
|
+
totalInput += result.usage.inputTokens ?? 0;
|
|
286
|
+
totalOutput += result.usage.outputTokens ?? 0;
|
|
287
|
+
return result;
|
|
288
|
+
},
|
|
289
|
+
};
|
|
290
|
+
const mockModel = createMockLanguageModel("gpt-4o", "openai.chat");
|
|
291
|
+
const { wrapLanguageModel } = await import("ai");
|
|
292
|
+
const wrapped = wrapLanguageModel({
|
|
293
|
+
model: mockModel,
|
|
294
|
+
middleware: billingMiddleware,
|
|
295
|
+
});
|
|
296
|
+
const callOpts = {
|
|
297
|
+
prompt: [
|
|
298
|
+
{
|
|
299
|
+
role: "user",
|
|
300
|
+
content: [{ type: "text", text: "go" }],
|
|
301
|
+
},
|
|
302
|
+
],
|
|
303
|
+
};
|
|
304
|
+
// act
|
|
305
|
+
await wrapped.doGenerate(callOpts);
|
|
306
|
+
// extract
|
|
307
|
+
await wrapped.doGenerate(callOpts);
|
|
308
|
+
// observe
|
|
309
|
+
await wrapped.doGenerate(callOpts);
|
|
310
|
+
expect(totalInput).toBe(30);
|
|
311
|
+
expect(totalOutput).toBe(15);
|
|
312
|
+
});
|
|
313
|
+
});
|
|
314
|
+
describe("middleware that logs per-model call counts", () => {
|
|
315
|
+
it("tracks which models were called and how many times", async () => {
|
|
316
|
+
const modelCallCounts = new Map();
|
|
317
|
+
const countingMiddleware = {
|
|
318
|
+
wrapGenerate: async ({ doGenerate, model }) => {
|
|
319
|
+
const key = `${model.provider}/${model.modelId}`;
|
|
320
|
+
modelCallCounts.set(key, (modelCallCounts.get(key) ?? 0) + 1);
|
|
321
|
+
return doGenerate();
|
|
322
|
+
},
|
|
323
|
+
};
|
|
324
|
+
const modelA = createMockLanguageModel("gpt-4o", "openai.chat");
|
|
325
|
+
const modelB = createMockLanguageModel("claude-sonnet-4-20250514", "anthropic.messages");
|
|
326
|
+
const { wrapLanguageModel } = await import("ai");
|
|
327
|
+
const wrappedA = wrapLanguageModel({
|
|
328
|
+
model: modelA,
|
|
329
|
+
middleware: countingMiddleware,
|
|
330
|
+
});
|
|
331
|
+
const wrappedB = wrapLanguageModel({
|
|
332
|
+
model: modelB,
|
|
333
|
+
middleware: countingMiddleware,
|
|
334
|
+
});
|
|
335
|
+
const callOpts = {
|
|
336
|
+
prompt: [
|
|
337
|
+
{
|
|
338
|
+
role: "user",
|
|
339
|
+
content: [{ type: "text", text: "go" }],
|
|
340
|
+
},
|
|
341
|
+
],
|
|
342
|
+
};
|
|
343
|
+
await wrappedA.doGenerate(callOpts);
|
|
344
|
+
await wrappedA.doGenerate(callOpts);
|
|
345
|
+
await wrappedB.doGenerate(callOpts);
|
|
346
|
+
expect(modelCallCounts.get("openai.chat/gpt-4o")).toBe(2);
|
|
347
|
+
expect(modelCallCounts.get("anthropic.messages/claude-sonnet-4-20250514")).toBe(1);
|
|
348
|
+
expect(modelCallCounts.size).toBe(2);
|
|
349
|
+
});
|
|
350
|
+
});
|
|
351
|
+
describe("middleware that detects errors", () => {
|
|
352
|
+
it("catches and re-throws errors from doGenerate while still recording the failure", async () => {
|
|
353
|
+
const errors = [];
|
|
354
|
+
const errorTrackingMiddleware = {
|
|
355
|
+
wrapGenerate: async ({ doGenerate }) => {
|
|
356
|
+
try {
|
|
357
|
+
return await doGenerate();
|
|
358
|
+
}
|
|
359
|
+
catch (err) {
|
|
360
|
+
errors.push(err);
|
|
361
|
+
throw err;
|
|
362
|
+
}
|
|
363
|
+
},
|
|
364
|
+
};
|
|
365
|
+
const failingModel = {
|
|
366
|
+
specificationVersion: "v2",
|
|
367
|
+
provider: "openai.chat",
|
|
368
|
+
modelId: "gpt-4o",
|
|
369
|
+
defaultObjectGenerationMode: "json",
|
|
370
|
+
doGenerate: vi.fn().mockRejectedValue(new Error("rate limit exceeded")),
|
|
371
|
+
doStream: vi.fn(),
|
|
372
|
+
};
|
|
373
|
+
const { wrapLanguageModel } = await import("ai");
|
|
374
|
+
const wrapped = wrapLanguageModel({
|
|
375
|
+
model: failingModel,
|
|
376
|
+
middleware: errorTrackingMiddleware,
|
|
377
|
+
});
|
|
378
|
+
await expect(wrapped.doGenerate({
|
|
379
|
+
prompt: [{ role: "user", content: [{ type: "text", text: "fail" }] }],
|
|
380
|
+
})).rejects.toThrow("rate limit exceeded");
|
|
381
|
+
expect(errors).toHaveLength(1);
|
|
382
|
+
expect(errors[0].message).toBe("rate limit exceeded");
|
|
383
|
+
});
|
|
384
|
+
});
|
|
385
|
+
describe("chaining middleware across multiple wrapped models", () => {
|
|
386
|
+
it("same middleware instance sees calls from different models", async () => {
|
|
387
|
+
const seen = [];
|
|
388
|
+
const spyMiddleware = {
|
|
389
|
+
wrapGenerate: async ({ doGenerate, model }) => {
|
|
390
|
+
seen.push(model.modelId);
|
|
391
|
+
return doGenerate();
|
|
392
|
+
},
|
|
393
|
+
};
|
|
394
|
+
const mockA = createMockLanguageModel("gpt-4o", "openai.chat");
|
|
395
|
+
const mockB = createMockLanguageModel("claude-sonnet-4-20250514", "anthropic.messages");
|
|
396
|
+
const { wrapLanguageModel } = await import("ai");
|
|
397
|
+
const wrappedA = wrapLanguageModel({
|
|
398
|
+
model: mockA,
|
|
399
|
+
middleware: spyMiddleware,
|
|
400
|
+
});
|
|
401
|
+
const wrappedB = wrapLanguageModel({
|
|
402
|
+
model: mockB,
|
|
403
|
+
middleware: spyMiddleware,
|
|
404
|
+
});
|
|
405
|
+
const callOpts = {
|
|
406
|
+
prompt: [
|
|
407
|
+
{
|
|
408
|
+
role: "user",
|
|
409
|
+
content: [{ type: "text", text: "go" }],
|
|
410
|
+
},
|
|
411
|
+
],
|
|
412
|
+
};
|
|
413
|
+
await wrappedA.doGenerate(callOpts);
|
|
414
|
+
await wrappedB.doGenerate(callOpts);
|
|
415
|
+
await wrappedA.doGenerate(callOpts);
|
|
416
|
+
expect(seen).toEqual(["gpt-4o", "claude-sonnet-4-20250514", "gpt-4o"]);
|
|
417
|
+
});
|
|
418
|
+
});
|
|
419
|
+
// ---------------------------------------------------------------------------
|
|
420
|
+
// Edge cases
|
|
421
|
+
// ---------------------------------------------------------------------------
|
|
422
|
+
describe("middleware edge cases", () => {
|
|
423
|
+
it("middleware that only implements wrapGenerate still works for doStream", async () => {
|
|
424
|
+
const generateCalls = [];
|
|
425
|
+
const partialMiddleware = {
|
|
426
|
+
wrapGenerate: async ({ doGenerate, model }) => {
|
|
427
|
+
generateCalls.push(model.modelId);
|
|
428
|
+
return doGenerate();
|
|
429
|
+
},
|
|
430
|
+
};
|
|
431
|
+
const mockModel = createMockLanguageModel("gpt-4o", "openai.chat");
|
|
432
|
+
const { wrapLanguageModel } = await import("ai");
|
|
433
|
+
const wrapped = wrapLanguageModel({
|
|
434
|
+
model: mockModel,
|
|
435
|
+
middleware: partialMiddleware,
|
|
436
|
+
});
|
|
437
|
+
const result = await wrapped.doStream({
|
|
438
|
+
prompt: [{ role: "user", content: [{ type: "text", text: "stream" }] }],
|
|
439
|
+
});
|
|
440
|
+
expect(result.stream).toBeDefined();
|
|
441
|
+
expect(generateCalls).toHaveLength(0);
|
|
442
|
+
});
|
|
443
|
+
it("middleware does not alter the response data", async () => {
|
|
444
|
+
const { middleware } = createRecordingMiddleware();
|
|
445
|
+
const mockModel = createMockLanguageModel("gpt-4o", "openai.chat");
|
|
446
|
+
const { wrapLanguageModel } = await import("ai");
|
|
447
|
+
const wrapped = wrapLanguageModel({ model: mockModel, middleware });
|
|
448
|
+
const result = await wrapped.doGenerate({
|
|
449
|
+
prompt: [{ role: "user", content: [{ type: "text", text: "test" }] }],
|
|
450
|
+
});
|
|
451
|
+
expect(result.content).toEqual([{ type: "text", text: "mock response" }]);
|
|
452
|
+
expect(result.usage).toEqual({
|
|
453
|
+
inputTokens: 10,
|
|
454
|
+
outputTokens: 5,
|
|
455
|
+
totalTokens: 15,
|
|
456
|
+
});
|
|
457
|
+
expect(result.finishReason).toBe("stop");
|
|
458
|
+
});
|
|
459
|
+
});
|
|
460
|
+
//# sourceMappingURL=llm-middleware.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"llm-middleware.test.js","sourceRoot":"","sources":["../../../../tests/unit/llm-middleware.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { describe, expect, it, vi } from \"vitest\";\nimport type {\n LanguageModelV2,\n LanguageModelV2Middleware,\n} from \"@ai-sdk/provider\";\nimport {\n getAISDKLanguageModel,\n LLMProvider,\n} from \"../../lib/v3/llm/LLMProvider.js\";\nimport { resolveModelConfiguration } from \"../../lib/v3/v3.js\";\n\n/**\n * Creates a recording middleware that captures every doGenerate / doStream\n * invocation along with the model identity and returned usage data.\n */\nfunction createRecordingMiddleware() {\n const calls: {\n type: \"generate\" | \"stream\";\n modelId: string;\n provider: string;\n usage?: { inputTokens?: number; outputTokens?: number };\n }[] = [];\n\n const middleware: LanguageModelV2Middleware = {\n wrapGenerate: async ({ doGenerate, model }) => {\n const result = await doGenerate();\n calls.push({\n type: \"generate\",\n modelId: model.modelId,\n provider: model.provider,\n usage: {\n inputTokens: result.usage.inputTokens ?? undefined,\n outputTokens: result.usage.outputTokens ?? undefined,\n },\n });\n return result;\n },\n wrapStream: async ({ doStream, model }) => {\n const result = await doStream();\n calls.push({\n type: \"stream\",\n modelId: model.modelId,\n provider: model.provider,\n });\n return result;\n },\n };\n\n return { middleware, calls };\n}\n\n/**\n * Creates a minimal mock LanguageModelV2 that returns canned results\n * without hitting any real provider. Useful for testing the wrapping\n * mechanics in isolation.\n */\nfunction createMockLanguageModel(\n modelId: string,\n provider: string,\n): LanguageModelV2 {\n return {\n specificationVersion: \"v2\",\n provider,\n modelId,\n defaultObjectGenerationMode: \"json\",\n doGenerate: vi.fn().mockResolvedValue({\n content: [{ type: \"text\", text: \"mock response\" }],\n finishReason: \"stop\",\n usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },\n warnings: [],\n }),\n doStream: vi.fn().mockResolvedValue({\n stream: new ReadableStream({\n start(controller) {\n controller.enqueue({\n type: \"finish\",\n finishReason: \"stop\",\n usage: { inputTokens: 8, outputTokens: 3, totalTokens: 11 },\n });\n controller.close();\n },\n }),\n }),\n } as unknown as LanguageModelV2;\n}\n\n// ---------------------------------------------------------------------------\n// getAISDKLanguageModel with middleware\n// ---------------------------------------------------------------------------\n\ndescribe(\"getAISDKLanguageModel with middleware\", () => {\n it(\"returns a model when no middleware is provided\", () => {\n const model = getAISDKLanguageModel(\"ollama\", \"llama3.2\");\n expect(model).toBeDefined();\n expect(model.modelId).toBe(\"llama3.2\");\n });\n\n it(\"returns a wrapped model when middleware is provided\", () => {\n const { middleware } = createRecordingMiddleware();\n const model = getAISDKLanguageModel(\n \"ollama\",\n \"llama3.2\",\n undefined,\n middleware,\n );\n expect(model).toBeDefined();\n // wrapLanguageModel preserves modelId\n expect(model.modelId).toBe(\"llama3.2\");\n });\n\n it(\"wrapped model preserves doGenerate and doStream methods\", () => {\n const { middleware } = createRecordingMiddleware();\n const model = getAISDKLanguageModel(\n \"ollama\",\n \"llama3.2\",\n undefined,\n middleware,\n );\n\n expect(typeof model.doGenerate).toBe(\"function\");\n expect(typeof model.doStream).toBe(\"function\");\n expect(model.provider).toContain(\"ollama\");\n });\n});\n\n// ---------------------------------------------------------------------------\n// LLMProvider with middleware\n// ---------------------------------------------------------------------------\n\ndescribe(\"LLMProvider with middleware\", () => {\n const noop = () => {};\n\n it(\"creates an AISdkClient without middleware\", () => {\n const provider = new LLMProvider(noop);\n const client = provider.getClient(\"openai/gpt-4o\" as never);\n expect(client).toBeDefined();\n expect(client.type).toBe(\"aisdk\");\n });\n\n it(\"creates an AISdkClient that carries middleware-wrapped model\", () => {\n const { middleware } = createRecordingMiddleware();\n const provider = new LLMProvider(noop, middleware);\n const client = provider.getClient(\"ollama/llama3.2\" as never);\n expect(client).toBeDefined();\n expect(client.type).toBe(\"aisdk\");\n\n const languageModel = client.getLanguageModel();\n expect(languageModel).toBeDefined();\n // Wrapped models should still expose the original modelId\n expect(languageModel.modelId).toBe(\"llama3.2\");\n });\n\n it(\"applies the same middleware to different models from getClient\", () => {\n const { middleware } = createRecordingMiddleware();\n const provider = new LLMProvider(noop, middleware);\n\n const clientA = provider.getClient(\"ollama/llama3.2\" as never);\n const clientB = provider.getClient(\"ollama/mistral\" as never);\n\n expect(clientA.getLanguageModel()).toBeDefined();\n expect(clientB.getLanguageModel()).toBeDefined();\n expect(clientA.getLanguageModel().modelId).toBe(\"llama3.2\");\n expect(clientB.getLanguageModel().modelId).toBe(\"mistral\");\n });\n});\n\n// ---------------------------------------------------------------------------\n// Middleware captures usage across act/extract/observe/agent code paths\n// ---------------------------------------------------------------------------\n\ndescribe(\"middleware captures usage from doGenerate and doStream\", () => {\n it(\"wrapGenerate fires and captures usage on doGenerate\", async () => {\n const { middleware, calls } = createRecordingMiddleware();\n const mockModel = createMockLanguageModel(\"gpt-4o\", \"openai.chat\");\n\n // Simulate what wrapLanguageModel does: import and wrap\n const { wrapLanguageModel } = await import(\"ai\");\n const wrapped = wrapLanguageModel({ model: mockModel, middleware });\n\n await wrapped.doGenerate({\n prompt: [\n {\n role: \"user\",\n content: [{ type: \"text\", text: \"act: click button\" }],\n },\n ],\n });\n\n expect(calls).toHaveLength(1);\n expect(calls[0].type).toBe(\"generate\");\n expect(calls[0].modelId).toBe(\"gpt-4o\");\n expect(calls[0].usage).toEqual({ inputTokens: 10, outputTokens: 5 });\n });\n\n it(\"wrapStream fires on doStream\", async () => {\n const { middleware, calls } = createRecordingMiddleware();\n const mockModel = createMockLanguageModel(\"gpt-4o\", \"openai.chat\");\n\n const { wrapLanguageModel } = await import(\"ai\");\n const wrapped = wrapLanguageModel({ model: mockModel, middleware });\n\n const result = await wrapped.doStream({\n prompt: [\n { role: \"user\", content: [{ type: \"text\", text: \"stream this\" }] },\n ],\n });\n\n // Consume the stream to trigger the finish chunk\n const reader = result.stream.getReader();\n while (true) {\n const { done } = await reader.read();\n if (done) break;\n }\n\n expect(calls).toHaveLength(1);\n expect(calls[0].type).toBe(\"stream\");\n expect(calls[0].modelId).toBe(\"gpt-4o\");\n });\n\n it(\"middleware fires for each separate doGenerate call (simulates act + extract + observe)\", async () => {\n const { middleware, calls } = createRecordingMiddleware();\n const mockModel = createMockLanguageModel(\"gpt-4o\", \"openai.chat\");\n\n const { wrapLanguageModel } = await import(\"ai\");\n const wrapped = wrapLanguageModel({ model: mockModel, middleware });\n\n const callOpts = {\n prompt: [\n {\n role: \"user\" as const,\n content: [{ type: \"text\" as const, text: \"test\" }],\n },\n ],\n };\n\n // Simulate act call\n await wrapped.doGenerate(callOpts);\n // Simulate extract call\n await wrapped.doGenerate(callOpts);\n // Simulate observe call\n await wrapped.doGenerate(callOpts);\n\n expect(calls).toHaveLength(3);\n expect(calls.every((c) => c.type === \"generate\")).toBe(true);\n expect(calls.every((c) => c.modelId === \"gpt-4o\")).toBe(true);\n });\n\n it(\"middleware fires for agent multi-step calls (sequential doGenerate)\", async () => {\n const { middleware, calls } = createRecordingMiddleware();\n const mockModel = createMockLanguageModel(\n \"openai/gpt-4.1\",\n \"gateway.openai\",\n );\n\n const { wrapLanguageModel } = await import(\"ai\");\n const wrapped = wrapLanguageModel({ model: mockModel, middleware });\n\n const callOpts = {\n prompt: [\n {\n role: \"user\" as const,\n content: [{ type: \"text\" as const, text: \"agent step\" }],\n },\n ],\n };\n\n // Simulate multiple agent reasoning steps\n await wrapped.doGenerate(callOpts);\n await wrapped.doGenerate(callOpts);\n await wrapped.doGenerate(callOpts);\n await wrapped.doGenerate(callOpts);\n await wrapped.doGenerate(callOpts);\n\n expect(calls).toHaveLength(5);\n calls.forEach((c) => {\n expect(c.usage).toEqual({ inputTokens: 10, outputTokens: 5 });\n });\n });\n});\n\n// ---------------------------------------------------------------------------\n// ModelConfiguration-level middleware (the user-facing shape)\n// ---------------------------------------------------------------------------\n\ndescribe(\"middleware inside ModelConfiguration\", () => {\n it(\"resolveModelConfiguration extracts middleware from object config\", () => {\n const { middleware: mw } = createRecordingMiddleware();\n const result = resolveModelConfiguration({\n modelName: \"openai/gpt-4o\",\n apiKey: \"sk-test\",\n middleware: mw,\n });\n\n expect(result.modelName).toBe(\"openai/gpt-4o\");\n expect(result.middleware).toBe(mw);\n expect(result.clientOptions).toEqual({ apiKey: \"sk-test\" });\n expect(result.clientOptions && \"middleware\" in result.clientOptions).toBe(\n false,\n );\n });\n\n it(\"string ModelConfiguration has no middleware\", () => {\n const result = resolveModelConfiguration(\"openai/gpt-4o\");\n expect(result.modelName).toBe(\"openai/gpt-4o\");\n expect(result.middleware).toBeUndefined();\n expect(result.clientOptions).toBeUndefined();\n });\n\n it(\"middleware is separated from clientOptions when resolving per-method overrides\", () => {\n const { middleware: mw } = createRecordingMiddleware();\n const result = resolveModelConfiguration({\n modelName: \"anthropic/claude-sonnet-4-20250514\",\n apiKey: \"sk-ant-test\",\n middleware: mw,\n });\n\n expect(result.modelName).toBe(\"anthropic/claude-sonnet-4-20250514\");\n expect(result.middleware).toBe(mw);\n expect(result.clientOptions).toEqual({ apiKey: \"sk-ant-test\" });\n expect(result.clientOptions && \"middleware\" in result.clientOptions).toBe(\n false,\n );\n });\n});\n\n// ---------------------------------------------------------------------------\n// Practical middleware behaviors\n// ---------------------------------------------------------------------------\n\ndescribe(\"middleware that tracks duration\", () => {\n it(\"measures wall-clock time of doGenerate\", async () => {\n const durations: number[] = [];\n\n const timingMiddleware: LanguageModelV2Middleware = {\n wrapGenerate: async ({ doGenerate }) => {\n const start = performance.now();\n const result = await doGenerate();\n durations.push(performance.now() - start);\n return result;\n },\n };\n\n const mockModel = createMockLanguageModel(\"gpt-4o\", \"openai.chat\");\n const { wrapLanguageModel } = await import(\"ai\");\n const wrapped = wrapLanguageModel({\n model: mockModel,\n middleware: timingMiddleware,\n });\n\n await wrapped.doGenerate({\n prompt: [{ role: \"user\", content: [{ type: \"text\", text: \"time me\" }] }],\n });\n\n expect(durations).toHaveLength(1);\n expect(durations[0]).toBeGreaterThanOrEqual(0);\n });\n});\n\ndescribe(\"middleware that aggregates token usage\", () => {\n it(\"sums tokens across multiple calls like a billing tracker\", async () => {\n let totalInput = 0;\n let totalOutput = 0;\n\n const billingMiddleware: LanguageModelV2Middleware = {\n wrapGenerate: async ({ doGenerate }) => {\n const result = await doGenerate();\n totalInput += result.usage.inputTokens ?? 0;\n totalOutput += result.usage.outputTokens ?? 0;\n return result;\n },\n };\n\n const mockModel = createMockLanguageModel(\"gpt-4o\", \"openai.chat\");\n const { wrapLanguageModel } = await import(\"ai\");\n const wrapped = wrapLanguageModel({\n model: mockModel,\n middleware: billingMiddleware,\n });\n\n const callOpts = {\n prompt: [\n {\n role: \"user\" as const,\n content: [{ type: \"text\" as const, text: \"go\" }],\n },\n ],\n };\n\n // act\n await wrapped.doGenerate(callOpts);\n // extract\n await wrapped.doGenerate(callOpts);\n // observe\n await wrapped.doGenerate(callOpts);\n\n expect(totalInput).toBe(30);\n expect(totalOutput).toBe(15);\n });\n});\n\ndescribe(\"middleware that logs per-model call counts\", () => {\n it(\"tracks which models were called and how many times\", async () => {\n const modelCallCounts = new Map<string, number>();\n\n const countingMiddleware: LanguageModelV2Middleware = {\n wrapGenerate: async ({ doGenerate, model }) => {\n const key = `${model.provider}/${model.modelId}`;\n modelCallCounts.set(key, (modelCallCounts.get(key) ?? 0) + 1);\n return doGenerate();\n },\n };\n\n const modelA = createMockLanguageModel(\"gpt-4o\", \"openai.chat\");\n const modelB = createMockLanguageModel(\n \"claude-sonnet-4-20250514\",\n \"anthropic.messages\",\n );\n\n const { wrapLanguageModel } = await import(\"ai\");\n const wrappedA = wrapLanguageModel({\n model: modelA,\n middleware: countingMiddleware,\n });\n const wrappedB = wrapLanguageModel({\n model: modelB,\n middleware: countingMiddleware,\n });\n\n const callOpts = {\n prompt: [\n {\n role: \"user\" as const,\n content: [{ type: \"text\" as const, text: \"go\" }],\n },\n ],\n };\n\n await wrappedA.doGenerate(callOpts);\n await wrappedA.doGenerate(callOpts);\n await wrappedB.doGenerate(callOpts);\n\n expect(modelCallCounts.get(\"openai.chat/gpt-4o\")).toBe(2);\n expect(\n modelCallCounts.get(\"anthropic.messages/claude-sonnet-4-20250514\"),\n ).toBe(1);\n expect(modelCallCounts.size).toBe(2);\n });\n});\n\ndescribe(\"middleware that detects errors\", () => {\n it(\"catches and re-throws errors from doGenerate while still recording the failure\", async () => {\n const errors: Error[] = [];\n\n const errorTrackingMiddleware: LanguageModelV2Middleware = {\n wrapGenerate: async ({ doGenerate }) => {\n try {\n return await doGenerate();\n } catch (err) {\n errors.push(err as Error);\n throw err;\n }\n },\n };\n\n const failingModel: LanguageModelV2 = {\n specificationVersion: \"v2\",\n provider: \"openai.chat\",\n modelId: \"gpt-4o\",\n defaultObjectGenerationMode: \"json\",\n doGenerate: vi.fn().mockRejectedValue(new Error(\"rate limit exceeded\")),\n doStream: vi.fn(),\n } as unknown as LanguageModelV2;\n\n const { wrapLanguageModel } = await import(\"ai\");\n const wrapped = wrapLanguageModel({\n model: failingModel,\n middleware: errorTrackingMiddleware,\n });\n\n await expect(\n wrapped.doGenerate({\n prompt: [{ role: \"user\", content: [{ type: \"text\", text: \"fail\" }] }],\n }),\n ).rejects.toThrow(\"rate limit exceeded\");\n\n expect(errors).toHaveLength(1);\n expect(errors[0].message).toBe(\"rate limit exceeded\");\n });\n});\n\ndescribe(\"chaining middleware across multiple wrapped models\", () => {\n it(\"same middleware instance sees calls from different models\", async () => {\n const seen: string[] = [];\n\n const spyMiddleware: LanguageModelV2Middleware = {\n wrapGenerate: async ({ doGenerate, model }) => {\n seen.push(model.modelId);\n return doGenerate();\n },\n };\n\n const mockA = createMockLanguageModel(\"gpt-4o\", \"openai.chat\");\n const mockB = createMockLanguageModel(\n \"claude-sonnet-4-20250514\",\n \"anthropic.messages\",\n );\n\n const { wrapLanguageModel } = await import(\"ai\");\n const wrappedA = wrapLanguageModel({\n model: mockA,\n middleware: spyMiddleware,\n });\n const wrappedB = wrapLanguageModel({\n model: mockB,\n middleware: spyMiddleware,\n });\n\n const callOpts = {\n prompt: [\n {\n role: \"user\" as const,\n content: [{ type: \"text\" as const, text: \"go\" }],\n },\n ],\n };\n\n await wrappedA.doGenerate(callOpts);\n await wrappedB.doGenerate(callOpts);\n await wrappedA.doGenerate(callOpts);\n\n expect(seen).toEqual([\"gpt-4o\", \"claude-sonnet-4-20250514\", \"gpt-4o\"]);\n });\n});\n\n// ---------------------------------------------------------------------------\n// Edge cases\n// ---------------------------------------------------------------------------\n\ndescribe(\"middleware edge cases\", () => {\n it(\"middleware that only implements wrapGenerate still works for doStream\", async () => {\n const generateCalls: string[] = [];\n const partialMiddleware: LanguageModelV2Middleware = {\n wrapGenerate: async ({ doGenerate, model }) => {\n generateCalls.push(model.modelId);\n return doGenerate();\n },\n };\n\n const mockModel = createMockLanguageModel(\"gpt-4o\", \"openai.chat\");\n const { wrapLanguageModel } = await import(\"ai\");\n const wrapped = wrapLanguageModel({\n model: mockModel,\n middleware: partialMiddleware,\n });\n\n const result = await wrapped.doStream({\n prompt: [{ role: \"user\", content: [{ type: \"text\", text: \"stream\" }] }],\n });\n expect(result.stream).toBeDefined();\n\n expect(generateCalls).toHaveLength(0);\n });\n\n it(\"middleware does not alter the response data\", async () => {\n const { middleware } = createRecordingMiddleware();\n const mockModel = createMockLanguageModel(\"gpt-4o\", \"openai.chat\");\n\n const { wrapLanguageModel } = await import(\"ai\");\n const wrapped = wrapLanguageModel({ model: mockModel, middleware });\n\n const result = await wrapped.doGenerate({\n prompt: [{ role: \"user\", content: [{ type: \"text\", text: \"test\" }] }],\n });\n\n expect(result.content).toEqual([{ type: \"text\", text: \"mock response\" }]);\n expect(result.usage).toEqual({\n inputTokens: 10,\n outputTokens: 5,\n totalTokens: 15,\n });\n expect(result.finishReason).toBe(\"stop\");\n });\n});\n"]}
|
|
@@ -6,10 +6,7 @@ const mockClientOptions = { apiKey: "test-api-key-for-testing" };
|
|
|
6
6
|
describe("Model format deprecation", () => {
|
|
7
7
|
describe("UnsupportedModelError", () => {
|
|
8
8
|
it("includes guidance to use provider/model format for unknown model names", () => {
|
|
9
|
-
const error = new UnsupportedModelError([
|
|
10
|
-
"gpt-4o",
|
|
11
|
-
"claude-3-5-sonnet-latest",
|
|
12
|
-
]);
|
|
9
|
+
const error = new UnsupportedModelError(["gpt-4o", "gemini-2.0-flash"]);
|
|
13
10
|
// Should mention the new format
|
|
14
11
|
expect(error.message).toContain("provider/model");
|
|
15
12
|
// Should include link to docs
|
|
@@ -68,15 +65,15 @@ describe("Model format deprecation", () => {
|
|
|
68
65
|
// The client should be an OpenAIClient (check constructor name)
|
|
69
66
|
expect(client.constructor.name).toBe("OpenAIClient");
|
|
70
67
|
});
|
|
71
|
-
it("returns
|
|
68
|
+
it("returns GoogleClient for legacy Google model names", () => {
|
|
72
69
|
const logs = [];
|
|
73
70
|
const logger = (line) => logs.push(line);
|
|
74
71
|
const provider = new LLMProvider(logger);
|
|
75
|
-
const client = provider.getClient("
|
|
72
|
+
const client = provider.getClient("gemini-2.0-flash", mockClientOptions);
|
|
76
73
|
// Should return a client
|
|
77
74
|
expect(client).toBeDefined();
|
|
78
|
-
// The client should be
|
|
79
|
-
expect(client.constructor.name).toBe("
|
|
75
|
+
// The client should be a GoogleClient
|
|
76
|
+
expect(client.constructor.name).toBe("GoogleClient");
|
|
80
77
|
});
|
|
81
78
|
});
|
|
82
79
|
describe("LLMProvider.getClient error handling", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-deprecation.test.js","sourceRoot":"","sources":["../../../../tests/unit/model-deprecation.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { describe, expect, it } from \"vitest\";\nimport { LLMProvider } from \"../../lib/v3/llm/LLMProvider.js\";\nimport {\n UnsupportedModelError,\n UnsupportedAISDKModelProviderError,\n} from \"../../lib/v3/types/public/sdkErrors.js\";\nimport type { LogLine } from \"../../lib/v3/types/public/logs.js\";\n\n// Mock client options with fake API keys for testing\nconst mockClientOptions = { apiKey: \"test-api-key-for-testing\" };\n\ndescribe(\"Model format deprecation\", () => {\n describe(\"UnsupportedModelError\", () => {\n it(\"includes guidance to use provider/model format for unknown model names\", () => {\n const error = new UnsupportedModelError([\n \"gpt-4o\",\n \"claude-3-5-sonnet-latest\",\n ]);\n\n // Should mention the new format\n expect(error.message).toContain(\"provider/model\");\n // Should include link to docs\n expect(error.message).toContain(\n \"https://docs.stagehand.dev/v3/configuration/models\",\n );\n });\n\n it(\"includes example of provider/model format\", () => {\n const error = new UnsupportedModelError([\"gpt-4o\"]);\n\n // Should provide examples like openai/gpt-4o\n expect(error.message).toContain(\"openai/gpt-4o\");\n expect(error.message).toContain(\"anthropic/claude-sonnet-4\");\n });\n\n it(\"works with feature parameter\", () => {\n const error = new UnsupportedModelError([\"gpt-4o\"], \"extract\");\n\n expect(error.message).toContain(\"extract\");\n expect(error.message).toContain(\"provider/model\");\n expect(error.message).toContain(\n \"https://docs.stagehand.dev/v3/configuration/models\",\n );\n });\n });\n\n describe(\"LLMProvider.getClient deprecation warning\", () => {\n it(\"logs deprecation warning for legacy model names\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n // Using a legacy model name like \"gpt-4o\" instead of \"openai/gpt-4o\"\n // Should not throw, but should log a deprecation warning\n const client = provider.getClient(\"gpt-4o\", mockClientOptions);\n\n // Should return a client (not throw)\n expect(client).toBeDefined();\n\n // Should have logged a deprecation warning at level 0\n const deprecationWarning = logs.find(\n (log) =>\n log.message.toLowerCase().includes(\"deprecated\") ||\n log.message.toLowerCase().includes(\"deprecation\"),\n );\n expect(deprecationWarning).toBeDefined();\n expect(deprecationWarning!.level).toBe(0);\n });\n\n it(\"deprecation warning mentions provider/model format\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n provider.getClient(\"gpt-4o\", mockClientOptions);\n\n const deprecationWarning = logs.find(\n (log) =>\n log.message.toLowerCase().includes(\"deprecated\") ||\n log.message.toLowerCase().includes(\"deprecation\"),\n );\n\n expect(deprecationWarning).toBeDefined();\n const message = deprecationWarning!.message;\n // Should mention the provider/model format\n expect(message).toContain(\"provider/model\");\n // Should give an example\n expect(message).toContain(\"openai/gpt-5\");\n });\n\n it(\"returns OpenAIClient for legacy OpenAI model names\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n const client = provider.getClient(\"gpt-4o\", mockClientOptions);\n\n // Should return a client\n expect(client).toBeDefined();\n // The client should be an OpenAIClient (check constructor name)\n expect(client.constructor.name).toBe(\"OpenAIClient\");\n });\n\n it(\"returns AnthropicClient for legacy Anthropic model names\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n const client = provider.getClient(\n \"claude-3-5-sonnet-latest\",\n mockClientOptions,\n );\n\n // Should return a client\n expect(client).toBeDefined();\n // The client should be an AnthropicClient\n expect(client.constructor.name).toBe(\"AnthropicClient\");\n });\n });\n\n describe(\"LLMProvider.getClient error handling\", () => {\n it(\"throws UnsupportedModelError for unknown model without slash\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n // Unknown model without slash should throw UnsupportedModelError\n expect(() => {\n provider.getClient(\"some-unknown-model\", mockClientOptions);\n }).toThrow(UnsupportedModelError);\n });\n\n it(\"UnsupportedModelError includes provider/model format guidance\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n try {\n provider.getClient(\"some-unknown-model\", mockClientOptions);\n } catch (error) {\n expect((error as Error).message).toContain(\"provider/model\");\n }\n });\n\n it(\"throws UnsupportedAISDKModelProviderError for invalid provider in provider/model format\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n // Invalid provider but correct format\n expect(() => {\n provider.getClient(\"invalid-provider/some-model\", mockClientOptions);\n }).toThrow(UnsupportedAISDKModelProviderError);\n });\n\n it(\"UnsupportedAISDKModelProviderError lists valid providers\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n try {\n provider.getClient(\"invalid-provider/some-model\", mockClientOptions);\n } catch (error) {\n const message = (error as Error).message;\n // Should list valid providers\n expect(message).toContain(\"openai\");\n expect(message).toContain(\"anthropic\");\n expect(message).toContain(\"google\");\n }\n });\n });\n\n describe(\"new provider/model format\", () => {\n it(\"does not log deprecation warning for provider/model format\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n // Using the new format\n const client = provider.getClient(\"openai/gpt-4o\", mockClientOptions);\n\n expect(client).toBeDefined();\n\n // Should NOT have a deprecation warning\n const deprecationWarning = logs.find(\n (log) =>\n log.message.toLowerCase().includes(\"deprecated\") ||\n log.message.toLowerCase().includes(\"deprecation\"),\n );\n expect(deprecationWarning).toBeUndefined();\n });\n });\n});\n"]}
|
|
1
|
+
{"version":3,"file":"model-deprecation.test.js","sourceRoot":"","sources":["../../../../tests/unit/model-deprecation.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { describe, expect, it } from \"vitest\";\nimport { LLMProvider } from \"../../lib/v3/llm/LLMProvider.js\";\nimport {\n UnsupportedModelError,\n UnsupportedAISDKModelProviderError,\n} from \"../../lib/v3/types/public/sdkErrors.js\";\nimport type { LogLine } from \"../../lib/v3/types/public/logs.js\";\n\n// Mock client options with fake API keys for testing\nconst mockClientOptions = { apiKey: \"test-api-key-for-testing\" };\n\ndescribe(\"Model format deprecation\", () => {\n describe(\"UnsupportedModelError\", () => {\n it(\"includes guidance to use provider/model format for unknown model names\", () => {\n const error = new UnsupportedModelError([\"gpt-4o\", \"gemini-2.0-flash\"]);\n\n // Should mention the new format\n expect(error.message).toContain(\"provider/model\");\n // Should include link to docs\n expect(error.message).toContain(\n \"https://docs.stagehand.dev/v3/configuration/models\",\n );\n });\n\n it(\"includes example of provider/model format\", () => {\n const error = new UnsupportedModelError([\"gpt-4o\"]);\n\n // Should provide examples like openai/gpt-4o\n expect(error.message).toContain(\"openai/gpt-4o\");\n expect(error.message).toContain(\"anthropic/claude-sonnet-4\");\n });\n\n it(\"works with feature parameter\", () => {\n const error = new UnsupportedModelError([\"gpt-4o\"], \"extract\");\n\n expect(error.message).toContain(\"extract\");\n expect(error.message).toContain(\"provider/model\");\n expect(error.message).toContain(\n \"https://docs.stagehand.dev/v3/configuration/models\",\n );\n });\n });\n\n describe(\"LLMProvider.getClient deprecation warning\", () => {\n it(\"logs deprecation warning for legacy model names\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n // Using a legacy model name like \"gpt-4o\" instead of \"openai/gpt-4o\"\n // Should not throw, but should log a deprecation warning\n const client = provider.getClient(\"gpt-4o\", mockClientOptions);\n\n // Should return a client (not throw)\n expect(client).toBeDefined();\n\n // Should have logged a deprecation warning at level 0\n const deprecationWarning = logs.find(\n (log) =>\n log.message.toLowerCase().includes(\"deprecated\") ||\n log.message.toLowerCase().includes(\"deprecation\"),\n );\n expect(deprecationWarning).toBeDefined();\n expect(deprecationWarning!.level).toBe(0);\n });\n\n it(\"deprecation warning mentions provider/model format\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n provider.getClient(\"gpt-4o\", mockClientOptions);\n\n const deprecationWarning = logs.find(\n (log) =>\n log.message.toLowerCase().includes(\"deprecated\") ||\n log.message.toLowerCase().includes(\"deprecation\"),\n );\n\n expect(deprecationWarning).toBeDefined();\n const message = deprecationWarning!.message;\n // Should mention the provider/model format\n expect(message).toContain(\"provider/model\");\n // Should give an example\n expect(message).toContain(\"openai/gpt-5\");\n });\n\n it(\"returns OpenAIClient for legacy OpenAI model names\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n const client = provider.getClient(\"gpt-4o\", mockClientOptions);\n\n // Should return a client\n expect(client).toBeDefined();\n // The client should be an OpenAIClient (check constructor name)\n expect(client.constructor.name).toBe(\"OpenAIClient\");\n });\n\n it(\"returns GoogleClient for legacy Google model names\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n const client = provider.getClient(\"gemini-2.0-flash\", mockClientOptions);\n\n // Should return a client\n expect(client).toBeDefined();\n // The client should be a GoogleClient\n expect(client.constructor.name).toBe(\"GoogleClient\");\n });\n });\n\n describe(\"LLMProvider.getClient error handling\", () => {\n it(\"throws UnsupportedModelError for unknown model without slash\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n // Unknown model without slash should throw UnsupportedModelError\n expect(() => {\n provider.getClient(\"some-unknown-model\", mockClientOptions);\n }).toThrow(UnsupportedModelError);\n });\n\n it(\"UnsupportedModelError includes provider/model format guidance\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n try {\n provider.getClient(\"some-unknown-model\", mockClientOptions);\n } catch (error) {\n expect((error as Error).message).toContain(\"provider/model\");\n }\n });\n\n it(\"throws UnsupportedAISDKModelProviderError for invalid provider in provider/model format\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n // Invalid provider but correct format\n expect(() => {\n provider.getClient(\"invalid-provider/some-model\", mockClientOptions);\n }).toThrow(UnsupportedAISDKModelProviderError);\n });\n\n it(\"UnsupportedAISDKModelProviderError lists valid providers\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n try {\n provider.getClient(\"invalid-provider/some-model\", mockClientOptions);\n } catch (error) {\n const message = (error as Error).message;\n // Should list valid providers\n expect(message).toContain(\"openai\");\n expect(message).toContain(\"anthropic\");\n expect(message).toContain(\"google\");\n }\n });\n });\n\n describe(\"new provider/model format\", () => {\n it(\"does not log deprecation warning for provider/model format\", () => {\n const logs: LogLine[] = [];\n const logger = (line: LogLine) => logs.push(line);\n const provider = new LLMProvider(logger);\n\n // Using the new format\n const client = provider.getClient(\"openai/gpt-4o\", mockClientOptions);\n\n expect(client).toBeDefined();\n\n // Should NOT have a deprecation warning\n const deprecationWarning = logs.find(\n (log) =>\n log.message.toLowerCase().includes(\"deprecated\") ||\n log.message.toLowerCase().includes(\"deprecation\"),\n );\n expect(deprecationWarning).toBeUndefined();\n });\n });\n});\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|