feat: add e2e testing for llamacloud datasource

.github/workflows/e2e.yml

@@ -62,6 +62,7 @@ jobs:
         run: pnpm run e2e
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          LLAMA_CLOUD_API_KEY: ${{ secrets.LLAMA_CLOUD_API_KEY }}
         working-directory: .
 
       - uses: actions/upload-artifact@v3

e2e/basic.spec.ts

@@ -17,7 +17,7 @@ const templateFrameworks: TemplateFramework[] = [
   "express",
   "fastapi",
 ];
-const dataSources: string[] = ["--no-files", "--example-file"];
+const dataSources: string[] = ["--no-files", "--example-file", "--llamacloud"];
 const templateUIs: TemplateUI[] = ["shadcn", "html"];
 const templatePostInstallActions: TemplatePostInstallAction[] = [
   "none",

e2e/utils.ts

@@ -110,6 +110,8 @@ export async function runCreateLlama(
     "--no-llama-parse",
     "--observability",
     "none",
+    "--llama-cloud-key",
+    process.env.LLAMA_CLOUD_API_KEY,
   ].join(" ");
   console.log(`running command '${command}' in ${cwd}`);
   const appProcess = exec(command, {

helpers/env-variables.ts

@@ -1,3 +1,4 @@
+import ciInfo from "ci-info";
 import fs from "fs/promises";
 import path from "path";
 import { TOOL_SYSTEM_PROMPT_ENV_VAR, Tool } from "./tools";
@@ -9,6 +10,7 @@ import {
   TemplateVectorDB,
 } from "./types";
 
+import { randomUUID } from "crypto";
 import { TSYSTEMS_LLMHUB_API_URL } from "./providers/llmhub";
 
 export type EnvVar = {
@@ -142,12 +144,12 @@ const getVectorDBEnvs = (
           name: "LLAMA_CLOUD_INDEX_NAME",
           description:
             "The name of the LlamaCloud index to use (part of the LlamaCloud project).",
-          value: "test",
+          value: ciInfo.isCI ? randomUUID() : "test",
         },
         {
           name: "LLAMA_CLOUD_PROJECT_NAME",
           description: "The name of the LlamaCloud project.",
-          value: "Default",
+          value: ciInfo.isCI ? "create-llama" : "Default",
         },
         {
           name: "LLAMA_CLOUD_BASE_URL",

helpers/run-app.ts

@@ -30,6 +30,7 @@ export async function runApp(
   framework: TemplateFramework,
   port?: number,
   externalPort?: number,
+  isUsingLlamaCloud?: boolean,
 ): Promise<any> {
   let backendAppProcess: ChildProcess;
   let frontendAppProcess: ChildProcess | undefined;
@@ -56,11 +57,11 @@ export async function runApp(
     ];
   } else if (framework === "nextjs") {
     backendCommand = "npm";
-    backendArgs = ["run", "dev"];
+    backendArgs = ["run", isUsingLlamaCloud ? "dev:generate" : "dev"];
     backendPort = frontendPort;
   } else {
     backendCommand = "npm";
-    backendArgs = ["run", "dev"];
+    backendArgs = ["run", isUsingLlamaCloud ? "dev:generate" : "dev"];
   }
 
   if (frontend) {

index.ts

@@ -9,7 +9,8 @@ import prompts from "prompts";
 import terminalLink from "terminal-link";
 import checkForUpdate from "update-check";
 import { createApp } from "./create-app";
-import { getDataSources } from "./helpers/datasources";
+import { TemplateDataSource } from "./helpers";
+import { EXAMPLE_FILE, getDataSources } from "./helpers/datasources";
 import { getPkgManager } from "./helpers/get-pkg-manager";
 import { isFolderEmpty } from "./helpers/is-folder-empty";
 import { initializeGlobalAgent } from "./helpers/proxy";
@@ -194,8 +195,16 @@ if (process.argv.includes("--no-llama-parse")) {
 program.askModels = process.argv.includes("--ask-models");
 if (process.argv.includes("--no-files")) {
   program.dataSources = [];
-} else {
+} else if (process.argv.includes("--example-file")) {
   program.dataSources = getDataSources(program.files, program.exampleFile);
+} else if (process.argv.includes("--llamacloud")) {
+  program.dataSources = [
+    {
+      type: "llamacloud",
+      config: {},
+    },
+    EXAMPLE_FILE,
+  ];
 }
 
 const packageManager = !!program.useNpm
@@ -331,12 +340,17 @@ Please check ${cyan(
     }
   } else if (program.postInstallAction === "runApp") {
     console.log(`Running app in ${root}...`);
+    const isUsingLlamaCloud = program.dataSources.some(
+      (ds: TemplateDataSource) => ds.type === "llamacloud",
+    );
+
     await runApp(
       root,
       program.frontend,
       program.framework,
       program.port,
       program.externalPort,
+      isUsingLlamaCloud,
     );
   }
 }

questions.ts

@@ -670,7 +670,7 @@ export const askQuestions = async (
   }
 
   // Ask for LlamaCloud API key when using a LlamaCloud index or LlamaParse
-  if (isUsingLlamaCloud || program.useLlamaParse) {
+  if ((isUsingLlamaCloud || program.useLlamaParse) && !program.llamaCloudKey) {
     if (ciInfo.isCI) {
       program.llamaCloudKey = getPrefOrDefault("llamaCloudKey");
     } else {

templates/types/streaming/express/package.json

@@ -12,6 +12,7 @@
     "format:write": "prettier --ignore-unknown --write .",
     "build": "tsup index.ts --format esm --dts",
     "start": "node dist/index.js",
+    "dev:generate": "npm run generate && npm run dev",
     "dev": "concurrently \"tsup index.ts --format esm --dts --watch\" \"nodemon --watch dist/index.js\""
   },
   "dependencies": {

templates/types/streaming/nextjs/package.json

@@ -4,6 +4,7 @@
   "scripts": {
     "format": "prettier --ignore-unknown --cache --check .",
     "format:write": "prettier --ignore-unknown --write .",
+    "dev:generate": "npm run generate && npm run dev",
     "dev": "next dev",
     "build": "next build",
     "start": "next start",