openlayer 0.7.0 → 0.9.0

package/src/core.ts

@@ -84,8 +84,10 @@ export class APIPromise<T> extends Promise<T> {
     });
   }
 
-  _thenUnwrap<U>(transform: (data: T) => U): APIPromise<U> {
-    return new APIPromise(this.responsePromise, async (props) => transform(await this.parseResponse(props)));
+  _thenUnwrap<U>(transform: (data: T, props: APIResponseProps) => U): APIPromise<U> {
+    return new APIPromise(this.responsePromise, async (props) =>
+      transform(await this.parseResponse(props), props),
+    );
   }
 
   /**
@@ -274,7 +276,10 @@ export abstract class APIClient {
     return null;
   }
 
-  buildRequest<Req>(options: FinalRequestOptions<Req>): { req: RequestInit; url: string; timeout: number } {
+  buildRequest<Req>(
+    options: FinalRequestOptions<Req>,
+    { retryCount = 0 }: { retryCount?: number } = {},
+  ): { req: RequestInit; url: string; timeout: number } {
     const { method, path, query, headers: headers = {} } = options;
 
     const body =
@@ -306,7 +311,7 @@ export abstract class APIClient {
       headers[this.idempotencyHeader] = options.idempotencyKey;
     }
 
-    const reqHeaders = this.buildHeaders({ options, headers, contentLength });
+    const reqHeaders = this.buildHeaders({ options, headers, contentLength, retryCount });
 
     const req: RequestInit = {
       method,
@@ -325,10 +330,12 @@ export abstract class APIClient {
     options,
     headers,
     contentLength,
+    retryCount,
   }: {
     options: FinalRequestOptions;
     headers: Record<string, string | null | undefined>;
     contentLength: string | null | undefined;
+    retryCount: number;
   }): Record<string, string> {
     const reqHeaders: Record<string, string> = {};
     if (contentLength) {
@@ -344,6 +351,16 @@ export abstract class APIClient {
       delete reqHeaders['content-type'];
     }
 
+    // Don't set the retry count header if it was already set or removed through default headers or by the
+    // caller. We check `defaultHeaders` and `headers`, which can contain nulls, instead of `reqHeaders` to
+    // account for the removal case.
+    if (
+      getHeader(defaultHeaders, 'x-stainless-retry-count') === undefined &&
+      getHeader(headers, 'x-stainless-retry-count') === undefined
+    ) {
+      reqHeaders['x-stainless-retry-count'] = String(retryCount);
+    }
+
     this.validateHeaders(reqHeaders, headers);
 
     return reqHeaders;
@@ -379,7 +396,7 @@ export abstract class APIClient {
     error: Object | undefined,
     message: string | undefined,
     headers: Headers | undefined,
-  ) {
+  ): APIError {
     return APIError.generate(status, error, message, headers);
   }
 
@@ -395,13 +412,14 @@ export abstract class APIClient {
     retriesRemaining: number | null,
   ): Promise<APIResponseProps> {
     const options = await optionsInput;
+    const maxRetries = options.maxRetries ?? this.maxRetries;
     if (retriesRemaining == null) {
-      retriesRemaining = options.maxRetries ?? this.maxRetries;
+      retriesRemaining = maxRetries;
     }
 
     await this.prepareOptions(options);
 
-    const { req, url, timeout } = this.buildRequest(options);
+    const { req, url, timeout } = this.buildRequest(options, { retryCount: maxRetries - retriesRemaining });
 
     await this.prepareRequest(req, { url, options });
 
@@ -650,9 +668,9 @@ export abstract class AbstractPage<Item> implements AsyncIterable<Item> {
     return await this.#client.requestAPIList(this.constructor as any, nextOptions);
   }
 
-  async *iterPages() {
+  async *iterPages(): AsyncGenerator<this> {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
-    let page: AbstractPage<Item> = this;
+    let page: this = this;
     yield page;
     while (page.hasNextPage()) {
       page = await page.getNextPage();
@@ -660,7 +678,7 @@ export abstract class AbstractPage<Item> implements AsyncIterable<Item> {
     }
   }
 
-  async *[Symbol.asyncIterator]() {
+  async *[Symbol.asyncIterator](): AsyncGenerator<Item> {
     for await (const page of this.iterPages()) {
       for (const item of page.getPaginatedItems()) {
         yield item;
@@ -703,7 +721,7 @@ export class PagePromise<
    *      console.log(item)
    *    }
    */
-  async *[Symbol.asyncIterator]() {
+  async *[Symbol.asyncIterator](): AsyncGenerator<Item> {
     const page = await this;
     for await (const item of page) {
       yield item;
@@ -978,6 +996,11 @@ const validatePositiveInteger = (name: string, n: unknown): number => {
 
 export const castToError = (err: any): Error => {
   if (err instanceof Error) return err;
+  if (typeof err === 'object' && err !== null) {
+    try {
+      return new Error(JSON.stringify(err));
+    } catch {}
+  }
   return new Error(err);
 };
 
@@ -1115,7 +1138,15 @@ export const isHeadersProtocol = (headers: any): headers is HeadersProtocol => {
   return typeof headers?.get === 'function';
 };
 
-export const getRequiredHeader = (headers: HeadersLike, header: string): string => {
+export const getRequiredHeader = (headers: HeadersLike | Headers, header: string): string => {
+  const foundHeader = getHeader(headers, header);
+  if (foundHeader === undefined) {
+    throw new Error(`Could not find ${header} header`);
+  }
+  return foundHeader;
+};
+
+export const getHeader = (headers: HeadersLike | Headers, header: string): string | undefined => {
   const lowerCasedHeader = header.toLowerCase();
   if (isHeadersProtocol(headers)) {
     // to deal with the case where the header looks like Stainless-Event-Id
@@ -1141,7 +1172,7 @@ export const getRequiredHeader = (headers: HeadersLike, header: string): string
     }
   }
 
-  throw new Error(`Could not find ${header} header`);
+  return undefined;
 };
 
 /**

package/src/error.ts

@@ -47,9 +47,9 @@ export class APIError extends OpenlayerError {
     errorResponse: Object | undefined,
     message: string | undefined,
     headers: Headers | undefined,
-  ) {
+  ): APIError {
     if (!status) {
-      return new APIConnectionError({ cause: castToError(errorResponse) });
+      return new APIConnectionError({ message, cause: castToError(errorResponse) });
     }
 
     const error = errorResponse as Record<string, any>;
@@ -101,7 +101,7 @@ export class APIUserAbortError extends APIError {
 export class APIConnectionError extends APIError {
   override readonly status: undefined = undefined;
 
-  constructor({ message, cause }: { message?: string; cause?: Error | undefined }) {
+  constructor({ message, cause }: { message?: string | undefined; cause?: Error | undefined }) {
     super(undefined, undefined, message || 'Connection error.', undefined);
     // in some environments the 'cause' property is already declared
     // @ts-ignore

package/src/index.ts

@@ -1,10 +1,25 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import * as Errors from './error';
-import * as Uploads from './uploads';
 import { type Agent } from './_shims/index';
 import * as Core from './core';
+import * as Errors from './error';
+import * as Uploads from './uploads';
 import * as API from './resources/index';
+import { Commits } from './resources/commits/commits';
+import {
+  InferencePipelineRetrieveResponse,
+  InferencePipelineUpdateParams,
+  InferencePipelineUpdateResponse,
+  InferencePipelines,
+} from './resources/inference-pipelines/inference-pipelines';
+import {
+  ProjectCreateParams,
+  ProjectCreateResponse,
+  ProjectListParams,
+  ProjectListResponse,
+  Projects,
+} from './resources/projects/projects';
+import { Storage } from './resources/storage/storage';
 
 export interface ClientOptions {
   /**
@@ -150,6 +165,7 @@ export class Openlayer extends Core.APIClient {
   }
 
   static Openlayer = this;
+  static DEFAULT_TIMEOUT = 60000; // 1 minute
 
   static OpenlayerError = Errors.OpenlayerError;
   static APIError = Errors.APIError;
@@ -169,7 +185,35 @@ export class Openlayer extends Core.APIClient {
   static fileFromPath = Uploads.fileFromPath;
 }
 
-export const {
+Openlayer.Projects = Projects;
+Openlayer.Commits = Commits;
+Openlayer.InferencePipelines = InferencePipelines;
+Openlayer.Storage = Storage;
+export declare namespace Openlayer {
+  export type RequestOptions = Core.RequestOptions;
+
+  export {
+    Projects as Projects,
+    type ProjectCreateResponse as ProjectCreateResponse,
+    type ProjectListResponse as ProjectListResponse,
+    type ProjectCreateParams as ProjectCreateParams,
+    type ProjectListParams as ProjectListParams,
+  };
+
+  export { Commits as Commits };
+
+  export {
+    InferencePipelines as InferencePipelines,
+    type InferencePipelineRetrieveResponse as InferencePipelineRetrieveResponse,
+    type InferencePipelineUpdateResponse as InferencePipelineUpdateResponse,
+    type InferencePipelineUpdateParams as InferencePipelineUpdateParams,
+  };
+
+  export { Storage as Storage };
+}
+
+export { toFile, fileFromPath } from './uploads';
+export {
   OpenlayerError,
   APIError,
   APIConnectionError,
@@ -183,28 +227,6 @@ export const {
   InternalServerError,
   PermissionDeniedError,
   UnprocessableEntityError,
-} = Errors;
-
-export import toFile = Uploads.toFile;
-export import fileFromPath = Uploads.fileFromPath;
-
-export namespace Openlayer {
-  export import RequestOptions = Core.RequestOptions;
-
-  export import Projects = API.Projects;
-  export import ProjectCreateResponse = API.ProjectCreateResponse;
-  export import ProjectListResponse = API.ProjectListResponse;
-  export import ProjectCreateParams = API.ProjectCreateParams;
-  export import ProjectListParams = API.ProjectListParams;
-
-  export import Commits = API.Commits;
-
-  export import InferencePipelines = API.InferencePipelines;
-  export import InferencePipelineRetrieveResponse = API.InferencePipelineRetrieveResponse;
-  export import InferencePipelineUpdateResponse = API.InferencePipelineUpdateResponse;
-  export import InferencePipelineUpdateParams = API.InferencePipelineUpdateParams;
-
-  export import Storage = API.Storage;
-}
+} from './error';
 
 export default Openlayer;

package/src/lib/core/openai-monitor.ts

@@ -213,7 +213,7 @@ class OpenAIMonitor {
   public createChatCompletion = async (
     body: ChatCompletionCreateParams,
     options?: RequestOptions,
-    additionalLogs?: Openlayer.RequestOptions<any> | undefined,
+    additionalLogs?: Openlayer.RequestOptions | undefined,
   ): Promise<ChatCompletion | Stream<ChatCompletionChunk>> => {
     // Start a timer to measure latency
     const startTime = Date.now();
@@ -309,7 +309,7 @@ class OpenAIMonitor {
   public createCompletion = async (
     body: CompletionCreateParams,
     options?: RequestOptions,
-    additionalLogs?: Openlayer.RequestOptions<any> | undefined,
+    additionalLogs?: Openlayer.RequestOptions | undefined,
   ): Promise<Completion | Stream<Completion>> => {
     if (!body.prompt) {
       console.error('No prompt provided.');
@@ -407,7 +407,7 @@ class OpenAIMonitor {
    * @param {Openlayer.RequestOptions<any> | undefined} [additionalLogs] - Optional metadata logs to include with the request sent to Openlayer.
    * @returns {Promise<void>} A promise that resolves when the run data has been successfully published to Openlayer.
    */
-  public async monitorThreadRun(run: Run, additionalLogs?: Openlayer.RequestOptions<any> | undefined) {
+  public async monitorThreadRun(run: Run, additionalLogs?: Openlayer.RequestOptions | undefined) {
     if (run.status !== 'completed' || this.openlayerInferencePipelineId.length === 0) {
       return;
     }

package/src/lib/integrations/openAiTracer.ts

@@ -1,5 +1,5 @@
 import OpenAI from 'openai';
-import { Stream } from 'openai/src/streaming';
+import { Stream } from 'openai/streaming';
 import { addChatCompletionStepToTrace } from '../tracing/tracer';
 
 export function traceOpenAI(openai: OpenAI): OpenAI {

package/src/lib/tracing/tracer.ts

@@ -184,7 +184,7 @@ function postProcessTrace(traceObj: Trace): { traceData: any; inputVariableNames
   const processed_steps = traceObj.toJSON();
 
   const traceData = {
-    inferenceTimestamp: Date.now(),
+    inferenceTimestamp: Math.floor(Date.now() / 1000),
     inferenceId: rootStep!.id.toString(),
     output: rootStep!.output,
     groundTruth: rootStep!.groundTruth,

package/src/resources/commits/commits.ts

@@ -2,13 +2,18 @@
 
 import { APIResource } from '../../resource';
 import * as TestResultsAPI from './test-results';
+import { TestResultListParams, TestResultListResponse, TestResults } from './test-results';
 
 export class Commits extends APIResource {
   testResults: TestResultsAPI.TestResults = new TestResultsAPI.TestResults(this._client);
 }
 
-export namespace Commits {
-  export import TestResults = TestResultsAPI.TestResults;
-  export import TestResultListResponse = TestResultsAPI.TestResultListResponse;
-  export import TestResultListParams = TestResultsAPI.TestResultListParams;
+Commits.TestResults = TestResults;
+
+export declare namespace Commits {
+  export {
+    TestResults as TestResults,
+    type TestResultListResponse as TestResultListResponse,
+    type TestResultListParams as TestResultListParams,
+  };
 }

package/src/resources/commits/index.ts

@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Commits } from './commits';
-export { TestResultListResponse, TestResultListParams, TestResults } from './test-results';
+export { TestResults, type TestResultListResponse, type TestResultListParams } from './test-results';

package/src/resources/commits/test-results.ts

@@ -3,7 +3,6 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as TestResultsAPI from './test-results';
 
 export class TestResults extends APIResource {
   /**
@@ -28,34 +27,10 @@ export class TestResults extends APIResource {
 }
 
 export interface TestResultListResponse {
-  _meta: TestResultListResponse._Meta;
-
   items: Array<TestResultListResponse.Item>;
 }
 
 export namespace TestResultListResponse {
-  export interface _Meta {
-    /**
-     * The current page.
-     */
-    page: number;
-
-    /**
-     * The number of items per page.
-     */
-    perPage: number;
-
-    /**
-     * The total number of items.
-     */
-    totalItems: number;
-
-    /**
-     * The total number of pages.
-     */
-    totalPages: number;
-  }
-
   export interface Item {
     /**
      * Project version (commit) id.
@@ -278,7 +253,9 @@ export interface TestResultListParams {
   type?: 'integrity' | 'consistency' | 'performance' | 'fairness' | 'robustness';
 }
 
-export namespace TestResults {
-  export import TestResultListResponse = TestResultsAPI.TestResultListResponse;
-  export import TestResultListParams = TestResultsAPI.TestResultListParams;
+export declare namespace TestResults {
+  export {
+    type TestResultListResponse as TestResultListResponse,
+    type TestResultListParams as TestResultListParams,
+  };
 }

package/src/resources/index.ts

@@ -2,16 +2,16 @@
 
 export { Commits } from './commits/commits';
 export {
-  InferencePipelineRetrieveResponse,
-  InferencePipelineUpdateResponse,
-  InferencePipelineUpdateParams,
   InferencePipelines,
+  type InferencePipelineRetrieveResponse,
+  type InferencePipelineUpdateResponse,
+  type InferencePipelineUpdateParams,
 } from './inference-pipelines/inference-pipelines';
 export {
-  ProjectCreateResponse,
-  ProjectListResponse,
-  ProjectCreateParams,
-  ProjectListParams,
   Projects,
+  type ProjectCreateResponse,
+  type ProjectListResponse,
+  type ProjectCreateParams,
+  type ProjectListParams,
 } from './projects/projects';
 export { Storage } from './storage/storage';

package/src/resources/inference-pipelines/data.ts

@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as DataAPI from './data';
 
 export class Data extends APIResource {
   /**
@@ -279,7 +278,6 @@ export namespace DataStreamParams {
   }
 }
 
-export namespace Data {
-  export import DataStreamResponse = DataAPI.DataStreamResponse;
-  export import DataStreamParams = DataAPI.DataStreamParams;
+export declare namespace Data {
+  export { type DataStreamResponse as DataStreamResponse, type DataStreamParams as DataStreamParams };
 }

package/src/resources/inference-pipelines/index.ts

@@ -1,11 +1,11 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { DataStreamResponse, DataStreamParams, Data } from './data';
+export { Data, type DataStreamResponse, type DataStreamParams } from './data';
 export {
-  InferencePipelineRetrieveResponse,
-  InferencePipelineUpdateResponse,
-  InferencePipelineUpdateParams,
   InferencePipelines,
+  type InferencePipelineRetrieveResponse,
+  type InferencePipelineUpdateResponse,
+  type InferencePipelineUpdateParams,
 } from './inference-pipelines';
-export { RowUpdateResponse, RowUpdateParams, Rows } from './rows';
-export { TestResultListResponse, TestResultListParams, TestResults } from './test-results';
+export { Rows, type RowUpdateResponse, type RowUpdateParams } from './rows';
+export { TestResults, type TestResultListResponse, type TestResultListParams } from './test-results';

package/src/resources/inference-pipelines/inference-pipelines.ts

@@ -3,10 +3,12 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as InferencePipelinesAPI from './inference-pipelines';
 import * as DataAPI from './data';
+import { Data, DataStreamParams, DataStreamResponse } from './data';
 import * as RowsAPI from './rows';
+import { RowUpdateParams, RowUpdateResponse, Rows } from './rows';
 import * as TestResultsAPI from './test-results';
+import { TestResultListParams, TestResultListResponse, TestResults } from './test-results';
 
 export class InferencePipelines extends APIResource {
   data: DataAPI.Data = new DataAPI.Data(this._client);
@@ -235,17 +237,32 @@ export interface InferencePipelineUpdateParams {
   referenceDatasetUri?: string | null;
 }
 
-export namespace InferencePipelines {
-  export import InferencePipelineRetrieveResponse = InferencePipelinesAPI.InferencePipelineRetrieveResponse;
-  export import InferencePipelineUpdateResponse = InferencePipelinesAPI.InferencePipelineUpdateResponse;
-  export import InferencePipelineUpdateParams = InferencePipelinesAPI.InferencePipelineUpdateParams;
-  export import Data = DataAPI.Data;
-  export import DataStreamResponse = DataAPI.DataStreamResponse;
-  export import DataStreamParams = DataAPI.DataStreamParams;
-  export import Rows = RowsAPI.Rows;
-  export import RowUpdateResponse = RowsAPI.RowUpdateResponse;
-  export import RowUpdateParams = RowsAPI.RowUpdateParams;
-  export import TestResults = TestResultsAPI.TestResults;
-  export import TestResultListResponse = TestResultsAPI.TestResultListResponse;
-  export import TestResultListParams = TestResultsAPI.TestResultListParams;
+InferencePipelines.Data = Data;
+InferencePipelines.Rows = Rows;
+InferencePipelines.TestResults = TestResults;
+
+export declare namespace InferencePipelines {
+  export {
+    type InferencePipelineRetrieveResponse as InferencePipelineRetrieveResponse,
+    type InferencePipelineUpdateResponse as InferencePipelineUpdateResponse,
+    type InferencePipelineUpdateParams as InferencePipelineUpdateParams,
+  };
+
+  export {
+    Data as Data,
+    type DataStreamResponse as DataStreamResponse,
+    type DataStreamParams as DataStreamParams,
+  };
+
+  export {
+    Rows as Rows,
+    type RowUpdateResponse as RowUpdateResponse,
+    type RowUpdateParams as RowUpdateParams,
+  };
+
+  export {
+    TestResults as TestResults,
+    type TestResultListResponse as TestResultListResponse,
+    type TestResultListParams as TestResultListParams,
+  };
 }

package/src/resources/inference-pipelines/rows.ts

@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as RowsAPI from './rows';
 
 export class Rows extends APIResource {
   /**
@@ -75,7 +74,6 @@ export namespace RowUpdateParams {
   }
 }
 
-export namespace Rows {
-  export import RowUpdateResponse = RowsAPI.RowUpdateResponse;
-  export import RowUpdateParams = RowsAPI.RowUpdateParams;
+export declare namespace Rows {
+  export { type RowUpdateResponse as RowUpdateResponse, type RowUpdateParams as RowUpdateParams };
 }

package/src/resources/inference-pipelines/test-results.ts

@@ -3,7 +3,6 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as TestResultsAPI from './test-results';
 
 export class TestResults extends APIResource {
   /**
@@ -28,34 +27,10 @@ export class TestResults extends APIResource {
 }
 
 export interface TestResultListResponse {
-  _meta: TestResultListResponse._Meta;
-
   items: Array<TestResultListResponse.Item>;
 }
 
 export namespace TestResultListResponse {
-  export interface _Meta {
-    /**
-     * The current page.
-     */
-    page: number;
-
-    /**
-     * The number of items per page.
-     */
-    perPage: number;
-
-    /**
-     * The total number of items.
-     */
-    totalItems: number;
-
-    /**
-     * The total number of pages.
-     */
-    totalPages: number;
-  }
-
   export interface Item {
     /**
      * Project version (commit) id.
@@ -273,7 +248,9 @@ export interface TestResultListParams {
   type?: 'integrity' | 'consistency' | 'performance' | 'fairness' | 'robustness';
 }
 
-export namespace TestResults {
-  export import TestResultListResponse = TestResultsAPI.TestResultListResponse;
-  export import TestResultListParams = TestResultsAPI.TestResultListParams;
+export declare namespace TestResults {
+  export {
+    type TestResultListResponse as TestResultListResponse,
+    type TestResultListParams as TestResultListParams,
+  };
 }