refactor: migrate @llamaindex/azure/storage

run-llama · Jan 21, 2025 · 6e674c8 · 6e674c8
1 parent 7b17967
commit 6e674c8
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 36 deletions.
diff --git a/packages/llamaindex/package.json b/packages/llamaindex/package.json
@@ -23,9 +23,6 @@
     "@anthropic-ai/sdk": "0.32.1",
     "@aws-crypto/sha256-js": "^5.2.0",
     "@aws-sdk/client-sso-oidc": "^3.693.0",
-    "@azure/cosmos": "^4.1.1",
-    "@azure/identity": "^4.4.1",
-    "@azure/search-documents": "^12.1.0",
     "@datastax/astra-db-ts": "^1.4.1",
     "@discoveryjs/json-ext": "^0.6.1",
     "@google-cloud/vertexai": "1.9.0",

diff --git a/packages/llamaindex/src/storage/index.ts b/packages/llamaindex/src/storage/index.ts
@@ -1,3 +1,4 @@
+export * from "@llamaindex/azure/storage";
 export * from "@llamaindex/core/storage/chat-store";
 export * from "@llamaindex/core/storage/doc-store";
 export * from "@llamaindex/core/storage/index-store";
@@ -7,14 +8,7 @@ export {
   PostgresIndexStore,
   PostgresKVStore,
 } from "@llamaindex/postgres";
-export * from "./chatStore/AzureCosmosMongovCoreChatStore.js";
-export * from "./chatStore/AzureCosmosNoSqlChatStore.js";
-export * from "./docStore/AzureCosmosMongovCoreDocumentStore.js";
-export * from "./docStore/AzureCosmosNoSqlDocumentStore.js";
 export { SimpleDocumentStore } from "./docStore/SimpleDocumentStore.js";
 export * from "./FileSystem.js";
-export * from "./indexStore/AzureCosmosMongovCoreIndexStore.js";
-export * from "./indexStore/AzureCosmosNoSqlIndexStore.js";
-export * from "./kvStore/AzureCosmosMongovCoreKVStore.js";
-export * from "./kvStore/AzureCosmosNoSqlKVStore.js";
+
 export * from "./StorageContext.js";
diff --git a/packages/llamaindex/tsconfig.json b/packages/llamaindex/tsconfig.json
@@ -10,7 +10,11 @@
     "skipLibCheck": true,
     "strict": true
   },
