📦 NEW: Config based env

Author: ahmadawais

examples/nodejs/baseai/baseai.config.ts

@@ -1,6 +1,4 @@
-import type {BaseAIConfig} from 'baseai';
-
-export const config: BaseAIConfig = {
+export const config = {
 	log: {
 		isEnabled: true,
 		logSensitiveData: false,
@@ -15,4 +13,8 @@ export const config: BaseAIConfig = {
 		useLocalEmbeddings: false,
 	},
 	envFilePath: '.env',
+	env: {
+		langbase: '===========================================================',
+		openai: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+	},
 };

examples/nodejs/baseai/pipes/summary.ts

@@ -1,8 +1,9 @@
 import {PipeI} from '@baseai/core';
+import {config} from '../baseai.config';
 
 const buildPipe = (): PipeI => ({
-	apiKey: process.env.LANGBASE_API_KEY!, // Replace with your API key https://langbase.com/docs/api-reference/api-keys
-	name: 'summary',
+	apiKey: config.env.langbase,
+	name: 'summary-nodejs',
 	description: '',
 	status: 'private',
 	model: 'openai:gpt-4o-mini',
@@ -18,7 +19,12 @@ const buildPipe = (): PipeI => ({
 	stop: [],
 	tool_choice: 'auto',
 	parallel_tool_calls: false,
-	messages: [{role: 'system', content: `You are a helpful AI assistant.`}],
+	messages: [
+		{
+			role: 'system',
+			content: `You are a helpful AI assistant. Make everything less wordy.`,
+		},
+	],
 	variables: [],
 	memory: [],
 	tools: [],

examples/nodejs/examples/pipe.run.ts

@@ -1,8 +1,12 @@
 import 'dotenv/config';
-import {Pipe} from '@baseai/core';
+import {config} from '../baseai/baseai.config';
 import pipeSummary from '../baseai/pipes/summary';
+import {Pipe} from './../../../packages/core/src/pipes/pipes';
 
-const pipe = new Pipe(pipeSummary());
+const pipe = new Pipe({
+	...pipeSummary(),
+	config,
+});
 
 async function main() {
 	const userMsg = 'Who is an AI Engineer?';

packages/baseai/package.json

@@ -24,7 +24,8 @@
 	},
 	"homepage": "https://BaseAI.dev",
 	"files": [
-		"dist/**"
+		"dist/**",
+		"bin/**"
 	],
 	"scripts": {
 		"build": "tsup",

packages/baseai/src/add/index.ts

@@ -302,8 +302,9 @@ async function createLocalPipe(pipe: Pipe) {
 ${toolData.map(tool => tool.importPath).join('\n')}
 
 		const ${pipeNameCamelCase} = (): PipeI => ({
-			// Replace with your API key https://langbase.com/docs/api-reference/api-keys
-			apiKey: process.env.LANGBASE_API_KEY!,
+			// Prod only: Replace with your Langbase API key
+			// https://langbase.com/docs/api-reference/api-keys
+			apiKey: process.env.LANGBASE_API_KEY,
 			name: \`${pipe.name}\`,
 			description: \`${pipe.description}\`,
 			status: \`${pipe.status}\`,

packages/baseai/src/dev/utils/get-llm-api-key.ts

@@ -132,8 +132,9 @@ export async function createPipe() {
 	const pipeContent = `import { PipeI } from '@baseai/core';${selectedTools}${selectedMemories}
 
 const ${pipeNameCamelCase} = (): PipeI => ({
-    // Replace with your API key https://langbase.com/docs/api-reference/api-keys
-	apiKey: process.env.LANGBASE_API_KEY!,
+    // Prod only: Replace with your Langbase API key
+    // https://langbase.com/docs/api-reference/api-keys
+    apiKey: process.env.LANGBASE_API_KEY,
     name: '${pipeNameSlugified}',
     description: '${pipeInfo.description || ''}',
     status: '${pipeInfo.status}',

packages/baseai/src/pipe/index.ts

@@ -1,16 +1,32 @@
 import * as p from '@clack/prompts';
 import { getEncoding } from 'js-tiktoken';
 import OpenAI from 'openai';
+import { loadConfig } from '../config/config-handler';
+import { cyan } from '../formatting';
 import { MEMORYSETS } from './constants';
 
 export const getOpenAIEmbeddings = async (
 	chunks: string[]
 ): Promise<OpenAI.Embeddings.Embedding[]> => {
-	const openAiKey = process.env.OPENAI_API_KEY;
+	const config = await loadConfig();
+	const configEnv = config?.env;
+
+	const getEnv = (key: string): string | undefined => {
+		let value: string | undefined;
+		if (configEnv && key in configEnv) {
+			value = configEnv[key as keyof typeof configEnv];
+		} else {
+			value = process.env[key];
+		}
+
+		return value;
+	};
+
+	const openAiKey = getEnv('OPENAI_API_KEY');
 
 	if (!openAiKey) {
 		p.cancel(
-			'OpenAI key not found. Please set the OPENAI_API_KEY environment variable. Only required locally, in production, add it to your keysets https://langbase.com/docs/features/keysets'
+			`Environment variable ${cyan(`OPENAI_API_KEY`)} is not set or empty. Only needed in local dev environment. \nNote: In production, add it to your keysets https://langbase.com/docs/features/keysets\n`
 		);
 		process.exit(1);
 	}

packages/baseai/src/utils/memory/generate-openai-embeddings.ts

@@ -29,4 +29,16 @@ export interface BaseAIConfig {
 	log: LoggerConfig;
 	memory: MemoryConfig;
 	envFilePath: string;
+	env: {
+		NODE_ENV: string;
+		OPENAI_API_KEY: string;
+		ANTHROPIC_API_KEY: string;
+		COHERE_API_KEY: string;
+		FIREWORKS_API_KEY: string;
+		GOOGLE_API_KEY: string;
+		GROQ_API_KEY: string;
+		MISTRAL_API_KEY: string;
+		PERPLEXITY_API_KEY: string;
+		TOGETHER_API_KEY: string;
+	};
 }

packages/baseai/types/config.ts

@@ -1,4 +1,5 @@
 import {Stream} from 'openai/streaming';
+import {Logger} from 'src/helpers/logger';
 import {APIConnectionError, APIError} from './errors';
 
 interface RequestOptions {
@@ -10,10 +11,11 @@ interface RequestOptions {
 	rawResponse?: boolean;
 }
 
-interface RequestConfig {
+interface RequestProps {
 	apiKey?: string;
 	baseUrl: string;
 	timeout?: number;
+	config?: any; // TODO: BaseAIConfig
 }
 
 interface SendOptions extends RequestOptions {
@@ -34,10 +36,12 @@ interface HandleGenerateResponseParams {
 }
 
 export class Request {
-	private config: RequestConfig;
+	private console: any;
+	private props: RequestProps;
 
-	constructor(config: RequestConfig) {
-		this.config = config;
+	constructor(props: RequestProps) {
+		this.props = props;
+		this.console = new Logger(this.props.config);
 	}
 
 	private async send<T>({endpoint, ...options}: SendOptions): Promise<T> {
@@ -79,7 +83,7 @@ export class Request {
 	}
 
 	private buildUrl({endpoint}: {endpoint: string}): string {
-		return `${this.config.baseUrl}${endpoint}`;
+		return `${this.props.baseUrl}${endpoint}`;
 	}
 
 	private buildHeaders({
@@ -89,7 +93,7 @@ export class Request {
 	}): Record<string, string> {
 		return {
 			'Content-Type': 'application/json',
-			Authorization: `Bearer ${this.config.apiKey}`,
+			Authorization: `Bearer ${this.props.apiKey}`,
 			...headers,
 		};
 	}
@@ -99,12 +103,17 @@ export class Request {
 		options,
 		headers,
 	}: MakeRequestParams): Promise<Response> {
-		// console.log(' =================== REQUEST ===================');
+		this.console.log('pipe.request', {
+			url,
+			method: options.method,
+			headers,
+			body: options.body,
+		});
 		const resp = await fetch(url, {
 			method: options.method,
 			headers,
 			body: JSON.stringify(options.body),
-			signal: AbortSignal.timeout(this.config.timeout || 30000),
+			signal: AbortSignal.timeout(this.props.timeout || 30000),
 		});
 		return resp;
 	}
@@ -194,9 +203,6 @@ export class Request {
 	}
 
 	async post<T>(options: Omit<RequestOptions, 'method'>): Promise<T> {
-		console.log('Request.post.options');
-		console.dir(options, {depth: null, colors: true});
-
 		return this.send<T>({...options, method: 'POST'});
 	}