Merge branch 'main' into tp/support-fully-custom-next-folder

packages/server/examples/agentic-rag/index.ts

@@ -1,12 +1,7 @@
+import { OpenAI, OpenAIEmbedding } from "@llamaindex/openai";
 import { LlamaIndexServer } from "@llamaindex/server";
 import { agent } from "@llamaindex/workflow";
-import {
-  Document,
-  OpenAI,
-  OpenAIEmbedding,
-  Settings,
-  VectorStoreIndex,
-} from "llamaindex";
+import { Document, Settings, VectorStoreIndex } from "llamaindex";
 
 Settings.llm = new OpenAI({
   model: "gpt-4o-mini",

packages/server/examples/custom-layout/index.ts

@@ -1,8 +1,11 @@
+import { OpenAI } from "@llamaindex/openai";
 import { LlamaIndexServer } from "@llamaindex/server";
 import { agent } from "@llamaindex/workflow";
-import { tool } from "llamaindex";
+import { Settings, tool } from "llamaindex";
 import { z } from "zod";
 
+Settings.llm = new OpenAI({ model: "gpt-4o-mini" });
+
 const weatherAgent = agent({
   tools: [
     tool({

packages/server/examples/devmode/index.ts

@@ -1,6 +1,10 @@
+import { OpenAI } from "@llamaindex/openai";
 import { LlamaIndexServer } from "@llamaindex/server";
+import { Settings } from "llamaindex";
 import { workflowFactory } from "./src/app/workflow";
 
+Settings.llm = new OpenAI({ model: "gpt-4o-mini" });
+
 new LlamaIndexServer({
   workflow: workflowFactory,
   uiConfig: {

packages/server/examples/devmode/src/app/workflow.ts

@@ -6,10 +6,10 @@ export const workflowFactory = async () => {
   return agent({
     tools: [
       tool({
-        name: "weather",
-        description: "Get the weather in a specific city",
-        parameters: z.object({ city: z.string() }),
-        execute: ({ city }) => `The weather in ${city} is sunny`,
+        name: "add",
+        description: "Adds two numbers",
+        parameters: z.object({ x: z.number(), y: z.number() }),
+        execute: ({ x, y }) => x + y,
       }),
     ],
   });

packages/server/examples/next-custom/.gitignore

@@ -0,0 +1,2 @@
+next/
+next-env.d.ts

packages/server/examples/next-custom/README.md

@@ -0,0 +1,15 @@
+# Fully Custom Next Folder
+
+This example shows how to fully customize the Next.js frontend and Route Handlers.
+
+## Running ejection
+
+```bash
+pnpm run eject
+```
+
+## Running the example
+
+```bash
+npx nodemon --exec tsx src/index.ts --ignore next/
+```

packages/server/examples/next-custom/src/app/settings.ts

@@ -0,0 +1,8 @@
+import { OpenAI } from "@llamaindex/openai";
+import { Settings } from "llamaindex";
+
+export function initSettings() {
+  Settings.llm = new OpenAI({
+    model: "gpt-4.1",
+  });
+}

packages/server/examples/next-custom/src/app/workflow.ts

@@ -0,0 +1,16 @@
+import { agent } from "@llamaindex/workflow";
+import { tool } from "llamaindex";
+import { z } from "zod";
+
+export const workflowFactory = async () => {
+  return agent({
+    tools: [
+      tool({
+        name: "weather",
+        description: "Get the weather in a given city",
+        parameters: z.object({ city: z.string() }),
+        execute: ({ city }) => `The weather in ${city} is sunny`,
+      }),
+    ],
+  });
+};

packages/server/examples/next-custom/src/index.ts

@@ -0,0 +1,14 @@
+import { LlamaIndexServer } from "@llamaindex/server";
+import "dotenv/config";
+import { initSettings } from "./app/settings";
+import { workflowFactory } from "./app/workflow";
+
+initSettings();
+
+new LlamaIndexServer({
+  workflow: workflowFactory,
+  // dir: "./src/next",
+  uiConfig: {
+    // maybe having an option here to use ejected next folder
+  },
+}).start();

packages/server/examples/package.json

@@ -7,13 +7,13 @@
     "dev": "nodemon --exec tsx simple-workflow/calculator.ts"
   },
   "dependencies": {
-    "@llamaindex/openai": "^0.2.0",
-    "@llamaindex/readers": "^3.0.0",
+    "@llamaindex/openai": "~0.4.0",
+    "@llamaindex/readers": "~3.1.4",
     "@llamaindex/server": "workspace:*",
-    "@llamaindex/tools": "0.0.4",
-    "@llamaindex/workflow": "1.1.0",
+    "@llamaindex/tools": "~0.0.11",
+    "@llamaindex/workflow": "~1.1.3",
     "dotenv": "^16.4.7",
-    "llamaindex": "0.10.2",
+    "llamaindex": "~0.11.3",
     "zod": "^3.23.8"
   },
   "devDependencies": {

packages/server/examples/simple-workflow/calculator.ts

@@ -1,8 +1,11 @@
+import { OpenAI } from "@llamaindex/openai";
 import { LlamaIndexServer } from "@llamaindex/server";
 import { agent } from "@llamaindex/workflow";
-import { tool } from "llamaindex";
+import { Settings, tool } from "llamaindex";
 import { z } from "zod";
 
+Settings.llm = new OpenAI({ model: "gpt-4o-mini" });
+
 const calculatorAgent = agent({
   tools: [
     tool({