-  "include": ["./src"],
+  "include": [
+    "./src",
+    "../providers/storage/azure/src/chatStore",
+    "../providers/storage/azure/src/kvStore"
+  ],
   "exclude": ["node_modules"],
   "references": [
     {

diff --git a/packages/providers/storage/azure/package.json b/packages/providers/storage/azure/package.json
@@ -23,6 +23,24 @@
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       }
+    },
+    "./storage": {
+      "edge-light": {
+        "types": "./dist/storage.edge-light.d.ts",
+        "default": "./dist/storage.edge-light.js"
+      },
+      "workerd": {
+        "types": "./dist/storage.edge-light.d.ts",
+        "default": "./dist/storage.edge-light.js"
+      },
+      "require": {
+        "types": "./dist/storage.d.cts",
+        "default": "./dist/storage.cjs"
+      },
+      "import": {
+        "types": "./dist/storage.d.ts",
+        "default": "./dist/storage.js"
+      }
     }
   },
   "files": [
@@ -38,7 +56,8 @@
     "dev": "bunchee --watch"
   },
   "devDependencies": {
-    "bunchee": "6.2.0"
+    "bunchee": "6.2.0",
+    "@types/node": "^22.9.0"
   },
   "dependencies": {
     "@llamaindex/core": "workspace:*",

diff --git a/...atStore/AzureCosmosMongovCoreChatStore.ts → ...atStore/AzureCosmosMongovCoreChatStore.ts b/...atStore/AzureCosmosMongovCoreChatStore.ts → ...atStore/AzureCosmosMongovCoreChatStore.ts
diff --git a/...ge/chatStore/AzureCosmosNoSqlChatStore.ts → ...rc/chatStore/AzureCosmosNoSqlChatStore.ts b/...ge/chatStore/AzureCosmosNoSqlChatStore.ts → ...rc/chatStore/AzureCosmosNoSqlChatStore.ts
diff --git a/...ore/AzureCosmosMongovCoreDocumentStore.ts → ...ore/AzureCosmosMongovCoreDocumentStore.ts b/...ore/AzureCosmosMongovCoreDocumentStore.ts → ...ore/AzureCosmosMongovCoreDocumentStore.ts
@@ -1,6 +1,6 @@
 import { KVDocumentStore } from "@llamaindex/core/storage/doc-store";
 import { MongoClient } from "mongodb";
-import { AzureCosmosVCoreKVStore } from "../kvStore/AzureCosmosMongovCoreKVStore.js";
+import { AzureCosmosVCoreKVStore } from "../kvStore/AzureCosmosMongovCoreKVStore";
 
 const DEFAULT_DATABASE = "DocumentStoreDB";
 const DEFAULT_COLLECTION = "DocumentStoreCollection";

diff --git a/...docStore/AzureCosmosNoSqlDocumentStore.ts → ...docStore/AzureCosmosNoSqlDocumentStore.ts b/...docStore/AzureCosmosNoSqlDocumentStore.ts → ...docStore/AzureCosmosNoSqlDocumentStore.ts
@@ -4,7 +4,7 @@ import {
   type AadTokenOptions,
   type AccountAndKeyOptions,
   type ConnectionStringOptions,
-} from "../kvStore/AzureCosmosNoSqlKVStore.js";
+} from "../kvStore/AzureCosmosNoSqlKVStore";
 
 const DEFAULT_DATABASE = "DocumentStoreDB";
 const DEFAULT_CONTAINER = "DocumentStoreContainer";

diff --git a/packages/providers/storage/azure/src/index.ts b/packages/providers/storage/azure/src/index.ts
@@ -1,9 +1,9 @@
-// Azure AI Search Vector Store
-export * from "./azure/AzureAISearchVectorStore.js";
-export * from "./azure/AzureAISearchVectorStoreConfig.js";
+export * from "./storage.js";
 
-// Azure Cosmos DB NoSQL Vector Store
-export * from "./AzureCosmosDBNoSqlVectorStore.js";
+export * from "./vectorStore/AzureAISearchVectorStore.js";
+export * from "./vectorStore/AzureAISearchVectorStoreConfig.js";
+export * from "./vectorStore/AzureCosmosDBMongoVectorStore.js";
+export * from "./vectorStore/AzureCosmosDBNoSqlVectorStore.js";
+export * from "./vectorStore/AzureQueryResultSearch.js";
 
-// Azure Cosmos DB MongoDB Vector Store
-export * from "./AzureCosmosDBMongoVectorStore.js";
+export * from "./tools/AzureDynamicSessionTool.node.js";
diff --git a/...xStore/AzureCosmosMongovCoreIndexStore.ts → ...xStore/AzureCosmosMongovCoreIndexStore.ts b/...xStore/AzureCosmosMongovCoreIndexStore.ts → ...xStore/AzureCosmosMongovCoreIndexStore.ts
@@ -1,6 +1,6 @@
+import { KVIndexStore } from "@llamaindex/core/storage/index-store";
 import { MongoClient } from "mongodb";
-import { AzureCosmosVCoreKVStore } from "../kvStore/AzureCosmosMongovCoreKVStore.js";
-import { KVIndexStore } from "./KVIndexStore.js";
+import { AzureCosmosVCoreKVStore } from "../kvStore/AzureCosmosMongovCoreKVStore";
 
 const DEFAULT_DATABASE = "IndexStoreDB";
 const DEFAULT_COLLECTION = "IndexStoreCollection";

