wip to fix node module

martinibach · martinibach · commit 03c128b62c40 · 2024-11-07T14:52:13.000+01:00
diff --git a/examples/express-together-llamaindex/.prettierrc b/examples/express-together-llamaindex/.prettierrc
@@ -0,0 +1 @@
+{}
diff --git a/examples/express-together-llamaindex/package.json b/examples/express-together-llamaindex/package.json
@@ -2,12 +2,8 @@
   "name": "restack-examples-ts-express",
   "version": "0.0.1",
   "description": "Basic Express example",
-  "main": "server.ts",
   "scripts": {
-    "start": "ts-node src/server.ts",
-    "start.watch": "nodemon src/server.ts",
-    "dev": "pnpm start.watch",
-    "build": "tsc --build",
+    "dev": "tsx watch --include src src/server.ts",
     "clean": "rm -rf node_modules",
     "docker:build": "docker build -t restack-express .",
     "docker:run": "docker run -p 8000:8000 restack-express",
@@ -28,14 +24,20 @@
     "@temporalio/workflow": "^1.11.2",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",
+    "llamaindex": "^0.8.4",
     "together-ai": "^0.9.0",
+    "tsx": "^4.19.2",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.5"
   },
   "devDependencies": {
     "@restackio/restack-sdk-cloud-ts": "^1.0.16",
     "@types/express": "^5.0.0",
     "@types/node": "^20.16.9",
-    "ts-node": "^10.9.2"
+    "@typescript-eslint/eslint-plugin": "^8.13.0",
+    "@typescript-eslint/parser": "^8.13.0",
+    "eslint": "^9.14.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.6.3"
   }
 }
diff --git a/examples/express-together-llamaindex/pnpm-lock.yaml b/examples/express-together-llamaindex/pnpm-lock.yaml
diff --git a/examples/express-together-llamaindex/src/functions/index.ts b/examples/express-together-llamaindex/src/functions/index.ts
@@ -1 +1,2 @@
+export * from './llamaindex';
 export * from './together-ai';
diff --git a/examples/express-together-llamaindex/src/functions/llamaindex/createDocument.ts b/examples/express-together-llamaindex/src/functions/llamaindex/createDocument.ts
@@ -0,0 +1,7 @@
+import {
+    Document,
+} from "llamaindex";
+
+export async function createDocument(essay: string, path: string): Promise<Document> {
+    return new Document({ text: essay, id_: path });
+}
diff --git a/examples/express-together-llamaindex/src/functions/llamaindex/createIndex.ts b/examples/express-together-llamaindex/src/functions/llamaindex/createIndex.ts
@@ -0,0 +1,5 @@
+import { VectorStoreIndex, Document } from "llamaindex";
+
+export async function createIndex(document: Document): Promise<VectorStoreIndex> {
+    return await VectorStoreIndex.fromDocuments([document]);
+  }
diff --git a/examples/express-together-llamaindex/src/functions/llamaindex/index.ts b/examples/express-together-llamaindex/src/functions/llamaindex/index.ts
@@ -0,0 +1,5 @@
+export * from './createDocument';
+export * from './createIndex';
+export * from './loadEssay';
+export * from './outputResponse';
+export * from './queryIndex';
diff --git a/examples/express-together-llamaindex/src/functions/llamaindex/loadEssay.ts b/examples/express-together-llamaindex/src/functions/llamaindex/loadEssay.ts
@@ -0,0 +1,5 @@
+import fs from "node:fs/promises";
+
+export async function loadEssay(path: string): Promise<string> {
+    return await fs.readFile(path, "utf-8");
+}
diff --git a/examples/express-together-llamaindex/src/functions/llamaindex/outputResponse.ts b/examples/express-together-llamaindex/src/functions/llamaindex/outputResponse.ts
@@ -0,0 +1,15 @@
+import {
+    MetadataMode,
+    NodeWithScore,
+} from "llamaindex";
+
+export async function outputResponse(response: any, sourceNodes: NodeWithScore[]): Promise<void> {
+    console.log(response);
+    if (sourceNodes) {
+        sourceNodes.forEach((source: NodeWithScore, index: number) => {
+            console.log(
+                `\n${index}: Score: ${source.score} - ${source.node.getContent(MetadataMode.NONE).substring(0, 50)}...\n`,
+            );
+        });
+    }
+}
diff --git a/examples/express-together-llamaindex/src/functions/llamaindex/queryIndex.ts b/examples/express-together-llamaindex/src/functions/llamaindex/queryIndex.ts
@@ -0,0 +1,13 @@
+import {
+    NodeWithScore,
+    VectorStoreIndex,
+} from "llamaindex";
+
+export async function queryIndex(index: VectorStoreIndex, query: string): Promise<{ response: any; sourceNodes: NodeWithScore[] }> {
+    const queryEngine = index.asQueryEngine();
+    const result = await queryEngine.query({ query });
+    return {
+        response: result.response,
+        sourceNodes: result.sourceNodes || [],
+    };
+}
diff --git a/examples/express-together-llamaindex/src/functions/together-ai/index.ts b/examples/express-together-llamaindex/src/functions/together-ai/index.ts
@@ -1,3 +1,2 @@
 export * from './chatCompletionBasic';
