observa-sdk 0.0.11 → 0.0.13

package/dist/index.cjs

@@ -428,19 +428,65 @@ function recordError2(req, error, start, opts) {
 // src/instrumentation/vercel-ai.ts
 function extractProviderFromModel(model) {
   if (!model) return "unknown";
-  const parts = model.split("/");
-  if (parts.length > 1) {
-    return parts[0].toLowerCase();
+  if (typeof model === "object" && model !== null) {
+    if (model.providerId) {
+      return model.providerId.toLowerCase();
+    }
+    if (model.provider) {
+      return String(model.provider).toLowerCase();
+    }
+    if (model.modelId) {
+      const modelId = String(model.modelId).toLowerCase();
+      if (modelId.includes("gpt") || modelId.includes("openai")) {
+        return "openai";
+      }
+      if (modelId.includes("claude") || modelId.includes("anthropic")) {
+        return "anthropic";
+      }
+      if (modelId.includes("gemini") || modelId.includes("google")) {
+        return "google";
+      }
+    }
+    return "unknown";
   }
-  const modelLower = model.toLowerCase();
-  if (modelLower.includes("gpt") || modelLower.includes("openai")) {
-    return "openai";
+  if (typeof model === "string") {
+    const parts = model.split("/");
+    if (parts.length > 1) {
+      return parts[0].toLowerCase();
+    }
+    const modelLower = model.toLowerCase();
+    if (modelLower.includes("gpt") || modelLower.includes("openai")) {
+      return "openai";
+    }
+    if (modelLower.includes("claude") || modelLower.includes("anthropic")) {
+      return "anthropic";
+    }
+    if (modelLower.includes("gemini") || modelLower.includes("google")) {
+      return "google";
+    }
   }
-  if (modelLower.includes("claude") || modelLower.includes("anthropic")) {
-    return "anthropic";
+  return "unknown";
+}
+function extractModelIdentifier(model) {
+  if (!model) return "unknown";
+  if (typeof model === "object" && model !== null) {
+    if (model.modelId) {
+      return String(model.modelId);
+    }
+    if (model.providerId && model.modelId) {
+      return `${model.providerId}/${model.modelId}`;
+    }
+    if (model.providerId) {
+      return String(model.providerId);
+    }
+    try {
+      return JSON.stringify(model);
+    } catch {
+      return "unknown";
+    }
   }
-  if (modelLower.includes("gemini") || modelLower.includes("google")) {
-    return "google";
+  if (typeof model === "string") {
+    return model;
   }
   return "unknown";
 }
@@ -449,15 +495,17 @@ async function traceGenerateText(originalFn, args, options) {
   const requestParams = args[0] || {};
   const model = requestParams.model || "unknown";
   const provider = extractProviderFromModel(model);
+  const modelIdentifier = extractModelIdentifier(model);
   try {
     const result = await originalFn(...args);
     const responseText = result.text || "";
     const usage = result.usage || {};
     const finishReason = result.finishReason || null;
     const responseId = result.response?.id || null;
+    const responseModel = result.model ? extractModelIdentifier(result.model) : modelIdentifier;
     recordTrace3(
       {
-        model,
+        model: modelIdentifier,
         prompt: requestParams.prompt || requestParams.messages || null,
         messages: requestParams.messages || null
       },
@@ -466,7 +514,7 @@ async function traceGenerateText(originalFn, args, options) {
         usage,
         finishReason,
         responseId,
-        model: result.model || model
+        model: responseModel
       },
       startTime,
       options,
@@ -479,7 +527,7 @@ async function traceGenerateText(originalFn, args, options) {
   } catch (error) {
     recordError3(
       {
-        model,
+        model: modelIdentifier,
         prompt: requestParams.prompt || requestParams.messages || null
       },
       error,
@@ -494,6 +542,7 @@ async function traceStreamText(originalFn, args, options) {
   const requestParams = args[0] || {};
   const model = requestParams.model || "unknown";
   const provider = extractProviderFromModel(model);
+  const modelIdentifier = extractModelIdentifier(model);
   try {
     const result = await originalFn(...args);
     if (result.textStream) {
@@ -502,7 +551,7 @@ async function traceStreamText(originalFn, args, options) {
         (fullResponse) => {
           recordTrace3(
             {
-              model,
+              model: modelIdentifier,
               prompt: requestParams.prompt || requestParams.messages || null,
               messages: requestParams.messages || null
             },
@@ -516,7 +565,7 @@ async function traceStreamText(originalFn, args, options) {
         },
         (err) => recordError3(
           {
-            model,
+            model: modelIdentifier,
             prompt: requestParams.prompt || requestParams.messages || null
           },
           err,
@@ -525,14 +574,14 @@ async function traceStreamText(originalFn, args, options) {
         ),
         "vercel-ai"
       );
-      return {
-        ...result,
-        textStream: wrappedStream
-      };
+      const wrappedResult = Object.create(Object.getPrototypeOf(result));
+      Object.assign(wrappedResult, result);
+      wrappedResult.textStream = wrappedStream;
+      return wrappedResult;
     }
     recordTrace3(
       {
-        model,
+        model: modelIdentifier,
         prompt: requestParams.prompt || requestParams.messages || null,
         messages: requestParams.messages || null
       },
@@ -547,7 +596,7 @@ async function traceStreamText(originalFn, args, options) {
   } catch (error) {
     recordError3(
       {
-        model,
+        model: modelIdentifier,
         prompt: requestParams.prompt || requestParams.messages || null
       },
       error,

package/dist/index.js

@@ -408,19 +408,65 @@ function recordError2(req, error, start, opts) {
 // src/instrumentation/vercel-ai.ts
 function extractProviderFromModel(model) {
   if (!model) return "unknown";
-  const parts = model.split("/");
-  if (parts.length > 1) {
-    return parts[0].toLowerCase();
+  if (typeof model === "object" && model !== null) {
+    if (model.providerId) {
+      return model.providerId.toLowerCase();
+    }
+    if (model.provider) {
+      return String(model.provider).toLowerCase();
+    }
+    if (model.modelId) {
+      const modelId = String(model.modelId).toLowerCase();
+      if (modelId.includes("gpt") || modelId.includes("openai")) {
+        return "openai";
+      }
+      if (modelId.includes("claude") || modelId.includes("anthropic")) {
+        return "anthropic";
+      }
+      if (modelId.includes("gemini") || modelId.includes("google")) {
+        return "google";
+      }
+    }
+    return "unknown";
   }
-  const modelLower = model.toLowerCase();
-  if (modelLower.includes("gpt") || modelLower.includes("openai")) {
-    return "openai";
+  if (typeof model === "string") {
+    const parts = model.split("/");
+    if (parts.length > 1) {
+      return parts[0].toLowerCase();
+    }
+    const modelLower = model.toLowerCase();
+    if (modelLower.includes("gpt") || modelLower.includes("openai")) {
+      return "openai";
+    }
+    if (modelLower.includes("claude") || modelLower.includes("anthropic")) {
+      return "anthropic";
+    }
+    if (modelLower.includes("gemini") || modelLower.includes("google")) {
+      return "google";
+    }
   }
-  if (modelLower.includes("claude") || modelLower.includes("anthropic")) {
-    return "anthropic";
+  return "unknown";
+}
+function extractModelIdentifier(model) {
+  if (!model) return "unknown";
+  if (typeof model === "object" && model !== null) {
+    if (model.modelId) {
+      return String(model.modelId);
+    }
+    if (model.providerId && model.modelId) {
+      return `${model.providerId}/${model.modelId}`;
+    }
+    if (model.providerId) {
+      return String(model.providerId);
+    }
+    try {
+      return JSON.stringify(model);
+    } catch {
+      return "unknown";
+    }
   }
-  if (modelLower.includes("gemini") || modelLower.includes("google")) {
-    return "google";
+  if (typeof model === "string") {
+    return model;
   }
   return "unknown";
 }
@@ -429,15 +475,17 @@ async function traceGenerateText(originalFn, args, options) {
   const requestParams = args[0] || {};
   const model = requestParams.model || "unknown";
   const provider = extractProviderFromModel(model);
+  const modelIdentifier = extractModelIdentifier(model);
   try {
     const result = await originalFn(...args);
     const responseText = result.text || "";
     const usage = result.usage || {};
     const finishReason = result.finishReason || null;
     const responseId = result.response?.id || null;
+    const responseModel = result.model ? extractModelIdentifier(result.model) : modelIdentifier;
     recordTrace3(
       {
-        model,
+        model: modelIdentifier,
         prompt: requestParams.prompt || requestParams.messages || null,
         messages: requestParams.messages || null
       },
@@ -446,7 +494,7 @@ async function traceGenerateText(originalFn, args, options) {
         usage,
         finishReason,
         responseId,
-        model: result.model || model
+        model: responseModel
       },
       startTime,
       options,
@@ -459,7 +507,7 @@ async function traceGenerateText(originalFn, args, options) {
   } catch (error) {
     recordError3(
       {
-        model,
+        model: modelIdentifier,
         prompt: requestParams.prompt || requestParams.messages || null
       },
       error,
@@ -474,6 +522,7 @@ async function traceStreamText(originalFn, args, options) {
   const requestParams = args[0] || {};
   const model = requestParams.model || "unknown";
   const provider = extractProviderFromModel(model);
+  const modelIdentifier = extractModelIdentifier(model);
   try {
     const result = await originalFn(...args);
     if (result.textStream) {
@@ -482,7 +531,7 @@ async function traceStreamText(originalFn, args, options) {
         (fullResponse) => {
           recordTrace3(
             {
-              model,
+              model: modelIdentifier,
               prompt: requestParams.prompt || requestParams.messages || null,
               messages: requestParams.messages || null
             },
@@ -496,7 +545,7 @@ async function traceStreamText(originalFn, args, options) {
         },
         (err) => recordError3(
           {
-            model,
+            model: modelIdentifier,
             prompt: requestParams.prompt || requestParams.messages || null
           },
           err,
@@ -505,14 +554,14 @@ async function traceStreamText(originalFn, args, options) {
         ),
         "vercel-ai"
       );
-      return {
-        ...result,
-        textStream: wrappedStream
-      };
+      const wrappedResult = Object.create(Object.getPrototypeOf(result));
+      Object.assign(wrappedResult, result);
+      wrappedResult.textStream = wrappedStream;
+      return wrappedResult;
     }
     recordTrace3(
       {
-        model,
+        model: modelIdentifier,
         prompt: requestParams.prompt || requestParams.messages || null,
         messages: requestParams.messages || null
       },
@@ -527,7 +576,7 @@ async function traceStreamText(originalFn, args, options) {
   } catch (error) {
     recordError3(
       {
-        model,
+        model: modelIdentifier,
         prompt: requestParams.prompt || requestParams.messages || null
       },
       error,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "observa-sdk",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Enterprise-grade observability SDK for AI applications. Track and monitor LLM interactions with zero friction.",
   "type": "module",
   "main": "./dist/index.cjs",