Release 0.1.42 (#261)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/workflows/e2e.yml

@@ -20,18 +20,6 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-22.04]
         frameworks: ["nextjs", "express", "fastapi"]
         datasources: ["--no-files", "--example-file"]
-        templates: ["streaming", "extractor"]
-        exclude:
-          # The extractor template currently only works with FastAPI and files,
-          # and it's not compatible with Windows at the moment.
-          - templates: "extractor"
-            os: windows-latest
-          - templates: "extractor"
-            frameworks: "nextjs"
-          - templates: "extractor"
-            frameworks: "express"
-          - templates: "extractor"
-            datasources: "--no-files"
     defaults:
       run:
         shell: bash
@@ -77,7 +65,6 @@ jobs:
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           LLAMA_CLOUD_API_KEY: ${{ secrets.LLAMA_CLOUD_API_KEY }}
-          TEMPLATE: ${{ matrix.templates }}
           FRAMEWORK: ${{ matrix.frameworks }}
           DATASOURCE: ${{ matrix.datasources }}
         working-directory: .

CHANGELOG.md

@@ -1,5 +1,11 @@
 # create-llama
 
+## 0.1.42
+
+### Patch Changes
+
+- 8f670a9: Allow relative URL in documents
+
 ## 0.1.41
 
 ### Patch Changes

e2e/extractor_template.spec.ts

@@ -3,9 +3,23 @@ import { expect, test } from "@playwright/test";
 import { ChildProcess } from "child_process";
 import fs from "fs";
 import path from "path";
+import { TemplateFramework } from "../helpers";
 import { createTestDir, runCreateLlama } from "./utils";
 
