Merge main into sweep/add-metadata-loading-documents

.changeset/bright-eagles-pump.md

@@ -1,5 +0,0 @@
----
-"llamaindex": patch
----
-
-CJK sentence splitting (thanks @TomPenguin)

.changeset/good-ghosts-suffer.md

@@ -1,5 +0,0 @@
----
-"llamaindex": patch
----
-
-Export options for Windows formatted text files

.changeset/happy-jokes-approve.md

@@ -1,5 +0,0 @@
----
-"llamaindex": patch
----
-
-Disable long sentence splitting by default

.changeset/tough-kings-approve.md

@@ -1,5 +0,0 @@
----
-"llamaindex": patch
----
-
-Make sentence splitter not split on decimals.

.changeset/wet-cooks-buy.md

@@ -1,5 +0,0 @@
----
-"llamaindex": patch
----
-
-Anthropic 0.6.1 and OpenAI 4.2.0. Changed Anthropic timeout back to 60s

apps/simple/CHANGELOG.md

@@ -1,5 +1,16 @@
 # simple
 
+## 0.0.20
+
+### Patch Changes
+
+- Updated dependencies [454f3f8]
+- Updated dependencies [454f3f8]
+- Updated dependencies [454f3f8]
+- Updated dependencies [454f3f8]
+- Updated dependencies [99df58f]
+  - llamaindex@0.0.22
+
 ## 0.0.19
 
 ### Patch Changes

apps/simple/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.19",
+  "version": "0.0.20",
   "private": true,
   "name": "simple",
   "dependencies": {

packages/core/CHANGELOG.md

@@ -1,5 +1,15 @@
 # llamaindex
 
+## 0.0.22
+
+### Patch Changes
+
+- 454f3f8: CJK sentence splitting (thanks @TomPenguin)
+- 454f3f8: Export options for Windows formatted text files
+- 454f3f8: Disable long sentence splitting by default
+- 454f3f8: Make sentence splitter not split on decimals.
+- 99df58f: Anthropic 0.6.1 and OpenAI 4.2.0. Changed Anthropic timeout back to 60s
+
 ## 0.0.21
 
 ### Patch Changes

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llamaindex",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "dependencies": {
     "@anthropic-ai/sdk": "^0.6.1",
     "lodash": "^4.17.21",

packages/core/src/storage/docStore/KVDocumentStore.ts

@@ -48,6 +48,7 @@ export class KVDocumentStore extends BaseDocumentStore {
       let data = docToJson(doc);
       await this.kvstore.put(nodeKey, data, this.nodeCollection);
       let metadata: DocMetaData = { docHash: doc.hash };
+      metadata = {...metadata, ...doc.metadata};
 
       if (doc.getType() === ObjectType.TEXT && doc.sourceNode !== undefined) {
         let refDocInfo = (await this.getRefDocInfo(doc.sourceNode.nodeId)) || {
@@ -82,7 +83,10 @@ export class KVDocumentStore extends BaseDocumentStore {
         return;
       }
     }
-    return jsonToDoc(json);
+    let doc = jsonToDoc(json);
+    let metadata = await this.kvstore.get(docId, this.metadataCollection);
+    doc.metadata = metadata;
+    return doc;
   }
 
   async getRefDocInfo(refDocId: string): Promise<RefDocInfo | undefined> {

packages/core/src/storage/docStore/utils.ts

@@ -23,6 +23,7 @@ export function jsonToDoc(docDict: Record<string, any>): BaseNode {
       hash: dataDict.hash,
       metadata: dataDict.metadata,
     });
+    doc.metadata = dataDict.metadata;
   } else if (docType === ObjectType.TEXT) {
     doc = new TextNode({
       text: dataDict.text,