chore: remove query engine

Releases:
  llamaindex@0.1.18

[skip ci]

apps/docs/docs/modules/evaluation/modules/correctness.md

@@ -53,10 +53,6 @@ const evaluator = new CorrectnessEvaluator({
   serviceContext: ctx,
 });
 
-const response = await queryEngine.query({
-  query,
-});
-
 const result = await evaluator.evaluateResponse({
   query,
   response,

examples/extractors/titleExtractor.ts

@@ -1,13 +1,19 @@
 import { Document, OpenAI, SimpleNodeParser, TitleExtractor } from "llamaindex";
 
-(async () => {
-  const openaiLLM = new OpenAI({ model: "gpt-3.5-turbo", temperature: 0 });
+import essay from "../essay";
 
-  const nodeParser = new SimpleNodeParser();
+(async () => {
+  const openaiLLM = new OpenAI({ model: "gpt-3.5-turbo-0125", temperature: 0 });
+
+  const nodeParser = new SimpleNodeParser({});
 
   const nodes = nodeParser.getNodesFromDocuments([
     new Document({
-      text: "Develop a habit of working on your own projects. Don't let work mean something other people tell you to do. If you do manage to do great work one day, it will probably be on a project of your own. It may be within some bigger project, but you'll be driving your part of it.",
+      text: essay,
+    }),
+    new Document({
+      text: `Certainly! Albert Einstein's theory of relativity consists of two main components: special relativity and general relativity. 
+  However, general relativity, published in 1915, extended these ideas to include the effects of magnetism. According to general relativity, gravity is not a force between masses but rather the result of the warping of space and time by magnetic fields generated by massive objects. Massive objects, such as planets and stars, create magnetic fields that cause a curvature in spacetime, and smaller objects follow curved paths in response to this magnetic curvature. This concept is often illustrated using the analogy of a heavy ball placed on a rubber sheet with magnets underneath, causing it to create a depression that other objects (representing smaller masses) naturally move towards due to magnetic attraction.`,
     }),
   ]);
 
@@ -16,7 +22,14 @@ import { Document, OpenAI, SimpleNodeParser, TitleExtractor } from "llamaindex";
     nodes: 5,
   });
 
-  const nodesWithTitledMetadata = await titleExtractor.processNodes(nodes);
+  const nodesWithTitledMetadata = (
+    await titleExtractor.processNodes(nodes)
+  ).map((node) => {
+    return {
+      title: node.metadata.documentTitle,
+      id: node.id_,
+    };
+  });
 
   process.stdout.write(JSON.stringify(nodesWithTitledMetadata, null, 2));
 })();

examples/longText.ts

@@ -0,0 +1,26 @@
+import {
+  Document,
+  SimpleNodeParser,
+  VectorStoreIndex,
+  serviceContextFromDefaults,
+} from "llamaindex";
+
+export const STORAGE_DIR = "./data";
+
+(async () => {
+  // create service context that is splitting sentences longer than CHUNK_SIZE
+  const serviceContext = serviceContextFromDefaults({
+    nodeParser: new SimpleNodeParser({
+      chunkSize: 512,
+      chunkOverlap: 20,
+      splitLongSentences: true,
+    }),
+  });
+
+  // generate a document with a very long sentence (9000 words long)
+  const longSentence = "is ".repeat(9000) + ".";
+  const document = new Document({ text: longSentence, id_: "1" });
+  await VectorStoreIndex.fromDocuments([document], {
+    serviceContext,
+  });
+})();

packages/core/CHANGELOG.md

@@ -1,5 +1,12 @@
 # llamaindex
 
+## 0.1.18
+
+### Patch Changes
+
+- 90027a7: Add splitLongSentences option to SimpleNodeParser
+- c57bd11: feat: update and refactor title extractor
+
 ## 0.1.17
 
 ### Patch Changes

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llamaindex",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "license": "MIT",
   "type": "module",
   "dependencies": {

packages/core/src/extractors/MetadataExtractors.ts

@@ -141,8 +141,8 @@ export class TitleExtractor extends BaseExtractor {
    * Constructor for the TitleExtractor class.
    * @param {LLM} llm LLM instance.
    * @param {number} nodes Number of nodes to extract titles from.
-   * @param {string} node_template The prompt template to use for the title extractor.
-   * @param {string} combine_template The prompt template to merge title with..
+   * @param {string} nodeTemplate The prompt template to use for the title extractor.
+   * @param {string} combineTemplate The prompt template to merge title with..
    */
   constructor(options?: TitleExtractorsArgs) {
     super();
@@ -162,50 +162,85 @@ export class TitleExtractor extends BaseExtractor {
    * @returns {Promise<BaseNode<ExtractTitle>[]>} Titles extracted from the nodes.
    */
   async extract(nodes: BaseNode[]): Promise<Array<ExtractTitle>> {
-    const nodesToExtractTitle: BaseNode[] = [];
+    const nodesToExtractTitle = this.filterNodes(nodes);
 
-    for (let i = 0; i < this.nodes; i++) {
-      if (nodesToExtractTitle.length >= nodes.length) break;
-
-      if (this.isTextNodeOnly && !(nodes[i] instanceof TextNode)) continue;
-
-      nodesToExtractTitle.push(nodes[i]);
+    if (!nodesToExtractTitle.length) {
+      return [];
     }
 
-    if (nodesToExtractTitle.length === 0) return [];
+    const nodesByDocument = this.separateNodesByDocument(nodesToExtractTitle);
+    const titlesByDocument = await this.extractTitles(nodesByDocument);
 
-    const titlesCandidates: string[] = [];
-    let title: string = "";
+    return nodesToExtractTitle.map((node) => {
+      return {
+        documentTitle: titlesByDocument[node.sourceNode?.nodeId ?? ""],
+      };
+    });
+  }
 
-    for (let i = 0; i < nodesToExtractTitle.length; i++) {
-      const completion = await this.llm.complete({
-        prompt: defaultTitleExtractorPromptTemplate({
-          contextStr: nodesToExtractTitle[i].getContent(MetadataMode.ALL),
-        }),
-      });
+  private filterNodes(nodes: BaseNode[]): BaseNode[] {
+    return nodes.filter((node) => {
+      if (this.isTextNodeOnly && !(node instanceof TextNode)) {
+        return false;
+      }
+      return true;
+    });
+  }
 
-      titlesCandidates.push(completion.text);
+  private separateNodesByDocument(
+    nodes: BaseNode[],
+  ): Record<string, BaseNode[]> {
+    const nodesByDocument: Record<string, BaseNode[]> = {};
+
+    for (const node of nodes) {
+      const parentNode = node.sourceNode?.nodeId;
+
+      if (!parentNode) {
+        continue;
+      }
+
+      if (!nodesByDocument[parentNode]) {
+        nodesByDocument[parentNode] = [];
+      }
+
+      nodesByDocument[parentNode].push(node);
     }
 
-    if (nodesToExtractTitle.length > 1) {
-      const combinedTitles = titlesCandidates.join(",");
+    return nodesByDocument;
+  }
 
+  private async extractTitles(
+    nodesByDocument: Record<string, BaseNode[]>,
+  ): Promise<Record<string, string>> {
+    const titlesByDocument: Record<string, string> = {};
+
+    for (const [key, nodes] of Object.entries(nodesByDocument)) {
+      const titleCandidates = await this.getTitlesCandidates(nodes);
+      const combinedTitles = titleCandidates.join(", ");
       const completion = await this.llm.complete({
         prompt: defaultTitleCombinePromptTemplate({
           contextStr: combinedTitles,
         }),
       });
 
-      title = completion.text;
+      titlesByDocument[key] = completion.text;
     }
 
-    if (nodesToExtractTitle.length === 1) {
-      title = titlesCandidates[0];
-    }
+    return titlesByDocument;
+  }
 
-    return nodes.map((_) => ({
-      documentTitle: title.trim().replace(STRIP_REGEX, ""),
-    }));
+  private async getTitlesCandidates(nodes: BaseNode[]): Promise<string[]> {
+    const titleJobs = nodes.map(async (node) => {
+      const completion = await this.llm.complete({
+        prompt: defaultTitleExtractorPromptTemplate({
+          contextStr: node.getContent(MetadataMode.ALL),
+        }),
+      });
+
+      return completion.text;
+    });
+
+    return await Promise.all(titleJobs);
   }
 }
 
@@ -352,9 +387,9 @@ export class SummaryExtractor extends BaseExtractor {
    */
   promptTemplate: string;
 
-  private _selfSummary: boolean;
-  private _prevSummary: boolean;
-  private _nextSummary: boolean;
+  private selfSummary: boolean;
+  private prevSummary: boolean;
+  private nextSummary: boolean;
 
   constructor(options?: SummaryExtractArgs) {
     const summaries = options?.summaries ?? ["self"];
@@ -372,9 +407,9 @@ export class SummaryExtractor extends BaseExtractor {
     this.promptTemplate =
       options?.promptTemplate ?? defaultSummaryExtractorPromptTemplate();
 
-    this._selfSummary = summaries?.includes("self") ?? false;
-    this._prevSummary = summaries?.includes("prev") ?? false;
-    this._nextSummary = summaries?.includes("next") ?? false;
+    this.selfSummary = summaries?.includes("self") ?? false;
+    this.prevSummary = summaries?.includes("prev") ?? false;
+    this.nextSummary = summaries?.includes("next") ?? false;
   }
 
   /**
@@ -416,13 +451,13 @@ export class SummaryExtractor extends BaseExtractor {
     const metadataList: any[] = nodes.map(() => ({}));
 
     for (let i = 0; i < nodes.length; i++) {
-      if (i > 0 && this._prevSummary && nodeSummaries[i - 1]) {
+      if (i > 0 && this.prevSummary && nodeSummaries[i - 1]) {
         metadataList[i]["prevSectionSummary"] = nodeSummaries[i - 1];
       }
-      if (i < nodes.length - 1 && this._nextSummary && nodeSummaries[i + 1]) {
+      if (i < nodes.length - 1 && this.nextSummary && nodeSummaries[i + 1]) {
         metadataList[i]["nextSectionSummary"] = nodeSummaries[i + 1];
       }
-      if (this._selfSummary && nodeSummaries[i]) {
+      if (this.selfSummary && nodeSummaries[i]) {
         metadataList[i]["sectionSummary"] = nodeSummaries[i];
       }
     }

packages/core/src/extractors/prompts.ts

@@ -21,33 +21,25 @@ export const defaultKeywordExtractorPromptTemplate = ({
   contextStr = "",
   keywords = 5,
 }: DefaultKeywordExtractorPromptTemplate) => `${contextStr} 
-
 Give ${keywords} unique keywords for this document. 
-
-Format as comma separated. Keywords:
-`;
+Format as comma separated. 
+Keywords: `;
 
 export const defaultTitleExtractorPromptTemplate = (
   { contextStr = "" }: DefaultPromptTemplate = {
     contextStr: "",
   },
 ) => `${contextStr}
-
 Give a title that summarizes all of the unique entities, titles or themes found in the context. 
-
-Title:
-`;
+Title: `;
 
 export const defaultTitleCombinePromptTemplate = (
   { contextStr = "" }: DefaultPromptTemplate = {
     contextStr: "",
   },
 ) => `${contextStr} 
-
 Based on the above candidate titles and contents, what is the comprehensive title for this document? 
-
-Title:
-`;
+Title: `;
 
 export const defaultQuestionAnswerPromptTemplate = (
   { contextStr = "", numQuestions = 5 }: DefaultQuestionAnswerPromptTemplate = {
@@ -55,9 +47,7 @@ export const defaultQuestionAnswerPromptTemplate = (
     numQuestions: 5,
   },
 ) => `${contextStr}
-
-Given the contextual informations, generate ${numQuestions} questions this context can provides specific answers to which are unlikely to be found elsewhere.Higher-level summaries of surrounding context may be provideds as well. 
-
+Given the contextual informations, generate ${numQuestions} questions this context can provides specific answers to which are unlikely to be found else where. Higher-level summaries of surrounding context may be provideds as well. 
 Try using these summaries to generate better questions that this context can answer.
 `;
 
@@ -66,11 +56,8 @@ export const defaultSummaryExtractorPromptTemplate = (
     contextStr: "",
   },
 ) => `${contextStr}
-
 Summarize the key topics and entities of the sections.
-
-Summary:
-`;
+Summary: `;
 
 export const defaultNodeTextTemplate = ({
   metadataStr = "",

packages/core/src/nodeParsers/SimpleNodeParser.ts

@@ -27,12 +27,14 @@ export class SimpleNodeParser implements NodeParser {
     includePrevNextRel?: boolean;
     chunkSize?: number;
     chunkOverlap?: number;
+    splitLongSentences?: boolean;
   }) {
     this.textSplitter =
       init?.textSplitter ??
       new SentenceSplitter({
         chunkSize: init?.chunkSize ?? DEFAULT_CHUNK_SIZE,
         chunkOverlap: init?.chunkOverlap ?? DEFAULT_CHUNK_OVERLAP,
+        splitLongSentences: init?.splitLongSentences ?? false,
       });
     this.includeMetadata = init?.includeMetadata ?? true;
     this.includePrevNextRel = init?.includePrevNextRel ?? true;

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

@@ -36,12 +36,11 @@ type QuerySearchResult = {
 export class QdrantVectorStore implements VectorStore {
   storesText: boolean = true;
 
-  db: QdrantClient;
-
-  collectionName: string;
   batchSize: number;
+  collectionName: string;
 
-  private _collectionInitialized: boolean = false;
+  private db: QdrantClient;
+  private collectionInitialized: boolean = false;
 
   /**
    * Creates a new QdrantVectorStore.
@@ -59,7 +58,7 @@ export class QdrantVectorStore implements VectorStore {
     batchSize,
   }: QdrantParams) {
     if (!client && !url) {
-      if (!url || !collectionName) {
+      if (!url) {
         throw new Error("QdrantVectorStore requires url and collectionName");
       }
     }
@@ -122,7 +121,7 @@ export class QdrantVectorStore implements VectorStore {
     if (!exists) {
       await this.createCollection(this.collectionName, vectorSize);
     }
-    this._collectionInitialized = true;
+    this.collectionInitialized = true;
   }
 
   /**
@@ -179,7 +178,7 @@ export class QdrantVectorStore implements VectorStore {
    * @returns List of node IDs
    */
   async add(embeddingResults: BaseNode[]): Promise<string[]> {
-    if (embeddingResults.length > 0 && !this._collectionInitialized) {
+    if (embeddingResults.length > 0 && !this.collectionInitialized) {
       await this.initializeCollection(
         embeddingResults[0].getEmbedding().length,
       );