Merge branch 'main' into feat/check-version

.changeset/fluffy-squids-play.md

@@ -0,0 +1,5 @@
+---
+"llamaindex": patch
+---
+
+Use Pinecone namespaces for all operations

examples/package.json

@@ -11,7 +11,7 @@
     "chromadb": "^1.8.1",
     "commander": "^11.1.0",
     "dotenv": "^16.4.1",
-    "llamaindex": "workspace:*",
+    "llamaindex": "latest",
     "mongodb": "^6.2.0",
     "pathe": "^1.1.2"
   },

examples/readers/CHANGELOG.md

@@ -1,7 +1,5 @@
 # llamaindex-loader-example
 
-## null
-
 ### Patch Changes
 
 - Updated dependencies [d2e8d0c]

examples/readers/package.json

@@ -12,12 +12,11 @@
     "start:llamaparse": "node --loader ts-node/esm ./src/llamaparse.ts"
   },
   "dependencies": {
-    "llamaindex": "workspace:*"
+    "llamaindex": "latest"
   },
   "devDependencies": {
     "@types/node": "^20.11.14",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
-  },
-  "version": null
+  }
 }

package.json

@@ -11,8 +11,10 @@
     "prepare": "husky",
     "test": "turbo run test",
     "type-check": "tsc -b --diagnostics",
-    "release": "pnpm run build:release && changeset publish",
-    "new-version": "pnpm run build:release && changeset version"
+    "release": "pnpm run check-minor-version && pnpm run build:release && changeset publish",
+    "check-minor-version": "node ./scripts/check-minor-version",
+    "new-version": "pnpm run build:release && changeset version && pnpm run check-minor-version",
+    "new-snapshot": "pnpm run build:release && changeset version --snapshot"
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.1",

packages/core/package.json

@@ -1,6 +1,7 @@
 {
   "name": "llamaindex",
   "version": "0.2.0",
+  "expectedMinorVersion": "2",
   "license": "MIT",
   "type": "module",
   "dependencies": {

packages/core/src/storage/vectorStore/PineconeVectorStore.ts

@@ -73,7 +73,7 @@ export class PineconeVectorStore implements VectorStore {
 
   async index() {
     const db: Pinecone = await this.getDb();
-    return await db.index(this.indexName);
+    return db.index(this.indexName).namespace(this.namespace);
   }
 
   /**
@@ -82,8 +82,8 @@ export class PineconeVectorStore implements VectorStore {
    * @returns The result of the delete query.
    */
   async clearIndex() {
-    const db: Pinecone = await this.getDb();
-    return await db.index(this.indexName).deleteAll();
+    const idx = await this.index();
+    return await idx.deleteAll();
   }
 
   /**
@@ -155,12 +155,10 @@ export class PineconeVectorStore implements VectorStore {
     };
 
     const idx = await this.index();
-    const results = await idx.namespace(this.namespace).query(options);
+    const results = await idx.query(options);
 
     const idList = results.matches.map((row) => row.id);
-    const records: FetchResponse<any> = await idx
-      .namespace(this.namespace)
-      .fetch(idList);
+    const records: FetchResponse<any> = await idx.fetch(idList);
     const rows = Object.values(records.records);
 
     const nodes = rows.map((row) => {

scripts/check-minor-version.js

@@ -0,0 +1,31 @@
+const fs = require("fs");
+
+const packageJson = JSON.parse(
+  fs.readFileSync("./packages/core/package.json", "utf8"),
+);
+
+const versions = packageJson.version.split(".");
+const minorVersion = packageJson.version.split(".")[1];
+const expectedMinorVersion = packageJson.expectedMinorVersion;
+
+if (versions.length !== 3) {
+  console.error(
+    "Version must be in format x.y.z but is " + packageJson.version,
+  );
+  process.exit(1);
+}
+
+if (minorVersion !== expectedMinorVersion) {
+  console.error(
+    "Minor version must be " +
+      expectedMinorVersion +
+      " but is " +
+      minorVersion +
+      ". Please adjust that on the packages/core/package.json.",
+  );
+  process.exit(1);
+}
+
+console.log("Current expected minor version is: " + expectedMinorVersion);
+console.log("Minor version is: " + minorVersion);
+console.log("Good to go!");