@xsai-ext/telemetry 0.5.0-beta.4 → 0.5.0-beta.6

package/dist/index.js

@@ -3,7 +3,7 @@ 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.4";
+var version = "0.5.0-beta.6";
 var pkg = {
 	version: version};
 
@@ -259,9 +259,9 @@ const streamText = (options) => {
   const [fullStream, fullCtrl] = createControlledStream();
   const [textStream, textCtrl] = createControlledStream();
   const [reasoningTextStream, reasoningTextCtrl] = createControlledStream();
-  const pushEvent = (stepEvent) => {
-    eventCtrl.current?.enqueue(stepEvent);
-    void options.onEvent?.(stepEvent);
+  const pushEvent = (event) => {
+    eventCtrl.current?.enqueue(event);
+    void options.onEvent?.(event);
   };
   const pushStep = (step) => {
     steps.push(step);
@@ -314,6 +314,9 @@ const streamText = (options) => {
       const toolCalls = [];
       const toolResults = [];
       let finishReason = "other";
+      let reasoningStarted = false;
+      let textStarted = false;
+      pushEvent({ type: "step.start" });
       await stream.pipeThrough(new TextDecoderStream()).pipeThrough(new EventSourceParserStream()).pipeThrough(new JsonMessageTransformStream()).pipeTo(new WritableStream({
         abort: (reason) => {
           errorControllers(reason, eventCtrl, fullCtrl, textCtrl, reasoningTextCtrl);
@@ -330,24 +333,39 @@ const streamText = (options) => {
           if (choice.delta.reasoning != null) {
             if (reasoningField !== "reasoning")
               reasoningField = "reasoning";
-            pushEvent({ text: choice.delta.reasoning, type: "reasoning-delta" });
+            if (!reasoningStarted) {
+              reasoningStarted = true;
+              pushEvent({ type: "reasoning.start" });
+            }
+            pushEvent({ delta: choice.delta.reasoning, type: "reasoning.delta" });
             pushReasoningText(choice.delta.reasoning);
           } else if (choice.delta.reasoning_content != null) {
             if (reasoningField !== "reasoning_content")
               reasoningField = "reasoning_content";
-            pushEvent({ text: choice.delta.reasoning_content, type: "reasoning-delta" });
+            if (!reasoningStarted) {
+              reasoningStarted = true;
+              pushEvent({ type: "reasoning.start" });
+            }
+            pushEvent({ delta: choice.delta.reasoning_content, type: "reasoning.delta" });
             pushReasoningText(choice.delta.reasoning_content);
           }
           if (choice.finish_reason != null)
             finishReason = choice.finish_reason;
           if (choice.delta.tool_calls?.length === 0 || choice.delta.tool_calls == null) {
             if (choice.delta.content != null) {
-              pushEvent({ text: choice.delta.content, type: "text-delta" });
+              if (!textStarted) {
+                textStarted = true;
+                pushEvent({ type: "text.start" });
+              }
+              pushEvent({ delta: choice.delta.content, type: "text.delta" });
               pushText(choice.delta.content);
             } else if (choice.delta.refusal != null) {
-              pushEvent({ error: choice.delta.refusal, type: "error" });
-            } else if (choice.finish_reason != null) {
-              pushEvent({ finishReason: choice.finish_reason, type: "finish", usage });
+              if (!textStarted) {
+                textStarted = true;
+                pushEvent({ type: "text.start" });
+              }
+              pushEvent({ delta: choice.delta.refusal, type: "text.delta" });
+              pushText(choice.delta.refusal);
             }
           } else {
             for (const toolCall of choice.delta.tool_calls) {
@@ -363,21 +381,22 @@ const streamText = (options) => {
                 pushEvent({
                   toolCallId: toolCall.id,
                   toolName: toolCall.function.name,
-                  type: "tool-call-streaming-start"
+                  type: "tool-call.start"
                 });
+                if (toolCall.function.arguments != null && toolCall.function.arguments.length > 0)
+                  pushEvent({ delta: toolCall.function.arguments, type: "tool-call.delta" });
               } else {
                 tool_calls[index].function.arguments += toolCall.function.arguments;
-                pushEvent({
-                  argsTextDelta: toolCall.function.arguments,
-                  toolCallId: toolCall.id,
-                  toolName: toolCall.function.name ?? tool_calls[index].function.name,
-                  type: "tool-call-delta"
-                });
+                pushEvent({ delta: toolCall.function.arguments, type: "tool-call.delta" });
               }
             }
           }
         }
       }));
+      if (reasoningStarted)
+        pushEvent({ content: reasoningText ?? "", type: "reasoning.done" });
+      if (textStarted)
+        pushEvent({ content: text, type: "text.done" });
       const message = {
         ...reasoningField != null ? { [reasoningField]: reasoningText } : {},
         content: text,
@@ -404,15 +423,9 @@ const streamText = (options) => {
             role: "tool",
             tool_call_id: completionToolCall.toolCallId
           });
-          pushEvent({ ...completionToolCall, type: "tool-call" });
-          pushEvent({ ...completionToolResult, type: "tool-result" });
+          pushEvent({ ...completionToolCall, type: "tool-call.done" });
+          pushEvent({ ...completionToolResult, type: "tool-result.done" });
         }
-      } else {
-        pushEvent({
-          finishReason,
-          type: "finish",
-          usage
-        });
       }
       const step = {
         finishReason,
@@ -428,6 +441,7 @@ const streamText = (options) => {
       });
       const willContinue = toolCalls.length > 0 && !stop;
       pushStep(step);
+      pushEvent({ type: "step.done", usage });
       span.setAttributes({
         "gen_ai.response.finish_reasons": [step.finishReason],
         ...step.usage && {

package/package.json

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