openlayer 0.1.21 → 0.1.23

package/dist/index.d.ts

@@ -189,11 +189,13 @@ 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.
@@ -220,7 +222,7 @@ export declare class OpenAIMonitor {
     /**
      * Starts monitoring for the OpenAI Monitor instance. If monitoring is already active, a warning is logged.
      */
-    startMonitoring(): void;
+    startMonitoring(): Promise<void>;
     /**
      * Stops monitoring for the OpenAI Monitor instance. If monitoring is not active, a warning is logged.
      */

package/dist/index.js

@@ -95,7 +95,7 @@ class OpenlayerClient {
             timestampColumnName: 'timestamp',
         };
         this.openlayerServerUrl = 'https://api.openlayer.com/v1';
-        this.version = '0.1.0a20';
+        this.version = '0.1.0a21';
         this.resolvedQuery = (endpoint, args = {}) => (0, request_1.resolvedQuery)(this.openlayerServerUrl, endpoint, args);
         /**
          * Creates a new inference pipeline in Openlayer or loads an existing one.
@@ -108,26 +108,25 @@ class OpenlayerClient {
             try {
                 return yield this.loadInferencePipeline(projectId, name);
             }
-            catch (_a) {
-                const createInferencePipelineEndpoint = `/projects/${projectId}/inference-pipelines`;
-                const createInferencePipelineQuery = this.resolvedQuery(createInferencePipelineEndpoint, { version: this.version });
-                const createInferencePipelineResponse = yield fetch(createInferencePipelineQuery, {
-                    body: JSON.stringify({
-                        description: '',
-                        name,
-                    }),
-                    headers: {
-                        Authorization: `Bearer ${this.openlayerApiKey}`,
-                        'Content-Type': 'application/json',
-                    },
-                    method: 'POST',
-                });
-                const inferencePipeline = yield createInferencePipelineResponse.json();
-                if (!(inferencePipeline === null || inferencePipeline === void 0 ? void 0 : inferencePipeline.id)) {
-                    throw new Error('Error creating inference pipeline');
-                }
-                return inferencePipeline;
+            catch (_a) { }
+            const createInferencePipelineEndpoint = `/projects/${projectId}/inference-pipelines`;
+            const createInferencePipelineQuery = this.resolvedQuery(createInferencePipelineEndpoint, { version: this.version });
+            const createInferencePipelineResponse = yield fetch(createInferencePipelineQuery, {
+                body: JSON.stringify({
+                    description: '',
+                    name,
+                }),
+                headers: {
+                    Authorization: `Bearer ${this.openlayerApiKey}`,
+                    'Content-Type': 'application/json',
+                },
+                method: 'POST',
+            });
+            const inferencePipeline = yield createInferencePipelineResponse.json();
+            if (!(inferencePipeline === null || inferencePipeline === void 0 ? void 0 : inferencePipeline.id)) {
+                throw new Error('Error creating inference pipeline');
             }
+            return inferencePipeline;
         });
         /**
          * Creates a new project in Openlayer or loads an existing one.
@@ -141,32 +140,31 @@ class OpenlayerClient {
             try {
                 return yield this.loadProject(name);
             }
-            catch (_b) {
-                const projectsEndpoint = '/projects';
-                const projectsQuery = this.resolvedQuery(projectsEndpoint);
-                const response = yield fetch(projectsQuery, {
-                    body: JSON.stringify({
-                        description,
-                        name,
-                        taskType,
-                    }),
-                    headers: {
-                        Authorization: `Bearer ${this.openlayerApiKey}`,
-                        'Content-Type': 'application/json',
-                    },
-                    method: 'POST',
-                });
-                const data = yield response.json();
-                const { items: projects, error } = data;
-                if (!Array.isArray(projects)) {
-                    throw new Error(typeof error === 'string' ? error : 'Invalid response from Openlayer');
-                }
-                const project = projects.find((p) => p.name === name);
-                if (!(project === null || project === void 0 ? void 0 : project.id)) {
-                    throw new Error('Project not found');
-                }
-                return project;
+            catch (_b) { }
+            const projectsEndpoint = '/projects';
+            const projectsQuery = this.resolvedQuery(projectsEndpoint);
+            const response = yield fetch(projectsQuery, {
+                body: JSON.stringify({
+                    description,
+                    name,
+                    taskType,
+                }),
+                headers: {
+                    Authorization: `Bearer ${this.openlayerApiKey}`,
+                    'Content-Type': 'application/json',
+                },
+                method: 'POST',
+            });
+            const data = yield response.json();
+            const { items: projects, error } = data;
+            if (!Array.isArray(projects)) {
+                throw new Error(typeof error === 'string' ? error : 'Invalid response from Openlayer');
             }
+            const project = projects.find((p) => p.name === name);
+            if (!(project === null || project === void 0 ? void 0 : project.id)) {
+                throw new Error('Project not found');
+            }
+            return project;
         });
         /**
          * Loads an existing inference pipeline from Openlayer based on its name and project ID.
@@ -189,12 +187,12 @@ class OpenlayerClient {
                 },
                 method: 'GET',
             });
-            const { items: inferencePipelines } = yield inferencePipelineResponse.json();
+            const { items: inferencePipelines, error } = yield inferencePipelineResponse.json();
             const inferencePipeline = Array.isArray(inferencePipelines)
                 ? inferencePipelines.find((p) => p.name === name)
                 : undefined;
             if (!(inferencePipeline === null || inferencePipeline === void 0 ? void 0 : inferencePipeline.id)) {
-                throw new Error('Inference pipeline not found');
+                throw new Error(typeof error === 'string' ? error : 'Inference pipeline not found');
             }
             return inferencePipeline;
         });
@@ -315,8 +313,9 @@ class OpenAIMonitor {
             if (!this.monitoringOn) {
                 throw new Error('Monitoring is not active.');
             }
-            const project = yield this.openlayerClient.createProject(this.openlayerProjectName, 'llm-base');
-            const inferencePipeline = yield this.openlayerClient.createInferencePipeline(project.id, this.openlayerInferencePipelineName);
+            if (typeof this.inferencePipeline === 'undefined') {
+                throw new Error('No inference pipeline found.');
+            }
             // Start a timer to measure latency
             const startTime = Date.now();
             // Accumulate output for streamed responses
@@ -325,7 +324,7 @@ class OpenAIMonitor {
             const prompt = this.formatChatCompletionInput(body.messages);
             const inputVariableNames = prompt
                 .filter(({ role }) => role === 'user')
-                .map(({ content }) => content.replace(/{{\s*|\s*}}/g, ''));
+                .map(({ content }) => String(content).replace(/{{\s*|\s*}}/g, ''));
             const inputVariables = body.messages
                 .filter(({ role }) => role === 'user')
                 .map(({ content }) => content);
@@ -353,7 +352,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, inferencePipeline.id);
+                this.openlayerClient.streamData(Object.assign(Object.assign({ latency, output: streamedOutput, timestamp: startTime }, inputVariablesMap), additionalLogs), config, this.inferencePipeline.id);
             }
             else {
                 const nonStreamedResponse = response;
@@ -370,7 +369,7 @@ class OpenAIMonitor {
                 }
                 this.openlayerClient.streamData(Object.assign(Object.assign({ cost,
                     latency,
-                    output, timestamp: startTime, tokens }, inputVariablesMap), additionalLogs), config, inferencePipeline.id);
+                    output, timestamp: startTime, tokens }, inputVariablesMap), additionalLogs), config, this.inferencePipeline.id);
             }
             return response;
         });
@@ -387,11 +386,12 @@ 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 +427,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, inferencePipeline.id);
+                this.openlayerClient.streamData(Object.assign({ cost, input: body.prompt, latency, output: streamedOutput, timestamp: startTime, tokens: streamedTokens }, additionalLogs), config, this.inferencePipeline.id);
             }
             else {
                 const nonStreamedResponse = response;
@@ -438,7 +438,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, inferencePipeline.id);
+                this.openlayerClient.streamData(Object.assign({ cost, input: body.prompt, latency, output: nonStreamedResponse.choices[0].text, timestamp: startTime, tokens }, additionalLogs), config, this.inferencePipeline.id);
             }
             return response;
         });
@@ -459,23 +459,33 @@ class OpenAIMonitor {
      * Starts monitoring for the OpenAI Monitor instance. If monitoring is already active, a warning is logged.
      */
     startMonitoring() {
-        if (this.monitoringOn) {
-            console.warn('Monitoring is already on!');
-            return;
-        }
-        this.monitoringOn = true;
-        console.info('Monitoring started.');
+        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');
+        });
     }
     /**
      * Stops monitoring for the OpenAI Monitor instance. If monitoring is not active, a warning is logged.
      */
     stopMonitoring() {
         if (!this.monitoringOn) {
-            console.warn('Monitoring is not active.');
+            console.warn('Monitor is not active.');
             return;
         }
         this.monitoringOn = false;
-        console.info('Monitoring stopped.');
+        this.project = undefined;
+        this.inferencePipeline = undefined;
+        console.info('Monitor stopped.');
     }
 }
 exports.OpenAIMonitor = OpenAIMonitor;

