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

package/dist/index.js

@@ -1,9 +1,9 @@
-import { embed as embed$1, clean, embedMany as embedMany$1, trampoline, resolveStepOptions, chat, responseJSON, InvalidResponseError, stepCountAtLeast, executeTool, shouldStop, determineStepType, RemoteAPIError, JSONParseError, DelayedPromise, objCamelToSnake } from 'xsai';
+import { embed as embed$1, clean, embedMany as embedMany$1, trampoline, resolvePrepareStep, chat, responseJSON, normalizeChatCompletionUsage, InvalidResponseError, stepCountAtLeast, executeTool, shouldStop, DelayedPromise, objCamelToSnake, computeTotalUsage } from 'xsai';
 export * from 'xsai';
 import { trace, SpanStatusCode } from '@opentelemetry/api';
-import { EventSourceParserStream } from 'eventsource-parser/stream';
+import { createControlledStream, errorControllers, closeControllers, EventSourceParserStream, JsonMessageTransformStream } from '@xsai/shared-stream';
 
-var version = "0.5.0-beta.1";
+var version = "0.5.0-beta.3";
 var pkg = {
 	version: version};
 
@@ -135,8 +135,8 @@ const generateText = async (options) => {
   const rawGenerateText = async (options2) => {
     const messages = options2.steps == null ? structuredClone(options2.messages) : options2.messages;
     const steps = options2.steps ?? [];
-    const stepOptions = await resolveStepOptions({
-      messages,
+    const stepOptions = await resolvePrepareStep({
+      input: messages,
       model: options2.model,
       prepareStep: options2.prepareStep,
       stepNumber: steps.length,
@@ -145,20 +145,21 @@ const generateText = async (options) => {
     });
     return recordSpan(chatSpan({
       ...options2,
-      messages: stepOptions.messages,
+      messages: stepOptions.input,
       model: stepOptions.model,
       toolChoice: stepOptions.toolChoice
     }, tracer), async (span) => chat({
       ...options2,
       maxSteps: void 0,
-      messages: stepOptions.messages,
+      messages: stepOptions.input,
       model: stepOptions.model,
       steps: void 0,
       stopWhen: void 0,
       stream: false,
       toolChoice: stepOptions.toolChoice
     }).then(responseJSON).then(async (res) => {
-      const { choices, usage } = res;
+      const { choices } = res;
+      const usage = normalizeChatCompletionUsage(res.usage);
       if (!choices?.length) {
         const responseBody = JSON.stringify(res);
         throw new InvalidResponseError(`No choices returned, response body: ${responseBody}`, {
@@ -182,13 +183,17 @@ const generateText = async (options) => {
             tools: options2.tools
           }))
         );
-        for (const { completionToolCall, completionToolResult, message: message2 } of results) {
+        for (const { completionToolCall, completionToolResult, result } of results) {
           toolCalls.push(completionToolCall);
           toolResults.push(completionToolResult);
-          messages.push(message2);
+          messages.push({
+            content: result,
+            role: "tool",
+            tool_call_id: completionToolCall.toolCallId
+          });
         }
       }
-      const stopStep = {
+      const step = {
         finishReason,
         text: Array.isArray(message.content) ? message.content.filter((m) => m.type === "text").map((m) => m.text).join("\n") : message.content,
         toolCalls,
@@ -196,25 +201,16 @@ const generateText = async (options) => {
         usage
       };
       const stop = shouldStop(stopWhen, {
-        messages,
-        step: stopStep,
-        steps: [...steps, stopStep]
+        input: messages,
+        step,
+        steps: [...steps, step]
       });
       const willContinue = toolCalls.length > 0 && !stop;
-      const step = {
-        ...stopStep,
-        stepType: determineStepType({
-          finishReason,
-          stepsLength: steps.length,
-          toolCallsLength: toolCalls.length,
-          willContinue
-        })
-      };
       steps.push(step);
       span.setAttributes({
         "gen_ai.response.finish_reasons": [step.finishReason],
-        "gen_ai.usage.input_tokens": step.usage.prompt_tokens,
-        "gen_ai.usage.output_tokens": step.usage.completion_tokens
+        "gen_ai.usage.input_tokens": step.usage.inputTokens,
+        "gen_ai.usage.output_tokens": step.usage.outputTokens
       });
       if (options2.onStepFinish)
         await options2.onStepFinish(step);
@@ -244,31 +240,6 @@ const generateText = async (options) => {
   }));
 };
 
-const parseChunk = (data) => {
-  if (data.startsWith("{") && data.includes('"error":')) {
-    throw new RemoteAPIError(`Error from server: ${data}`, {
-      responseBody: data
-    });
-  }
-  try {
-    return JSON.parse(data);
-  } catch (cause) {
-    throw new JSONParseError(`Failed to parse stream chunk JSON: ${data}`, {
-      cause,
-      text: data
-    });
-  }
-};
-const transformChunk = () => {
-  return new TransformStream({
-    transform: async (chunk, controller) => {
-      if (!chunk.data || chunk.data === "[DONE]")
-        return;
-      controller.enqueue(parseChunk(chunk.data));
-    }
-  });
-};
-
 const streamText = (options) => {
   const tracer = getTracer();
   const steps = [];
@@ -281,14 +252,11 @@ const streamText = (options) => {
   const resultMessages = new DelayedPromise();
   const resultUsage = new DelayedPromise();
   const resultTotalUsage = new DelayedPromise();
-  let eventCtrl;
-  let textCtrl;
-  let reasoningTextCtrl;
-  const eventStream = new ReadableStream({ start: (controller) => eventCtrl = controller });
-  const textStream = new ReadableStream({ start: (controller) => textCtrl = controller });
-  const reasoningTextStream = new ReadableStream({ start: (controller) => reasoningTextCtrl = controller });
+  const [eventStream, eventCtrl] = createControlledStream();
+  const [textStream, textCtrl] = createControlledStream();
+  const [reasoningTextStream, reasoningTextCtrl] = createControlledStream();
   const pushEvent = (stepEvent) => {
-    eventCtrl?.enqueue(stepEvent);
+    eventCtrl.current?.enqueue(stepEvent);
     void options.onEvent?.(stepEvent);
   };
   const pushStep = (step) => {
@@ -297,8 +265,8 @@ const streamText = (options) => {
   };
   const tools = options.tools != null && options.tools.length > 0 ? options.tools.map((tool) => wrapTool(tool, tracer)) : void 0;
   const doStream = async () => {
-    const stepOptions = await resolveStepOptions({
-      messages,
+    const stepOptions = await resolvePrepareStep({
+      input: messages,
       model: options.model,
       prepareStep: options.prepareStep,
       stepNumber: steps.length,
@@ -307,14 +275,14 @@ const streamText = (options) => {
     });
     return recordSpan(chatSpan({
       ...options,
-      messages: stepOptions.messages,
+      messages: stepOptions.input,
       model: stepOptions.model,
       toolChoice: stepOptions.toolChoice
     }, tracer), async (span) => {
       const { body: stream } = await chat({
         ...options,
         maxSteps: void 0,
-        messages: stepOptions.messages,
+        messages: stepOptions.input,
         model: stepOptions.model,
         stopWhen: void 0,
         stream: true,
@@ -323,40 +291,35 @@ const streamText = (options) => {
         tools
       });
       const pushUsage = (u) => {
-        usage = u;
-        totalUsage = totalUsage ? {
-          completion_tokens: totalUsage.completion_tokens + u.completion_tokens,
-          prompt_tokens: totalUsage.prompt_tokens + u.prompt_tokens,
-          total_tokens: totalUsage.total_tokens + u.total_tokens
-        } : u;
+        if (u == null)
+          return;
+        usage = normalizeChatCompletionUsage(u);
+        totalUsage = computeTotalUsage(totalUsage, usage);
       };
       let text = "";
       let reasoningText;
       const pushText = (content) => {
-        textCtrl?.enqueue(content);
+        textCtrl.current?.enqueue(content);
         text += content;
       };
       const pushReasoningText = (reasoningContent) => {
-        if (reasoningText == null)
-          reasoningText = "";
-        reasoningTextCtrl?.enqueue(reasoningContent);
+        reasoningText ??= "";
+        reasoningTextCtrl.current?.enqueue(reasoningContent);
         reasoningText += reasoningContent;
       };
       const tool_calls = [];
       const toolCalls = [];
       const toolResults = [];
       let finishReason = "other";
-      await stream.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream()).pipeThrough(transformChunk()).pipeTo(new WritableStream({
+      await stream.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream()).pipeThrough(new JsonMessageTransformStream()).pipeTo(new WritableStream({
         abort: (reason) => {
-          eventCtrl?.error(reason);
-          textCtrl?.error(reason);
+          errorControllers(reason, eventCtrl, textCtrl, reasoningTextCtrl);
         },
         close: () => {
         },
         // eslint-disable-next-line sonarjs/cognitive-complexity
         write: (chunk) => {
-          if (chunk.usage)
-            pushUsage(chunk.usage);
+          pushUsage(chunk.usage);
           if (chunk.choices == null || chunk.choices.length === 0)
             return;
           const choice = chunk.choices[0];
@@ -429,10 +392,14 @@ const streamText = (options) => {
             tools
           }))
         );
-        for (const { completionToolCall, completionToolResult, message: message2 } of results) {
+        for (const { completionToolCall, completionToolResult, result } of results) {
           toolCalls.push(completionToolCall);
           toolResults.push(completionToolResult);
-          messages.push(message2);
+          messages.push({
+            content: result,
+            role: "tool",
+            tool_call_id: completionToolCall.toolCallId
+          });
           pushEvent({ ...completionToolCall, type: "tool-call" });
           pushEvent({ ...completionToolResult, type: "tool-result" });
         }
@@ -443,7 +410,7 @@ const streamText = (options) => {
           usage
         });
       }
-      const stopStep = {
+      const step = {
         finishReason,
         text,
         toolCalls,
@@ -451,26 +418,17 @@ const streamText = (options) => {
         usage
       };
       const stop = shouldStop(stopWhen, {
-        messages,
-        step: stopStep,
-        steps: [...steps, stopStep]
+        input: messages,
+        step,
+        steps: [...steps, step]
       });
       const willContinue = toolCalls.length > 0 && !stop;
-      const step = {
-        ...stopStep,
-        stepType: determineStepType({
-          finishReason,
-          stepsLength: steps.length,
-          toolCallsLength: toolCalls.length,
-          willContinue
-        })
-      };
       pushStep(step);
       span.setAttributes({
         "gen_ai.response.finish_reasons": [step.finishReason],
         ...step.usage && {
-          "gen_ai.usage.input_tokens": step.usage.prompt_tokens,
-          "gen_ai.usage.output_tokens": step.usage.completion_tokens
+          "gen_ai.usage.input_tokens": step.usage.inputTokens,
+          "gen_ai.usage.output_tokens": step.usage.outputTokens
         }
       });
       if (willContinue)
@@ -490,18 +448,14 @@ const streamText = (options) => {
       finalError ??= err;
     }
     if (finalError != null) {
-      eventCtrl?.error(finalError);
-      textCtrl?.error(finalError);
-      reasoningTextCtrl?.error(finalError);
+      errorControllers(finalError, eventCtrl, textCtrl, reasoningTextCtrl);
       resultSteps.reject(finalError);
       resultMessages.reject(finalError);
       resultUsage.reject(finalError);
       resultTotalUsage.reject(finalError);
       return;
     }
-    eventCtrl?.close();
-    textCtrl?.close();
-    reasoningTextCtrl?.close();
+    closeControllers(eventCtrl, textCtrl, reasoningTextCtrl);
     resultSteps.resolve(steps);
     resultMessages.resolve(messages);
     resultUsage.resolve(usage);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai-ext/telemetry",
   "type": "module",
-  "version": "0.5.0-beta.1",
+  "version": "0.5.0-beta.3",
   "description": "extra-small AI SDK.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -29,15 +29,15 @@
     "dist"
   ],
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
-    "eventsource-parser": "^3.0.6",
-    "xsai": "~0.5.0-beta.1"
+    "@opentelemetry/api": "^1.9.1",
+    "xsai": "0.5.0-beta.3",
+    "@xsai/shared-stream": "0.5.0-beta.3"
   },
   "devDependencies": {
-    "@langfuse/otel": "^4.5.1",
-    "@opentelemetry/sdk-trace-base": "^2.2.0",
-    "@opentelemetry/sdk-trace-node": "^2.2.0",
-    "zod": "^4.2.1"
+    "@langfuse/otel": "^5.1.0",
+    "@opentelemetry/sdk-trace-base": "^2.6.1",
+    "@opentelemetry/sdk-trace-node": "^2.6.1",
+    "zod": "^4.3.6"
   },
   "scripts": {
     "build": "pkgroll",