-export * from './createEmbedding';
-export * from './utils/parseToolResponse';
+export * from './createEmbedding';
diff --git a/examples/express-together-llamaindex/src/functions/together-ai/utils/parseToolResponse.ts b/examples/express-together-llamaindex/src/functions/together-ai/utils/parseToolResponse.ts
diff --git a/examples/express-together-llamaindex/src/workflows/index.ts b/examples/express-together-llamaindex/src/workflows/index.ts
@@ -1,2 +1 @@
-export * from './chatCompletionBasic';
-export * from './chatCompletionBasicToolCall';
+export * from './chatCompletionBasic';
diff --git a/examples/express-together-llamaindex/src/workflows/simpleRag.ts b/examples/express-together-llamaindex/src/workflows/simpleRag.ts
@@ -0,0 +1,43 @@
+import { step } from "@restackio/ai/workflow";
+import * as functions from "../functions";
+import { z } from "zod";
+import zodToJsonSchema from "zod-to-json-schema";
+
+const QuerySchema = z.object({
+    query: z.string().describe("The query to ask the index."),
+});
+
+const jsonSchema = zodToJsonSchema(QuerySchema, 'Query');
+
+export async function simpleRagWorkflow() {
+    const path = "node_modules/llamaindex/examples/abramov.txt";
+
+    const essay = await step<typeof functions>({
+        taskQueue: 'together',
+    }).loadEssay(path);
+
+    const document = await step<typeof functions>({
+        taskQueue: 'together',
+    }).createDocument({
+        text: essay,
+        id_: path,
+    });
+
+    const index = await step<typeof functions>({
+        taskQueue: 'together',
+    }).createIndex(document);
+
+    const { response, sourceNodes } = await step<typeof functions>({
+        taskQueue: 'together',
+    }).queryIndex({
+        index,
+        query: "What did the author do in college?",
+    });
+
+    await step<typeof functions>({
+        taskQueue: 'together',
+    }).outputResponse({
+        response,
+        sourceNodes,
+    });
+}
diff --git a/examples/express-together-llamaindex/tsconfig.json b/examples/express-together-llamaindex/tsconfig.json
@@ -1,14 +1,15 @@
 {
-    "compilerOptions": {
-      "target": "ES2020",
-      "module": "Node16",
-      "moduleResolution": "Node16",
-      "esModuleInterop": true,
-      "forceConsistentCasingInFileNames": true,
-      "strict": true,
-      "skipLibCheck": true,
-      "outDir": "dist"
-    },
-    "include": ["src/**/*"],
-    "exclude": ["node_modules"]
+  "compilerOptions": {
+    "target": "ES6",
+    "module": "Node16",
+    "moduleDetection": "force",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "resolveJsonModule": true
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules"]
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+export * from './llamaindex';`
`1`	`2`	`export * from './together-ai';`