@langinsight/ai-sdk 0.1.0 → 0.1.1

package/dist/index.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -96,24 +106,24 @@ var mergePath = (base, path) => {
   return base + path;
 };
 var replaceUrlParam = (urlString, params) => {
-  for (const [k, v] of Object.entries(params)) {
+  for (const [k, v2] of Object.entries(params)) {
     const reg = new RegExp("/:" + k + "(?:{[^/]+})?\\??");
-    urlString = urlString.replace(reg, v ? `/${v}` : "");
+    urlString = urlString.replace(reg, v2 ? `/${v2}` : "");
   }
   return urlString;
 };
 var buildSearchParams = (query) => {
   const searchParams = new URLSearchParams();
-  for (const [k, v] of Object.entries(query)) {
-    if (v === void 0) {
+  for (const [k, v2] of Object.entries(query)) {
+    if (v2 === void 0) {
       continue;
     }
-    if (Array.isArray(v)) {
-      for (const v2 of v) {
-        searchParams.append(k, v2);
+    if (Array.isArray(v2)) {
+      for (const v22 of v2) {
+        searchParams.append(k, v22);
       }
     } else {
-      searchParams.set(k, v);
+      searchParams.set(k, v2);
     }
   }
   return searchParams;
@@ -190,13 +200,13 @@ var ClientRequestImpl = class {
       }
       if (args.form) {
         const form = new FormData();
-        for (const [k, v] of Object.entries(args.form)) {
-          if (Array.isArray(v)) {
-            for (const v2 of v) {
-              form.append(k, v2);
+        for (const [k, v2] of Object.entries(args.form)) {
+          if (Array.isArray(v2)) {
+            for (const v22 of v2) {
+              form.append(k, v22);
             }
           } else {
-            form.append(k, v);
+            form.append(k, v2);
           }
         }
         this.rBody = form;
@@ -315,132 +325,165 @@ var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
 }, []);
 
 // src/index.ts
+var v = __toESM(require("valibot"), 1);
 var LangInsight;
 ((LangInsight2) => {
   class CallbackHandler {
     constructor(options) {
       this.options = options;
       this.client = hc(options.endpoint, { fetch });
-      this.result = new Promise((resolve, reject) => {
+      this.result = new Promise((resolve) => {
         this.resolve = resolve;
-        this.reject = reject;
       });
     }
     client;
     resolve = null;
-    reject = null;
     result;
+    extract({ steps }) {
+      const result = v.safeParse(
+        v.object({
+          contents: v.array(
+            v.partial(
+              v.looseObject({
+                role: v.string(),
+                parts: v.array(v.partial(v.looseObject({ type: v.string(), text: v.string() })))
+              })
+            )
+          )
+        }),
+        steps[steps.length - 1]?.request.body
+      );
+      return result;
+    }
     /**
-     * streamText の onFinish コールバックとして使用
+     * streamText の onFinish コールバック。
+     * ストリーミング完了時に入力・出力のトレースを Core API に送信する。
      *
      * @example
      * ```ts
-     * const handler = new LangInsight.CallbackHandler(options);
-     *
+     * const handler = new LangInsight.CallbackHandler({ cookie, metadata: { userId, sessionId } });
      * const result = streamText({
-     *   model: openai("gpt-4o"),
-     *   prompt: "Hello!",
-     *   onFinish: handler.onFinish({ input: "Hello!" }),
+     *   model,
+     *   messages,
+     *   onFinish: handler.onFinish,
      * });
      * ```
      */
-    onFinish(params) {
-      return async (event) => {
-        await this.sendTraces({
-          input: params.input,
-          result: event
-        });
-      };
-    }
+    onFinish = async (event) => {
+      try {
+        const { userId, sessionId, ...rest } = this.options.metadata;
+        const model = event.response.modelId ?? "unknown";
+        const usage = event.usage;
+        const startedAt = event.response.timestamp;
+        const endedAt = /* @__PURE__ */ new Date();
+        const { success, output, issues } = this.extract(event);
+        if (!success) {
+          console.error(issues);
+          throw new Error("Failed to parse request body");
+        }
+        const input = output.contents.at(-1)?.parts?.map((part) => part.text).join("") ?? "";
+        const body = {
+          userId,
+          sessionId,
+          model,
+          meta: { ...rest },
+          startedAt: startedAt.toISOString(),
+          endedAt: endedAt.toISOString()
+        };
+        const res = await Promise.all([
+          this.client.traces.external.$post({
+            json: {
+              ...body,
+              type: "input",
+              token: usage.inputTokens ?? 0,
+              content: input
+            },
+            header: {
+              "x-api-key": this.options.apiKey
+            }
+          }),
+          this.client.traces.external.$post({
+            json: {
+              ...body,
+              type: "output",
+              token: usage.outputTokens ?? 0,
+              content: event.text
+            },
+            header: {
+              "x-api-key": this.options.apiKey
+            }
+          })
+        ]);
+        if (!res.every((r) => r.ok)) {
+          const [a, b] = await Promise.all(res.map((r) => r.text()));
+          console.error(a, b);
+          throw new Error("Failed to send traces");
+        }
+        const trace = { input: await res[0].json(), output: await res[1].json() };
+        this.resolve?.(trace);
+        this.options.onSuccess?.(trace.input, trace.output);
+      } catch (error) {
+        const err = error instanceof Error ? error : new Error(String(error));
+        this.resolve?.(null);
+        console.error(err);
+        this.options.onFailure?.(err);
+      }
+    };
     /**
-     * generateText の結果を送信
-     * traceId の取得・DB永続化は onSuccess コールバックで trace を受け取り行う。
+     * generateText の結果からトレースを送信する。
+     * 非ストリーミング生成時に入力・出力のトレースを Core API に送信する。
      *
-     * @example
-     * ```ts
-     * const handler = new LangInsight.CallbackHandler({
-     *   ...options,
-     *   onSuccess: (input, output) => {
-     *     saveTraceToDb(output); // traceId = output.id
-     *   },
-     * });
-     * const result = await generateText({ model: openai("gpt-4o"), prompt: "Hello!" });
-     * await handler.report(result, { input: "Hello!" });
-     * ```
-     */
-    // biome-ignore lint/suspicious/noExplicitAny: should accept any output
-    async report(result, params) {
-      await this.sendTraces({
-        input: params.input,
-        result
-      });
-    }
-    /**
-     * フィードバック（👍/👎）を送信
-     * traceId は onSuccess コールバックで受け取った output.id を使用する。
+     * @param result - generateText の戻り値
      *
      * @example
      * ```ts
-     * onSuccess: (input, output) => { lastOutputTraceId = output.id; },
-     * // ...
-     * await handler.score({ traceId: lastOutputTraceId, value: 1 }); // 👍
+     * const handler = new LangInsight.CallbackHandler({ cookie, metadata: { userId, sessionId } });
+     * const result = await generateText({ model, messages });
+     * await handler.report(result);
      * ```
      */
-    async score(params) {
-      const { userId, sessionId } = this.options.metadata;
-      const res = await this.client.feedbacks.external.$post({
-        header: {
-          "x-api-key": this.options.apiKey
-        },
-        json: {
-          traceId: params.traceId,
-          sessionId,
-          userId,
-          value: params.value
-        }
-      });
-      if (!res.ok) {
-        console.error(await res.text());
-      }
-    }
-    async sendTraces(params) {
-      const { input, result } = params;
-      const { userId, sessionId, ...rest } = this.options.metadata;
-      const model = result.response.modelId ?? "unknown";
-      const startedAt = result.response.timestamp;
-      const endedAt = /* @__PURE__ */ new Date();
+    async report(result) {
       try {
+        const { userId, sessionId, ...rest } = this.options.metadata;
+        const model = result.response.modelId ?? "unknown";
+        const usage = result.usage;
+        const startedAt = result.response.timestamp;
+        const endedAt = /* @__PURE__ */ new Date();
+        const { success, output, issues } = this.extract(result);
+        if (!success) {
+          console.error(issues);
+          throw new Error("Failed to parse request body");
+        }
+        const input = output.contents.at(-1)?.parts?.map((part) => part.text).join("") ?? "";
+        const body = {
+          userId,
+          sessionId,
+          model,
+          meta: { ...rest },
+          startedAt: startedAt.toISOString(),
+          endedAt: endedAt.toISOString()
+        };
         const res = await Promise.all([
           this.client.traces.external.$post({
-            header: {
-              "x-api-key": this.options.apiKey
-            },
             json: {
-              userId,
-              sessionId,
-              model,
-              token: result.usage.inputTokens ?? 0,
-              content: input,
+              ...body,
               type: "input",
-              meta: { ...rest },
-              startedAt: startedAt.toISOString(),
-              endedAt: endedAt.toISOString()
+              token: usage.inputTokens ?? 0,
+              content: input
+            },
+            header: {
+              "x-api-key": this.options.apiKey
             }
           }),
           this.client.traces.external.$post({
-            header: {
-              "x-api-key": this.options.apiKey
-            },
             json: {
-              userId,
-              sessionId,
-              model,
-              token: result.usage.outputTokens ?? 0,
-              content: result.text,
+              ...body,
               type: "output",
-              meta: { ...rest },
-              startedAt: startedAt.toISOString(),
-              endedAt: endedAt.toISOString()
+              token: usage.outputTokens ?? 0,
+              content: result.text
+            },
+            header: {
+              "x-api-key": this.options.apiKey
             }
           })
         ]);
@@ -449,17 +492,39 @@ var LangInsight;
           console.error(a, b);
           throw new Error("Failed to send traces");
         }
-        const inputTrace = await res[0].json();
-        const outputTrace = await res[1].json();
-        this.resolve?.({ input: inputTrace, output: outputTrace });
-        this.options.onSuccess?.(inputTrace, outputTrace);
+        const trace = { input: await res[0].json(), output: await res[1].json() };
+        this.resolve?.(trace);
+        this.options.onSuccess?.(trace.input, trace.output);
       } catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));
-        this.reject?.(err);
+        this.resolve?.(null);
         console.error(err);
         this.options.onFailure?.(err);
       }
     }
+    /**
+     * フィードバック（👍/👎）を送信
+     * traceId は onSuccess コールバックで受け取った output.id を使用する。
+     *
+     * @example
+     * ```ts
+     * onSuccess: (input, output) => { lastOutputTraceId = output.id; },
+     * // ...
+     * await handler.score({ traceId: lastOutputTraceId, value: 1 }); // 👍
+     * ```
+     */
+    async score(params) {
+      const { userId, sessionId } = this.options.metadata;
+      const res = await this.client.feedbacks.external.$post({
+        json: { traceId: params.traceId, sessionId, userId, value: params.value },
+        header: {
+          "x-api-key": this.options.apiKey
+        }
+      });
+      if (!res.ok) {
+        console.error(await res.text());
+      }
+    }
   }
   LangInsight2.CallbackHandler = CallbackHandler;
 })(LangInsight || (LangInsight = {}));

package/dist/index.d.cts

@@ -1,7 +1,8 @@
-import { StepResult, ToolSet, LanguageModelUsage, GenerateTextResult } from 'ai';
+import { StreamTextOnFinishCallback, ToolSet, generateText } from 'ai';
 import { InferOutput, ObjectSchema, SchemaWithPipe, StringSchema, UuidAction, NumberSchema, PicklistSchema, RecordSchema, AnySchema, CustomSchema, StandardProps, UnknownDataset, Config, BaseIssue, OutputDataset, ObjectIssue, NumberIssue, StringIssue, PicklistIssue, RecordIssue, CustomIssue } from 'valibot';
 
-declare const vTraceEntity: ObjectSchema<{
+declare const vTraceEntity: ObjectSchema<
+  {
     readonly id: SchemaWithPipe<readonly [StringSchema<undefined>, UuidAction<string, undefined>]>;
     readonly userId: StringSchema<undefined>;
     readonly sessionId: StringSchema<undefined>;
@@ -13,8 +14,12 @@ declare const vTraceEntity: ObjectSchema<{
     readonly createdAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
     readonly startedAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
     readonly endedAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
-}, undefined> & {
-    create: Omit<ObjectSchema<{
+  },
+  undefined
+> & {
+  create: Omit<
+    ObjectSchema<
+      {
         readonly id: SchemaWithPipe<readonly [StringSchema<undefined>, UuidAction<string, undefined>]>;
         readonly userId: StringSchema<undefined>;
         readonly sessionId: StringSchema<undefined>;
@@ -26,96 +31,114 @@ declare const vTraceEntity: ObjectSchema<{
         readonly createdAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
         readonly startedAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
         readonly endedAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
-    }, undefined>, "~types" | "~run" | "~standard" | "entries"> & {
-        readonly entries: Omit<{
-            readonly id: SchemaWithPipe<readonly [StringSchema<undefined>, UuidAction<string, undefined>]>;
-            readonly userId: StringSchema<undefined>;
-            readonly sessionId: StringSchema<undefined>;
-            readonly model: StringSchema<undefined>;
-            readonly token: NumberSchema<undefined>;
-            readonly content: StringSchema<undefined>;
-            readonly type: PicklistSchema<["input", "output", "error"], undefined>;
-            readonly meta: RecordSchema<StringSchema<undefined>, AnySchema, undefined>;
-            readonly createdAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
-            readonly startedAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
-            readonly endedAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
-        }, "id" | "createdAt">;
-        readonly "~standard": StandardProps<{
+      },
+      undefined
+    >,
+    "~types" | "~run" | "~standard" | "entries"
+  > & {
+    readonly entries: Omit<
+      {
+        readonly id: SchemaWithPipe<readonly [StringSchema<undefined>, UuidAction<string, undefined>]>;
+        readonly userId: StringSchema<undefined>;
+        readonly sessionId: StringSchema<undefined>;
+        readonly model: StringSchema<undefined>;
+        readonly token: NumberSchema<undefined>;
+        readonly content: StringSchema<undefined>;
+        readonly type: PicklistSchema<["input", "output", "error"], undefined>;
+        readonly meta: RecordSchema<StringSchema<undefined>, AnySchema, undefined>;
+        readonly createdAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
+        readonly startedAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
+        readonly endedAt: SchemaWithPipe<readonly [CustomSchema<unknown, undefined>, StringSchema<undefined>]>;
+      },
+      "id" | "createdAt"
+    >;
+    readonly "~standard": StandardProps<
+      {
+        type: "output" | "input" | "error";
+        token: number;
+        content: string;
+        userId: string;
+        model: string;
+        meta: {
+          [x: string]: any;
+        };
+        sessionId: string;
+        startedAt: unknown;
+        endedAt: unknown;
+      },
+      {
+        type: "output" | "input" | "error";
+        token: number;
+        content: string;
+        userId: string;
+        model: string;
+        meta: {
+          [x: string]: any;
+        };
+        sessionId: string;
+        startedAt: string;
+        endedAt: string;
+      }
+    >;
+    readonly "~run": (
+      dataset: UnknownDataset,
+      config: Config<BaseIssue<unknown>>,
+    ) => OutputDataset<
+      {
+        type: "output" | "input" | "error";
+        token: number;
+        content: string;
+        userId: string;
+        model: string;
+        meta: {
+          [x: string]: any;
+        };
+        sessionId: string;
+        startedAt: string;
+        endedAt: string;
+      },
+      ObjectIssue | NumberIssue | StringIssue | PicklistIssue | RecordIssue | CustomIssue
+    >;
+    readonly "~types"?:
+      | {
+          readonly input: {
             type: "output" | "input" | "error";
             token: number;
             content: string;
             userId: string;
             model: string;
             meta: {
-                [x: string]: any;
+              [x: string]: any;
             };
             sessionId: string;
             startedAt: unknown;
             endedAt: unknown;
-        }, {
-            type: "output" | "input" | "error";
-            token: number;
-            content: string;
-            userId: string;
-            model: string;
-            meta: {
-                [x: string]: any;
-            };
-            sessionId: string;
-            startedAt: string;
-            endedAt: string;
-        }>;
-        readonly "~run": (dataset: UnknownDataset, config: Config<BaseIssue<unknown>>) => OutputDataset<{
+          };
+          readonly output: {
             type: "output" | "input" | "error";
             token: number;
             content: string;
             userId: string;
             model: string;
             meta: {
-                [x: string]: any;
+              [x: string]: any;
             };
             sessionId: string;
             startedAt: string;
             endedAt: string;
-        }, ObjectIssue | NumberIssue | StringIssue | PicklistIssue | RecordIssue | CustomIssue>;
-        readonly "~types"?: {
-            readonly input: {
-                type: "output" | "input" | "error";
-                token: number;
-                content: string;
-                userId: string;
-                model: string;
-                meta: {
-                    [x: string]: any;
-                };
-                sessionId: string;
-                startedAt: unknown;
-                endedAt: unknown;
-            };
-            readonly output: {
-                type: "output" | "input" | "error";
-                token: number;
-                content: string;
-                userId: string;
-                model: string;
-                meta: {
-                    [x: string]: any;
-                };
-                sessionId: string;
-                startedAt: string;
-                endedAt: string;
-            };
-            readonly issue: ObjectIssue | NumberIssue | StringIssue | PicklistIssue | RecordIssue | CustomIssue;
-        } | undefined;
-    };
+          };
+          readonly issue: ObjectIssue | NumberIssue | StringIssue | PicklistIssue | RecordIssue | CustomIssue;
+        }
+      | undefined;
+  };
 };
 type TraceEntity = InferOutput<typeof vTraceEntity>;
 declare namespace TraceEntity {
-    type Create = InferOutput<typeof vTraceEntity.create>;
+  type Create = InferOutput<typeof vTraceEntity.create>;
 }
 
 declare namespace LangInsight {
-    interface Options {
+    export interface Options {
         apiKey: string;
         endpoint: string;
         metadata: {
@@ -126,55 +149,46 @@ declare namespace LangInsight {
         onSuccess?: (input: TraceEntity, output: TraceEntity) => void;
         onFailure?: (error: Error) => void;
     }
-    class CallbackHandler {
+    type TraceValue = {
+        input: TraceEntity;
+        output: TraceEntity;
+    } | null;
+    export class CallbackHandler {
         private readonly options;
         private readonly client;
         private resolve;
-        private reject;
-        readonly result: Promise<{
-            input: TraceEntity;
-            output: TraceEntity;
-        }>;
+        readonly result: Promise<TraceValue>;
         constructor(options: Options);
+        private extract;
         /**
-         * streamText の onFinish コールバックとして使用
+         * streamText の onFinish コールバック。
+         * ストリーミング完了時に入力・出力のトレースを Core API に送信する。
          *
          * @example
          * ```ts
-         * const handler = new LangInsight.CallbackHandler(options);
-         *
+         * const handler = new LangInsight.CallbackHandler({ cookie, metadata: { userId, sessionId } });
          * const result = streamText({
-         *   model: openai("gpt-4o"),
-         *   prompt: "Hello!",
-         *   onFinish: handler.onFinish({ input: "Hello!" }),
+         *   model,
+         *   messages,
+         *   onFinish: handler.onFinish,
          * });
          * ```
          */
-        onFinish(params: {
-            input: string;
-        }): (event: StepResult<ToolSet> & {
-            readonly steps: StepResult<ToolSet>[];
-            readonly totalUsage: LanguageModelUsage;
-        }) => Promise<void>;
+        onFinish: StreamTextOnFinishCallback<ToolSet>;
         /**
-         * generateText の結果を送信
-         * traceId の取得・DB永続化は onSuccess コールバックで trace を受け取り行う。
+         * generateText の結果からトレースを送信する。
+         * 非ストリーミング生成時に入力・出力のトレースを Core API に送信する。
+         *
+         * @param result - generateText の戻り値
          *
          * @example
          * ```ts
-         * const handler = new LangInsight.CallbackHandler({
-         *   ...options,
-         *   onSuccess: (input, output) => {
-         *     saveTraceToDb(output); // traceId = output.id
-         *   },
-         * });
-         * const result = await generateText({ model: openai("gpt-4o"), prompt: "Hello!" });
-         * await handler.report(result, { input: "Hello!" });
+         * const handler = new LangInsight.CallbackHandler({ cookie, metadata: { userId, sessionId } });
+         * const result = await generateText({ model, messages });
+         * await handler.report(result);
          * ```
          */
-        report(result: GenerateTextResult<ToolSet, any>, params: {
-            input: string;
-        }): Promise<void>;
+        report(result: Awaited<ReturnType<typeof generateText>>): Promise<void>;
         /**
          * フィードバック（👍/👎）を送信
          * traceId は onSuccess コールバックで受け取った output.id を使用する。
@@ -190,8 +204,8 @@ declare namespace LangInsight {
             traceId: string;
             value: 1 | -1;
         }): Promise<void>;
-        private sendTraces;
     }
+    export {  };
 }
 
 export { LangInsight };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@langinsight/ai-sdk",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "publishConfig": {
     "access": "public"
   },
@@ -16,14 +16,15 @@
     "build": "tsup src/index.ts --dts --out-dir dist"
   },
   "dependencies": {
-    "@hono/client": "^0.0.3"
+    "@hono/client": "^0.0.3",
+    "valibot": "^1.2.0"
   },
   "peerDependencies": {
     "ai": ">=5.0.0"
   },
   "devDependencies": {
-    "@types/bun": "1.3.8",
-    "ai": "^6.0.78",
+    "@types/bun": "1.3.9",
+    "ai": "^6.0.86",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3"
   }