package/examples/langchain.mjs

@@ -24,28 +24,27 @@ const inputs = [
   'What would be a good name for a company that makes colorful socks?',
 ];
 
-await Promise.all(
-  inputs.map(async (input) => {
-    // Call the LLM
-    const output = await chatModel.predict(input);
+for (let i = 0; i < inputs.length; i++) {
+  const input = inputs[i];
+  // Call the LLM
+  const output = await chatModel.predict(input);
 
-    // Stream the results to Openlayer
-    await openlayer.streamData(
-      {
-        input,
-        output,
-      },
-      {
-        ...openlayer.defaultConfig,
-        inputVariableNames: ['input'],
-        prompt: [
-          {
-            content: '{{ input }}',
-            role: 'user',
-          },
-        ],
-      },
-      inferencePipeline.id
-    );
-  })
-);
+  // Stream the results to Openlayer
+  await openlayer.streamData(
+    {
+      input,
+      output,
+    },
+    {
+      ...openlayer.defaultConfig,
+      inputVariableNames: ['input'],
+      prompt: [
+        {
+          content: '{{ input }}',
+          role: 'user',
+        },
+      ],
+    },
+    inferencePipeline.id
+  );
+}

package/examples/openai_monitor.mjs

@@ -5,12 +5,14 @@
 import { OpenAIMonitor } from 'openlayer';
 
 const monitor = new OpenAIMonitor({
-  openAiApiKey: 'YOUR_OPENAI_API_KEY',
-  openlayerApiKey: 'YOUR_OPENLAYER_API_KEY',
-  openlayerProjectName: 'YOUR_PROJECT_NAME',
+  openAiApiKey: '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',
+  openlayerApiKey: 'UyKge0qbzrnAg_vehsTtw_e_mArrHHyT',
+  openlayerInferencePipelineName: 'production',
+  openlayerProjectName: 'test13',
+  openlayerServerUrl: 'http://localhost:8080/v1',
 });
 
-monitor.startMonitoring();
+await monitor.startMonitoring();
 
 const inputs = [
   {
@@ -27,9 +29,10 @@ const inputs = [
   },
 ];
 
-inputs.map(async ({ promptVersion, systemMessage, userMessage }) => {
+for (let i = 0; i < inputs.length; i++) {
+  const { promptVersion, systemMessage, userMessage } = inputs[i];
   // Stream the results to Openlayer
-  const chatCompletion = await monitor.createChatCompletion(
+  await monitor.createChatCompletion(
     {
       messages: [
         {
@@ -49,5 +52,4 @@ inputs.map(async ({ promptVersion, systemMessage, userMessage }) => {
       promptVersion,
     }
   );
-  console.log(chatCompletion);
-});
+}

package/package.json

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