@arizeai/openinference-instrumentation-openai 4.1.7 → 4.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arizeai/openinference-instrumentation-openai",
-  "version": "4.1.7",
+  "version": "4.1.9",
   "private": false,
   "description": "OpenInference instrumentation for OpenAI",
   "keywords": [],
@@ -28,8 +28,8 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.8.0",
     "@opentelemetry/instrumentation": "^0.46.0",
-    "@arizeai/openinference-core": "2.5.0",
-    "@arizeai/openinference-semantic-conventions": "2.6.0"
+    "@arizeai/openinference-core": "2.5.2",
+    "@arizeai/openinference-semantic-conventions": "2.7.0"
   },
   "devDependencies": {
     "@opentelemetry/exporter-trace-otlp-proto": "^0.50.0",

package/src/instrumentation.ts

@@ -75,6 +75,7 @@ export const HOST_SUFFIX_TO_PROVIDER: Record<string, LLMProvider> = {
   "api.perplexity.ai": LLMProvider.PERPLEXITY,
   "api.together.ai": LLMProvider.TOGETHER,
   "api.together.xyz": LLMProvider.TOGETHER,
+  "ollama.com": LLMProvider.OLLAMA,
 };
 
 /**
@@ -83,7 +84,9 @@ export const HOST_SUFFIX_TO_PROVIDER: Record<string, LLMProvider> = {
 export function getProviderFromHost(host: string): LLMProvider | undefined {
   const normalised = host.toLowerCase().trim();
   for (const [suffix, provider] of Object.entries(HOST_SUFFIX_TO_PROVIDER)) {
-    if (normalised.endsWith(suffix)) {
+    // Anchor at a label boundary so e.g. "smollama.com" does not match the
+    // "ollama.com" suffix.
+    if (normalised === suffix || normalised.endsWith("." + suffix)) {
       return provider;
     }
   }
@@ -129,23 +132,19 @@ function getLLMProvider(clientInstance: unknown): LLMProvider | undefined {
   try {
     // The clientInstance might be a sub-object (like Completions) that has a _client property
     // pointing to the actual OpenAI/AzureOpenAI client
-    const instance = clientInstance as {
-      baseURL?: string | { host?: string };
-      _client?: {
-        baseURL?: string | { host?: string };
-      };
-    };
-
     let host: string | undefined;
-    let baseURL: string | { host?: string } | undefined;
+    let baseURL: unknown;
 
     // First try to get baseURL from the instance itself
-    if (instance.baseURL) {
-      baseURL = instance.baseURL;
-    }
-    // If not found, try the _client property (this is where Azure OpenAI stores it)
-    else if (instance._client?.baseURL) {
-      baseURL = instance._client.baseURL;
+    if (clientInstance != null && typeof clientInstance === "object") {
+      baseURL = Reflect.get(clientInstance, "baseURL");
+      // If not found (or empty), try the _client property (this is where Azure OpenAI stores it)
+      if (!baseURL) {
+        const nestedClient = Reflect.get(clientInstance, "_client");
+        if (nestedClient != null && typeof nestedClient === "object") {
+          baseURL = Reflect.get(nestedClient, "baseURL");
+        }
+      }
     }
 
     if (typeof baseURL === "string") {
@@ -159,7 +158,7 @@ function getLLMProvider(clientInstance: unknown): LLMProvider | undefined {
       }
     } else if (baseURL && typeof baseURL === "object" && "host" in baseURL) {
       // Direct host property
-      host = baseURL.host;
+      host = typeof baseURL.host === "string" ? baseURL.host : undefined;
     }
 
     if (host && typeof host === "string") {
@@ -332,7 +331,7 @@ export class OpenAIInstrumentation extends InstrumentationBase<typeof openai> {
               // handle the chunks and add them to the span
               // First split the stream via tee
               const [leftStream, rightStream] = result.tee();
-              consumeChatCompletionStreamChunks(rightStream, span);
+              void consumeChatCompletionStreamChunks(rightStream, span);
               result = leftStream;
             }
 
@@ -544,7 +543,7 @@ export class OpenAIInstrumentation extends InstrumentationBase<typeof openai> {
                 const [leftStream, rightStream] = result.tee();
                 // take the right stream, consuming it and then recording the final chunk
                 // into the span
-                consumeResponseStreamEvents(rightStream).then(recordSpan);
+                void consumeResponseStreamEvents(rightStream).then(recordSpan);
                 // give the left stream back to the caller
                 result = leftStream;
               }
@@ -1002,15 +1001,14 @@ function isAPIPromise<T>(promise: unknown): promise is APIPromise<T> {
  * @param then - The thennable to invoke
  * @returns The promise with the thennable invoked
  */
-function invokeMaybeAPIPromise<T>(
-  promise: T,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  then: (value: any) => unknown,
-): T {
-  if (isAPIPromise<T>(promise)) {
-    return promise._thenUnwrap(then) as T;
+function invokeMaybeAPIPromise<T>(promise: APIPromise<T>, then: (value: T) => T): APIPromise<T>;
+function invokeMaybeAPIPromise<T>(promise: Promise<T>, then: (value: T) => T): Promise<T>;
+function invokeMaybeAPIPromise<T>(promise: T, then: (value: T) => T): T;
+function invokeMaybeAPIPromise(promise: unknown, then: (value: unknown) => unknown): unknown {
+  if (isAPIPromise<unknown>(promise)) {
+    return promise._thenUnwrap(then);
   } else if (promise instanceof Promise) {
-    return promise.then(then) as T;
+    return promise.then(then);
   } else {
     // eslint-disable-next-line no-console
     console.warn("Promise is not an APIPromise or a regular promise, cannot instrument.");

package/src/version.ts

@@ -1,2 +1,2 @@
 // this is an auto-generated file. see js/scripts/version-update.js
-export const VERSION = "4.1.7";
+export const VERSION = "4.1.9";