Merge main into sweep/model-selection

packages/core/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Patch Changes
 
-- 63f2108: Add multimodal support (thanks @marcusschiesser)
+- 63f2108: Add multimodal support (thanks Marcus)
 
 ## 0.0.34
 

packages/create-llama/.npmrc

@@ -0,0 +1 @@
+

packages/create-llama/CHANGELOG.md

@@ -1,22 +1,10 @@
 # create-llama
 
-## 0.0.8
-
-### Patch Changes
-
-- 8cdb07f: Fix Next deployment (thanks @seldo and @marcusschiesser)
-
-## 0.0.7
-
-### Patch Changes
-
-- 9f9f293: Added more to README and made it easier to switch models (thanks @seldo)
-
 ## 0.0.6
 
 ### Patch Changes
 
-- 4431ec7: Label bug fix (thanks @marcusschiesser)
+- 4431ec7: Label bug fix
 
 ## 0.0.5
 
@@ -28,16 +16,16 @@
 
 ### Patch Changes
 
-- 031e926: Update create-llama readme (thanks @logan-markewich)
+- 031e926: Update create-llama readme (thanks Logan)
 
 ## 0.0.3
 
 ### Patch Changes
 
-- 91b42a3: change version (thanks @marcusschiesser)
+- 91b42a3: change version (thanks Marcus)
 
 ## 0.0.2
 
 ### Patch Changes
 
-- e2a6805: Hello Create Llama (thanks @marcusschiesser)
+- e2a6805: Hello Create Llama (thanks Marcus!)

packages/create-llama/README.md

