@framers/agentos 0.10.23 → 0.10.25
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/api/AgentOS.d.ts.map +1 -1
- package/dist/api/AgentOS.js +3 -2
- package/dist/api/AgentOS.js.map +1 -1
- package/dist/api/agent.d.ts.map +1 -1
- package/dist/api/agent.js +25 -10
- package/dist/api/agent.js.map +1 -1
- package/dist/api/embedText.d.ts.map +1 -1
- package/dist/api/embedText.js +53 -17
- package/dist/api/embedText.js.map +1 -1
- package/dist/api/generateImage.d.ts.map +1 -1
- package/dist/api/generateImage.js +51 -7
- package/dist/api/generateImage.js.map +1 -1
- package/dist/api/generateText.d.ts +36 -6
- package/dist/api/generateText.d.ts.map +1 -1
- package/dist/api/generateText.js +102 -17
- package/dist/api/generateText.js.map +1 -1
- package/dist/api/model.d.ts.map +1 -1
- package/dist/api/model.js +11 -4
- package/dist/api/model.js.map +1 -1
- package/dist/api/runtime/SelfImprovementSessionManager.d.ts +34 -2
- package/dist/api/runtime/SelfImprovementSessionManager.d.ts.map +1 -1
- package/dist/api/runtime/SelfImprovementSessionManager.js +119 -33
- package/dist/api/runtime/SelfImprovementSessionManager.js.map +1 -1
- package/dist/api/runtime/provider-defaults.d.ts.map +1 -1
- package/dist/api/runtime/provider-defaults.js +5 -2
- package/dist/api/runtime/provider-defaults.js.map +1 -1
- package/dist/api/streamText.d.ts.map +1 -1
- package/dist/api/streamText.js +116 -34
- package/dist/api/streamText.js.map +1 -1
- package/dist/api/types/AgentOSInput.d.ts +11 -0
- package/dist/api/types/AgentOSInput.d.ts.map +1 -1
- package/dist/api/types.d.ts +14 -6
- package/dist/api/types.d.ts.map +1 -1
- package/dist/api/types.js.map +1 -1
- package/dist/cognition/emergent/AdaptPersonalityTool.d.ts +13 -4
- package/dist/cognition/emergent/AdaptPersonalityTool.d.ts.map +1 -1
- package/dist/cognition/emergent/AdaptPersonalityTool.js +32 -23
- package/dist/cognition/emergent/AdaptPersonalityTool.js.map +1 -1
- package/dist/cognition/emergent/EmergentCapabilityEngine.d.ts +18 -6
- package/dist/cognition/emergent/EmergentCapabilityEngine.d.ts.map +1 -1
- package/dist/cognition/emergent/EmergentCapabilityEngine.js.map +1 -1
- package/dist/cognition/emergent/SelfEvaluateTool.d.ts +10 -3
- package/dist/cognition/emergent/SelfEvaluateTool.d.ts.map +1 -1
- package/dist/cognition/emergent/SelfEvaluateTool.js +3 -2
- package/dist/cognition/emergent/SelfEvaluateTool.js.map +1 -1
- package/dist/cognition/substrate/CognitiveMemoryBridge.d.ts +51 -2
- package/dist/cognition/substrate/CognitiveMemoryBridge.d.ts.map +1 -1
- package/dist/cognition/substrate/CognitiveMemoryBridge.js +84 -2
- package/dist/cognition/substrate/CognitiveMemoryBridge.js.map +1 -1
- package/dist/cognition/substrate/ConversationHistoryManager.d.ts +8 -4
- package/dist/cognition/substrate/ConversationHistoryManager.d.ts.map +1 -1
- package/dist/cognition/substrate/ConversationHistoryManager.js +17 -5
- package/dist/cognition/substrate/ConversationHistoryManager.js.map +1 -1
- package/dist/cognition/substrate/GMI.d.ts +92 -5
- package/dist/cognition/substrate/GMI.d.ts.map +1 -1
- package/dist/cognition/substrate/GMI.js +291 -65
- package/dist/cognition/substrate/GMI.js.map +1 -1
- package/dist/cognition/substrate/GMIManager.d.ts +12 -0
- package/dist/cognition/substrate/GMIManager.d.ts.map +1 -1
- package/dist/cognition/substrate/GMIManager.js +22 -16
- package/dist/cognition/substrate/GMIManager.js.map +1 -1
- package/dist/cognition/substrate/IGMI.d.ts +23 -0
- package/dist/cognition/substrate/IGMI.d.ts.map +1 -1
- package/dist/cognition/substrate/IGMI.js.map +1 -1
- package/dist/cognition/substrate/MetapromptExecutor.d.ts +183 -28
- package/dist/cognition/substrate/MetapromptExecutor.d.ts.map +1 -1
- package/dist/cognition/substrate/MetapromptExecutor.js +431 -108
- package/dist/cognition/substrate/MetapromptExecutor.js.map +1 -1
- package/dist/cognition/substrate/personas/IPersonaDefinition.d.ts +5 -0
- package/dist/cognition/substrate/personas/IPersonaDefinition.d.ts.map +1 -1
- package/dist/cognition/substrate/personas/PersonaValidation.d.ts.map +1 -1
- package/dist/cognition/substrate/personas/PersonaValidation.js +30 -0
- package/dist/cognition/substrate/personas/PersonaValidation.js.map +1 -1
- package/dist/cognition/substrate/personas/SoulLoader.d.ts +14 -1
- package/dist/cognition/substrate/personas/SoulLoader.d.ts.map +1 -1
- package/dist/cognition/substrate/personas/SoulLoader.js +45 -12
- package/dist/cognition/substrate/personas/SoulLoader.js.map +1 -1
- package/dist/cognition/substrate/personas/definitions/default_assistant_persona.json +3 -35
- package/dist/cognition/substrate/personas/hexaco.d.ts +34 -0
- package/dist/cognition/substrate/personas/hexaco.d.ts.map +1 -0
- package/dist/cognition/substrate/personas/hexaco.js +66 -0
- package/dist/cognition/substrate/personas/hexaco.js.map +1 -0
- package/dist/cognition/substrate/userFeedback.d.ts +69 -0
- package/dist/cognition/substrate/userFeedback.d.ts.map +1 -0
- package/dist/cognition/substrate/userFeedback.js +107 -0
- package/dist/cognition/substrate/userFeedback.js.map +1 -0
- package/dist/core/conversation/ConversationMessage.d.ts +9 -0
- package/dist/core/conversation/ConversationMessage.d.ts.map +1 -1
- package/dist/core/conversation/ConversationMessage.js.map +1 -1
- package/dist/core/llm/IPromptEngine.d.ts +9 -0
- package/dist/core/llm/IPromptEngine.d.ts.map +1 -1
- package/dist/core/llm/IPromptEngine.js.map +1 -1
- package/dist/core/llm/PromptEngine.d.ts +30 -1
- package/dist/core/llm/PromptEngine.d.ts.map +1 -1
- package/dist/core/llm/PromptEngine.js +229 -92
- package/dist/core/llm/PromptEngine.js.map +1 -1
- package/dist/core/llm/providers/IProvider.d.ts +28 -8
- package/dist/core/llm/providers/IProvider.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/AnthropicProvider.d.ts +135 -49
- package/dist/core/llm/providers/implementations/AnthropicProvider.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/AnthropicProvider.js +294 -110
- package/dist/core/llm/providers/implementations/AnthropicProvider.js.map +1 -1
- package/dist/core/llm/providers/implementations/ClaudeCodeProvider.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/ClaudeCodeProvider.js +15 -1
- package/dist/core/llm/providers/implementations/ClaudeCodeProvider.js.map +1 -1
- package/dist/core/llm/providers/implementations/GeminiCLIProvider.d.ts +1 -1
- package/dist/core/llm/providers/implementations/GeminiCLIProvider.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/GeminiCLIProvider.js +51 -24
- package/dist/core/llm/providers/implementations/GeminiCLIProvider.js.map +1 -1
- package/dist/core/llm/providers/implementations/GeminiProvider.d.ts +19 -6
- package/dist/core/llm/providers/implementations/GeminiProvider.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/GeminiProvider.js +62 -24
- package/dist/core/llm/providers/implementations/GeminiProvider.js.map +1 -1
- package/dist/core/llm/providers/implementations/OpenAIProvider.d.ts +255 -70
- package/dist/core/llm/providers/implementations/OpenAIProvider.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/OpenAIProvider.js +943 -214
- package/dist/core/llm/providers/implementations/OpenAIProvider.js.map +1 -1
- package/dist/core/llm/providers/implementations/cacheLeakDetector.d.ts +15 -7
- package/dist/core/llm/providers/implementations/cacheLeakDetector.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/cacheLeakDetector.js +12 -7
- package/dist/core/llm/providers/implementations/cacheLeakDetector.js.map +1 -1
- package/dist/core/llm/providers/implementations/openai-response-format-guard.d.ts +17 -0
- package/dist/core/llm/providers/implementations/openai-response-format-guard.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/openai-response-format-guard.js +31 -0
- package/dist/core/llm/providers/implementations/openai-response-format-guard.js.map +1 -1
- package/dist/core/llm/providers/model-cache-capabilities.d.ts +24 -9
- package/dist/core/llm/providers/model-cache-capabilities.d.ts.map +1 -1
- package/dist/core/llm/providers/model-cache-capabilities.js +59 -44
- package/dist/core/llm/providers/model-cache-capabilities.js.map +1 -1
- package/dist/core/llm/providers/model-effort.d.ts +21 -0
- package/dist/core/llm/providers/model-effort.d.ts.map +1 -1
- package/dist/core/llm/providers/model-effort.js +38 -2
- package/dist/core/llm/providers/model-effort.js.map +1 -1
- package/dist/core/llm/providers/model-forced-tool-choice.d.ts +13 -6
- package/dist/core/llm/providers/model-forced-tool-choice.d.ts.map +1 -1
- package/dist/core/llm/providers/model-forced-tool-choice.js +14 -7
- package/dist/core/llm/providers/model-forced-tool-choice.js.map +1 -1
- package/dist/core/llm/providers/model-thinking.d.ts +64 -13
- package/dist/core/llm/providers/model-thinking.d.ts.map +1 -1
- package/dist/core/llm/providers/model-thinking.js +52 -12
- package/dist/core/llm/providers/model-thinking.js.map +1 -1
- package/dist/core/llm/streaming/StreamingBatcher.d.ts +4 -3
- package/dist/core/llm/streaming/StreamingBatcher.d.ts.map +1 -1
- package/dist/core/llm/streaming/StreamingBatcher.js +8 -3
- package/dist/core/llm/streaming/StreamingBatcher.js.map +1 -1
- package/dist/core/safety/LLMProviderHealthRegistry.d.ts +4 -0
- package/dist/core/safety/LLMProviderHealthRegistry.d.ts.map +1 -1
- package/dist/core/safety/LLMProviderHealthRegistry.js +26 -0
- package/dist/core/safety/LLMProviderHealthRegistry.js.map +1 -1
- package/dist/core/utils/sha256.d.ts +19 -0
- package/dist/core/utils/sha256.d.ts.map +1 -0
- package/dist/core/utils/sha256.js +101 -0
- package/dist/core/utils/sha256.js.map +1 -0
- package/dist/orchestration/pipeline/query/types.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embedText.js","sourceRoot":"","sources":["../../src/api/embedText.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,kBAAkB,EAAkC,MAAM,0BAA0B,CAAC;AAC9F,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"embedText.js","sourceRoot":"","sources":["../../src/api/embedText.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,kBAAkB,EAAkC,MAAM,0BAA0B,CAAC;AAC9F,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACvG,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAoKxE,8EAA8E;AAC9E,4BAA4B;AAC5B,8EAA8E;AAE9E;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,mBAAmB,CAChC,OAAe,EACf,MAAc,EACd,OAAe,EACf,KAAe,EACf,UAAmB;IAEnB,uEAAuE;IACvE,mDAAmD;IACnD,MAAM,IAAI,GAA4B,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAChE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC;IAExD,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAC1B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,eAAe,EAAE,UAAU,MAAM,EAAE;aACpC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;QAC5D,2DAA2D;QAC3D,MAAM,IAAI,KAAK,CAAC,6BAA6B,QAAQ,CAAC,MAAM,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IACjH,CAAC;IAED,OAAO,QAAQ,CAAC,IAAI,EAAsC,CAAC;AAC7D,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAS,mBAAmB,CAC1B,KAAc,EACd,KAAa,EACb,OAAe,EACf,UAAiC,EAAE;IAEnC,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GAAI,KAA2D,EAAE,KAAK,EAAE,IAAI,CAAC;IACvF,MAAM,MAAM,GAAG,OAAO,IAAI,KAAK,QAAQ,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9F,OAAO,IAAI,KAAK,CAAC,GAAG,KAAK,oBAAoB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAAC,CAAC;AACvG,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,eAAe,CAC5B,OAAe,EACf,OAAe,EACf,KAAe;IAEf,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC;IAEvD,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAC1B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAChD,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,mBAAmB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,CAAC,MAAM,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1G,CAAC;IAED,OAAO,QAAQ,CAAC,IAAI,EAAkC,CAAC;AACzD,CAAC;AAED,8EAA8E;AAC9E,gBAAgB;AAChB,8EAA8E;AAE9E;;;;;;GAMG;AACH,MAAM,8BAA8B,GAAG,oBAAoB,CAAC;AAE5D;;;;;;;;;;GAUG;AACH,SAAS,0BAA0B,CAAC,OAA2B;IAC7D,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,GAAG,CAAC,QAAQ,KAAK,mCAAmC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACpG,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,0BAA0B,CAAC,IAAsB;IACxD,IAAI,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAC5B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,8BAA8B,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAChG,CAAC;IACD,MAAM,aAAa,GAAG,kBAAkB,EAAE,CAAC;IAC3C,IAAI,aAAa,EAAE,QAAQ,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACtD,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC;IACxC,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,WAAW,IAAI,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,8BAA8B;KACpG,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,IAAsB;IACpD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI,YAAY,GAAmB,IAAI,CAAC;IACxC,IAAI,gBAAoC,CAAC;IACzC,IAAI,aAAiC,CAAC;IACtC,IAAI,WAAwF,CAAC;IAE7F,IAAI,CAAC;QACH,OAAO,MAAM,eAAe,CAC1B,wBAAwB,EACxB,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,gEAAgE;YAChE,mEAAmE;YACnE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC,0BAA0B,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC;YAClG,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,EAAE,OAAO,EAAE;gBACpD,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;YAEH,gBAAgB,GAAG,QAAQ,CAAC,UAAU,CAAC;YACvC,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC;YAEjC,IAAI,EAAE,YAAY,CAAC,cAAc,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;YACxD,IAAI,EAAE,YAAY,CAAC,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;YAElD,8DAA8D;YAC9D,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzE,IAAI,EAAE,YAAY,CAAC,+BAA+B,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;YAEvE,IAAI,UAAsB,CAAC;YAC3B,IAAI,aAAqB,CAAC;YAC1B,IAAI,KAAsE,CAAC;YAE3E,IAAI,QAAQ,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;gBACrC,iDAAiD;gBACjD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,wBAAwB,CAAC;gBAC7D,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBAE5E,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;gBAC/B,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;gBAC7B,mDAAmD;gBACnD,KAAK,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;YAC9C,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,KAAK,QAAQ,IAAI,0BAA0B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5F,oEAAoE;gBACpE,oEAAoE;gBACpE,oEAAoE;gBACpE,oDAAoD;gBACpD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACrB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;gBAC3E,CAAC;gBACD,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;gBACpC,MAAM,MAAM,CAAC,UAAU,CAAC;oBACtB,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC3D,CAAC,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,MAAM;qBACxB,kBAAkB,CACjB,QAAQ,CAAC,OAAO,EAChB,UAAU,EACV,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAC9D;qBACA,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;oBACxB,+DAA+D;oBAC/D,gEAAgE;oBAChE,MAAM,OAAO,GAAG,KAAK,YAAY,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;oBACtF,IAAI,OAAO,EAAE,CAAC;wBACZ,WAAW,GAAG;4BACZ,YAAY,EAAE,OAAO,CAAC,aAAa;4BACnC,WAAW,EAAE,OAAO,CAAC,YAAY;4BACjC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;yBACvE,CAAC;oBACJ,CAAC;oBACD,MAAM,KAAK,CAAC;gBACd,CAAC,CAAC,CAAC;gBACL,UAAU,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gBACxF,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;gBAC7B,iEAAiE;gBACjE,sEAAsE;gBACtE,KAAK,GAAG;oBACN,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa;oBACxC,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY;oBACtC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACjF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,yDAAyD;gBACzD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,CAClC,QAAQ,CAAC,UAAU,KAAK,YAAY;oBAClC,CAAC,CAAC,8BAA8B;oBAChC,CAAC,CAAC,2BAA2B,CAChC,CAAC;gBAEF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;oBACrB,MAAM,IAAI,KAAK,CAAC,gDAAgD,QAAQ,CAAC,UAAU,IAAI,CAAC,CAAC;gBAC3F,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,mBAAmB,CACtC,OAAO,EACP,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,OAAO,EAChB,UAAU,EACV,IAAI,CAAC,UAAU,CAChB,CAAC;gBAEF,uDAAuD;gBACvD,mEAAmE;gBACnE,MAAM,MAAM,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;gBAClE,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gBAC5C,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;gBAC7B,6DAA6D;gBAC7D,iCAAiC;gBACjC,KAAK,GAAG;oBACN,YAAY,EAAE,MAAM,CAAC,KAAK,EAAE,aAAa,IAAI,CAAC;oBAC9C,WAAW,EAAE,MAAM,CAAC,KAAK,EAAE,YAAY,IAAI,CAAC;iBAC7C,CAAC;YACJ,CAAC;YAED,WAAW,GAAG,KAAK,CAAC;YACpB,IAAI,EAAE,YAAY,CAAC,8BAA8B,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;YAC/E,qBAAqB,CAAC,IAAI,EAAE;gBAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnE,CAAC,CAAC;YACH,0DAA0D;YAC1D,+DAA+D;YAC/D,kEAAkE;YAClE,qBAAqB,CAAC,IAAI,EAAE;gBAC1B,YAAY,EAAE,QAAQ,CAAC,UAAU;gBACjC,aAAa,EAAE,YAAY;gBAC3B,YAAY,EAAE,QAAQ,CAAC,OAAO;gBAC9B,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa;oBACpD,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,EAAE;oBAClC,CAAC,CAAC,EAAE,CAAC;gBACP,KAAK,EAAE;oBACL,YAAY,EAAE,KAAK,CAAC,YAAY;oBAChC,oBAAoB,EAAE,KAAK,CAAC,YAAY;iBACzC;aACF,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU;gBACV,KAAK,EAAE,aAAa;gBACpB,QAAQ,EAAE,QAAQ,CAAC,UAAU;gBAC7B,KAAK;aACN,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,YAAY,GAAG,OAAO,CAAC;QACvB,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,sDAAsD;QACtD,IAAI,CAAC;YACH,MAAM,kBAAkB,CAAC;gBACvB,UAAU,EAAE,gBAAgB;gBAC5B,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;oBACnB,YAAY,EAAE,WAAW,CAAC,YAAY;oBACtC,gBAAgB,EAAE,CAAC;oBACnB,WAAW,EAAE,WAAW,CAAC,WAAW;oBACpC,GAAG,CAAC,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC/E,CAAC,CAAC,CAAC,SAAS;gBACb,OAAO,EAAE;oBACP,GAAG,IAAI,CAAC,WAAW;oBACnB,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,IAAI,WAAW;iBAChD;aACF,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,gFAAgF;QAClF,CAAC;QACD,wBAAwB,CAAC;YACvB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;YAClC,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;gBACrC,YAAY,EAAE,WAAW,CAAC,YAAY;gBACtC,gBAAgB,EAAE,CAAC;gBACnB,WAAW,EAAE,WAAW,CAAC,WAAW;gBACpC,GAAG,CAAC,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC/E,CAAC,CAAC,CAAC,SAAS,CAAC;SACf,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateImage.d.ts","sourceRoot":"","sources":["../../src/api/generateImage.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAEV,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,eAAe,EACf,aAAa,EACb,iBAAiB,EAClB,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"generateImage.d.ts","sourceRoot":"","sources":["../../src/api/generateImage.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAEV,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACnB,eAAe,EACf,aAAa,EACb,iBAAiB,EAClB,MAAM,sCAAsC,CAAC;AAG9C,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAsB,KAAK,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAwJ9F;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;IAC7B,wEAAwE;IACxE,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,uEAAuE;IACvE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oFAAoF;IACpF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0DAA0D;IAC1D,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,qEAAqE;IACrE,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,0DAA0D;IAC1D,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uEAAuE;IACvE,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sCAAsC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kFAAkF;IAClF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4EAA4E;IAC5E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gFAAgF;IAChF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,8EAA8E;IAC9E,eAAe,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnE;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,uBAAuB,CAAC;IAC9C;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,eAAe,CAAC;IAC9D;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,yBAAyB,CAAC;IACxC,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,uFAAuF;IACvF,eAAe,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;CACnD;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,iDAAiD;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,4DAA4D;IAC5D,QAAQ,EAAE,MAAM,CAAC;IACjB,2DAA2D;IAC3D,OAAO,EAAE,MAAM,CAAC;IAChB,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uEAAuE;IACvE,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,qEAAqE;IACrE,KAAK,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC;CACxC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqM5F"}
|
|
@@ -14,6 +14,7 @@ import { EventEmitter } from 'events';
|
|
|
14
14
|
import { createImageProvider, hasImageProviderFactory } from '../io/media/images/index.js';
|
|
15
15
|
import { FallbackImageProxy } from '../io/media/images/FallbackImageProxy.js';
|
|
16
16
|
import { resolveModelOption, resolveMediaProvider } from './model.js';
|
|
17
|
+
import { getDefaultProvider } from './runtime/global-default.js';
|
|
17
18
|
import { resolveProviderChain, resolveProviderOrder, } from '../io/media/ProviderPreferences.js';
|
|
18
19
|
import { attachUsageAttributes, toTurnMetricUsage } from './observability.js';
|
|
19
20
|
import { recordAgentOSUsage } from './runtime/usageLedger.js';
|
|
@@ -74,6 +75,36 @@ function detectAvailableImageProviders() {
|
|
|
74
75
|
}
|
|
75
76
|
return available;
|
|
76
77
|
}
|
|
78
|
+
/**
|
|
79
|
+
* The image model the global default (setDefaultProvider) resolves to, when
|
|
80
|
+
* its provider makes images: the default's model when it can serve images
|
|
81
|
+
* (see resolveModelOption), else the provider's default image model.
|
|
82
|
+
* Undefined when there is no global default, its provider has no image
|
|
83
|
+
* provider, no image model resolves for it (OpenRouter with a chat model),
|
|
84
|
+
* or it has no credential in the default, the call or the environment.
|
|
85
|
+
*
|
|
86
|
+
* @param inline - The call's own key and base URL. Pass them only for the
|
|
87
|
+
* primary: a custom endpoint keeps the default's model whatever its name,
|
|
88
|
+
* and a fallback runs on its own endpoint with its own key.
|
|
89
|
+
*/
|
|
90
|
+
function globalDefaultImageModel(inline) {
|
|
91
|
+
const providerId = getDefaultProvider()?.provider;
|
|
92
|
+
if (!providerId || !hasImageProviderFactory(providerId))
|
|
93
|
+
return undefined;
|
|
94
|
+
try {
|
|
95
|
+
const resolved = resolveModelOption({ ...(inline.baseUrl ? { baseUrl: inline.baseUrl } : {}) }, 'image');
|
|
96
|
+
if (resolved.providerId !== providerId || !resolved.modelId)
|
|
97
|
+
return undefined;
|
|
98
|
+
// Throws when a built-in provider has no key in the default, the call or
|
|
99
|
+
// the environment, or stable-diffusion-local has no base URL.
|
|
100
|
+
const media = resolveMediaProvider(providerId, resolved.modelId, inline);
|
|
101
|
+
const hasCredential = Boolean(media.apiKey) || providerId === 'stable-diffusion-local';
|
|
102
|
+
return hasCredential ? { providerId, modelId: resolved.modelId } : undefined;
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
return undefined;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
77
108
|
/**
|
|
78
109
|
* Creates an {@link IImageProvider} for the resolved primary provider,
|
|
79
110
|
* optionally wrapped in a {@link FallbackImageProxy} when an ordered
|
|
@@ -81,9 +112,11 @@ function detectAvailableImageProviders() {
|
|
|
81
112
|
*
|
|
82
113
|
* @param resolved - The primary resolved provider credentials.
|
|
83
114
|
* @param providerChain - Optional ordered provider IDs with the primary first.
|
|
115
|
+
* @param preferred - The model to use when its provider runs as a fallback
|
|
116
|
+
* (the global default's image model on that provider's own endpoint).
|
|
84
117
|
* @returns An initialised image provider (possibly a fallback proxy).
|
|
85
118
|
*/
|
|
86
|
-
async function createImageProviderWithFallback(resolved, providerChain) {
|
|
119
|
+
async function createImageProviderWithFallback(resolved, providerChain, preferred) {
|
|
87
120
|
const primary = createImageProvider(resolved.providerId);
|
|
88
121
|
await primary.initialize({
|
|
89
122
|
apiKey: resolved.apiKey,
|
|
@@ -101,8 +134,7 @@ async function createImageProviderWithFallback(resolved, providerChain) {
|
|
|
101
134
|
const chain = [primary];
|
|
102
135
|
for (const fbId of fallbackIds) {
|
|
103
136
|
try {
|
|
104
|
-
const
|
|
105
|
-
const fbResolved = resolveMediaProvider(fbId, fallbackModelId);
|
|
137
|
+
const fbResolved = resolveMediaProvider(fbId, preferred?.providerId === fbId ? preferred.modelId : resolveModelOption({ provider: fbId }, 'image').modelId);
|
|
106
138
|
const fb = createImageProvider(fbId);
|
|
107
139
|
await fb.initialize({
|
|
108
140
|
apiKey: fbResolved.apiKey,
|
|
@@ -151,12 +183,22 @@ export async function generateImage(opts) {
|
|
|
151
183
|
let providerChain;
|
|
152
184
|
let providerId;
|
|
153
185
|
let modelId;
|
|
186
|
+
let defaultImage;
|
|
154
187
|
if (!opts.provider && !opts.model) {
|
|
155
|
-
|
|
188
|
+
// A global default (setDefaultProvider) with an image model for its
|
|
189
|
+
// provider leads the chain: its key need not be in the environment.
|
|
190
|
+
defaultImage = globalDefaultImageModel({ apiKey: opts.apiKey, baseUrl: opts.baseUrl });
|
|
191
|
+
const detected = detectAvailableImageProviders();
|
|
192
|
+
providerChain = resolveProviderChain(defaultImage
|
|
193
|
+
? [defaultImage.providerId, ...detected.filter((id) => id !== defaultImage.providerId)]
|
|
194
|
+
: detected, opts.providerPreferences);
|
|
156
195
|
if (providerChain.length === 0) {
|
|
157
|
-
throw new Error('No image provider configured.
|
|
196
|
+
throw new Error('No image provider configured. Call setDefaultProvider() with an image-capable provider, or set OPENAI_API_KEY, STABILITY_API_KEY, REPLICATE_API_TOKEN, BFL_API_KEY, FAL_API_KEY, OPENROUTER_API_KEY, or STABLE_DIFFUSION_LOCAL_BASE_URL.');
|
|
158
197
|
}
|
|
159
|
-
({ providerId, modelId } =
|
|
198
|
+
({ providerId, modelId } =
|
|
199
|
+
defaultImage && providerChain[0] === defaultImage.providerId
|
|
200
|
+
? defaultImage
|
|
201
|
+
: resolveModelOption({ provider: providerChain[0] }, 'image'));
|
|
160
202
|
}
|
|
161
203
|
else {
|
|
162
204
|
({ providerId, modelId } = resolveModelOption(opts, 'image'));
|
|
@@ -218,7 +260,9 @@ export async function generateImage(opts) {
|
|
|
218
260
|
metricModelId = resolved.modelId;
|
|
219
261
|
span?.setAttribute('llm.provider', resolved.providerId);
|
|
220
262
|
span?.setAttribute('llm.model', resolved.modelId);
|
|
221
|
-
|
|
263
|
+
// A fallback on the default's provider runs its image model on that
|
|
264
|
+
// provider's own endpoint, without the call's inline key or base URL.
|
|
265
|
+
const provider = await createImageProviderWithFallback(resolved, providerChain, defaultImage ? globalDefaultImageModel({}) : undefined);
|
|
222
266
|
const result = await provider.generateImage({
|
|
223
267
|
modelId: provider instanceof FallbackImageProxy
|
|
224
268
|
? undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateImage.js","sourceRoot":"","sources":["../../src/api/generateImage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAW9E,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"generateImage.js","sourceRoot":"","sources":["../../src/api/generateImage.ts"],"names":[],"mappings":"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"}
|
|
@@ -125,6 +125,14 @@ export interface PlanningConfig {
|
|
|
125
125
|
cache?: {
|
|
126
126
|
ttl?: '5m' | '1h';
|
|
127
127
|
} | false;
|
|
128
|
+
/**
|
|
129
|
+
* `false` turns model thinking off for the planning completion, on models
|
|
130
|
+
* that allow it. Inherits the call's `thinking: false` when unset, so a
|
|
131
|
+
* caller that switched thinking off does not pay for it in planning. A
|
|
132
|
+
* thinking budget is not inherited: it is sized for the main call and may
|
|
133
|
+
* not fit the planning call's `maxTokens`.
|
|
134
|
+
*/
|
|
135
|
+
thinking?: false;
|
|
128
136
|
}
|
|
129
137
|
/**
|
|
130
138
|
* A single step in a plan produced by the planning phase.
|
|
@@ -321,15 +329,17 @@ export interface GenerateTextOptions {
|
|
|
321
329
|
/** Hard cap on output tokens. Provider-dependent default applies when omitted. */
|
|
322
330
|
maxTokens?: number;
|
|
323
331
|
/**
|
|
324
|
-
* Extended-thinking switch forwarded to
|
|
325
|
-
*
|
|
326
|
-
*
|
|
327
|
-
*
|
|
328
|
-
*
|
|
332
|
+
* Extended-thinking switch forwarded to Claude models. Any positive
|
|
333
|
+
* `budgetTokens` turns adaptive thinking on (the number itself is not sent
|
|
334
|
+
* and `maxTokens` passes through unchanged). `false` turns thinking off
|
|
335
|
+
* with the model's own off shape; Opus 5.5, Fable and Mythos always think.
|
|
336
|
+
* Omitted keeps the model's default: thinking on for Opus 5 and later,
|
|
337
|
+
* Sonnet 5 and later, Fable and Mythos, off for older models. Other
|
|
338
|
+
* providers ignore it.
|
|
329
339
|
*/
|
|
330
340
|
thinking?: {
|
|
331
341
|
budgetTokens: number;
|
|
332
|
-
};
|
|
342
|
+
} | false;
|
|
333
343
|
/**
|
|
334
344
|
* Reasoning depth / token-spend control forwarded to effort-capable models
|
|
335
345
|
* (Opus 4.5+, Sonnet 4.6, Fable/Mythos 5) as `output_config.effort`
|
|
@@ -871,6 +881,26 @@ export declare function resolveChainOfThought(cot: boolean | string | undefined)
|
|
|
871
881
|
export declare function createPlan(provider: {
|
|
872
882
|
generateCompletion: (...args: any[]) => Promise<any>;
|
|
873
883
|
}, modelId: string, userMessages: Array<Record<string, unknown>>, toolNames: string[], config: PlanningConfig | undefined, totalUsage: TokenUsage): Promise<Plan | undefined>;
|
|
884
|
+
/**
|
|
885
|
+
* Adds a provider's usage report (`ModelUsage`) to a call's running
|
|
886
|
+
* {@link TokenUsage}, as each completed step is added.
|
|
887
|
+
*
|
|
888
|
+
* @internal Shared with streamText.
|
|
889
|
+
*/
|
|
890
|
+
export declare function addModelUsage(target: TokenUsage, usage: unknown): void;
|
|
891
|
+
/**
|
|
892
|
+
* The usage a provider error reports for the request it ended, such as the
|
|
893
|
+
* billed tokens of a refused turn (`details.usage`).
|
|
894
|
+
*
|
|
895
|
+
* @internal Shared with streamText.
|
|
896
|
+
*/
|
|
897
|
+
export declare function usageOfError(error: unknown): unknown;
|
|
898
|
+
/**
|
|
899
|
+
* Whether a usage report shows billable consumption.
|
|
900
|
+
*
|
|
901
|
+
* @internal Shared with streamText.
|
|
902
|
+
*/
|
|
903
|
+
export declare function hasBillableUsage(usage: TokenUsage): boolean;
|
|
874
904
|
/**
|
|
875
905
|
* Detect content-policy refusals across providers so the fallback chain
|
|
876
906
|
* can route them to a more permissive model (typically uncensored
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateText.d.ts","sourceRoot":"","sources":["../../src/api/generateText.ts"],"names":[],"mappings":"AAiBA,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAc,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAuC,KAAK,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AACvG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAE1E,OAAO,KAAK,EAAE,KAAK,EAAwB,MAAM,wBAAwB,CAAC;AAG1E,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAoDpE,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC1F,OAAO,EAA2B,KAAK,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAG5C,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;AACnD,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAS7D;;;GAGG;AACH,MAAM,WAAW,OAAO;IACtB,kCAAkC;IAClC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC/C,0FAA0F;IAC1F,OAAO,EAAE,cAAc,CAAC;CACzB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAOtE;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,IAAI,EAAE,OAAO,CAAC;IACd,4EAA4E;IAC5E,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,sEAAsE;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,gEAAgE;IAChE,YAAY,EAAE,MAAM,CAAC;IACrB,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;;;OAaG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;OASG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;KAAE,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"generateText.d.ts","sourceRoot":"","sources":["../../src/api/generateText.ts"],"names":[],"mappings":"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"}
|
package/dist/api/generateText.js
CHANGED
|
@@ -169,6 +169,7 @@ export async function createPlan(provider, modelId, userMessages, toolNames, con
|
|
|
169
169
|
// Inherited (or planning-specific) cache control: a cache:false root
|
|
170
170
|
// call's planning sub-call must not auto-cache behind the caller's back.
|
|
171
171
|
...(config?.cache !== undefined ? { cache: config.cache } : {}),
|
|
172
|
+
...(config?.thinking === false ? { thinking: false } : {}),
|
|
172
173
|
});
|
|
173
174
|
// Accumulate planning call usage
|
|
174
175
|
if (response.usage) {
|
|
@@ -287,6 +288,70 @@ function markToolsRan(error) {
|
|
|
287
288
|
}
|
|
288
289
|
return target;
|
|
289
290
|
}
|
|
291
|
+
/**
|
|
292
|
+
* Adds a provider's usage report (`ModelUsage`) to a call's running
|
|
293
|
+
* {@link TokenUsage}, as each completed step is added.
|
|
294
|
+
*
|
|
295
|
+
* @internal Shared with streamText.
|
|
296
|
+
*/
|
|
297
|
+
export function addModelUsage(target, usage) {
|
|
298
|
+
if (!usage || typeof usage !== 'object')
|
|
299
|
+
return;
|
|
300
|
+
const u = usage;
|
|
301
|
+
const num = (value) => typeof value === 'number' && Number.isFinite(value) ? value : undefined;
|
|
302
|
+
target.promptTokens += num(u.promptTokens) ?? 0;
|
|
303
|
+
target.completionTokens += num(u.completionTokens) ?? 0;
|
|
304
|
+
target.totalTokens += num(u.totalTokens) ?? 0;
|
|
305
|
+
const cost = num(u.costUSD);
|
|
306
|
+
if (cost !== undefined)
|
|
307
|
+
target.costUSD = (target.costUSD ?? 0) + cost;
|
|
308
|
+
const cacheRead = num(u.cacheReadInputTokens);
|
|
309
|
+
if (cacheRead !== undefined)
|
|
310
|
+
target.cacheReadTokens = (target.cacheReadTokens ?? 0) + cacheRead;
|
|
311
|
+
const cacheWrite = num(u.cacheCreationInputTokens);
|
|
312
|
+
if (cacheWrite !== undefined)
|
|
313
|
+
target.cacheCreationTokens = (target.cacheCreationTokens ?? 0) + cacheWrite;
|
|
314
|
+
const inclusive = num(u.inclusiveInputTokens);
|
|
315
|
+
if (inclusive !== undefined)
|
|
316
|
+
target.inclusiveInputTokens = (target.inclusiveInputTokens ?? 0) + inclusive;
|
|
317
|
+
}
|
|
318
|
+
/**
|
|
319
|
+
* The usage a provider error reports for the request it ended, such as the
|
|
320
|
+
* billed tokens of a refused turn (`details.usage`).
|
|
321
|
+
*
|
|
322
|
+
* @internal Shared with streamText.
|
|
323
|
+
*/
|
|
324
|
+
export function usageOfError(error) {
|
|
325
|
+
return error?.details?.usage;
|
|
326
|
+
}
|
|
327
|
+
/**
|
|
328
|
+
* Whether a usage report shows billable consumption.
|
|
329
|
+
*
|
|
330
|
+
* @internal Shared with streamText.
|
|
331
|
+
*/
|
|
332
|
+
export function hasBillableUsage(usage) {
|
|
333
|
+
return (usage.promptTokens > 0 ||
|
|
334
|
+
usage.completionTokens > 0 ||
|
|
335
|
+
(usage.cacheReadTokens ?? 0) > 0 ||
|
|
336
|
+
(usage.cacheCreationTokens ?? 0) > 0);
|
|
337
|
+
}
|
|
338
|
+
/** The sum of two usage reports; an optional counter stays absent when neither has it. */
|
|
339
|
+
function sumTokenUsage(a, b) {
|
|
340
|
+
const optional = (x, y) => x === undefined && y === undefined ? undefined : (x ?? 0) + (y ?? 0);
|
|
341
|
+
const costUSD = optional(a.costUSD, b.costUSD);
|
|
342
|
+
const inclusiveInputTokens = optional(a.inclusiveInputTokens, b.inclusiveInputTokens);
|
|
343
|
+
const cacheReadTokens = optional(a.cacheReadTokens, b.cacheReadTokens);
|
|
344
|
+
const cacheCreationTokens = optional(a.cacheCreationTokens, b.cacheCreationTokens);
|
|
345
|
+
return {
|
|
346
|
+
promptTokens: a.promptTokens + b.promptTokens,
|
|
347
|
+
completionTokens: a.completionTokens + b.completionTokens,
|
|
348
|
+
totalTokens: a.totalTokens + b.totalTokens,
|
|
349
|
+
...(costUSD !== undefined ? { costUSD } : {}),
|
|
350
|
+
...(inclusiveInputTokens !== undefined ? { inclusiveInputTokens } : {}),
|
|
351
|
+
...(cacheReadTokens !== undefined ? { cacheReadTokens } : {}),
|
|
352
|
+
...(cacheCreationTokens !== undefined ? { cacheCreationTokens } : {}),
|
|
353
|
+
};
|
|
354
|
+
}
|
|
290
355
|
/** Whether `error` was marked by {@link markToolsRan}. */
|
|
291
356
|
function toolsRanBefore(error) {
|
|
292
357
|
return (error !== null &&
|
|
@@ -665,6 +730,10 @@ export async function generateText(opts) {
|
|
|
665
730
|
// What this attempt did that a failover must not repeat. Written inside
|
|
666
731
|
// the span callback and read by the fallback walk below, so it lives on an
|
|
667
732
|
// object rather than in narrowed locals.
|
|
733
|
+
// What this attempt consumed, planning and completed steps included. It
|
|
734
|
+
// lives outside the span callback so a failed attempt still reports the
|
|
735
|
+
// tokens it was billed for.
|
|
736
|
+
const attemptUsage = { promptTokens: 0, completionTokens: 0, totalTokens: 0 };
|
|
668
737
|
const toolProgress = { shimRanTool: false };
|
|
669
738
|
// The tool run this call's tool execution contexts belong to, and the
|
|
670
739
|
// step it starts at. A fallback leg that continues the call keeps both,
|
|
@@ -809,7 +878,7 @@ export async function generateText(opts) {
|
|
|
809
878
|
}))
|
|
810
879
|
: undefined;
|
|
811
880
|
const allToolCalls = [];
|
|
812
|
-
const totalUsage =
|
|
881
|
+
const totalUsage = attemptUsage;
|
|
813
882
|
// Provider-reported model id of the final step (spec batch-1 C1);
|
|
814
883
|
// additive — the public `model` field keeps the resolved requested id.
|
|
815
884
|
let lastResponseModelId;
|
|
@@ -840,6 +909,7 @@ export async function generateText(opts) {
|
|
|
840
909
|
...(planConfig?.cache !== undefined || opts.cache !== undefined
|
|
841
910
|
? { cache: planConfig?.cache ?? opts.cache }
|
|
842
911
|
: {}),
|
|
912
|
+
...(planConfig?.thinking === false || opts.thinking === false ? { thinking: false } : {}),
|
|
843
913
|
}, totalUsage);
|
|
844
914
|
if (resolvedPlan) {
|
|
845
915
|
// Inject the plan as a system message right after any existing
|
|
@@ -912,12 +982,13 @@ export async function generateText(opts) {
|
|
|
912
982
|
...(opts.requestTimeout !== undefined ? { requestTimeout: opts.requestTimeout } : {}),
|
|
913
983
|
});
|
|
914
984
|
// Aggregate the COMPLETE normalized usage from every shim
|
|
915
|
-
// roundtrip (spec batch-1 review fold)
|
|
916
|
-
//
|
|
917
|
-
//
|
|
918
|
-
//
|
|
919
|
-
// final response identity is captured for telemetry.
|
|
985
|
+
// roundtrip (spec batch-1 review fold) as each call returns, so
|
|
986
|
+
// an attempt that fails on a later round still reports what its
|
|
987
|
+
// earlier rounds consumed. The loop's own {totalTokens} sum is
|
|
988
|
+
// left unused, or it would count twice.
|
|
920
989
|
if (r.usage) {
|
|
990
|
+
if (typeof r.usage.totalTokens === 'number')
|
|
991
|
+
totalUsage.totalTokens += r.usage.totalTokens;
|
|
921
992
|
if (typeof r.usage.promptTokens === 'number')
|
|
922
993
|
totalUsage.promptTokens += r.usage.promptTokens;
|
|
923
994
|
if (typeof r.usage.completionTokens === 'number')
|
|
@@ -945,10 +1016,7 @@ export async function generateText(opts) {
|
|
|
945
1016
|
};
|
|
946
1017
|
},
|
|
947
1018
|
});
|
|
948
|
-
const shimUsage = {
|
|
949
|
-
...totalUsage,
|
|
950
|
-
totalTokens: (totalUsage.totalTokens ?? 0) + loopResult.totalTokens,
|
|
951
|
-
};
|
|
1019
|
+
const shimUsage = { ...totalUsage };
|
|
952
1020
|
metricUsage = shimUsage;
|
|
953
1021
|
// Dual-emit the same root-span attribute pairs as the native
|
|
954
1022
|
// terminals below — the shim early-return is a first-class chat
|
|
@@ -1479,8 +1547,25 @@ export async function generateText(opts) {
|
|
|
1479
1547
|
if (metricProviderId && !(error instanceof LLMProviderCircuitOpenError)) {
|
|
1480
1548
|
globalLLMProviderHealth.recordFailure(metricProviderId, error);
|
|
1481
1549
|
}
|
|
1482
|
-
//
|
|
1483
|
-
//
|
|
1550
|
+
// The failed attempt is billed for its completed steps and for a step
|
|
1551
|
+
// the provider ended with usage attached (a refused turn). It is metered
|
|
1552
|
+
// here, once: this call's ledger row and a usage event of its own; a
|
|
1553
|
+
// fallback leg meters itself.
|
|
1554
|
+
addModelUsage(attemptUsage, usageOfError(error));
|
|
1555
|
+
metricUsage = attemptUsage;
|
|
1556
|
+
if (hasBillableUsage(attemptUsage)) {
|
|
1557
|
+
fireLlmUsageObserver({
|
|
1558
|
+
provider: metricProviderId ?? 'unknown',
|
|
1559
|
+
model: metricModelId ?? 'unknown',
|
|
1560
|
+
usage: { ...attemptUsage },
|
|
1561
|
+
source: opts.source,
|
|
1562
|
+
...(opts.__fallbackDepth ? { fallbackDepth: opts.__fallbackDepth } : {}),
|
|
1563
|
+
finishReason: 'error',
|
|
1564
|
+
surface: 'generateText',
|
|
1565
|
+
durationMs: Date.now() - rootStartedAt,
|
|
1566
|
+
});
|
|
1567
|
+
}
|
|
1568
|
+
// The failed primary heads the fallback trail.
|
|
1484
1569
|
const primaryProviderId = metricProviderId;
|
|
1485
1570
|
const primaryModelId = metricModelId;
|
|
1486
1571
|
const fallbackHops = [
|
|
@@ -1611,8 +1696,9 @@ export async function generateText(opts) {
|
|
|
1611
1696
|
// answered to open with its signed thinking, and a turn
|
|
1612
1697
|
// another model ran has none, so the continuation runs
|
|
1613
1698
|
// without a thinking budget. Adaptive thinking turns itself
|
|
1614
|
-
// off for such a turn.
|
|
1615
|
-
...(opts.thinking
|
|
1699
|
+
// off for such a turn. `thinking: false` stays as asked.
|
|
1700
|
+
...(typeof opts.thinking === 'object' &&
|
|
1701
|
+
opts.thinking !== null &&
|
|
1616
1702
|
(fb.provider === 'anthropic' || /claude/i.test(fb.model ?? '')) &&
|
|
1617
1703
|
toolTurnLacksThinking(toolProgress.completedToolRounds.messages)
|
|
1618
1704
|
? { thinking: undefined }
|
|
@@ -1629,14 +1715,13 @@ export async function generateText(opts) {
|
|
|
1629
1715
|
attempt,
|
|
1630
1716
|
});
|
|
1631
1717
|
metricStatus = 'ok';
|
|
1632
|
-
metricUsage = fallbackResult.usage;
|
|
1633
|
-
metricProviderId = fallbackResult.provider;
|
|
1634
|
-
metricModelId = fallbackResult.model;
|
|
1635
1718
|
fallbackHops.push(...(fallbackResult.fallback?.hops ?? [
|
|
1636
1719
|
{ provider: fallbackResult.provider, model: fallbackResult.model, ok: true },
|
|
1637
1720
|
]));
|
|
1638
1721
|
return {
|
|
1639
1722
|
...fallbackResult,
|
|
1723
|
+
// The call's usage covers the failed attempt and the leg.
|
|
1724
|
+
usage: sumTokenUsage(attemptUsage, fallbackResult.usage),
|
|
1640
1725
|
...(toolProgress.completedToolRounds
|
|
1641
1726
|
? { toolCalls: [...toolProgress.completedToolRounds.toolCalls, ...fallbackResult.toolCalls] }
|
|
1642
1727
|
: {}),
|