@effect/ai-openai 0.27.0 → 0.28.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/OpenAiClient.js
CHANGED
|
@@ -81,18 +81,18 @@ const make = options => Effect.gen(function* () {
|
|
|
81
81
|
inputTokens: chunk.usage.prompt_tokens,
|
|
82
82
|
outputTokens: chunk.usage.completion_tokens,
|
|
83
83
|
totalTokens: chunk.usage.prompt_tokens + chunk.usage.completion_tokens,
|
|
84
|
-
reasoningTokens: chunk.usage.completion_tokens_details
|
|
85
|
-
cacheReadInputTokens: chunk.usage.prompt_tokens_details
|
|
84
|
+
reasoningTokens: chunk.usage.completion_tokens_details?.reasoning_tokens ?? 0,
|
|
85
|
+
cacheReadInputTokens: chunk.usage.prompt_tokens_details?.cached_tokens ?? 0,
|
|
86
86
|
cacheWriteInputTokens: usage.cacheWriteInputTokens
|
|
87
87
|
};
|
|
88
88
|
metadata = {
|
|
89
89
|
...metadata,
|
|
90
90
|
serviceTier: chunk.service_tier,
|
|
91
91
|
systemFingerprint: chunk.system_fingerprint,
|
|
92
|
-
acceptedPredictionTokens: chunk.usage.completion_tokens_details
|
|
93
|
-
rejectedPredictionTokens: chunk.usage.completion_tokens_details
|
|
94
|
-
inputAudioTokens: chunk.usage.prompt_tokens_details
|
|
95
|
-
outputAudioTokens: chunk.usage.completion_tokens_details
|
|
92
|
+
acceptedPredictionTokens: chunk.usage.completion_tokens_details?.accepted_prediction_tokens ?? 0,
|
|
93
|
+
rejectedPredictionTokens: chunk.usage.completion_tokens_details?.rejected_prediction_tokens ?? 0,
|
|
94
|
+
inputAudioTokens: chunk.usage.prompt_tokens_details?.audio_tokens ?? 0,
|
|
95
|
+
outputAudioTokens: chunk.usage.completion_tokens_details?.audio_tokens ?? 0
|
|
96
96
|
};
|
|
97
97
|
}
|
|
98
98
|
for (let i = 0; i < chunk.choices.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiClient.js","names":["AiResponse","_interopRequireWildcard","require","Sse","HttpBody","HttpClient","HttpClientRequest","Config","Context","Effect","_Function","Layer","Option","Predicate","Redacted","Stream","Generated","InternalUtilities","_OpenAiConfig","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","constDisableValidation","disableValidation","OpenAiClient","Tag","exports","make","options","gen","httpClient","pipe","mapRequest","request","prependUrl","apiUrl","apiKey","bearerToken","identity","organizationId","undefined","setHeader","value","projectId","acceptJson","transformClient","httpClientOk","filterStatusOk","client","OpenAiConfig","getOrUndefined","map","config","streamRequest","execute","stream","unwrapScoped","decodeText","pipeThroughChannel","makeChannel","takeWhile","event","data","JSON","parse","suspend","toolCalls","isFirstChunk","toolCallIndex","finishReason","usage","inputTokens","outputTokens","totalTokens","reasoningTokens","cacheReadInputTokens","cacheWriteInputTokens","metadata","post","body","unsafeJson","stream_options","include_usage","filterMap","chunk","parts","push","MetadataPart","id","model","timestamp","Date","created","isNotNullable","prompt_tokens","completion_tokens","completion_tokens_details","reasoning_tokens","prompt_tokens_details","cached_tokens","serviceTier","service_tier","systemFingerprint","system_fingerprint","acceptedPredictionTokens","accepted_prediction_tokens","rejectedPredictionTokens","rejected_prediction_tokens","inputAudioTokens","audio_tokens","outputAudioTokens","choices","length","choice","finish_reason","resolveFinishReason","isNotUndefined","finishToolCall","FinishPart","reason","providerMetadata","ProviderMetadataKey","delta","content","TextPart","text","hasProperty","Array","isArray","tool_calls","index","isUndefined","toolCall","isFinished","function","arguments","none","some","of","layer","effect","layerConfig","configs","all","flatMap","params","ToolCallPart","name"],"sources":["../../src/OpenAiClient.ts"],"sourcesContent":[null],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OpenAiClient.js","names":["AiResponse","_interopRequireWildcard","require","Sse","HttpBody","HttpClient","HttpClientRequest","Config","Context","Effect","_Function","Layer","Option","Predicate","Redacted","Stream","Generated","InternalUtilities","_OpenAiConfig","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","constDisableValidation","disableValidation","OpenAiClient","Tag","exports","make","options","gen","httpClient","pipe","mapRequest","request","prependUrl","apiUrl","apiKey","bearerToken","identity","organizationId","undefined","setHeader","value","projectId","acceptJson","transformClient","httpClientOk","filterStatusOk","client","OpenAiConfig","getOrUndefined","map","config","streamRequest","execute","stream","unwrapScoped","decodeText","pipeThroughChannel","makeChannel","takeWhile","event","data","JSON","parse","suspend","toolCalls","isFirstChunk","toolCallIndex","finishReason","usage","inputTokens","outputTokens","totalTokens","reasoningTokens","cacheReadInputTokens","cacheWriteInputTokens","metadata","post","body","unsafeJson","stream_options","include_usage","filterMap","chunk","parts","push","MetadataPart","id","model","timestamp","Date","created","isNotNullable","prompt_tokens","completion_tokens","completion_tokens_details","reasoning_tokens","prompt_tokens_details","cached_tokens","serviceTier","service_tier","systemFingerprint","system_fingerprint","acceptedPredictionTokens","accepted_prediction_tokens","rejectedPredictionTokens","rejected_prediction_tokens","inputAudioTokens","audio_tokens","outputAudioTokens","choices","length","choice","finish_reason","resolveFinishReason","isNotUndefined","finishToolCall","FinishPart","reason","providerMetadata","ProviderMetadataKey","delta","content","TextPart","text","hasProperty","Array","isArray","tool_calls","index","isUndefined","toolCall","isFinished","function","arguments","none","some","of","layer","effect","layerConfig","configs","all","flatMap","params","ToolCallPart","name"],"sources":["../../src/OpenAiClient.ts"],"sourcesContent":[null],"mappings":";;;;;;AAIA,IAAAA,UAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,GAAA,GAAAF,uBAAA,CAAAC,OAAA;AACA,IAAAE,QAAA,GAAAH,uBAAA,CAAAC,OAAA;AACA,IAAAG,UAAA,GAAAJ,uBAAA,CAAAC,OAAA;AAEA,IAAAI,iBAAA,GAAAL,uBAAA,CAAAC,OAAA;AACA,IAAAK,MAAA,GAAAN,uBAAA,CAAAC,OAAA;AAEA,IAAAM,OAAA,GAAAP,uBAAA,CAAAC,OAAA;AACA,IAAAO,MAAA,GAAAR,uBAAA,CAAAC,OAAA;AACA,IAAAQ,SAAA,GAAAR,OAAA;AACA,IAAAS,KAAA,GAAAV,uBAAA,CAAAC,OAAA;AACA,IAAAU,MAAA,GAAAX,uBAAA,CAAAC,OAAA;AACA,IAAAW,SAAA,GAAAZ,uBAAA,CAAAC,OAAA;AACA,IAAAY,QAAA,GAAAb,uBAAA,CAAAC,OAAA;AACA,IAAAa,MAAA,GAAAd,uBAAA,CAAAC,OAAA;AACA,IAAAc,SAAA,GAAAf,uBAAA,CAAAC,OAAA;AACA,IAAAe,iBAAA,GAAAhB,uBAAA,CAAAC,OAAA;AACA,IAAAgB,aAAA,GAAAhB,OAAA;AAAgD,SAAAD,wBAAAkB,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAApB,uBAAA,YAAAA,CAAAkB,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAEhD,MAAMkB,sBAAsB,GAAG;EAAEC,iBAAiB,EAAE;AAAI,CAAW;AAEnE;;;;AAIM,MAAOC,YAAa,sBAAQhC,OAAO,CAACiC,GAAG,CAAC,gCAAgC,CAAC,EAG5E;AA2BH;;;;AAAAC,OAAA,CAAAF,YAAA,GAAAA,YAAA;AAIO,MAAMG,IAAI,GAAIC,OAwBpB,IACCnC,MAAM,CAACoC,GAAG,CAAC,aAAS;EAClB,MAAMC,UAAU,GAAG,CAAC,OAAOzC,UAAU,CAACA,UAAU,EAAE0C,IAAI,CACpD1C,UAAU,CAAC2C,UAAU,CAAEC,OAAO,IAC5BA,OAAO,CAACF,IAAI,CACVzC,iBAAiB,CAAC4C,UAAU,CAACN,OAAO,CAACO,MAAM,IAAI,2BAA2B,CAAC,EAC3EP,OAAO,CAACQ,MAAM,GAAG9C,iBAAiB,CAAC+C,WAAW,CAACT,OAAO,CAACQ,MAAM,CAAC,GAAGE,kBAAQ,EACzEV,OAAO,CAACW,cAAc,KAAKC,SAAS,GAChClD,iBAAiB,CAACmD,SAAS,CAAC,qBAAqB,EAAE3C,QAAQ,CAAC4C,KAAK,CAACd,OAAO,CAACW,cAAc,CAAC,CAAC,GAC1FD,kBAAQ,EACZV,OAAO,CAACe,SAAS,KAAKH,SAAS,GAC3BlD,iBAAiB,CAACmD,SAAS,CAAC,gBAAgB,EAAE3C,QAAQ,CAAC4C,KAAK,CAACd,OAAO,CAACe,SAAS,CAAC,CAAC,GAChFL,kBAAQ,EACZhD,iBAAiB,CAACsD,UAAU,CAC7B,CACF,EACDhB,OAAO,CAACiB,eAAe,GAAGjB,OAAO,CAACiB,eAAe,GAAGP,kBAAQ,CAC7D;EACD,MAAMQ,YAAY,GAAGzD,UAAU,CAAC0D,cAAc,CAACjB,UAAU,CAAC;EAC1D,MAAMkB,MAAM,GAAGhD,SAAS,CAAC2B,IAAI,CAACG,UAAU,EAAE;IACxCe,eAAe,EAAGG,MAAM,IACtBC,0BAAY,CAACC,cAAc,CAACnB,IAAI,CAC9BtC,MAAM,CAAC0D,GAAG,CAAEC,MAAM,IAAKA,MAAM,EAAEP,eAAe,GAAGO,MAAM,CAACP,eAAe,CAACG,MAAM,CAAC,GAAGA,MAAM,CAAC;GAE9F,CAAC;EAEF,MAAMK,aAAa,GAAiBpB,OAA4C,IAC9Ea,YAAY,CAACQ,OAAO,CAACrB,OAAO,CAAC,CAACF,IAAI,CAChCtC,MAAM,CAAC0D,GAAG,CAAE7C,CAAC,IAAKA,CAAC,CAACiD,MAAM,CAAC,EAC3BxD,MAAM,CAACyD,YAAY,EACnBzD,MAAM,CAAC0D,UAAU,EAAE,EACnB1D,MAAM,CAAC2D,kBAAkB,CAACvE,GAAG,CAACwE,WAAW,EAAE,CAAC,EAC5C5D,MAAM,CAAC6D,SAAS,CAAEC,KAAK,IAAKA,KAAK,CAACC,IAAI,KAAK,QAAQ,CAAC,EACpD/D,MAAM,CAACoD,GAAG,CAAEU,KAAK,IAAKE,IAAI,CAACC,KAAK,CAACH,KAAK,CAACC,IAAI,CAAM,CAAC,CACnD;EAEH,MAAMP,MAAM,GAAItB,OAAgC,IAC9ClC,MAAM,CAACkE,OAAO,CAAC,MAAK;IAClB,MAAMC,SAAS,GAAG,EAA2D;IAC7E,IAAIC,YAAY,GAAG,KAAK;IACxB,IAAIC,aAAa,GAAuB5B,SAAS;IACjD,IAAI6B,YAAY,GAA4B,SAAS;IACrD,IAAIC,KAAK,GAAqB;MAC5BC,WAAW,EAAE,CAAC;MACdC,YAAY,EAAE,CAAC;MACfC,WAAW,EAAE,CAAC;MACdC,eAAe,EAAE,CAAC;MAClBC,oBAAoB,EAAE,CAAC;MACvBC,qBAAqB,EAAE;KACxB;IACD,IAAIC,QAAQ,GAA4B,EAAE;IAC1C,OAAOxB,aAAa,CAAqB/D,iBAAiB,CAACwF,IAAI,CAAC,mBAAmB,EAAE;MACnFC,IAAI,EAAE3F,QAAQ,CAAC4F,UAAU,CAAC;QACxB,GAAG/C,OAAO;QACVsB,MAAM,EAAE,IAAI;QACZ0B,cAAc,EAAE;UAAEC,aAAa,EAAE;QAAI;OACtC;KACF,CAAC,CAAC,CAACnD,IAAI,CACNhC,MAAM,CAACoF,SAAS,CAAEC,KAAK,IAAI;MACzB,MAAMC,KAAK,GAA2B,EAAE;MAExC;MACA,IAAIlB,YAAY,EAAE;QAChBA,YAAY,GAAG,KAAK;QACpBkB,KAAK,CAACC,IAAI,CACR,IAAItG,UAAU,CAACuG,YAAY,CAAC;UAC1BC,EAAE,EAAEJ,KAAK,CAACI,EAAE;UACZC,KAAK,EAAEL,KAAK,CAACK,KAAK;UAClBC,SAAS,EAAE,IAAIC,IAAI,CAACP,KAAK,CAACQ,OAAO,GAAG,IAAI;SACzC,EAAEtE,sBAAsB,CAAC,CAC3B;MACH;MAEA;MACA,IAAIzB,SAAS,CAACgG,aAAa,CAACT,KAAK,CAACd,KAAK,CAAC,EAAE;QACxCA,KAAK,GAAG;UACNC,WAAW,EAAEa,KAAK,CAACd,KAAK,CAACwB,aAAa;UACtCtB,YAAY,EAAEY,KAAK,CAACd,KAAK,CAACyB,iBAAiB;UAC3CtB,WAAW,EAAEW,KAAK,CAACd,KAAK,CAACwB,aAAa,GAAGV,KAAK,CAACd,KAAK,CAACyB,iBAAiB;UACtErB,eAAe,EAAEU,KAAK,CAACd,KAAK,CAAC0B,yBAAyB,EAAEC,gBAAgB,IAAI,CAAC;UAC7EtB,oBAAoB,EAAES,KAAK,CAACd,KAAK,CAAC4B,qBAAqB,EAAEC,aAAa,IAAI,CAAC;UAC3EvB,qBAAqB,EAAEN,KAAK,CAACM;SAC9B;QACDC,QAAQ,GAAG;UACT,GAAGA,QAAQ;UACXuB,WAAW,EAAEhB,KAAK,CAACiB,YAAY;UAC/BC,iBAAiB,EAAElB,KAAK,CAACmB,kBAAkB;UAC3CC,wBAAwB,EAAEpB,KAAK,CAACd,KAAK,CAAC0B,yBAAyB,EAAES,0BAA0B,IAAI,CAAC;UAChGC,wBAAwB,EAAEtB,KAAK,CAACd,KAAK,CAAC0B,yBAAyB,EAAEW,0BAA0B,IAAI,CAAC;UAChGC,gBAAgB,EAAExB,KAAK,CAACd,KAAK,CAAC4B,qBAAqB,EAAEW,YAAY,IAAI,CAAC;UACtEC,iBAAiB,EAAE1B,KAAK,CAACd,KAAK,CAAC0B,yBAAyB,EAAEa,YAAY,IAAI;SAC3E;MACH;MAEA,KAAK,IAAInG,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAG0E,KAAK,CAAC2B,OAAO,CAACC,MAAM,EAAEtG,CAAC,EAAE,EAAE;QAC7C,MAAMuG,MAAM,GAAG7B,KAAK,CAAC2B,OAAO,CAACrG,CAAC,CAAC;QAE/B;QACA,IAAIb,SAAS,CAACgG,aAAa,CAACoB,MAAM,CAACC,aAAa,CAAC,EAAE;UACjD7C,YAAY,GAAGpE,iBAAiB,CAACkH,mBAAmB,CAACF,MAAM,CAACC,aAAa,CAAC;UAC1E,IAAI7C,YAAY,KAAK,YAAY,IAAIxE,SAAS,CAACuH,cAAc,CAAChD,aAAa,CAAC,EAAE;YAC5EiD,cAAc,CAACnD,SAAS,CAACE,aAAa,CAAC,EAAEiB,KAAK,CAAC;UACjD;UACAA,KAAK,CAACC,IAAI,CACR,IAAItG,UAAU,CAACsI,UAAU,CAAC;YACxBhD,KAAK;YACLiD,MAAM,EAAElD,YAAY;YACpBmD,gBAAgB,EAAE;cAAE,CAACvH,iBAAiB,CAACwH,mBAAmB,GAAG5C;YAAQ;WACtE,EAAEvD,sBAAsB,CAAC,CAC3B;QACH;QAEA;QACA,IAAIzB,SAAS,CAACgG,aAAa,CAACoB,MAAM,CAACS,KAAK,CAACC,OAAO,CAAC,EAAE;UACjDtC,KAAK,CAACC,IAAI,CACR,IAAItG,UAAU,CAAC4I,QAAQ,CAAC;YACtBC,IAAI,EAAEZ,MAAM,CAACS,KAAK,CAACC;WACpB,EAAErG,sBAAsB,CAAC,CAC3B;QACH;QAEA;QACA,IAAIzB,SAAS,CAACiI,WAAW,CAACb,MAAM,CAACS,KAAK,EAAE,YAAY,CAAC,IAAIK,KAAK,CAACC,OAAO,CAACf,MAAM,CAACS,KAAK,CAACO,UAAU,CAAC,EAAE;UAC/F,KAAK,MAAMP,KAAK,IAAIT,MAAM,CAACS,KAAK,CAACO,UAAU,EAAE;YAC3C;YACA,IAAIpI,SAAS,CAACuH,cAAc,CAAChD,aAAa,CAAC,IAAIA,aAAa,KAAKsD,KAAK,CAACQ,KAAK,EAAE;cAC5Eb,cAAc,CAACnD,SAAS,CAACE,aAAa,CAAC,EAAEiB,KAAK,CAAC;cAC/CjB,aAAa,GAAG5B,SAAS;YAC3B;YAEA,IAAI3C,SAAS,CAACsI,WAAW,CAAC/D,aAAa,CAAC,EAAE;cACxC,MAAMgE,QAAQ,GAAGV,KAA+B;cAChD;cACAxD,SAAS,CAACwD,KAAK,CAACQ,KAAK,CAAC,GAAG;gBAAE,GAAGE,QAAQ;gBAAEC,UAAU,EAAE;cAAK,CAAE;cAC3DjE,aAAa,GAAGsD,KAAK,CAACQ,KAAK;YAC7B,CAAC,MAAM;cACLhE,SAAS,CAACwD,KAAK,CAACQ,KAAK,CAAC,CAACI,QAAQ,CAACC,SAAS,IAAIb,KAAK,CAACY,QAAQ,CAACC,SAAS;YACvE;UACF;QACF;MACF;MAEA,OAAOlD,KAAK,CAAC2B,MAAM,KAAK,CAAC,GACrBpH,MAAM,CAAC4I,IAAI,EAAE,GACb5I,MAAM,CAAC6I,IAAI,CAACzJ,UAAU,CAACA,UAAU,CAAC2C,IAAI,CAAC;QAAE0D;MAAK,CAAE,EAAE/D,sBAAsB,CAAC,CAAC;IAChF,CAAC,CAAC,CACH;EACH,CAAC,CAAC;EAEJ,OAAOE,YAAY,CAACkH,EAAE,CAAC;IAAE1F,MAAM;IAAEK,aAAa;IAAEE;EAAM,CAAE,CAAC;AAC3D,CAAC,CAAC;AAEJ;;;;AAAA7B,OAAA,CAAAC,IAAA,GAAAA,IAAA;AAIO,MAAMgH,KAAK,GAAI/G,OAMrB,IAA8DjC,KAAK,CAACiJ,MAAM,CAACpH,YAAY,EAAEG,IAAI,CAACC,OAAO,CAAC,CAAC;AAExG;;;;AAAAF,OAAA,CAAAiH,KAAA,GAAAA,KAAA;AAIO,MAAME,WAAW,GACtBjH,OAMC,IACgE;EACjE,MAAM;IAAEiB,eAAe;IAAE,GAAGiG;EAAO,CAAE,GAAGlH,OAAO;EAC/C,OAAOrC,MAAM,CAACwJ,GAAG,CAACD,OAAO,CAAC,CAAC/G,IAAI,CAC7BtC,MAAM,CAACuJ,OAAO,CAAEF,OAAO,IAAKnH,IAAI,CAAC;IAAE,GAAGmH,OAAO;IAAEjG;EAAe,CAAE,CAAC,CAAC,EAClElD,KAAK,CAACiJ,MAAM,CAACpH,YAAY,CAAC,CAC3B;AACH,CAAC;AA+DD;AACA;AACA;AAAAE,OAAA,CAAAmH,WAAA,GAAAA,WAAA;AAEA,MAAMxB,cAAc,GAAGA,CACrBe,QAA+C,EAC/C/C,KAA6B,KAC3B;EACF;EACA,IAAI+C,QAAQ,CAACC,UAAU,EAAE;IACvB;EACF;EACA,IAAI;IACF,MAAMY,MAAM,GAAGlF,IAAI,CAACC,KAAK,CAACoE,QAAQ,CAACE,QAAQ,CAACC,SAAS,CAAC;IACtDlD,KAAK,CAACC,IAAI,CACR,IAAItG,UAAU,CAACkK,YAAY,CAAC;MAC1B1D,EAAE,EAAE4C,QAAQ,CAAC5C,EAAgB;MAC7B2D,IAAI,EAAEf,QAAQ,CAACE,QAAQ,CAACa,IAAI;MAC5BF;KACD,CAAC,CACH;IACDb,QAAQ,CAACC,UAAU,GAAG,IAAI;IAC1B;IACA;EACF,CAAC,CAAC,MAAM,CAAC;AACX,CAAC","ignoreList":[]}
|
package/dist/esm/OpenAiClient.js
CHANGED
|
@@ -73,18 +73,18 @@ export const make = options => Effect.gen(function* () {
|
|
|
73
73
|
inputTokens: chunk.usage.prompt_tokens,
|
|
74
74
|
outputTokens: chunk.usage.completion_tokens,
|
|
75
75
|
totalTokens: chunk.usage.prompt_tokens + chunk.usage.completion_tokens,
|
|
76
|
-
reasoningTokens: chunk.usage.completion_tokens_details
|
|
77
|
-
cacheReadInputTokens: chunk.usage.prompt_tokens_details
|
|
76
|
+
reasoningTokens: chunk.usage.completion_tokens_details?.reasoning_tokens ?? 0,
|
|
77
|
+
cacheReadInputTokens: chunk.usage.prompt_tokens_details?.cached_tokens ?? 0,
|
|
78
78
|
cacheWriteInputTokens: usage.cacheWriteInputTokens
|
|
79
79
|
};
|
|
80
80
|
metadata = {
|
|
81
81
|
...metadata,
|
|
82
82
|
serviceTier: chunk.service_tier,
|
|
83
83
|
systemFingerprint: chunk.system_fingerprint,
|
|
84
|
-
acceptedPredictionTokens: chunk.usage.completion_tokens_details
|
|
85
|
-
rejectedPredictionTokens: chunk.usage.completion_tokens_details
|
|
86
|
-
inputAudioTokens: chunk.usage.prompt_tokens_details
|
|
87
|
-
outputAudioTokens: chunk.usage.completion_tokens_details
|
|
84
|
+
acceptedPredictionTokens: chunk.usage.completion_tokens_details?.accepted_prediction_tokens ?? 0,
|
|
85
|
+
rejectedPredictionTokens: chunk.usage.completion_tokens_details?.rejected_prediction_tokens ?? 0,
|
|
86
|
+
inputAudioTokens: chunk.usage.prompt_tokens_details?.audio_tokens ?? 0,
|
|
87
|
+
outputAudioTokens: chunk.usage.completion_tokens_details?.audio_tokens ?? 0
|
|
88
88
|
};
|
|
89
89
|
}
|
|
90
90
|
for (let i = 0; i < chunk.choices.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiClient.js","names":["AiResponse","Sse","HttpBody","HttpClient","HttpClientRequest","Config","Context","Effect","identity","Layer","Option","Predicate","Redacted","Stream","Generated","InternalUtilities","OpenAiConfig","constDisableValidation","disableValidation","OpenAiClient","Tag","make","options","gen","httpClient","pipe","mapRequest","request","prependUrl","apiUrl","apiKey","bearerToken","organizationId","undefined","setHeader","value","projectId","acceptJson","transformClient","httpClientOk","filterStatusOk","client","getOrUndefined","map","config","streamRequest","execute","r","stream","unwrapScoped","decodeText","pipeThroughChannel","makeChannel","takeWhile","event","data","JSON","parse","suspend","toolCalls","isFirstChunk","toolCallIndex","finishReason","usage","inputTokens","outputTokens","totalTokens","reasoningTokens","cacheReadInputTokens","cacheWriteInputTokens","metadata","post","body","unsafeJson","stream_options","include_usage","filterMap","chunk","parts","push","MetadataPart","id","model","timestamp","Date","created","isNotNullable","prompt_tokens","completion_tokens","completion_tokens_details","reasoning_tokens","prompt_tokens_details","cached_tokens","serviceTier","service_tier","systemFingerprint","system_fingerprint","acceptedPredictionTokens","accepted_prediction_tokens","rejectedPredictionTokens","rejected_prediction_tokens","inputAudioTokens","audio_tokens","outputAudioTokens","i","choices","length","choice","finish_reason","resolveFinishReason","isNotUndefined","finishToolCall","FinishPart","reason","providerMetadata","ProviderMetadataKey","delta","content","TextPart","text","hasProperty","Array","isArray","tool_calls","index","isUndefined","toolCall","isFinished","function","arguments","none","some","of","layer","effect","layerConfig","configs","all","flatMap","params","ToolCallPart","name"],"sources":["../../src/OpenAiClient.ts"],"sourcesContent":[null],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OpenAiClient.js","names":["AiResponse","Sse","HttpBody","HttpClient","HttpClientRequest","Config","Context","Effect","identity","Layer","Option","Predicate","Redacted","Stream","Generated","InternalUtilities","OpenAiConfig","constDisableValidation","disableValidation","OpenAiClient","Tag","make","options","gen","httpClient","pipe","mapRequest","request","prependUrl","apiUrl","apiKey","bearerToken","organizationId","undefined","setHeader","value","projectId","acceptJson","transformClient","httpClientOk","filterStatusOk","client","getOrUndefined","map","config","streamRequest","execute","r","stream","unwrapScoped","decodeText","pipeThroughChannel","makeChannel","takeWhile","event","data","JSON","parse","suspend","toolCalls","isFirstChunk","toolCallIndex","finishReason","usage","inputTokens","outputTokens","totalTokens","reasoningTokens","cacheReadInputTokens","cacheWriteInputTokens","metadata","post","body","unsafeJson","stream_options","include_usage","filterMap","chunk","parts","push","MetadataPart","id","model","timestamp","Date","created","isNotNullable","prompt_tokens","completion_tokens","completion_tokens_details","reasoning_tokens","prompt_tokens_details","cached_tokens","serviceTier","service_tier","systemFingerprint","system_fingerprint","acceptedPredictionTokens","accepted_prediction_tokens","rejectedPredictionTokens","rejected_prediction_tokens","inputAudioTokens","audio_tokens","outputAudioTokens","i","choices","length","choice","finish_reason","resolveFinishReason","isNotUndefined","finishToolCall","FinishPart","reason","providerMetadata","ProviderMetadataKey","delta","content","TextPart","text","hasProperty","Array","isArray","tool_calls","index","isUndefined","toolCall","isFinished","function","arguments","none","some","of","layer","effect","layerConfig","configs","all","flatMap","params","ToolCallPart","name"],"sources":["../../src/OpenAiClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/ai-openai",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.28.1",
|
|
4
4
|
"description": "Effect modules for working with AI apis",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
"gpt-tokenizer": "^2.9.0"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@effect/ai": "^0.
|
|
18
|
-
"@effect/experimental": "^0.54.
|
|
17
|
+
"@effect/ai": "^0.25.0",
|
|
18
|
+
"@effect/experimental": "^0.54.3",
|
|
19
19
|
"@effect/platform": "^0.90.0",
|
|
20
|
-
"effect": "^3.17.
|
|
20
|
+
"effect": "^3.17.6"
|
|
21
21
|
},
|
|
22
22
|
"publishConfig": {
|
|
23
23
|
"provenance": true
|
package/src/OpenAiClient.ts
CHANGED
|
@@ -165,18 +165,18 @@ export const make = (options: {
|
|
|
165
165
|
inputTokens: chunk.usage.prompt_tokens,
|
|
166
166
|
outputTokens: chunk.usage.completion_tokens,
|
|
167
167
|
totalTokens: chunk.usage.prompt_tokens + chunk.usage.completion_tokens,
|
|
168
|
-
reasoningTokens: chunk.usage.completion_tokens_details
|
|
169
|
-
cacheReadInputTokens: chunk.usage.prompt_tokens_details
|
|
168
|
+
reasoningTokens: chunk.usage.completion_tokens_details?.reasoning_tokens ?? 0,
|
|
169
|
+
cacheReadInputTokens: chunk.usage.prompt_tokens_details?.cached_tokens ?? 0,
|
|
170
170
|
cacheWriteInputTokens: usage.cacheWriteInputTokens
|
|
171
171
|
}
|
|
172
172
|
metadata = {
|
|
173
173
|
...metadata,
|
|
174
174
|
serviceTier: chunk.service_tier,
|
|
175
175
|
systemFingerprint: chunk.system_fingerprint,
|
|
176
|
-
acceptedPredictionTokens: chunk.usage.completion_tokens_details
|
|
177
|
-
rejectedPredictionTokens: chunk.usage.completion_tokens_details
|
|
178
|
-
inputAudioTokens: chunk.usage.prompt_tokens_details
|
|
179
|
-
outputAudioTokens: chunk.usage.completion_tokens_details
|
|
176
|
+
acceptedPredictionTokens: chunk.usage.completion_tokens_details?.accepted_prediction_tokens ?? 0,
|
|
177
|
+
rejectedPredictionTokens: chunk.usage.completion_tokens_details?.rejected_prediction_tokens ?? 0,
|
|
178
|
+
inputAudioTokens: chunk.usage.prompt_tokens_details?.audio_tokens ?? 0,
|
|
179
|
+
outputAudioTokens: chunk.usage.completion_tokens_details?.audio_tokens ?? 0
|
|
180
180
|
}
|
|
181
181
|
}
|
|
182
182
|
|
|
@@ -302,7 +302,7 @@ interface RawUsage {
|
|
|
302
302
|
readonly prompt_tokens: number
|
|
303
303
|
readonly completion_tokens: number
|
|
304
304
|
readonly total_tokens: number
|
|
305
|
-
readonly completion_tokens_details
|
|
305
|
+
readonly completion_tokens_details?: {
|
|
306
306
|
readonly accepted_prediction_tokens: number
|
|
307
307
|
readonly audio_tokens: number
|
|
308
308
|
readonly reasoning_tokens: number
|