@@ -67,13 +67,7 @@ You can also replace OpenAI with one of our [dozens of other supported LLMs](htt
 The simplest thing to do is run `create-llama` in interactive mode:
 
 ```bash
-npx create-llama@latest
-# or
 npm create llama@latest
-# or
-yarn create llama
-# or
-pnpm create llama@latest
 ```
 
 You will be asked for the name of your project, along with other configuration options, something like this:
@@ -86,10 +80,32 @@ Ok to proceed? (y) y
 ✔ What is your project named? … my-app
 ✔ Which template would you like to use? › Chat with streaming
 ✔ Which framework would you like to use? › NextJS
+✔ Which UI would you like to use? › Shadcn
+✔ Which chat engine would you like to use? › SimpleChatEngine
+✔ **Please provide your llm of choice (leave blank to skip): …**
+✔ Please select a model › Model1 / Model2 / Model3
+✔ Please provide your API key (leave blank to skip): … 
+✔ Would you like to use ESLint? … No / Yes
+✔ Which chat engine would you like to use? › ContextChatEngine
+✔ Please provide your OpenAI API key (leave blank to skip): …
+✔ Would you like to use ESLint? … No / Yes
+Creating a new LlamaIndex app in /home/my-app.
+```
+Here is an example:
+
+```bash
+>> npm create llama
+Need to install the following packages:
+  create-llama@latest
+Ok to proceed? (y) y
+✔ What is your project named? … my-app
+✔ Which template would you like to use? › Chat with streaming
+✔ Which framework would you like to use? › NextJS
 ✔ Which UI would you like to use? › Just HTML
 ✔ Which chat engine would you like to use? › ContextChatEngine
 ✔ Please provide your OpenAI API key (leave blank to skip): …
 ✔ Would you like to use ESLint? … No / Yes
+✔ Please select a model › Model1 / Model2 / Model3
 Creating a new LlamaIndex app in /home/my-app.
 ```
 

packages/create-llama/create-app.ts

@@ -88,7 +88,7 @@ export async function createApp({
       path.join(root, "README.md"),
     );
   } else {
-    await installTemplate({ ...args, backend: true, forBackend: framework });
+    await installTemplate({ ...args, backend: true });
   }
 
   process.chdir(root);

packages/create-llama/package.json

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

packages/create-llama/templates/README-fullstack.md

@@ -16,3 +16,8 @@ To learn more about LlamaIndex, take a look at the following resources:
 - [LlamaIndexTS Documentation](https://ts.llamaindex.ai) - learn about LlamaIndex (Typescript features).
 
 You can check out [the LlamaIndexTS GitHub repository](https://github.com/run-llama/LlamaIndexTS) - your feedback and contributions are welcome!
+
++ 
++ ### Model Selection
++ 
++ When creating a new LlamaIndex app, you can select a model to use. The available models are Model1, Model2, and Model3. The selected model will be used in the generated code.

packages/create-llama/templates/index.ts

@@ -103,7 +103,6 @@ const installTSTemplate = async ({
   ui,
   eslint,
   customApiPath,
-  forBackend,
 }: InstallTemplateArgs) => {
   console.log(bold(`Using ${packageManager}.`));
 
@@ -121,26 +120,6 @@ const installTSTemplate = async ({
     rename,
   });
 
-  /**
-   * If the backend is next.js, rename next.config.app.js to next.config.js
-   * If not, rename next.config.static.js to next.config.js
-   */
-  if (framework == "nextjs" && forBackend === "nextjs") {
-    const nextConfigAppPath = path.join(root, "next.config.app.js");
-    const nextConfigPath = path.join(root, "next.config.js");
-    await fs.rename(nextConfigAppPath, nextConfigPath);
-    // delete next.config.static.js
-    const nextConfigStaticPath = path.join(root, "next.config.static.js");
-    await fs.rm(nextConfigStaticPath);
-  } else if (framework == "nextjs" && typeof forBackend === "undefined") {
-    const nextConfigStaticPath = path.join(root, "next.config.static.js");
-    const nextConfigPath = path.join(root, "next.config.js");
-    await fs.rename(nextConfigStaticPath, nextConfigPath);
-    // delete next.config.app.js
-    const nextConfigAppPath = path.join(root, "next.config.app.js");
-    await fs.rm(nextConfigAppPath);
-  }
-
   /**
    * Copy the selected chat engine files to the target directory and reference it.
    */

packages/create-llama/templates/types.ts

@@ -17,5 +17,4 @@ export interface InstallTemplateArgs {
   eslint: boolean;
   customApiPath?: string;
   openAIKey?: string;
-  forBackend?: string;
 }

packages/create-llama/templates/types/simple/express/gitignore

@@ -1,2 +0,0 @@
-# local env files
-.env

packages/create-llama/templates/types/simple/express/index.ts

@@ -8,24 +8,12 @@ const port = 8000;
 
 const env = process.env["NODE_ENV"];
 const isDevelopment = !env || env === "development";
-const prodCorsOrigin = process.env["PROD_CORS_ORIGIN"];
-
 if (isDevelopment) {
   console.warn("Running in development mode - allowing CORS for all origins");
   app.use(cors());
-} else if (prodCorsOrigin) {
-  console.log(
-    `Running in production mode - allowing CORS for domain: ${prodCorsOrigin}`,
-  );
-  const corsOptions = {
-    origin: prodCorsOrigin, // Restrict to production domain
-  };
-  app.use(cors(corsOptions));
-} else {
-  console.warn("Production CORS origin not set, defaulting to no CORS.");
 }
 
-app.use(express.text());
+app.use(express.json());
 
 app.get("/", (req: Request, res: Response) => {
   res.send("LlamaIndex Express Server");

packages/create-llama/templates/types/simple/express/src/controllers/chat.controller.ts

@@ -4,7 +4,7 @@ import { createChatEngine } from "./engine";
 
 export const chat = async (req: Request, res: Response, next: NextFunction) => {
   try {
-    const { messages }: { messages: ChatMessage[] } = JSON.parse(req.body);
+    const { messages }: { messages: ChatMessage[] } = req.body;
     const lastMessage = messages.pop();
     if (!messages || !lastMessage || lastMessage.role !== "user") {
       return res.status(400).json({

packages/create-llama/templates/types/simple/fastapi/app/utils/index.py

@@ -15,10 +15,9 @@ STORAGE_DIR = "./storage"  # directory to cache the generated index
 DATA_DIR = "./data"  # directory containing the documents to index
 
 service_context = ServiceContext.from_defaults(
-    llm=OpenAI(model="gpt-3.5-turbo")
+    llm=OpenAI("gpt-3.5-turbo")
 )
 
-
 def get_index():
     logger = logging.getLogger("uvicorn")
     # check if storage already exists

packages/create-llama/templates/types/simple/fastapi/main.py

@@ -1,4 +1,3 @@
-from pathlib import Path
 import logging
 import os
 import uvicorn
@@ -7,9 +6,7 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from dotenv import load_dotenv
 
-load_dotenv(Path('.env'))
-
-print(f"OPENAI_API_KEY: {os.getenv('OPENAI_API_KEY')}")
+load_dotenv()
 
 app = FastAPI()
 

packages/create-llama/templates/types/simple/nextjs/next.config.js

@@ -2,9 +2,6 @@
 const nextConfig = {
   experimental: {
     serverComponentsExternalPackages: ["llamaindex"],
-    outputFileTracingIncludes: {
-      "/*": ["./cache/**/*"],
-    },
   },
 };
 

packages/create-llama/templates/types/simple/nextjs/next.config.static.js

@@ -1,13 +0,0 @@
-/** @type {import('next').NextConfig} */
-const nextConfig = {
-  output: "export",
-  images: { unoptimized: true },
-  experimental: {
-    serverComponentsExternalPackages: ["llamaindex"],
-    outputFileTracingIncludes: {
-      "/*": ["./cache/**/*"],
-    },
-  },
-};
-
-module.exports = nextConfig;

packages/create-llama/templates/types/streaming/express/gitignore

@@ -1,2 +0,0 @@
-# local env files
-.env

packages/create-llama/templates/types/streaming/express/index.ts

@@ -8,24 +8,12 @@ const port = 8000;
 
 const env = process.env["NODE_ENV"];
 const isDevelopment = !env || env === "development";
-const prodCorsOrigin = process.env["PROD_CORS_ORIGIN"];
-
 if (isDevelopment) {
   console.warn("Running in development mode - allowing CORS for all origins");
   app.use(cors());
-} else if (prodCorsOrigin) {
-  console.log(
-    `Running in production mode - allowing CORS for domain: ${prodCorsOrigin}`,
-  );
-  const corsOptions = {
-    origin: prodCorsOrigin, // Restrict to production domain
-  };
-  app.use(cors(corsOptions));
-} else {
-  console.warn("Production CORS origin not set, defaulting to no CORS.");
 }
 
-app.use(express.text());
+app.use(express.json());
 
 app.get("/", (req: Request, res: Response) => {
   res.send("LlamaIndex Express Server");

packages/create-llama/templates/types/streaming/express/src/controllers/chat.controller.ts

@@ -6,7 +6,7 @@ import { LlamaIndexStream } from "./llamaindex-stream";
 
 export const chat = async (req: Request, res: Response, next: NextFunction) => {
   try {
-    const { messages }: { messages: ChatMessage[] } = JSON.parse(req.body);
+    const { messages }: { messages: ChatMessage[] } = req.body;
     const lastMessage = messages.pop();
     if (!messages || !lastMessage || lastMessage.role !== "user") {
       return res.status(400).json({

packages/create-llama/templates/types/streaming/fastapi/app/utils/index.py

@@ -15,7 +15,7 @@ STORAGE_DIR = "./storage"  # directory to cache the generated index
 DATA_DIR = "./data"  # directory containing the documents to index
 
 service_context = ServiceContext.from_defaults(
-    llm=OpenAI(model="gpt-3.5-turbo")
+    llm=OpenAI("gpt-3.5-turbo")
 )
 
 def get_index():

packages/create-llama/templates/types/streaming/fastapi/main.py

@@ -1,4 +1,3 @@
-from pathlib import Path
 import logging
 import os
 import uvicorn
@@ -7,8 +6,7 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from dotenv import load_dotenv
 
-load_dotenv(Path('.env'))
-print(f"OPENAI_API_KEY: {os.getenv('OPENAI_API_KEY')}")
+load_dotenv()
 
 app = FastAPI()
 

packages/create-llama/templates/types/streaming/nextjs/next.config.js

@@ -2,9 +2,6 @@
 const nextConfig = {
   experimental: {
     serverComponentsExternalPackages: ["llamaindex"],
-    outputFileTracingIncludes: {
-      "/*": ["./cache/**/*"],
-    },
   },
 };
 

packages/create-llama/templates/types/streaming/nextjs/next.config.static.js

@@ -1,13 +0,0 @@
-/** @type {import('next').NextConfig} */
-const nextConfig = {
-  output: "export",
-  images: { unoptimized: true },
-  experimental: {
-    serverComponentsExternalPackages: ["llamaindex"],
-    outputFileTracingIncludes: {
-      "/*": ["./cache/**/*"],
-    },
-  },
-};
-
-module.exports = nextConfig;