openlit 1.10.0 → 1.12.0

package/dist/instrumentation/ollama/index.js

@@ -26,17 +26,46 @@ class OpenlitOllamaInstrumentation extends instrumentation_1.InstrumentationBase
     }
     _patch(moduleExports) {
         try {
-            if ((0, instrumentation_1.isWrapped)(moduleExports.Ollama.prototype.chat)) {
-                this._unwrap(moduleExports.Ollama.prototype, 'chat');
+            const proto = moduleExports.Ollama.prototype;
+            if ((0, instrumentation_1.isWrapped)(proto.chat)) {
+                this._unwrap(proto, 'chat');
+            }
+            this._wrap(proto, 'chat', wrapper_1.default._patchChat(this.tracer));
+            if (typeof proto.generate === 'function') {
+                if ((0, instrumentation_1.isWrapped)(proto.generate)) {
+                    this._unwrap(proto, 'generate');
+                }
+                this._wrap(proto, 'generate', wrapper_1.default._patchGenerate(this.tracer));
+            }
+            if (typeof proto.embed === 'function') {
+                if ((0, instrumentation_1.isWrapped)(proto.embed)) {
+                    this._unwrap(proto, 'embed');
+                }
+                this._wrap(proto, 'embed', wrapper_1.default._patchEmbeddings(this.tracer));
+            }
+            if (typeof proto.embeddings === 'function') {
+                if ((0, instrumentation_1.isWrapped)(proto.embeddings)) {
+                    this._unwrap(proto, 'embeddings');
+                }
+                this._wrap(proto, 'embeddings', wrapper_1.default._patchEmbeddings(this.tracer));
             }
-            this._wrap(moduleExports.Ollama.prototype, 'chat', wrapper_1.default._patchChat(this.tracer));
         }
         catch (e) {
             console.error('Error in _patch method:', e);
         }
     }
     _unpatch(moduleExports) {
-        this._unwrap(moduleExports.Ollama.prototype, 'chat');
+        const proto = moduleExports.Ollama.prototype;
+        this._unwrap(proto, 'chat');
+        if (typeof proto.generate === 'function') {
+            this._unwrap(proto, 'generate');
+        }
+        if (typeof proto.embed === 'function') {
+            this._unwrap(proto, 'embed');
+        }
+        if (typeof proto.embeddings === 'function') {
+            this._unwrap(proto, 'embeddings');
+        }
     }
 }
 exports.default = OpenlitOllamaInstrumentation;

package/dist/instrumentation/ollama/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/instrumentation/ollama/index.ts"],"names":[],"mappings":";;;;;AAAA,oEAKwC;AAExC,6CAAwD;AACxD,wDAAsC;AAItC,MAAqB,4BAA6B,SAAQ,qCAAmB;IAC3E,YAAY,SAAsC,EAAE;QAClD,KAAK,CAAC,GAAG,iCAAsB,yBAAyB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7E,CAAC;IAES,IAAI;QACZ,MAAM,MAAM,GAAG,IAAI,qDAAmC,CACpD,QAAQ,EACR,CAAC,UAAU,CAAC,EACZ,CAAC,aAAa,EAAE,EAAE;YAChB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YAC3B,OAAO,aAAa,CAAC;QACvB,CAAC,EACD,CAAC,aAAa,EAAE,EAAE;YAChB,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC,CACF,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAEM,WAAW,CAAC,MAAW;QAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAES,MAAM,CAAC,aAAkB;QACjC,IAAI,CAAC;YACH,IAAI,IAAA,2BAAS,EAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACvD,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAa,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5F,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAES,QAAQ,CAAC,aAAkB;QACnC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;CACF;AAzCD,+CAyCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/instrumentation/ollama/index.ts"],"names":[],"mappings":"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"}

package/dist/instrumentation/ollama/wrapper.d.ts

@@ -16,7 +16,7 @@ export default class OllamaWrapper extends BaseWrapper {
         genAIEndpoint: string;
         response: any;
         span: Span;
-    }): AsyncGenerator<any, any, unknown>;
+    }): AsyncGenerator<unknown, any, unknown>;
     static _chatCommonSetter({ args, genAIEndpoint, result, span, ttft, tbt, }: {
         args: any[];
         genAIEndpoint: string;
@@ -27,8 +27,34 @@ export default class OllamaWrapper extends BaseWrapper {
     }): Promise<{
         genAIEndpoint: string;
         model: any;
-        user: any;
         cost: number;
         aiSystem: string;
     }>;
+    static _patchGenerate(tracer: Tracer): any;
+    static _generate({ args, genAIEndpoint, response, span, }: {
+        args: any[];
+        genAIEndpoint: string;
+        response: any;
+        span: Span;
+    }): Promise<any>;
+    static _generateGenerator({ args, genAIEndpoint, response, span, }: {
+        args: any[];
+        genAIEndpoint: string;
+        response: any;
+        span: Span;
+    }): AsyncGenerator<unknown, any, unknown>;
+    static _generateCommonSetter({ args, genAIEndpoint, result, span, ttft, tbt, }: {
+        args: any[];
+        genAIEndpoint: string;
+        result: any;
+        span: Span;
+        ttft?: number;
+        tbt?: number;
+    }): Promise<{
+        genAIEndpoint: string;
+        model: any;
+        cost: number;
+        aiSystem: string;
+    }>;
+    static _patchEmbeddings(tracer: Tracer): any;
 }