From 431133fe75476e1a844d555cd9c82acc381b5270 Mon Sep 17 00:00:00 2001 From: msaaddev Date: Wed, 28 Aug 2024 22:08:06 +0200 Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=93=A6=20NEW:=20Demo=20request=20supp?= =?UTF-8?q?ort?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/langbase/src/pipes/pipes.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/langbase/src/pipes/pipes.ts b/packages/langbase/src/pipes/pipes.ts index f2db0df..a4f2d9d 100644 --- a/packages/langbase/src/pipes/pipes.ts +++ b/packages/langbase/src/pipes/pipes.ts @@ -32,6 +32,7 @@ export interface GenerateOptions { variables?: Variable[]; threadId?: string; chat?: boolean; + demoRequest?: boolean; } export interface StreamOptions { @@ -39,6 +40,7 @@ export interface StreamOptions { variables?: Variable[]; threadId?: string | null; chat?: boolean; + demoRequest?: boolean; } interface ChoiceGenerate { From 84a29c261a4046acbb0c82b456e0f7aafbfd6780 Mon Sep 17 00:00:00 2001 From: msaaddev Date: Wed, 28 Aug 2024 22:24:50 +0200 Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=91=8C=20IMPROVE:=20Type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/langbase/src/pipes/pipes.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/langbase/src/pipes/pipes.ts b/packages/langbase/src/pipes/pipes.ts index a4f2d9d..6d6de36 100644 --- a/packages/langbase/src/pipes/pipes.ts +++ b/packages/langbase/src/pipes/pipes.ts @@ -32,7 +32,7 @@ export interface GenerateOptions { variables?: Variable[]; threadId?: string; chat?: boolean; - demoRequest?: boolean; + demo?: boolean; } export interface StreamOptions { @@ -40,7 +40,7 @@ export interface StreamOptions { variables?: Variable[]; threadId?: string | null; chat?: boolean; - demoRequest?: boolean; + demo?: boolean; } interface ChoiceGenerate { From 39403ad020f5c57ba2b368182d095f99e8c9329d Mon Sep 17 00:00:00 2001 From: msaaddev Date: Wed, 28 Aug 2024 22:49:47 +0200 Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=93=A6=20NEW:=20Demo=20env=20variable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/langbase/src/pipes/pipes.ts | 7 +++---- turbo.json | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/langbase/src/pipes/pipes.ts b/packages/langbase/src/pipes/pipes.ts index 6d6de36..b66585d 100644 --- a/packages/langbase/src/pipes/pipes.ts +++ b/packages/langbase/src/pipes/pipes.ts @@ -32,7 +32,6 @@ export interface GenerateOptions { variables?: Variable[]; threadId?: string; chat?: boolean; - demo?: boolean; } export interface StreamOptions { @@ -40,7 +39,6 @@ export interface StreamOptions { variables?: Variable[]; threadId?: string | null; chat?: boolean; - demo?: boolean; } interface ChoiceGenerate { @@ -103,6 +101,7 @@ export interface PipeOptions { export class Pipe { private request: Request; + private demo = process.env.LB_DEMO || ''; constructor(options: PipeOptions) { const baseUrl = 'https://api.langbase.com'; @@ -112,14 +111,14 @@ export class Pipe { async generateText(options: GenerateOptions): Promise { return this.request.post({ endpoint: options.chat ? '/beta/chat' : '/beta/generate', - body: {...options, stream: false}, + body: {...options, stream: false, demo: this.demo}, }); } async streamText(options: StreamOptions): Promise { return this.request.post({ endpoint: options.chat ? '/beta/chat' : '/beta/generate', - body: {...options, stream: true}, + body: {...options, stream: true, demo: this.demo}, }); } } diff --git a/turbo.json b/turbo.json index cedb898..efd9504 100644 --- a/turbo.json +++ b/turbo.json @@ -28,7 +28,8 @@ "ASSISTANT_ID", "INKEEP_API_KEY", "INKEEP_INTEGRATION_ID", - "VERCEL_URL" + "VERCEL_URL", + "LB_DEMO" ], "outputs": [ "dist/**", From 9405cf928b35c1432d62c967df22dac1dd79ce95 Mon Sep 17 00:00:00 2001 From: msaaddev Date: Wed, 28 Aug 2024 23:15:08 +0200 Subject: [PATCH 4/9] =?UTF-8?q?=F0=9F=91=8C=20IMPROVE:=20Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/langbase/src/pipes/pipes.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/langbase/src/pipes/pipes.ts b/packages/langbase/src/pipes/pipes.ts index b66585d..df03cd1 100644 --- a/packages/langbase/src/pipes/pipes.ts +++ b/packages/langbase/src/pipes/pipes.ts @@ -1,5 +1,6 @@ import {Request} from '../common/request'; import {Stream} from '../common/stream'; +import 'dotenv/config'; export type Role = 'user' | 'assistant' | 'system' | 'tool'; @@ -101,11 +102,12 @@ export interface PipeOptions { export class Pipe { private request: Request; - private demo = process.env.LB_DEMO || ''; + private demo: string = ''; constructor(options: PipeOptions) { const baseUrl = 'https://api.langbase.com'; this.request = new Request({apiKey: options.apiKey, baseUrl}); + this.demo = process.env.LB_DEMO || '' } async generateText(options: GenerateOptions): Promise { From 07a9fb4c6ff5328f3d33c8c970eb462bd3becd99 Mon Sep 17 00:00:00 2001 From: msaaddev Date: Thu, 29 Aug 2024 00:29:11 +0200 Subject: [PATCH 5/9] =?UTF-8?q?=F0=9F=93=A6=20NEW:=20User=20ip=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/langbase/src/common/request.ts | 2 ++ packages/langbase/src/pipes/pipes.ts | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/langbase/src/common/request.ts b/packages/langbase/src/common/request.ts index 35d2106..1ed3bf2 100644 --- a/packages/langbase/src/common/request.ts +++ b/packages/langbase/src/common/request.ts @@ -14,6 +14,7 @@ interface RequestConfig { apiKey: string; baseUrl: string; timeout?: number; + ip?: string; } interface SendOptions extends RequestOptions { @@ -82,6 +83,7 @@ export class Request { return { 'Content-Type': 'application/json', Authorization: `Bearer ${this.config.apiKey}`, + 'lb-meta-external-user-id': this.config.ip || '', ...headers, }; } diff --git a/packages/langbase/src/pipes/pipes.ts b/packages/langbase/src/pipes/pipes.ts index df03cd1..cbb2a66 100644 --- a/packages/langbase/src/pipes/pipes.ts +++ b/packages/langbase/src/pipes/pipes.ts @@ -98,6 +98,7 @@ export interface StreamChunk { export interface PipeOptions { apiKey: string; baseUrl?: string; + ip?: string; } export class Pipe { @@ -106,7 +107,7 @@ export class Pipe { constructor(options: PipeOptions) { const baseUrl = 'https://api.langbase.com'; - this.request = new Request({apiKey: options.apiKey, baseUrl}); + this.request = new Request({apiKey: options.apiKey, baseUrl, ip: options.ip}); this.demo = process.env.LB_DEMO || '' } From 872070bd4434b881206f924caafb83720254feef Mon Sep 17 00:00:00 2001 From: msaaddev Date: Thu, 29 Aug 2024 01:31:12 +0200 Subject: [PATCH 6/9] =?UTF-8?q?=F0=9F=91=8C=20IMPROVE:=20Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/langbase/src/common/request.ts | 3 +++ packages/langbase/src/pipes/pipes.ts | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/langbase/src/common/request.ts b/packages/langbase/src/common/request.ts index 1ed3bf2..d79fc7c 100644 --- a/packages/langbase/src/common/request.ts +++ b/packages/langbase/src/common/request.ts @@ -35,9 +35,11 @@ interface HandleGenerateResponseParams { export class Request { private config: RequestConfig; + private demo: string = ''; constructor(config: RequestConfig) { this.config = config; + this.demo = process.env.LB_DEMO || ''; } // Main send function @@ -84,6 +86,7 @@ export class Request { 'Content-Type': 'application/json', Authorization: `Bearer ${this.config.apiKey}`, 'lb-meta-external-user-id': this.config.ip || '', + demo: this.demo, ...headers, }; } diff --git a/packages/langbase/src/pipes/pipes.ts b/packages/langbase/src/pipes/pipes.ts index cbb2a66..451708d 100644 --- a/packages/langbase/src/pipes/pipes.ts +++ b/packages/langbase/src/pipes/pipes.ts @@ -103,25 +103,27 @@ export interface PipeOptions { export class Pipe { private request: Request; - private demo: string = ''; constructor(options: PipeOptions) { const baseUrl = 'https://api.langbase.com'; - this.request = new Request({apiKey: options.apiKey, baseUrl, ip: options.ip}); - this.demo = process.env.LB_DEMO || '' + this.request = new Request({ + apiKey: options.apiKey, + baseUrl, + ip: options.ip, + }); } async generateText(options: GenerateOptions): Promise { return this.request.post({ endpoint: options.chat ? '/beta/chat' : '/beta/generate', - body: {...options, stream: false, demo: this.demo}, + body: {...options, stream: false}, }); } async streamText(options: StreamOptions): Promise { return this.request.post({ endpoint: options.chat ? '/beta/chat' : '/beta/generate', - body: {...options, stream: true, demo: this.demo}, + body: {...options, stream: true}, }); } } From 14b755105fb9cc92ad5bdf991309625c0e5968d2 Mon Sep 17 00:00:00 2001 From: msaaddev Date: Thu, 29 Aug 2024 01:32:38 +0200 Subject: [PATCH 7/9] =?UTF-8?q?=F0=9F=91=8C=20IMPROVE:=20Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/langbase/src/common/request.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/langbase/src/common/request.ts b/packages/langbase/src/common/request.ts index d79fc7c..cefc798 100644 --- a/packages/langbase/src/common/request.ts +++ b/packages/langbase/src/common/request.ts @@ -86,7 +86,7 @@ export class Request { 'Content-Type': 'application/json', Authorization: `Bearer ${this.config.apiKey}`, 'lb-meta-external-user-id': this.config.ip || '', - demo: this.demo, + 'lb-demo-id': this.demo, ...headers, }; } From ad1272b27cae383d8901ed6d66e61a210b6fee70 Mon Sep 17 00:00:00 2001 From: msaaddev Date: Thu, 29 Aug 2024 02:01:15 +0200 Subject: [PATCH 8/9] =?UTF-8?q?=F0=9F=91=8C=20IMPROVE:=20Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/langbase/src/common/request.ts | 4 ++-- packages/langbase/src/pipes/pipes.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/langbase/src/common/request.ts b/packages/langbase/src/common/request.ts index cefc798..8519c92 100644 --- a/packages/langbase/src/common/request.ts +++ b/packages/langbase/src/common/request.ts @@ -14,7 +14,7 @@ interface RequestConfig { apiKey: string; baseUrl: string; timeout?: number; - ip?: string; + id?: string; } interface SendOptions extends RequestOptions { @@ -85,7 +85,7 @@ export class Request { return { 'Content-Type': 'application/json', Authorization: `Bearer ${this.config.apiKey}`, - 'lb-meta-external-user-id': this.config.ip || '', + 'lb-meta-external-user-id': this.config.id || '', 'lb-demo-id': this.demo, ...headers, }; diff --git a/packages/langbase/src/pipes/pipes.ts b/packages/langbase/src/pipes/pipes.ts index 451708d..3c05a81 100644 --- a/packages/langbase/src/pipes/pipes.ts +++ b/packages/langbase/src/pipes/pipes.ts @@ -98,7 +98,7 @@ export interface StreamChunk { export interface PipeOptions { apiKey: string; baseUrl?: string; - ip?: string; + id?: string; } export class Pipe { @@ -107,9 +107,9 @@ export class Pipe { constructor(options: PipeOptions) { const baseUrl = 'https://api.langbase.com'; this.request = new Request({ - apiKey: options.apiKey, baseUrl, - ip: options.ip, + id: options.id, + apiKey: options.apiKey, }); } From 9d4072276d257f4e0e0a0e2576c6226ca6ebd3be Mon Sep 17 00:00:00 2001 From: msaaddev Date: Thu, 29 Aug 2024 02:06:56 +0200 Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=91=8C=20IMPROVE:=20Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/langbase/src/common/request.ts | 1 + packages/langbase/src/pipes/pipes.ts | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/langbase/src/common/request.ts b/packages/langbase/src/common/request.ts index 8519c92..548413d 100644 --- a/packages/langbase/src/common/request.ts +++ b/packages/langbase/src/common/request.ts @@ -1,6 +1,7 @@ import {Headers} from './../../types'; // Ensure this import is correct import {APIConnectionError, APIError} from './errors'; import {Stream} from './stream'; +import 'dotenv/config'; interface RequestOptions { endpoint: string; diff --git a/packages/langbase/src/pipes/pipes.ts b/packages/langbase/src/pipes/pipes.ts index 3c05a81..e0a2a9b 100644 --- a/packages/langbase/src/pipes/pipes.ts +++ b/packages/langbase/src/pipes/pipes.ts @@ -1,6 +1,5 @@ import {Request} from '../common/request'; import {Stream} from '../common/stream'; -import 'dotenv/config'; export type Role = 'user' | 'assistant' | 'system' | 'tool';