@xsai-ext/telemetry 0.4.0 → 0.4.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Attributes } from '@opentelemetry/api';
-import { WithUnknown, GenerateTextOptions, GenerateTextResult, StreamTextOptions, StreamTextResult } from 'xsai';
+import { EmbedOptions, EmbedResult, EmbedManyOptions, EmbedManyResult, WithUnknown, GenerateTextOptions, GenerateTextResult, StreamTextOptions, StreamTextResult } from 'xsai';
 export * from 'xsai';
 
 interface TelemetryOptions {
@@ -9,6 +9,17 @@ type WithTelemetry<T> = T & {
     telemetry?: TelemetryOptions;
 };
 
+/**
+ * @experimental
+ * Embeddings with Telemetry.
+ */
+declare const embed: (options: WithTelemetry<EmbedOptions>) => Promise<EmbedResult>;
+/**
+ * @experimental
+ * Embeddings with Telemetry.
+ */
+declare const embedMany: (options: WithTelemetry<EmbedManyOptions>) => Promise<EmbedManyResult>;
+
 /**
  * @experimental
  * Generating Text with Telemetry.
@@ -21,5 +32,5 @@ declare const generateText: (options: WithUnknown<WithTelemetry<GenerateTextOpti
  */
 declare const streamText: (options: WithUnknown<WithTelemetry<StreamTextOptions>>) => StreamTextResult;
 
-export { generateText, streamText };
+export { embed, embedMany, generateText, streamText };
 export type { TelemetryOptions, WithTelemetry };

package/dist/index.js

@@ -1,33 +1,8 @@
-import { trampoline, chat, responseJSON, determineStepType, executeTool, DelayedPromise, objCamelToSnake } from 'xsai';
+import { embed as embed$1, clean, embedMany as embedMany$1, trampoline, chat, responseJSON, determineStepType, executeTool, DelayedPromise, objCamelToSnake } from 'xsai';
 export * from 'xsai';
 import { trace, SpanStatusCode } from '@opentelemetry/api';
 
-const chatSpan = (options, tracer) => ({
-  attributes: {
-    "gen_ai.input.messages": JSON.stringify(options.messages),
-    "gen_ai.operation.name": "chat",
-    "gen_ai.provider.name": "openai",
-    "gen_ai.request.choice.count": 1,
-    "gen_ai.request.frequency_penalty": options.frequencyPenalty,
-    "gen_ai.request.model": options.model,
-    "gen_ai.request.presence_penalty": options.presencePenalty,
-    "gen_ai.request.seed": options.seed,
-    "gen_ai.request.stop_sequences": options.stop == null ? void 0 : Array.isArray(options.stop) ? options.stop : [options.stop],
-    "gen_ai.request.temperature": options.temperature,
-    "gen_ai.request.top_k": options.topK,
-    "gen_ai.request.top_p": options.topP,
-    "gen_ai.response.id": crypto.randomUUID(),
-    "gen_ai.response.model": options.model,
-    "gen_ai.tool.definitions": JSON.stringify(options.tools?.map((tool) => ({ function: tool.function, type: tool.type }))),
-    "server.address": new URL(options.baseURL).host,
-    ...options.telemetry?.attributes
-    // TODO: gen_ai.output.type
-  },
-  name: `chat ${options.model}`,
-  tracer
-});
-
-var version = "0.4.0";
+var version = "0.4.1";
 var pkg = {
 	version: version};
 
@@ -35,6 +10,10 @@ const getTracer = () => trace.getTracer("@xsai-ext/telemetry", pkg.version);
 
 const recordErrorOnSpan = (span, error) => {
   if (error instanceof Error) {
+    span.setAttributes({
+      "error.message": error.message,
+      "error.type": error.name
+    });
     span.recordException({
       message: error.message,
       name: error.name,
@@ -69,6 +48,67 @@ const recordSpan = async ({
   }
 });
 
+const serverAddressAndPort = (baseURL) => {
+  const url = new URL(baseURL);
+  return {
+    "server.address": url.hostname,
+    "server.port": url.port ? Number.parseInt(url.port) : url.protocol === "https:" ? 443 : 80
+  };
+};
+const chatSpan = (options, tracer) => ({
+  attributes: {
+    "gen_ai.input.messages": JSON.stringify(options.messages),
+    "gen_ai.operation.name": "chat",
+    "gen_ai.provider.name": "openai",
+    "gen_ai.request.choice.count": 1,
+    "gen_ai.request.frequency_penalty": options.frequencyPenalty,
+    "gen_ai.request.model": options.model,
+    "gen_ai.request.presence_penalty": options.presencePenalty,
+    "gen_ai.request.seed": options.seed,
+    "gen_ai.request.stop_sequences": options.stop == null ? void 0 : Array.isArray(options.stop) ? options.stop : [options.stop],
+    "gen_ai.request.temperature": options.temperature,
+    "gen_ai.request.top_k": options.topK,
+    "gen_ai.request.top_p": options.topP,
+    "gen_ai.response.id": crypto.randomUUID(),
+    "gen_ai.response.model": options.model,
+    "gen_ai.tool.definitions": JSON.stringify(options.tools?.map((tool) => ({ function: tool.function, type: tool.type }))),
+    ...serverAddressAndPort(options.baseURL),
+    ...options.telemetry?.attributes
+    // TODO: gen_ai.output.type
+  },
+  name: `chat ${options.model}`,
+  tracer
+});
+const embedSpan = (options, tracer) => ({
+  attributes: {
+    "gen_ai.embeddings.dimension.count": options.dimensions,
+    "gen_ai.operation.name": "embeddings",
+    "gen_ai.request.encoding_formats": "float",
+    "gen_ai.request.model": options.model,
+    ...serverAddressAndPort(options.baseURL),
+    ...options.telemetry?.attributes
+  },
+  name: `embeddings ${options.model}`,
+  tracer
+});
+
+const embed = async (options) => {
+  const tracer = getTracer();
+  return recordSpan(embedSpan(options, tracer), async (span) => {
+    const result = await embed$1(clean({ ...options, telemetry: void 0 }));
+    span.setAttribute("gen_ai.usage.input_tokens", result.usage.prompt_tokens);
+    return result;
+  });
+};
+const embedMany = async (options) => {
+  const tracer = getTracer();
+  return recordSpan(embedSpan(options, tracer), async (span) => {
+    const result = await embedMany$1(clean({ ...options, telemetry: void 0 }));
+    span.setAttribute("gen_ai.usage.input_tokens", result.usage.prompt_tokens);
+    return result;
+  });
+};
+
 const wrapTool = (tool, tracer) => ({
   execute: async (input, options) => recordSpan({
     attributes: {
@@ -81,15 +121,9 @@ const wrapTool = (tool, tracer) => ({
     name: `execute_tool ${tool.function.name}`,
     tracer
   }, async (span) => {
-    try {
-      const result = await tool.execute(input, options);
-      span.setAttribute("gen_ai.tool.call.result", JSON.stringify(result));
-      return result;
-    } catch (err) {
-      if (err instanceof Error)
-        span.setAttribute("error.type", err.message);
-      throw err;
-    }
+    const result = await tool.execute(input, options);
+    span.setAttribute("gen_ai.tool.call.result", JSON.stringify(result));
+    return result;
   }),
   function: tool.function,
   type: tool.type
@@ -220,6 +254,7 @@ const streamText = (options) => {
   const maxSteps = options.maxSteps ?? 1;
   let usage;
   let totalUsage;
+  let reasoningField;
   const resultSteps = new DelayedPromise();
   const resultMessages = new DelayedPromise();
   const resultUsage = new DelayedPromise();
@@ -254,7 +289,7 @@ const streamText = (options) => {
         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 };
+      } : u;
     };
     let text = "";
     let reasoningText;
@@ -286,7 +321,14 @@ const streamText = (options) => {
         if (chunk.choices == null || chunk.choices.length === 0)
           return;
         const choice = chunk.choices[0];
-        if (choice.delta.reasoning_content != null) {
+        if (choice.delta.reasoning != null) {
+          if (reasoningField !== "reasoning")
+            reasoningField = "reasoning";
+          pushEvent({ text: 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" });
           pushReasoningText(choice.delta.reasoning_content);
         }
@@ -331,8 +373,8 @@ const streamText = (options) => {
       }
     }));
     const message = {
+      ...reasoningField != null ? { [reasoningField]: reasoningText } : {},
       content: text,
-      reasoning_content: reasoningText,
       role: "assistant",
       tool_calls: tool_calls.length > 0 ? tool_calls : void 0
     };
@@ -414,4 +456,4 @@ const streamText = (options) => {
   };
 };
 
-export { generateText, streamText };
+export { embed, embedMany, generateText, streamText };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai-ext/telemetry",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "extra-small AI SDK.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "xsai": "~0.4.0"
+    "xsai": "~0.4.1"
   },
   "devDependencies": {
     "@langfuse/otel": "^4.5.1",