Merge main into sweep/fix-env-variable-loading

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/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/package.json

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

packages/create-llama/templates/index.ts

@@ -1,5 +1,6 @@
 import { copy } from "../helpers/copy";
 import { callPackageManager } from "../helpers/install";
+import dotenv from 'dotenv';
 
 import fs from "fs/promises";
 import os from "os";
@@ -71,6 +72,7 @@ const copyTestData = async (
     }
   }
 };
+dotenv.config();
 
 const rename = (name: string) => {
   switch (name) {

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

@@ -13,7 +13,7 @@ if (isDevelopment) {
   app.use(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/nextjs/next.config.js

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

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

@@ -13,7 +13,7 @@ if (isDevelopment) {
   app.use(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/nextjs/next.config.js

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