@xsai-ext/telemetry 0.5.0-beta.3 → 0.5.0-beta.5

package/dist/index.js

@@ -1,9 +1,9 @@
-import { embed as embed$1, clean, embedMany as embedMany$1, trampoline, resolvePrepareStep, chat, responseJSON, normalizeChatCompletionUsage, InvalidResponseError, stepCountAtLeast, executeTool, shouldStop, DelayedPromise, objCamelToSnake, computeTotalUsage } from 'xsai';
+import { embed as embed$1, clean, embedMany as embedMany$1, trampoline, resolvePrepareStep, chat, responseJSON, normalizeChatCompletionUsage, computeTotalUsage, InvalidResponseError, stepCountAtLeast, executeTool, shouldStop, DelayedPromise, objCamelToSnake } from 'xsai';
 export * from 'xsai';
 import { trace, SpanStatusCode } from '@opentelemetry/api';
 import { createControlledStream, errorControllers, closeControllers, EventSourceParserStream, JsonMessageTransformStream } from '@xsai/shared-stream';
 
-var version = "0.5.0-beta.3";
+var version = "0.5.0-beta.5";
 var pkg = {
 	version: version};
 
@@ -150,16 +150,17 @@ const generateText = async (options) => {
       toolChoice: stepOptions.toolChoice
     }, tracer), async (span) => chat({
       ...options2,
-      maxSteps: void 0,
       messages: stepOptions.input,
       model: stepOptions.model,
       steps: void 0,
-      stopWhen: void 0,
       stream: false,
-      toolChoice: stepOptions.toolChoice
+      telemetry: void 0,
+      toolChoice: stepOptions.toolChoice,
+      totalUsage: void 0
     }).then(responseJSON).then(async (res) => {
       const { choices } = res;
       const usage = normalizeChatCompletionUsage(res.usage);
+      const totalUsage = computeTotalUsage(options2.totalUsage, usage);
       if (!choices?.length) {
         const responseBody = JSON.stringify(res);
         throw new InvalidResponseError(`No choices returned, response body: ${responseBody}`, {
@@ -223,13 +224,15 @@ const generateText = async (options) => {
           text: step.text,
           toolCalls: step.toolCalls,
           toolResults: step.toolResults,
+          totalUsage,
           usage: step.usage
         };
       } else {
         return async () => rawGenerateText({
           ...options2,
           messages,
-          steps
+          steps,
+          totalUsage
         });
       }
     }));
@@ -253,6 +256,7 @@ const streamText = (options) => {
   const resultUsage = new DelayedPromise();
   const resultTotalUsage = new DelayedPromise();
   const [eventStream, eventCtrl] = createControlledStream();
+  const [fullStream, fullCtrl] = createControlledStream();
   const [textStream, textCtrl] = createControlledStream();
   const [reasoningTextStream, reasoningTextCtrl] = createControlledStream();
   const pushEvent = (stepEvent) => {
@@ -281,12 +285,11 @@ const streamText = (options) => {
     }, tracer), async (span) => {
       const { body: stream } = await chat({
         ...options,
-        maxSteps: void 0,
         messages: stepOptions.input,
         model: stepOptions.model,
-        stopWhen: void 0,
         stream: true,
         streamOptions: options.streamOptions != null ? objCamelToSnake(options.streamOptions) : void 0,
+        telemetry: void 0,
         toolChoice: stepOptions.toolChoice,
         tools
       });
@@ -313,12 +316,13 @@ const streamText = (options) => {
       let finishReason = "other";
       await stream.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream()).pipeThrough(new JsonMessageTransformStream()).pipeTo(new WritableStream({
         abort: (reason) => {
-          errorControllers(reason, eventCtrl, textCtrl, reasoningTextCtrl);
+          errorControllers(reason, eventCtrl, fullCtrl, textCtrl, reasoningTextCtrl);
         },
         close: () => {
         },
         // eslint-disable-next-line sonarjs/cognitive-complexity
         write: (chunk) => {
+          fullCtrl.current?.enqueue(chunk);
           pushUsage(chunk.usage);
           if (chunk.choices == null || chunk.choices.length === 0)
             return;
@@ -448,21 +452,22 @@ const streamText = (options) => {
       finalError ??= err;
     }
     if (finalError != null) {
-      errorControllers(finalError, eventCtrl, textCtrl, reasoningTextCtrl);
+      errorControllers(finalError, eventCtrl, fullCtrl, textCtrl, reasoningTextCtrl);
       resultSteps.reject(finalError);
       resultMessages.reject(finalError);
       resultUsage.reject(finalError);
       resultTotalUsage.reject(finalError);
       return;
     }
-    closeControllers(eventCtrl, textCtrl, reasoningTextCtrl);
+    closeControllers(eventCtrl, fullCtrl, textCtrl, reasoningTextCtrl);
     resultSteps.resolve(steps);
     resultMessages.resolve(messages);
     resultUsage.resolve(usage);
     resultTotalUsage.resolve(totalUsage);
   })();
   return {
-    fullStream: eventStream,
+    eventStream,
+    fullStream,
     messages: resultMessages.promise,
     reasoningTextStream,
     steps: resultSteps.promise,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai-ext/telemetry",
   "type": "module",
-  "version": "0.5.0-beta.3",
+  "version": "0.5.0-beta.5",
   "description": "extra-small AI SDK.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -30,8 +30,8 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "xsai": "0.5.0-beta.3",
-    "@xsai/shared-stream": "0.5.0-beta.3"
+    "@xsai/shared-stream": "0.5.0-beta.5",
+    "xsai": "0.5.0-beta.5"
   },
   "devDependencies": {
     "@langfuse/otel": "^5.1.0",