fix pagination logic

langchain-ai · Jul 2, 2024 · 70ee9fe · 70ee9fe
1 parent 1809ac4
commit 70ee9fe
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/js/src/client.ts b/js/src/client.ts
@@ -571,7 +571,6 @@ export class Client {
   ): AsyncIterable<T[]> {
     let offset = Number(queryParams.get("offset")) || 0;
     const limit = Number(queryParams.get("limit")) || 100;
-    const limitSet = queryParams.has("limit");
     while (true) {
       queryParams.set("offset", String(offset));
       queryParams.set("limit", String(limit));
@@ -595,10 +594,6 @@ export class Client {
       }
       yield items;
 
-      if (limitSet && items.length === limit) {
-        break;
-      }
-
       if (items.length < limit) {
         break;
       }
@@ -2248,11 +2243,18 @@ export class Client {
     if (filter !== undefined) {
       params.append("filter", filter);
     }
+    let i = 0;
     for await (const examples of this._getPaginated<Example>(
       "/examples",
       params
     )) {
-      yield* examples;
+      for (const example of examples) {
+        yield example;
+        i++;
+      }
+      if (limit !== undefined && i >= limit) {
+        break;
+      }
     }
   }