📦 NEW: Use Langbase API key in .env file for deploy (#136)

Author: msaaddev

packages/baseai/package.json

@@ -60,7 +60,6 @@
 		"cli-table3": "^0.6.5",
 		"cli-welcome": "^3.0.0",
 		"compute-cosine-similarity": "^1.1.0",
-		"conf": "^13.0.1",
 		"cosmiconfig": "^9.0.0",
 		"cosmiconfig-typescript-loader": "^5.0.0",
 		"dotenv": "^16.4.5",

packages/baseai/src/add/index.ts

@@ -1,10 +1,10 @@
-import { getStoredAuth } from '@/auth';
 import { dim, dimItalic } from '@/utils/formatting';
 import { getAvailablePipes } from '@/utils/get-available-pipes';
 import { getAvailableTools } from '@/utils/get-available-tools';
 import { heading } from '@/utils/heading';
 import icons from '@/utils/icons';
 import { isToolPresent } from '@/utils/is-tool-present';
+import { retrieveAuthentication } from '@/utils/retrieve-credentials';
 import { formatCode } from '@/utils/ts-format-code';
 import * as p from '@clack/prompts';
 import slugify from '@sindresorhus/slugify';
@@ -43,37 +43,6 @@ function extractLoginName(loginAndPipe: string) {
 	};
 }
 
