@agentmark-ai/shared-utils 0.4.0 → 0.5.0

package/dist/index.mjs

@@ -921,39 +921,50 @@ var AiSdkV4Strategy = class {
     return attributes["gen_ai.request.model"] || attributes["ai.model.id"];
   }
   extractInput(attributes) {
-    let messagesValue;
-    if (attributes["ai.prompt.messages"] !== void 0) {
-      messagesValue = attributes["ai.prompt.messages"];
-    } else if (attributes["ai.prompt"] !== void 0) {
-      const promptValue = attributes["ai.prompt"];
-      if (typeof promptValue === "string") {
-        try {
-          const parsed = JSON.parse(promptValue);
-          messagesValue = parsed.messages || parsed;
-        } catch {
-          return void 0;
-        }
-      } else {
-        messagesValue = promptValue.messages || promptValue;
-      }
-    } else {
+    const raw = attributes["ai.prompt.messages"] !== void 0 ? attributes["ai.prompt.messages"] : attributes["ai.prompt"];
+    if (raw === void 0) {
       return void 0;
     }
-    let messages;
-    if (typeof messagesValue === "string") {
+    let value = raw;
+    if (typeof value === "string") {
       try {
-        messages = JSON.parse(messagesValue);
+        value = JSON.parse(value);
       } catch {
-        return void 0;
       }
-    } else {
-      messages = messagesValue;
     }
-    if (!Array.isArray(messages)) {
+    const messages = this.coerceToMessages(value);
+    if (!messages) {
       return void 0;
     }
     return this.normalizeMessages(messages);
   }
+  /**
+   * Coerce the shapes `ai.prompt` / `ai.prompt.messages` can take into a
+   * messages array: a raw array, `{ messages, system? }`,
+   * `{ prompt, system? }` (string prompt), or a bare string.
+   */
+  coerceToMessages(value) {
+    if (typeof value === "string") {
+      return [{ role: "user", content: value }];
+    }
+    if (Array.isArray(value)) {
+      return value;
+    }
+    if (value && typeof value === "object") {
+      if (Array.isArray(value.messages)) {
+        return typeof value.system === "string" ? [{ role: "system", content: value.system }, ...value.messages] : value.messages;
+      }
+      if (typeof value.prompt === "string") {
+        const messages = [];
+        if (typeof value.system === "string") {
+          messages.push({ role: "system", content: value.system });
+        }
+        messages.push({ role: "user", content: value.prompt });
+        return messages;
+      }
+    }
+    return void 0;
+  }
   extractOutput(attributes) {
     if (attributes["ai.result.text"] !== void 0) return attributes["ai.result.text"];
     if (attributes["ai.response.text"] !== void 0) return attributes["ai.response.text"];
@@ -1217,39 +1228,54 @@ var AiSdkV5Strategy = class {
     return attributes["gen_ai.request.model"] || attributes["ai.model.id"];
   }
   extractInput(attributes) {
-    let messagesValue;
-    if (attributes["ai.prompt.messages"] !== void 0) {
-      messagesValue = attributes["ai.prompt.messages"];
-    } else if (attributes["ai.prompt"] !== void 0) {
-      const promptValue = attributes["ai.prompt"];
-      if (typeof promptValue === "string") {
-        try {
-          const parsed = JSON.parse(promptValue);
-          messagesValue = parsed.messages || parsed;
-        } catch {
-          return void 0;
-        }
-      } else {
-        messagesValue = promptValue.messages || promptValue;
-      }
-    } else {
+    const raw = attributes["ai.prompt.messages"] !== void 0 ? attributes["ai.prompt.messages"] : attributes["ai.prompt"];
+    if (raw === void 0) {
       return void 0;
     }
-    let messages;
-    if (typeof messagesValue === "string") {
+    let value = raw;
+    if (typeof value === "string") {
       try {
-        messages = JSON.parse(messagesValue);
+        value = JSON.parse(value);
       } catch {
-        return void 0;
       }
-    } else {
-      messages = messagesValue;
     }
-    if (!Array.isArray(messages)) {
+    const messages = this.coerceToMessages(value);
+    if (!messages) {
       return void 0;
     }
     return this.normalizeMessages(messages);
   }
+  /**
+   * Coerce the shapes `ai.prompt` / `ai.prompt.messages` can take into a
+   * messages array:
+   *   - `[ ...messages ]`              — ai.prompt.messages (leaf spans)
+   *   - `{ messages: [...], system? }` — ai.prompt with messages
+   *   - `{ prompt: "text", system? }`  — ai.prompt for a string prompt
+   *                                      (the parent wrapper spans)
+   *   - `"text"`                       — a bare (non-JSON) prompt string
+   */
+  coerceToMessages(value) {
+    if (typeof value === "string") {
+      return [{ role: "user", content: value }];
+    }
+    if (Array.isArray(value)) {
+      return value;
+    }
+    if (value && typeof value === "object") {
+      if (Array.isArray(value.messages)) {
+        return typeof value.system === "string" ? [{ role: "system", content: value.system }, ...value.messages] : value.messages;
+      }
+      if (typeof value.prompt === "string") {
+        const messages = [];
+        if (typeof value.system === "string") {
+          messages.push({ role: "system", content: value.system });
+        }
+        messages.push({ role: "user", content: value.prompt });
+        return messages;
+      }
+    }
+    return void 0;
+  }
   extractOutput(attributes) {
     if (attributes["ai.response.text"] !== void 0) return attributes["ai.response.text"];
     return void 0;
@@ -1590,6 +1616,8 @@ function parseAgentMarkAttributes(attributes, prefix = "agentmark.") {
   if (get("dataset_expected_output")) result.datasetExpectedOutput = String(get("dataset_expected_output"));
   if (get("dataset_input")) result.datasetInput = String(get("dataset_input"));
   if (get("dataset_path")) result.datasetPath = String(get("dataset_path"));
+  if (get("experiment_key")) result.experimentKey = String(get("experiment_key"));
+  if (get("source_tree_hash")) result.sourceTreeHash = String(get("source_tree_hash"));
   return result;
 }
 
@@ -2104,13 +2132,20 @@ var FRAMEWORK_MAPPINGS = [
   {
     key: "ai.operationId",
     // Vercel AI SDK
+    // The AI SDK emits ai.operationId WITH the "ai." prefix (e.g.
+    // "ai.generateText"); accept both prefixed and unprefixed so generation
+    // wrappers resolve to "llm" instead of falling through to "function".
     map: {
       "embed": "embedding",
       "ai.embed": "embedding",
       "generateText": "llm",
+      "ai.generateText": "llm",
       "streamText": "llm",
+      "ai.streamText": "llm",
       "generateObject": "llm",
-      "streamObject": "llm"
+      "ai.generateObject": "llm",
+      "streamObject": "llm",
+      "ai.streamObject": "llm"
     }
   },
   {
@@ -2154,6 +2189,9 @@ function resolveSemanticKind(normalized, allAttributes) {
   if (normalized.type === "GENERATION" /* GENERATION */) {
     return "llm";
   }
+  if (normalized.model) {
+    return "llm";
+  }
   if (normalized.toolCalls && normalized.toolCalls.length > 0) {
     return "tool";
   }
@@ -2255,36 +2293,6 @@ function normalizeOtlpSpans(resourceSpans) {
   }
   return normalizedSpans;
 }
-
-// src/dataset-item-name.ts
-import { createHash } from "crypto";
-function computeDatasetItemName(input, fallbackIndex) {
-  if (input === void 0 || input === null) {
-    return String(fallbackIndex);
-  }
-  const canonical = canonicalJsonStringify(input);
-  return createHash("md5").update(canonical).digest("hex").slice(0, 12);
-}
-function canonicalJsonStringify(value) {
-  if (value === null) return "null";
-  if (value === void 0) return JSON.stringify(String(void 0));
-  const t = typeof value;
-  if (t === "string" || t === "number" || t === "boolean") {
-    return JSON.stringify(value);
-  }
-  if (t === "bigint" || t === "function" || t === "symbol") {
-    return JSON.stringify(String(value));
-  }
-  if (Array.isArray(value)) {
-    return "[" + value.map(canonicalJsonStringify).join(",") + "]";
-  }
-  const obj = value;
-  const keys = Object.keys(obj).sort();
-  const parts = keys.map((k) => {
-    return JSON.stringify(k) + ":" + canonicalJsonStringify(obj[k]);
-  });
-  return "{" + parts.join(",") + "}";
-}
 export {
   AGENTMARK_SCOPE_NAME,
   AgentMarkTransformer,
@@ -2296,8 +2304,6 @@ export {
   SpanType,
   TransformerRegistry,
   TypeClassifier,
-  canonicalJsonStringify,
-  computeDatasetItemName,
   convertOtlpAttributes,
   createSignature,
   detectVersion,