-if (process.env.TEMPLATE === "extractor") {
+const templateFramework: TemplateFramework = process.env.FRAMEWORK
+  ? (process.env.FRAMEWORK as TemplateFramework)
+  : "fastapi";
+const dataSource: string = process.env.DATASOURCE
+  ? process.env.DATASOURCE
+  : "--example-file";
+
+// The extractor template currently only works with FastAPI and files (and not on Windows)
+if (
+  process.platform !== "win32" &&
+  templateFramework !== "nextjs" &&
+  templateFramework !== "express" &&
+  dataSource !== "--no-files"
+) {
   test.describe("Test extractor template", async () => {
     let frontendPort: number;
     let backendPort: number;

e2e/streaming_template.spec.ts

@@ -6,14 +6,10 @@ import path from "path";
 import type {
   TemplateFramework,
   TemplatePostInstallAction,
-  TemplateType,
   TemplateUI,
 } from "../helpers";
 import { createTestDir, runCreateLlama, type AppType } from "./utils";
 
-const templateType: TemplateType | undefined = process.env.TEMPLATE
-  ? (process.env.TEMPLATE as TemplateType)
-  : undefined;
 const templateFramework: TemplateFramework = process.env.FRAMEWORK
   ? (process.env.FRAMEWORK as TemplateFramework)
   : "fastapi";
@@ -30,96 +26,94 @@ const appType: AppType = templateFramework === "nextjs" ? "" : "--frontend";
 const userMessage =
   dataSource !== "--no-files" ? "Physical standard for letters" : "Hello";
 
-if (templateType === "streaming") {
-  test.describe(`Test streaming template ${templateFramework} ${dataSource} ${templateUI} ${appType} ${templatePostInstallAction}`, async () => {
-    let port: number;
-    let externalPort: number;
-    let cwd: string;
-    let name: string;
-    let appProcess: ChildProcess;
-    // Only test without using vector db for now
-    const vectorDb = "none";
+test.describe(`Test streaming template ${templateFramework} ${dataSource} ${templateUI} ${appType} ${templatePostInstallAction}`, async () => {
+  let port: number;
+  let externalPort: number;
+  let cwd: string;
+  let name: string;
+  let appProcess: ChildProcess;
+  // Only test without using vector db for now
+  const vectorDb = "none";
 
-    test.beforeAll(async () => {
-      port = Math.floor(Math.random() * 10000) + 10000;
-      externalPort = port + 1;
-      cwd = await createTestDir();
-      const result = await runCreateLlama(
-        cwd,
-        templateType,
-        templateFramework,
-        dataSource,
-        vectorDb,
-        port,
-        externalPort,
-        templatePostInstallAction,
-        templateUI,
-        appType,
-        llamaCloudProjectName,
-        llamaCloudIndexName,
-      );
-      name = result.projectName;
-      appProcess = result.appProcess;
-    });
-
-    test("App folder should exist", async () => {
-      const dirExists = fs.existsSync(path.join(cwd, name));
-      expect(dirExists).toBeTruthy();
-    });
-    test("Frontend should have a title", async ({ page }) => {
-      test.skip(templatePostInstallAction !== "runApp");
-      await page.goto(`http://localhost:${port}`);
-      await expect(page.getByText("Built by LlamaIndex")).toBeVisible();
-    });
-
-    test("Frontend should be able to submit a message and receive a response", async ({
-      page,
-    }) => {
-      test.skip(templatePostInstallAction !== "runApp");
-      await page.goto(`http://localhost:${port}`);
-      await page.fill("form input", userMessage);
-      const [response] = await Promise.all([
-        page.waitForResponse(
-          (res) => {
-            return res.url().includes("/api/chat") && res.status() === 200;
-          },
-          {
-            timeout: 1000 * 60,
-          },
-        ),
-        page.click("form button[type=submit]"),
-      ]);
-      const text = await response.text();
-      console.log("AI response when submitting message: ", text);
-      expect(response.ok()).toBeTruthy();
-    });
-
-    test("Backend frameworks should response when calling non-streaming chat API", async ({
-      request,
-    }) => {
-      test.skip(templatePostInstallAction !== "runApp");
-      test.skip(templateFramework === "nextjs");
-      const response = await request.post(
-        `http://localhost:${externalPort}/api/chat/request`,
-        {
-          data: {
-            messages: [
-              {
-                role: "user",
-                content: userMessage,
-              },
-            ],
-          },
-        },
-      );
-      const text = await response.text();
-      console.log("AI response when calling API: ", text);
-      expect(response.ok()).toBeTruthy();
-    });
-
-    // clean processes
-    test.afterAll(async () => {
-      appProcess?.kill();
-    });
+  test.beforeAll(async () => {
+    port = Math.floor(Math.random() * 10000) + 10000;
+    externalPort = port + 1;
+    cwd = await createTestDir();
+    const result = await runCreateLlama(
+      cwd,
+      "streaming",
+      templateFramework,
+      dataSource,
+      vectorDb,
+      port,
+      externalPort,
+      templatePostInstallAction,
+      templateUI,
+      appType,
+      llamaCloudProjectName,
+      llamaCloudIndexName,
+    );
+    name = result.projectName;
+    appProcess = result.appProcess;
   });
-}
+
+  test("App folder should exist", async () => {
+    const dirExists = fs.existsSync(path.join(cwd, name));
+    expect(dirExists).toBeTruthy();
+  });
+  test("Frontend should have a title", async ({ page }) => {
+    test.skip(templatePostInstallAction !== "runApp");
+    await page.goto(`http://localhost:${port}`);
+    await expect(page.getByText("Built by LlamaIndex")).toBeVisible();
+  });
+
+  test("Frontend should be able to submit a message and receive a response", async ({
+    page,
+  }) => {
+    test.skip(templatePostInstallAction !== "runApp");
+    await page.goto(`http://localhost:${port}`);
+    await page.fill("form input", userMessage);
+    const [response] = await Promise.all([
+      page.waitForResponse(
+        (res) => {
+          return res.url().includes("/api/chat") && res.status() === 200;
+        },
+        {
+          timeout: 1000 * 60,
+        },
+      ),
+      page.click("form button[type=submit]"),
+    ]);
+    const text = await response.text();
+    console.log("AI response when submitting message: ", text);
+    expect(response.ok()).toBeTruthy();
+  });
+
+  test("Backend frameworks should response when calling non-streaming chat API", async ({
+    request,
+  }) => {
+    test.skip(templatePostInstallAction !== "runApp");
+    test.skip(templateFramework === "nextjs");
+    const response = await request.post(
+      `http://localhost:${externalPort}/api/chat/request`,
+      {
+        data: {
+          messages: [
+            {
+              role: "user",
+              content: userMessage,
+            },
+          ],
+        },
+      },
+    );
+    const text = await response.text();
+    console.log("AI response when calling API: ", text);
+    expect(response.ok()).toBeTruthy();
+  });
+
+  // clean processes
+  test.afterAll(async () => {
+    appProcess?.kill();
+  });
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-llama",
-  "version": "0.1.41",
+  "version": "0.1.42",
   "description": "Create LlamaIndex-powered apps with one command",
   "keywords": [
     "rag",

templates/types/streaming/nextjs/app/components/ui/chat/index.ts

@@ -1,5 +1,4 @@
 import { JSONValue } from "ai";
-import { isValidUrl } from "../lib/utils";
 import ChatInput from "./chat-input";
 import ChatMessages from "./chat-messages";
 
@@ -113,7 +112,7 @@ function preprocessSourceNodes(nodes: SourceNode[]): SourceNode[] {
   // Filter source nodes has lower score
   nodes = nodes
     .filter((node) => (node.score ?? 1) > NODE_SCORE_THRESHOLD)
-    .filter((node) => isValidUrl(node.url))
+    .filter((node) => node.url && node.url.trim() !== "")
     .sort((a, b) => (b.score ?? 1) - (a.score ?? 1))
     .map((node) => {
       // remove trailing slash for node url if exists

templates/types/streaming/nextjs/app/components/ui/lib/utils.ts

@@ -4,13 +4,3 @@ import { twMerge } from "tailwind-merge";
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
-
-export function isValidUrl(url?: string): boolean {
-  if (!url) return false;
-  try {
-    new URL(url);
-    return true;
-  } catch (_) {
-    return false;
-  }
-}