-/**
- * Represents an account with login credentials and an API key.
- */
-interface Account {
-	login: string;
-	apiKey: string;
-}
-
-/**
- * Retrieves the stored authentication account.
- *
- * This function attempts to retrieve the stored authentication account
- * asynchronously. If the account is found, it is returned. If no account
- * is found or an error occurs during retrieval, `null` is returned.
- *
- * @returns {Promise<Account | null>} A promise that resolves to the stored
- * authentication account, or `null` if no account is found or an error occurs.
- */
-async function retrieveAuthentication(): Promise<Account | null> {
-	try {
-		const account = await getStoredAuth();
-		if (!account) return null;
-
-		return account;
-	} catch (error) {
-		p.log.error(
-			`Error retrieving stored auth: ${(error as Error).message}`
-		);
-		return null;
-	}
-}
 
 /**
  * Fetches a pipe from Langbase using the provided login and name.
@@ -93,9 +62,17 @@ async function getPipe({
 	name: string;
 	spinner: Spinner;
 }) {
-	spinner.start('Fetching pipe from Langbase');
 	try {
-		const account = await retrieveAuthentication();
+		const account = await retrieveAuthentication({ spinner });
+		if (!account) {
+			p.log.error(
+				'Authentication failed. Please run "npx baseai auth" to authenticate.'
+			);
+			return;
+		}
+
+		spinner.start('Fetching pipe from Langbase');
+
 		const API_URL = `https://api.langbase.com/v1/pipes/${login}/${name}`;
 
 		const createResponse = await fetch(API_URL, {

packages/baseai/src/auth/index.ts

@@ -9,21 +9,11 @@ import {
 	outro,
 	password
 } from '@clack/prompts';
-import Conf from 'conf';
-import fs from 'fs';
+import fs from 'fs/promises';
 import open from 'open';
 import path from 'path';
 import color from 'picocolors';
 
-const config = new Conf({
-	projectName: 'baseai'
-});
-
-interface Account {
-	login: string;
-	apiKey: string;
-}
-
 export async function auth() {
 	p.intro(
 		heading({
@@ -72,17 +62,6 @@ export async function auth() {
 		process.exit(1);
 	}
 
-	// Store in Conf (old functionality)
-	const newAccount: Account = { login, apiKey };
-	const existingAccounts = (config.get('accounts') as Account[]) || [];
-	const updatedAccounts = [...existingAccounts, newAccount];
-	config.set('accounts', updatedAccounts);
-
-	// Store in .env file (new functionality)
-	// const envKeyName = apiKey.startsWith('user_')
-	// 	? 'LANGBASE_USER_API_KEY'
-	// 	: 'LANGBASE_ORG_API_KEY';
-
 	const envKeyName = 'LANGBASE_API_KEY';
 	const envContent = `\n# Langbase API key for https://langbase.com/${login}\n${envKeyName}=${apiKey}\n\n`;
 
@@ -99,37 +78,45 @@ export async function auth() {
 	const baiConfig = await loadConfig();
 	let envFile = baiConfig.envFilePath || '.env';
 
-	fs.appendFileSync(path.join(process.cwd(), envFile), envContent);
+	const envFileContent = await fs.readFile(envFile, 'utf-8');
+
+	const oldKey = envFileContent
+		.split('\n')
+		.reverse() // Reverse to get the latest key if there are multiple
+		.find(line => line.includes('LANGBASE_API_KEY'))
+		?.split('=')[1];
+
+	if (oldKey) {
+		const shouldOverwrite = await confirm({
+			message: `API key found in ${envFile}. Overwrite?`
+		});
+
+		if (isCancel(shouldOverwrite)) {
+			cancel('Operation cancelled.');
+			process.exit(0);
+		}
+
+		if (!shouldOverwrite) {
+			outro(
+				color.yellow('Operation cancelled. API key not overwritten.')
+			);
+			process.exit(0);
+		}
+
+		const newEnvContent = envFileContent.replace(
+			new RegExp(`LANGBASE_API_KEY=${oldKey}`),
+			envContent.trim()
+		);
+
+		await fs.writeFile(path.join(process.cwd(), envFile), newEnvContent);
+	} else {
+		await fs.appendFile(path.join(process.cwd(), envFile), envContent);
+	}
 
 	outro(
 		color.green(
-			`Authentication successful. Credentials stored in config and ${envFile}`
+			`Authentication successful. Credentials stored in ${envFile}`
 		)
 	);
-	console.log(color.dim(`Config file location: ${config.path}`));
 	process.exit(0);
 }
-
-export function getStoredAuth(): Account | undefined {
-	const accounts = (config.get('accounts') as Account[]) || [];
-	const currentLogin = config.get('currentAccount') as string | undefined;
-
-	if (currentLogin) {
-		return accounts.find(account => account.login === currentLogin);
-	}
-
-	return accounts[0]; // Return the first account if no current account is set
-}
-
-export function getStoredAccounts(): Account[] {
-	return (config.get('accounts') as Account[]) || [];
-}
-
-export function setCurrentAccount(login: string): boolean {
-	const accounts = getStoredAccounts();
-	if (accounts.some(account => account.login === login)) {
-		config.set('currentAccount', login);
-		return true;
-	}
-	return false;
-}

packages/baseai/src/deploy/document.ts

@@ -7,9 +7,7 @@ import {
 	handleError,
 	handleInvalidConfig,
 	listMemoryDocuments,
-	retrieveAuthentication,
 	uploadDocumentsToMemory,
-	type Account
 } from '.';
 import path from 'path';
 import fs from 'fs/promises';
@@ -21,6 +19,7 @@ import {
 } from '@/utils/memory/load-memory-files';
 import type { MemoryI } from 'types/memory';
 import { compareDocumentLists } from '@/utils/memory/compare-docs-list';
+import { retrieveAuthentication, type Account } from '@/utils/retrieve-credentials';
 
 type Spinner = ReturnType<typeof p.spinner>;
 

packages/baseai/src/deploy/index.ts

@@ -18,7 +18,6 @@ import path from 'path';
 import color from 'picocolors';
 import { type MemoryI } from 'types/memory';
 import type { Pipe, PipeOld } from 'types/pipe';
-import { getStoredAuth } from './../auth/index';
 import {
 	handleGitSyncMemories,
 	updateDeployedCommitHash
@@ -28,11 +27,10 @@ import {
 	generateUpgradeInstructions,
 	isOldMemoryConfigFormat
 } from '@/utils/memory/handle-old-memory-config';
-
-export interface Account {
-	login: string;
-	apiKey: string;
-}
+import {
+	retrieveAuthentication,
+	type Account
+} from '@/utils/retrieve-credentials';
 
 interface ErrorResponse {
 	error?: { message: string };
@@ -161,26 +159,6 @@ async function readToolsDirectory({
 	}
 }
 
-export async function retrieveAuthentication({
-	spinner
-}: {
-	spinner: Spinner;
-}): Promise<Account | null> {
-	spinner.start('Retrieving stored authentication');
-	try {
-		const account = await getStoredAuth();
-		if (!account) {
-			handleNoAccountFound({ spinner });
-			return null;
-		}
-		spinner.stop(`Deploying as ${color.cyan(account.login)}`);
-		return account;
-	} catch (error) {
-		handleAuthError({ spinner, error });
-		return null;
-	}
-}
-
 async function deployPipes({
 	spinner,
 	pipes,
@@ -357,23 +335,6 @@ function handleDirectoryReadError({
 	}
 }
 
-function handleNoAccountFound({ spinner }: { spinner: Spinner }): void {
-	spinner.stop('No account found');
-	p.log.warn('No account found. Please authenticate first.');
-	p.log.info(`Run: ${color.green('npx baseai auth')}`);
-}
-
-function handleAuthError({
-	spinner,
-	error
-}: {
-	spinner: Spinner;
-	error: unknown;
-}): void {
-	spinner.stop('Failed to retrieve authentication');
-	p.log.error(`Error retrieving stored auth: ${(error as Error).message}`);
-}
-
 export function handleInvalidConfig({
 	spinner,
 	name,
@@ -932,11 +893,6 @@ async function getSignedUploadUrl({
 		memoryName
 	});
 
-	const isOrgAccount = account.apiKey.includes(':');
-
-	const ownerLogin = isOrgAccount
-		? account.apiKey.split(':')[0]
-		: account.login;
 	try {
 		const response = await fetch(uploadDocument, {
 			method: 'POST',
@@ -947,7 +903,6 @@ async function getSignedUploadUrl({
 			body: JSON.stringify({
 				meta,
 				memoryName,
-				ownerLogin,
 				fileName: documentName
 			})
 		});
@@ -1184,10 +1139,10 @@ export async function deploySingleMemory({
 		// Retrieve authentication
 		const account = await retrieveAuthentication({ spinner });
 		if (!account) {
-			p.log.error(
-				'Authentication failed. Please run "npx baseai auth" to authenticate.'
+			p.outro(
+				`No account found. Skipping deployment. \n Run: ${cyan('npx baseai@latest auth')}`
 			);
-			return;
+			process.exit(1);
 		}
 
 		// Call deployMemory function

packages/baseai/src/utils/retrieve-credentials.ts

@@ -0,0 +1,59 @@
+import { loadConfig } from './config/config-handler';
+import fs from 'fs/promises';
+import * as p from '@clack/prompts';
+import color from 'picocolors';
+
+export interface Account {
+	apiKey: string;
+}
+
+type Spinner = ReturnType<typeof p.spinner>;
+
+function handleNoAccountFound({ spinner }: { spinner: Spinner }): void {
+	spinner.stop('No account found');
+	p.log.warn('No account found. Please authenticate first.');
+	p.log.info(`Run: ${color.green('npx baseai auth')}`);
+}
+function handleAuthError({
+	spinner,
+	error
+}: {
+	spinner: Spinner;
+	error: unknown;
+}): void {
+	spinner.stop('Failed to retrieve authentication');
+	p.log.error(`Error retrieving stored auth: ${(error as Error).message}`);
+}
+
+export async function retrieveAuthentication({
+	spinner
+}: {
+	spinner: Spinner;
+}): Promise<Account | null> {
+	spinner.start('Retrieving stored authentication');
+	try {
+		const baiConfig = await loadConfig();
+		let envFile = baiConfig.envFilePath || '.env';
+		const envFileContent = await fs.readFile(envFile, 'utf-8');
+
+		const apiKey = envFileContent
+			.split('\n')
+			.reverse()
+			.find(line => line.includes('LANGBASE_API_KEY='))
+			?.split('=')[1];
+
+		if (!apiKey) {
+			handleNoAccountFound({ spinner });
+			return null;
+		}
+
+		spinner.stop('Retrieved stored authentication');
+
+		return {
+			apiKey
+		};
+	} catch (error) {
+		handleAuthError({ spinner, error });
+		return null;
+	}
+}