openlayer 0.1.17 → 0.1.19

package/dist/index.d.ts

@@ -143,14 +143,6 @@ export declare class OpenlayerClient {
      */
     constructor({ openlayerApiKey, openlayerServerUrl, }: OpenlayerClientConstructorProps);
     private resolvedQuery;
-    /**
-     * Streams data to the Openlayer inference pipeline.
-     * @param {StreamingData} data - The chat completion data to be streamed.
-     * @param {string} inferencePipelineId - The ID of the Openlayer inference pipeline to which data is streamed.
-     * @returns {Promise<void>} A promise that resolves when the data has been successfully streamed.
-     * @throws {Error} Throws an error if the Openlayer API key is not set or an error occurs in the streaming process.
-     */
-    streamData: (data: StreamingData, config: StreamingDataConfig, inferencePipelineId: string) => Promise<void>;
     /**
      * Creates a new inference pipeline in Openlayer or loads an existing one.
      * @param {string} projectId - The ID of the project containing the inference pipeline.
@@ -183,6 +175,14 @@ export declare class OpenlayerClient {
      * @throws {Error} Throws an error if the project is not found.
      */
     loadProject: (name: string) => Promise<OpenlayerProject>;
+    /**
+     * Streams data to the Openlayer inference pipeline.
+     * @param {StreamingData} data - The chat completion data to be streamed.
+     * @param {string} inferencePipelineId - The ID of the Openlayer inference pipeline to which data is streamed.
+     * @returns {Promise<void>} A promise that resolves when the data has been successfully streamed.
+     * @throws {Error} Throws an error if the Openlayer API key is not set or an error occurs in the streaming process.
+     */
+    streamData: (data: StreamingData, config: StreamingDataConfig, inferencePipelineId: string) => Promise<void>;
 }
 export declare class OpenAIMonitor {
     private openlayerClient;

package/dist/index.js

@@ -96,45 +96,6 @@ class OpenlayerClient {
         this.openlayerServerUrl = 'https://api.openlayer.com/v1';
         this.version = '0.1.0a16';
         this.resolvedQuery = (endpoint, args = {}) => (0, request_1.resolvedQuery)(this.openlayerServerUrl, endpoint, args);
-        /**
-         * Streams data to the Openlayer inference pipeline.
-         * @param {StreamingData} data - The chat completion data to be streamed.
-         * @param {string} inferencePipelineId - The ID of the Openlayer inference pipeline to which data is streamed.
-         * @returns {Promise<void>} A promise that resolves when the data has been successfully streamed.
-         * @throws {Error} Throws an error if the Openlayer API key is not set or an error occurs in the streaming process.
-         */
-        this.streamData = (data, config, inferencePipelineId) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (!this.openlayerApiKey) {
-                throw new Error('Openlayer API key are required for streaming data.');
-            }
-            try {
-                const dataStreamEndpoint = `/inference-pipelines/${inferencePipelineId}/data-stream`;
-                const dataStreamQuery = this.resolvedQuery(dataStreamEndpoint);
-                const response = yield fetch(dataStreamQuery, {
-                    body: JSON.stringify({
-                        config,
-                        rows: [
-                            Object.assign(Object.assign({}, data), { id: (0, uuid_1.v4)(), timestamp: Math.round(((_a = data.timestamp) !== null && _a !== void 0 ? _a : Date.now()) / 1000) }),
-                        ],
-                    }),
-                    headers: {
-                        Authorization: `Bearer ${this.openlayerApiKey}`,
-                        'Content-Type': 'application/json',
-                    },
-                    method: 'POST',
-                });
-                if (!response.ok) {
-                    console.error('Error making POST request:', response.status);
-                    throw new Error(`Error: ${response.status}`);
-                }
-                return yield response.json();
-            }
-            catch (error) {
-                console.error('Error streaming data to Openlayer:', error);
-                throw error;
-            }
-        });
         /**
          * Creates a new inference pipeline in Openlayer or loads an existing one.
          * @param {string} projectId - The ID of the project containing the inference pipeline.
@@ -146,7 +107,7 @@ class OpenlayerClient {
             try {
                 return yield this.loadInferencePipeline(projectId, name);
             }
-            catch (_b) {
+            catch (_a) {
                 const createInferencePipelineEndpoint = `/projects/${projectId}/inference-pipelines`;
                 const createInferencePipelineQuery = this.resolvedQuery(createInferencePipelineEndpoint, { version: this.version });
                 const createInferencePipelineResponse = yield fetch(createInferencePipelineQuery, {
@@ -179,7 +140,7 @@ class OpenlayerClient {
             try {
                 return yield this.loadProject(name);
             }
-            catch (_c) {
+            catch (_b) {
                 const projectsEndpoint = '/projects';
                 const projectsQuery = this.resolvedQuery(projectsEndpoint);
                 const response = yield fetch(projectsQuery, {
@@ -267,6 +228,45 @@ class OpenlayerClient {
             }
             return project;
         });
+        /**
+         * Streams data to the Openlayer inference pipeline.
+         * @param {StreamingData} data - The chat completion data to be streamed.
+         * @param {string} inferencePipelineId - The ID of the Openlayer inference pipeline to which data is streamed.
+         * @returns {Promise<void>} A promise that resolves when the data has been successfully streamed.
+         * @throws {Error} Throws an error if the Openlayer API key is not set or an error occurs in the streaming process.
+         */
+        this.streamData = (data, config, inferencePipelineId) => __awaiter(this, void 0, void 0, function* () {
+            var _c;
+            if (!this.openlayerApiKey) {
+                throw new Error('Openlayer API key are required for streaming data.');
+            }
+            try {
+                const dataStreamEndpoint = `/inference-pipelines/${inferencePipelineId}/data-stream`;
+                const dataStreamQuery = this.resolvedQuery(dataStreamEndpoint);
+                const response = yield fetch(dataStreamQuery, {
+                    body: JSON.stringify({
+                        config,
+                        rows: [
+                            Object.assign(Object.assign({}, data), { id: (0, uuid_1.v4)(), timestamp: Math.round(((_c = data.timestamp) !== null && _c !== void 0 ? _c : Date.now()) / 1000) }),
+                        ],
+                    }),
+                    headers: {
+                        Authorization: `Bearer ${this.openlayerApiKey}`,
+                        'Content-Type': 'application/json',
+                    },
+                    method: 'POST',
+                });
+                if (!response.ok) {
+                    console.error('Error making POST request:', response.status);
+                    throw new Error(`Error: ${response.status}`);
+                }
+                return yield response.json();
+            }
+            catch (error) {
+                console.error('Error streaming data to Openlayer:', error);
+                throw error;
+            }
+        });
         this.openlayerApiKey = openlayerApiKey;
         if (openlayerServerUrl) {
             this.openlayerServerUrl = openlayerServerUrl;
@@ -381,7 +381,7 @@ class OpenAIMonitor {
          */
         this.createCompletion = (body, options, additionalLogs) => __awaiter(this, void 0, void 0, function* () {
             var _m, e_2, _o, _p;
-            var _q, _r, _s, _t, _u, _v, _w, _x;
+            var _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
             if (!this.monitoringOn) {
                 throw new Error('Monitoring is not active.');
             }
@@ -393,41 +393,48 @@ class OpenAIMonitor {
             // Start a timer to measure latency
             const startTime = Date.now();
             // Accumulate output and tokens data for streamed responses
+            let streamedModel = body.model;
             let streamedOutput = '';
             let streamedTokens = 0;
+            let streamedInputTokens = 0;
+            let streamedOutputTokens = 0;
             const response = yield this.openAIClient.completions.create(body, options);
             const config = Object.assign(Object.assign({}, this.openlayerClient.defaultConfig), { inputVariableNames: ['input'] });
             if (body.stream) {
                 const streamedResponse = response;
                 try {
-                    for (var _y = true, streamedResponse_2 = __asyncValues(streamedResponse), streamedResponse_2_1; streamedResponse_2_1 = yield streamedResponse_2.next(), _m = streamedResponse_2_1.done, !_m; _y = true) {
+                    for (var _2 = true, streamedResponse_2 = __asyncValues(streamedResponse), streamedResponse_2_1; streamedResponse_2_1 = yield streamedResponse_2.next(), _m = streamedResponse_2_1.done, !_m; _2 = true) {
                         _p = streamedResponse_2_1.value;
-                        _y = false;
+                        _2 = false;
                         const chunk = _p;
                         // Process each chunk - for example, accumulate input data
+                        streamedModel = chunk.model;
                         streamedOutput += chunk.choices[0].text.trim();
                         streamedTokens += (_r = (_q = chunk.usage) === null || _q === void 0 ? void 0 : _q.total_tokens) !== null && _r !== void 0 ? _r : 0;
+                        streamedInputTokens += (_t = (_s = chunk.usage) === null || _s === void 0 ? void 0 : _s.prompt_tokens) !== null && _t !== void 0 ? _t : 0;
+                        streamedOutputTokens += (_v = (_u = chunk.usage) === null || _u === void 0 ? void 0 : _u.completion_tokens) !== null && _v !== void 0 ? _v : 0;
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (!_y && !_m && (_o = streamedResponse_2.return)) yield _o.call(streamedResponse_2);
+                        if (!_2 && !_m && (_o = streamedResponse_2.return)) yield _o.call(streamedResponse_2);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
                 const endTime = Date.now();
                 const latency = endTime - startTime;
-                this.openlayerClient.streamData(Object.assign({ input: body.prompt, latency, output: streamedOutput, timestamp: startTime, tokens: streamedTokens }, additionalLogs), config, inferencePipeline.id);
+                const cost = this.cost(streamedModel, streamedInputTokens, streamedOutputTokens);
+                this.openlayerClient.streamData(Object.assign({ cost, input: body.prompt, latency, output: streamedOutput, timestamp: startTime, tokens: streamedTokens }, additionalLogs), config, inferencePipeline.id);
             }
             else {
                 const nonStreamedResponse = response;
                 // Handle regular (non-streamed) response
                 const endTime = Date.now();
                 const latency = endTime - startTime;
-                const tokens = (_t = (_s = nonStreamedResponse.usage) === null || _s === void 0 ? void 0 : _s.total_tokens) !== null && _t !== void 0 ? _t : 0;
-                const inputTokens = (_v = (_u = nonStreamedResponse.usage) === null || _u === void 0 ? void 0 : _u.prompt_tokens) !== null && _v !== void 0 ? _v : 0;
-                const outputTokens = (_x = (_w = nonStreamedResponse.usage) === null || _w === void 0 ? void 0 : _w.completion_tokens) !== null && _x !== void 0 ? _x : 0;
+                const tokens = (_x = (_w = nonStreamedResponse.usage) === null || _w === void 0 ? void 0 : _w.total_tokens) !== null && _x !== void 0 ? _x : 0;
+                const inputTokens = (_z = (_y = nonStreamedResponse.usage) === null || _y === void 0 ? void 0 : _y.prompt_tokens) !== null && _z !== void 0 ? _z : 0;
+                const outputTokens = (_1 = (_0 = nonStreamedResponse.usage) === null || _0 === void 0 ? void 0 : _0.completion_tokens) !== null && _1 !== void 0 ? _1 : 0;
                 const cost = this.cost(nonStreamedResponse.model, inputTokens, outputTokens);
                 this.openlayerClient.streamData(Object.assign({ cost, input: body.prompt, latency, output: nonStreamedResponse.choices[0].text, timestamp: startTime, tokens }, additionalLogs), config, inferencePipeline.id);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openlayer",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "The Openlayer TypeScript client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",