diff --git a/.../indexStore/AzureCosmosNoSqlIndexStore.ts → .../indexStore/AzureCosmosNoSqlIndexStore.ts b/.../indexStore/AzureCosmosNoSqlIndexStore.ts → .../indexStore/AzureCosmosNoSqlIndexStore.ts
@@ -1,10 +1,10 @@
+import { KVIndexStore } from "@llamaindex/core/storage/index-store";
 import {
   AzureCosmosNoSqlKVStore,
   type AadTokenOptions,
   type AccountAndKeyOptions,
   type ConnectionStringOptions,
-} from "../kvStore/AzureCosmosNoSqlKVStore.js";
-import { KVIndexStore } from "./KVIndexStore.js";
+} from "../kvStore/AzureCosmosNoSqlKVStore";
 
 const DEFAULT_DATABASE = "IndexStoreDB";
 const DEFAULT_CONTAINER = "IndexStoreContainer";

diff --git a/...e/kvStore/AzureCosmosMongovCoreKVStore.ts → ...c/kvStore/AzureCosmosMongovCoreKVStore.ts b/...e/kvStore/AzureCosmosMongovCoreKVStore.ts → ...c/kvStore/AzureCosmosMongovCoreKVStore.ts
diff --git a/...torage/kvStore/AzureCosmosNoSqlKVStore.ts → ...re/src/kvStore/AzureCosmosNoSqlKVStore.ts b/...torage/kvStore/AzureCosmosNoSqlKVStore.ts → ...re/src/kvStore/AzureCosmosNoSqlKVStore.ts
diff --git a/packages/providers/storage/azure/src/storage.ts b/packages/providers/storage/azure/src/storage.ts
@@ -0,0 +1,8 @@
+export * from "./chatStore/AzureCosmosMongovCoreChatStore.js";
+export * from "./chatStore/AzureCosmosNoSqlChatStore.js";
+export * from "./docStore/AzureCosmosMongovCoreDocumentStore.js";
+export * from "./docStore/AzureCosmosNoSqlDocumentStore.js";
+export * from "./indexStore/AzureCosmosMongovCoreIndexStore.js";
+export * from "./indexStore/AzureCosmosNoSqlIndexStore.js";
+export * from "./kvStore/AzureCosmosMongovCoreKVStore.js";
+export * from "./kvStore/AzureCosmosNoSqlKVStore.js";
diff --git a/...src/tools/AzureDynamicSessionTool.node.ts → ...src/tools/AzureDynamicSessionTool.node.ts b/...src/tools/AzureDynamicSessionTool.node.ts → ...src/tools/AzureDynamicSessionTool.node.ts
diff --git a/...ure/src/azure/AzureAISearchVectorStore.ts → ...c/vectorStore/AzureAISearchVectorStore.ts b/...ure/src/azure/AzureAISearchVectorStore.ts → ...c/vectorStore/AzureAISearchVectorStore.ts
diff --git a/...c/azure/AzureAISearchVectorStoreConfig.ts → ...orStore/AzureAISearchVectorStoreConfig.ts b/...c/azure/AzureAISearchVectorStoreConfig.ts → ...orStore/AzureAISearchVectorStoreConfig.ts
diff --git a/...zure/src/AzureCosmosDBMongoVectorStore.ts → ...torStore/AzureCosmosDBMongoVectorStore.ts b/...zure/src/AzureCosmosDBMongoVectorStore.ts → ...torStore/AzureCosmosDBMongoVectorStore.ts
diff --git a/...zure/src/AzureCosmosDBNoSqlVectorStore.ts → ...torStore/AzureCosmosDBNoSqlVectorStore.ts b/...zure/src/AzureCosmosDBNoSqlVectorStore.ts → ...torStore/AzureCosmosDBNoSqlVectorStore.ts
diff --git a/...azure/src/azure/AzureQueryResultSearch.ts → ...src/vectorStore/AzureQueryResultSearch.ts b/...azure/src/azure/AzureQueryResultSearch.ts → ...src/vectorStore/AzureQueryResultSearch.ts
diff --git a/packages/providers/storage/azure/tsconfig.json b/packages/providers/storage/azure/tsconfig.json
@@ -5,7 +5,8 @@
     "module": "ESNext",
     "moduleResolution": "bundler",
     "outDir": "./lib",
-    "tsBuildInfoFile": "./lib/.tsbuildinfo"
+    "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "types": ["node"]
   },
   "include": ["./src"],
   "references": [

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml