RELEASING: Releasing 1 package(s)

Releases:
  create-llama@0.0.19

[skip ci]

.changeset/curly-mangos-brake.md

@@ -0,0 +1,5 @@
+---
+"llamaindex": patch
+---
+
+update dependencies

.changeset/shy-cars-know.md

@@ -1,5 +0,0 @@
----
-"create-llama": patch
----
-
-Add node_modules to gitignore in Express backends

.husky/pre-commit

@@ -1,6 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 pnpm format
 pnpm lint
 npx lint-staged

.husky/pre-push

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 pnpm test

package.json

@@ -8,7 +8,7 @@
     "format": "prettier --ignore-unknown --cache --check .",
     "format:write": "prettier --ignore-unknown --write .",
     "lint": "turbo run lint",
-    "prepare": "husky install",
+    "prepare": "husky",
     "test": "turbo run test",
     "type-check": "tsc -b --diagnostics",
     "release": "pnpm run build:release && changeset publish",
@@ -22,7 +22,7 @@
     "@types/jest": "^29.5.11",
     "eslint": "^8.56.0",
     "eslint-config-custom": "workspace:*",
-    "husky": "^8.0.3",
+    "husky": "^9.0.6",
     "jest": "^29.7.0",
     "lint-staged": "^15.2.0",
     "prettier": "^3.2.4",
@@ -31,7 +31,7 @@
     "turbo": "^1.11.3",
     "typescript": "^5.3.3"
   },
-  "packageManager": "pnpm@8.10.5+sha256.a4bd9bb7b48214bbfcd95f264bd75bb70d100e5d4b58808f5cd6ab40c6ac21c5",
+  "packageManager": "pnpm@8.14.3+sha256.2d0363bb6c314daa67087ef07743eea1ba2e2d360c835e8fec6b5575e4ed9484",
   "pnpm": {
     "overrides": {
       "trim": "1.0.1",

packages/core/CHANGELOG.md

@@ -1,5 +1,9 @@
 # llamaindex
 
+## 0.1.2
+
+- e4b807a: fix: invalid package.json
+
 ## 0.1.1
 
 No changes for this release.

packages/core/package.json

@@ -1,17 +1,17 @@
 {
   "name": "llamaindex",
   "private": true,
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "MIT",
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.9.1",
-    "@datastax/astra-db-ts": "^0.1.2",
-    "@mistralai/mistralai": "^0.0.7",
+    "@anthropic-ai/sdk": "^0.12.4",
+    "@datastax/astra-db-ts": "^0.1.4",
+    "@mistralai/mistralai": "^0.0.10",
     "@notionhq/client": "^2.2.14",
-    "@pinecone-database/pinecone": "^1.1.2",
+    "@pinecone-database/pinecone": "^1.1.3",
     "@qdrant/js-client-rest": "^1.7.0",
-    "@xenova/transformers": "^2.10.0",
-    "assemblyai": "^4.0.0",
+    "@xenova/transformers": "^2.14.1",
+    "assemblyai": "^4.2.1",
     "chromadb": "~1.7.3",
     "file-type": "^18.7.0",
     "js-tiktoken": "^1.0.8",
@@ -25,11 +25,11 @@
     "pathe": "^1.1.2",
     "pdfjs-dist": "4.0.269",
     "pg": "^8.11.3",
-    "pgvector": "^0.1.5",
+    "pgvector": "^0.1.7",
     "portkey-ai": "^0.1.16",
     "rake-modified": "^1.0.8",
-    "replicate": "^0.21.1",
-    "string-strip-html": "^13.4.3",
+    "replicate": "^0.25.2",
+    "string-strip-html": "^13.4.5",
     "wink-nlp": "^1.14.3"
   },
   "devDependencies": {
@@ -37,10 +37,10 @@
     "@types/edit-json-file": "^1.7.3",
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.202",
-    "@types/node": "^18.19.6",
+    "@types/node": "^18.19.9",
     "@types/papaparse": "^5.3.14",
-    "@types/pg": "^8.10.9",
-    "bunchee": "^4.4.1",
+    "@types/pg": "^8.11.0",
+    "bunchee": "^4.4.2",
     "edit-json-file": "^1.8.0",
     "madge": "^6.1.0",
     "typescript": "^5.3.3"

packages/core/scripts/modify-package-json.mjs

@@ -5,9 +5,21 @@
  */
 import editJsonFile from "edit-json-file";
 import fs from "node:fs/promises";
-await fs.copyFile("./package.json", "./dist/package.json");
-const file = editJsonFile("./dist/package.json");
 
-file.unset("scripts");
-file.unset("private");
-await new Promise((resolve) => file.save(resolve));
+{
+  await fs.copyFile("./package.json", "./dist/package.json");
+  const file = editJsonFile("./dist/package.json");
+
+  file.unset("scripts");
+  file.unset("private");
+  await new Promise((resolve) => file.save(resolve));
+}
+{
+  const packageJson = await fs.readFile("./dist/package.json", "utf8");
+  const modifiedPackageJson = packageJson.replaceAll("./dist/", "./");
+  await fs.writeFile(
+    "./dist/package.json",
+    JSON.stringify(JSON.parse(modifiedPackageJson), null, 2),
+    "utf8",
+  );
+}

packages/core/src/types/mistral.d.ts

@@ -1,3 +0,0 @@
-declare module "@mistralai/mistralai" {
-  export = MistralClient;
-}

packages/create-llama/CHANGELOG.md

@@ -1,5 +1,12 @@
 # create-llama
 
+## 0.0.19
+
+### Patch Changes
+
+- 3a29a80: Add node_modules to gitignore in Express backends
+- fe03aaa: feat: generate llama pack example
+
 ## 0.0.18
 
 ### Patch Changes

packages/create-llama/create-app.ts

@@ -32,6 +32,7 @@ export async function createApp({
   openAiKey,
   model,
   communityProjectPath,
+  llamapack,
   vectorDb,
   externalPort,
   postInstallAction,
@@ -75,6 +76,7 @@ export async function createApp({
     openAiKey,
     model,
     communityProjectPath,
+    llamapack,
     vectorDb,
     externalPort,
     postInstallAction,

packages/create-llama/helpers/constant.ts

@@ -1,2 +1,6 @@
 export const COMMUNITY_OWNER = "run-llama";
 export const COMMUNITY_REPO = "create_llama_projects";
+export const LLAMA_PACK_OWNER = "run-llama";
+export const LLAMA_PACK_REPO = "llama-hub";
+export const LLAMA_HUB_FOLDER_PATH = `${LLAMA_PACK_OWNER}/${LLAMA_PACK_REPO}/main/llama_hub`;
+export const LLAMA_PACK_CONFIG_PATH = `${LLAMA_HUB_FOLDER_PATH}/llama_packs/library.json`;

packages/create-llama/helpers/index.ts

@@ -7,6 +7,7 @@ import { cyan } from "picocolors";
 
 import { COMMUNITY_OWNER, COMMUNITY_REPO } from "./constant";
 import { PackageManager } from "./get-pkg-manager";
+import { installLlamapackProject } from "./llama-pack";
 import { isHavingPoetryLockFile, tryPoetryRun } from "./poetry";
 import { installPythonTemplate } from "./python";
 import { downloadAndExtractRepo } from "./repo";
@@ -153,6 +154,11 @@ export const installTemplate = async (
     return;
   }
 
+  if (props.template === "llamapack" && props.llamapack) {
+    await installLlamapackProject(props);
+    return;
+  }
+
   if (props.framework === "fastapi") {
     await installPythonTemplate(props);
   } else {

packages/create-llama/helpers/llama-pack.ts

@@ -0,0 +1,91 @@
+import fs from "fs/promises";
+import path from "path";
+import { LLAMA_HUB_FOLDER_PATH, LLAMA_PACK_CONFIG_PATH } from "./constant";
+import { copy } from "./copy";
+import { installPythonDependencies } from "./python";
+import { getRepoRawContent } from "./repo";
+import { InstallTemplateArgs } from "./types";
+
+export async function getAvailableLlamapackOptions(): Promise<
+  {
+    name: string;
+    folderPath: string;
+    example: boolean | undefined;
+  }[]
+> {
+  const libraryJsonRaw = await getRepoRawContent(LLAMA_PACK_CONFIG_PATH);
+  const libraryJson = JSON.parse(libraryJsonRaw);
+  const llamapackKeys = Object.keys(libraryJson);
+  return llamapackKeys
+    .map((key) => ({
+      name: key,
+      folderPath: libraryJson[key].id,
+      example: libraryJson[key].example,
+    }))
+    .filter((item) => !!item.example);
+}
+
+const copyLlamapackEmptyProject = async ({
+  root,
+}: Pick<InstallTemplateArgs, "root">) => {
+  const templatePath = path.join(
+    __dirname,
+    "..",
+    "templates/components/sample-projects/llamapack",
+  );
+  await copy("**", root, {
+    parents: true,
+    cwd: templatePath,
+  });
+};
+
+const copyData = async ({
+  root,
+}: Pick<InstallTemplateArgs, "root" | "llamapack">) => {
+  const dataPath = path.join(__dirname, "..", "templates/components/data");
+  await copy("**", path.join(root, "data"), {
+    parents: true,
+    cwd: dataPath,
+  });
+};
+
+const installLlamapackExample = async ({
+  root,
+  llamapack,
+}: Pick<InstallTemplateArgs, "root" | "llamapack">) => {
+  const exampleFileName = "example.py";
+  const readmeFileName = "README.md";
+  const exampleFilePath = `${LLAMA_HUB_FOLDER_PATH}/${llamapack}/${exampleFileName}`;
+  const readmeFilePath = `${LLAMA_HUB_FOLDER_PATH}/${llamapack}/${readmeFileName}`;
+
+  // Download example.py from llamapack and save to root
+  const exampleContent = await getRepoRawContent(exampleFilePath);
+  await fs.writeFile(path.join(root, exampleFileName), exampleContent);
+
+  // Download README.md from llamapack and combine with README-template.md,
+  // save to root and then delete template file
+  const readmeContent = await getRepoRawContent(readmeFilePath);
+  const readmeTemplateContent = await fs.readFile(
+    path.join(root, "README-template.md"),
+    "utf-8",
+  );
+  await fs.writeFile(
+    path.join(root, readmeFileName),
+    `${readmeContent}\n${readmeTemplateContent}`,
+  );
+  await fs.unlink(path.join(root, "README-template.md"));
+};
+
+export const installLlamapackProject = async ({
+  root,
+  llamapack,
+  postInstallAction,
+}: Pick<InstallTemplateArgs, "root" | "llamapack" | "postInstallAction">) => {
+  console.log("\nInstalling Llamapack project:", llamapack!);
+  await copyLlamapackEmptyProject({ root });
+  await copyData({ root });
+  await installLlamapackExample({ root, llamapack });
+  if (postInstallAction !== "none") {
+    installPythonDependencies({ noRoot: true });
+  }
+};

packages/create-llama/helpers/poetry.ts

@@ -10,9 +10,11 @@ export function isPoetryAvailable(): boolean {
   return false;
 }
 
-export function tryPoetryInstall(): boolean {
+export function tryPoetryInstall(noRoot: boolean): boolean {
   try {
-    execSync("poetry install", { stdio: "inherit" });
+    execSync(`poetry install${noRoot ? " --no-root" : ""}`, {
+      stdio: "inherit",
+    });
     return true;
   } catch (_) {}
   return false;

packages/create-llama/helpers/python.ts

@@ -92,12 +92,14 @@ export const addDependencies = async (
   }
 };
 
-export const installPythonDependencies = (root: string) => {
+export const installPythonDependencies = (
+  { noRoot }: { noRoot: boolean } = { noRoot: false },
+) => {
   if (isPoetryAvailable()) {
     console.log(
       `Installing python dependencies using poetry. This may take a while...`,
     );
-    const installSuccessful = tryPoetryInstall();
+    const installSuccessful = tryPoetryInstall(noRoot);
     if (!installSuccessful) {
       console.error(
         red("Install failed. Please install dependencies manually."),
@@ -181,6 +183,6 @@ export const installPythonTemplate = async ({
   await addDependencies(root, addOnDependencies);
 
   if (postInstallAction !== "none") {
-    installPythonDependencies(root);
+    installPythonDependencies();
   }
 };

packages/create-llama/helpers/repo.ts

@@ -61,3 +61,11 @@ export async function getRepoRootFolders(
   const folders = data.filter((item) => item.type === "dir");
   return folders.map((item) => item.name);
 }
+
+export async function getRepoRawContent(repoFilePath: string) {
+  const url = `https://raw.githubusercontent.com/${repoFilePath}`;
+  const response = await got(url, {
+    responseType: "text",
+  });
+  return response.body;
+}

packages/create-llama/helpers/types.ts

@@ -1,6 +1,6 @@
 import { PackageManager } from "../helpers/get-pkg-manager";
 
-export type TemplateType = "simple" | "streaming" | "community";
+export type TemplateType = "simple" | "streaming" | "community" | "llamapack";
 export type TemplateFramework = "nextjs" | "express" | "fastapi";
 export type TemplateEngine = "simple" | "context";
 export type TemplateUI = "html" | "shadcn";
@@ -23,6 +23,7 @@ export interface InstallTemplateArgs {
   forBackend?: string;
   model: string;
   communityProjectPath?: string;
+  llamapack?: string;
   vectorDb?: TemplateVectorDB;
   externalPort?: number;
   postInstallAction?: TemplatePostInstallAction;

packages/create-llama/index.ts

@@ -237,6 +237,7 @@ async function run(): Promise<void> {
     openAiKey: program.openAiKey,
     model: program.model,
     communityProjectPath: program.communityProjectPath,
+    llamapack: program.llamapack,
     vectorDb: program.vectorDb,
     externalPort: program.externalPort,
     postInstallAction: program.postInstallAction,

packages/create-llama/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-llama",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "keywords": [
     "rag",
     "llamaindex",

packages/create-llama/questions.ts

@@ -7,6 +7,7 @@ import prompts from "prompts";
 import { InstallAppArgs } from "./create-app";
 import { TemplateFramework } from "./helpers";
 import { COMMUNITY_OWNER, COMMUNITY_REPO } from "./helpers/constant";
+import { getAvailableLlamapackOptions } from "./helpers/llama-pack";
 import { getRepoRootFolders } from "./helpers/repo";
 
 export type QuestionArgs = Omit<InstallAppArgs, "appPath" | "packageManager">;
@@ -37,6 +38,7 @@ const defaults: QuestionArgs = {
   openAiKey: "",
   model: "gpt-3.5-turbo",
   communityProjectPath: "",
+  llamapack: "",
   postInstallAction: "dependencies",
 };
 
@@ -129,6 +131,48 @@ export const askQuestions = async (
     field: K,
   ): QuestionArgs[K] => preferences[field] ?? defaults[field];
 
+  // Ask for next action after installation
+  async function askPostInstallAction() {
+    if (program.postInstallAction === undefined) {
+      if (ciInfo.isCI) {
+        program.postInstallAction = getPrefOrDefault("postInstallAction");
+      } else {
+        let actionChoices = [
+          {
+            title: "Just generate code (~1 sec)",
+            value: "none",
+          },
+          {
+            title: "Generate code and install dependencies (~2 min)",
+            value: "dependencies",
+          },
+        ];
+
+        const hasOpenAiKey = program.openAiKey || process.env["OPENAI_API_KEY"];
+        if (program.vectorDb === "none" && hasOpenAiKey) {
+          actionChoices.push({
+            title:
+              "Generate code, install dependencies, and run the app (~2 min)",
+            value: "runApp",
+          });
+        }
+
+        const { action } = await prompts(
+          {
+            type: "select",
+            name: "action",
+            message: "How would you like to proceed?",
+            choices: actionChoices,
+            initial: 1,
+          },
+          handlers,
+        );
+
+        program.postInstallAction = action;
+      }
+    }
+  }
+
   if (!program.template) {
     if (ciInfo.isCI) {
       program.template = getPrefOrDefault("template");
@@ -148,6 +192,10 @@ export const askQuestions = async (
               title: `Community template from ${styledRepo}`,
               value: "community",
             },
+            {
+              title: "Example using a LlamaPack",
+              value: "llamapack",
+            },
           ],
           initial: 1,
         },
@@ -181,6 +229,27 @@ export const askQuestions = async (
     return; // early return - no further questions needed for community projects
   }
 
+  if (program.template === "llamapack") {
+    const availableLlamaPacks = await getAvailableLlamapackOptions();
+    const { llamapack } = await prompts(
+      {
+        type: "select",
+        name: "llamapack",
+        message: "Select LlamaPack",
+        choices: availableLlamaPacks.map((pack) => ({
+          title: pack.name,
+          value: pack.folderPath,
+        })),
+        initial: 0,
+      },
+      handlers,
+    );
+    program.llamapack = llamapack;
+    preferences.llamapack = llamapack;
+    await askPostInstallAction();
+    return; // early return - no further questions needed for llamapack projects
+  }
+
   if (!program.framework) {
     if (ciInfo.isCI) {
       program.framework = getPrefOrDefault("framework");
@@ -386,45 +455,7 @@ export const askQuestions = async (
     }
   }
 
-  // Ask for next action after installation
-  if (program.postInstallAction === undefined) {
-    if (ciInfo.isCI) {
-      program.postInstallAction = getPrefOrDefault("postInstallAction");
-    } else {
-      let actionChoices = [
-        {
-          title: "Just generate code (~1 sec)",
-          value: "none",
-        },
-        {
-          title: "Generate code and install dependencies (~2 min)",
-          value: "dependencies",
-        },
-      ];
-
-      const hasOpenAiKey = program.openAiKey || process.env["OPENAI_API_KEY"];
-      if (program.vectorDb === "none" && hasOpenAiKey) {
-        actionChoices.push({
-          title:
-            "Generate code, install dependencies, and run the app (~2 min)",
-          value: "runApp",
-        });
-      }
-
-      const { action } = await prompts(
-        {
-          type: "select",
-          name: "action",
-          message: "How would you like to proceed?",
-          choices: actionChoices,
-          initial: 1,
-        },
-        handlers,
-      );
-
-      program.postInstallAction = action;
-    }
-  }
+  await askPostInstallAction();
 
   // TODO: consider using zod to validate the input (doesn't work like this as not every option is required)
   // templateUISchema.parse(program.ui);

packages/create-llama/templates/components/sample-projects/llamapack/README-template.md

@@ -0,0 +1,16 @@
+---
+
+## Quickstart
+
+1. Check above instructions for setting up your environment and export required environment variables
+   For example, if you are using bash, you can run the following command to set up OpenAI API key
+
+```bash
+export OPENAI_API_KEY=your_api_key
+```
+
+2. Run the example
+
+```
+poetry run python example.py
+```

packages/create-llama/templates/components/sample-projects/llamapack/pyproject.toml

@@ -0,0 +1,16 @@
+[tool.poetry]
+name = "app"
+version = "0.1.0"
+description = "Llama Pack Example"
+authors = ["Marcus Schiesser <mail@marcusschiesser.de>"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.11,<3.12"
+llama-index = "^0.9.19"
+python-dotenv = "^1.0.0"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"