openlayer 0.1.23 → 0.1.24

package/dist/index.d.ts

@@ -189,13 +189,11 @@ export declare class OpenlayerClient {
     streamData: (data: StreamingData, config: StreamingDataConfig, inferencePipelineId: string) => Promise<void>;
 }
 export declare class OpenAIMonitor {
-    private inferencePipeline?;
     private openlayerClient;
     private openAIClient;
     private openlayerProjectName;
     private openlayerInferencePipelineName;
     private monitoringOn;
-    private project?;
     /**
      * Constructs an OpenAIMonitor instance.
      * @param {OpenAIMonitorConstructorProps} props - The configuration properties for the OpenAI and Openlayer clients.
@@ -222,7 +220,7 @@ export declare class OpenAIMonitor {
     /**
      * Starts monitoring for the OpenAI Monitor instance. If monitoring is already active, a warning is logged.
      */
-    startMonitoring(): Promise<void>;
+    startMonitoring(): void;
     /**
      * Stops monitoring for the OpenAI Monitor instance. If monitoring is not active, a warning is logged.
      */

package/dist/index.js

@@ -61,6 +61,10 @@ const OpenAIPricing = {
         input: 0.03,
         output: 0.06,
     },
+    'gpt-4-0613': {
+        input: 0.03,
+        output: 0.06,
+    },
     'gpt-4-1106-preview': {
         input: 0.01,
         output: 0.03,
@@ -77,6 +81,10 @@ const OpenAIPricing = {
         input: 0.06,
         output: 0.12,
     },
+    'gpt-4-32k-0613': {
+        input: 0.03,
+        output: 0.06,
+    },
 };
 class OpenlayerClient {
     /**
@@ -313,9 +321,8 @@ class OpenAIMonitor {
             if (!this.monitoringOn) {
                 throw new Error('Monitoring is not active.');
             }
-            if (typeof this.inferencePipeline === 'undefined') {
-                throw new Error('No inference pipeline found.');
-            }
+            const project = yield this.openlayerClient.createProject(this.openlayerProjectName, 'llm-base');
+            const inferencePipeline = yield this.openlayerClient.createInferencePipeline(project.id, this.openlayerInferencePipelineName);
             // Start a timer to measure latency
             const startTime = Date.now();
             // Accumulate output for streamed responses
@@ -352,7 +359,7 @@ class OpenAIMonitor {
                 }
                 const endTime = Date.now();
                 const latency = endTime - startTime;
-                this.openlayerClient.streamData(Object.assign(Object.assign({ latency, output: streamedOutput, timestamp: startTime }, inputVariablesMap), additionalLogs), config, this.inferencePipeline.id);
+                this.openlayerClient.streamData(Object.assign(Object.assign({ latency, output: streamedOutput, timestamp: startTime }, inputVariablesMap), additionalLogs), config, inferencePipeline.id);
             }
             else {
                 const nonStreamedResponse = response;
@@ -368,8 +375,7 @@ class OpenAIMonitor {
                     throw new Error('No output received from OpenAI.');
                 }
                 this.openlayerClient.streamData(Object.assign(Object.assign({ cost,
-                    latency,
-                    output, timestamp: startTime, tokens }, inputVariablesMap), additionalLogs), config, this.inferencePipeline.id);
+                    latency, model: nonStreamedResponse.model, output, timestamp: startTime, tokens }, inputVariablesMap), additionalLogs), config, inferencePipeline.id);
             }
             return response;
         });
@@ -386,12 +392,11 @@ class OpenAIMonitor {
             if (!this.monitoringOn) {
                 throw new Error('Monitoring is not active.');
             }
-            if (typeof this.inferencePipeline === 'undefined') {
-                throw new Error('No inference pipeline found.');
-            }
             if (!body.prompt) {
                 throw new Error('No prompt provided.');
             }
+            const project = yield this.openlayerClient.createProject(this.openlayerProjectName, 'llm-base');
+            const inferencePipeline = yield this.openlayerClient.createInferencePipeline(project.id, this.openlayerInferencePipelineName);
             // Start a timer to measure latency
             const startTime = Date.now();
             // Accumulate output and tokens data for streamed responses
@@ -427,7 +432,7 @@ class OpenAIMonitor {
                 const endTime = Date.now();
                 const latency = endTime - startTime;
                 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, this.inferencePipeline.id);
+                this.openlayerClient.streamData(Object.assign({ cost, input: body.prompt, latency, output: streamedOutput, timestamp: startTime, tokens: streamedTokens }, additionalLogs), config, inferencePipeline.id);
             }
             else {
                 const nonStreamedResponse = response;
@@ -438,7 +443,7 @@ class OpenAIMonitor {
                 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, this.inferencePipeline.id);
+                this.openlayerClient.streamData(Object.assign({ cost, input: body.prompt, latency, output: nonStreamedResponse.choices[0].text, timestamp: startTime, tokens }, additionalLogs), config, inferencePipeline.id);
             }
             return response;
         });
@@ -459,33 +464,23 @@ class OpenAIMonitor {
      * Starts monitoring for the OpenAI Monitor instance. If monitoring is already active, a warning is logged.
      */
     startMonitoring() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.monitoringOn) {
-                console.warn('Monitor is already on.');
-                return;
-            }
-            console.info('Starting monitor: creating or loading an Openlayer project and inference pipeline...');
-            this.monitoringOn = true;
-            this.project = yield this.openlayerClient.createProject(this.openlayerProjectName, 'llm-base');
-            if (typeof this.project !== 'undefined') {
-                this.inferencePipeline =
-                    yield this.openlayerClient.createInferencePipeline(this.project.id, this.openlayerInferencePipelineName);
-            }
-            console.info('Monitor started');
-        });
+        if (this.monitoringOn) {
+            console.warn('Monitoring is already on!');
+            return;
+        }
+        this.monitoringOn = true;
+        console.info('Monitoring started.');
     }
     /**
      * Stops monitoring for the OpenAI Monitor instance. If monitoring is not active, a warning is logged.
      */
     stopMonitoring() {
         if (!this.monitoringOn) {
-            console.warn('Monitor is not active.');
+            console.warn('Monitoring is not active.');
             return;
         }
         this.monitoringOn = false;
-        this.project = undefined;
-        this.inferencePipeline = undefined;
-        console.info('Monitor stopped.');
+        console.info('Monitoring stopped.');
     }
 }
 exports.OpenAIMonitor = OpenAIMonitor;

package/examples/openai_monitor.mjs

@@ -5,14 +5,13 @@
 import { OpenAIMonitor } from 'openlayer';
 
 const monitor = new OpenAIMonitor({
-  openAiApiKey: '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',
-  openlayerApiKey: 'UyKge0qbzrnAg_vehsTtw_e_mArrHHyT',
+  openAiApiKey: 'YOUR_OPENAI_API_KEY',
+  openlayerApiKey: 'YOUR_OPENLAYER_API_KEY',
   openlayerInferencePipelineName: 'production',
-  openlayerProjectName: 'test13',
-  openlayerServerUrl: 'http://localhost:8080/v1',
+  openlayerProjectName: 'YOUR_OPENLAYER_PROJECT_NAME',
 });
 
-await monitor.startMonitoring();
+monitor.startMonitoring();
 
 const inputs = [
   {
@@ -37,7 +36,7 @@ for (let i = 0; i < inputs.length; i++) {
       messages: [
         {
           content: systemMessage,
-          role: 'assistant',
+          role: 'system',
         },
         {
           content: userMessage,
@@ -53,3 +52,5 @@ for (let i = 0; i < inputs.length; i++) {
     }
   );
 }
+
+monitor.stopMonitoring();

package/package.json

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