Sync updates from stainless branch: main

src/core.ts

@@ -409,7 +409,7 @@ export abstract class APIClient {
       !headers ? {}
       : Symbol.iterator in headers ?
         Object.fromEntries(Array.from(headers as Iterable<string[]>).map((header) => [...header]))
-      : { ...headers }
+      : { ...(headers as any as Record<string, string>) }
     );
   }
 

src/index.ts

@@ -4,6 +4,8 @@ import { type Agent } from './_shims/index';
 import * as qs from './internal/qs';
 import * as Core from './core';
 import * as Errors from './error';
+import * as Pagination from './pagination';
+import { type DatasetsIterrowsParams, DatasetsIterrowsResponse } from './pagination';
 import * as Uploads from './uploads';
 import * as API from './resources/index';
 import {
@@ -20,14 +22,11 @@ import {
   ListBenchmarksResponse,
 } from './resources/benchmarks';
 import {
-  Datasetio,
-  DatasetioAppendRowsParams,
-  DatasetioGetRowsPaginatedParams,
-  PaginatedRowsResult,
-} from './resources/datasetio';
-import {
+  DatasetIterrowsParams,
+  DatasetIterrowsResponse,
   DatasetListResponse,
   DatasetRegisterParams,
+  DatasetRegisterResponse,
   DatasetRetrieveResponse,
   Datasets,
   ListDatasetsResponse,
@@ -286,7 +285,6 @@ export class LlamaStackClient extends Core.APIClient {
   shields: API.Shields = new API.Shields(this);
   syntheticDataGeneration: API.SyntheticDataGeneration = new API.SyntheticDataGeneration(this);
   telemetry: API.Telemetry = new API.Telemetry(this);
-  datasetio: API.Datasetio = new API.Datasetio(this);
   scoring: API.Scoring = new API.Scoring(this);
   scoringFunctions: API.ScoringFunctions = new API.ScoringFunctions(this);
   benchmarks: API.Benchmarks = new API.Benchmarks(this);
@@ -353,13 +351,18 @@ LlamaStackClient.Safety = Safety;
 LlamaStackClient.Shields = Shields;
 LlamaStackClient.SyntheticDataGeneration = SyntheticDataGeneration;
 LlamaStackClient.Telemetry = Telemetry;
-LlamaStackClient.Datasetio = Datasetio;
 LlamaStackClient.Scoring = Scoring;
 LlamaStackClient.ScoringFunctions = ScoringFunctions;
 LlamaStackClient.Benchmarks = Benchmarks;
 export declare namespace LlamaStackClient {
   export type RequestOptions = Core.RequestOptions;
 
+  export import DatasetsIterrows = Pagination.DatasetsIterrows;
+  export {
+    type DatasetsIterrowsParams as DatasetsIterrowsParams,
+    type DatasetsIterrowsResponse as DatasetsIterrowsResponse,
+  };
+
   export {
     Toolgroups as Toolgroups,
     type ListToolGroupsResponse as ListToolGroupsResponse,
@@ -407,6 +410,9 @@ export declare namespace LlamaStackClient {
     type ListDatasetsResponse as ListDatasetsResponse,
     type DatasetRetrieveResponse as DatasetRetrieveResponse,
     type DatasetListResponse as DatasetListResponse,
+    type DatasetIterrowsResponse as DatasetIterrowsResponse,
+    type DatasetRegisterResponse as DatasetRegisterResponse,
+    type DatasetIterrowsParams as DatasetIterrowsParams,
     type DatasetRegisterParams as DatasetRegisterParams,
   };
 
@@ -528,13 +534,6 @@ export declare namespace LlamaStackClient {
     type TelemetrySaveSpansToDatasetParams as TelemetrySaveSpansToDatasetParams,
   };
 
-  export {
-    Datasetio as Datasetio,
-    type PaginatedRowsResult as PaginatedRowsResult,
-    type DatasetioAppendRowsParams as DatasetioAppendRowsParams,
-    type DatasetioGetRowsPaginatedParams as DatasetioGetRowsPaginatedParams,
-  };
-
   export {
     Scoring as Scoring,
     type ScoringScoreResponse as ScoringScoreResponse,

src/pagination.ts

@@ -0,0 +1,62 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { AbstractPage, Response, APIClient, FinalRequestOptions, PageInfo } from './core';
+
+export interface DatasetsIterrowsResponse<Item> {
+  data: Array<Item>;
+
+  next_index: number;
+}
+
+export interface DatasetsIterrowsParams {
+  dataset_id?: string;
+
+  start_index?: number;
+
+  limit?: number;
+}
+
+export class DatasetsIterrows<Item> extends AbstractPage<Item> implements DatasetsIterrowsResponse<Item> {
+  data: Array<Item>;
+
+  next_index: number;
+
+  constructor(
+    client: APIClient,
+    response: Response,
+    body: DatasetsIterrowsResponse<Item>,
+    options: FinalRequestOptions,
+  ) {
+    super(client, response, body, options);
+
+    this.data = body.data || [];
+    this.next_index = body.next_index || 0;
+  }
+
+  getPaginatedItems(): Item[] {
+    return this.data ?? [];
+  }
+
+  // @deprecated Please use `nextPageInfo()` instead
+  nextPageParams(): Partial<DatasetsIterrowsParams> | null {
+    const info = this.nextPageInfo();
+    if (!info) return null;
+    if ('params' in info) return info.params;
+    const params = Object.fromEntries(info.url.searchParams);
+    if (!Object.keys(params).length) return null;
+    return params;
+  }
+
+  nextPageInfo(): PageInfo | null {
+    const cursor = this.next_index;
+    if (!cursor) {
+      return null;
+    }
+
+    return {
+      params: {
+        start_index: cursor,
+      },
+    };
+  }
+}

src/resources.ts

@@ -0,0 +1 @@
+export * from './resources/index';

src/resources/benchmarks.ts

@@ -4,7 +4,7 @@ import { APIResource } from '../resource';
 import * as Core from '../core';
 
 export class Benchmarks extends APIResource {
-  retrieve(benchmarkId: string, options?: Core.RequestOptions): Core.APIPromise<Benchmark | null> {
+  retrieve(benchmarkId: string, options?: Core.RequestOptions): Core.APIPromise<Benchmark> {
     return this._client.get(`/v1/eval/benchmarks/${benchmarkId}`, options);
   }