exa-js 1.8.26 → 1.9.0

package/dist/index.js

@@ -52,7 +52,6 @@ __export(index_exports, {
   MonitorRunType: () => MonitorRunType,
   MonitorStatus: () => MonitorStatus,
   PreviewWebsetResponseEnrichmentsFormat: () => PreviewWebsetResponseEnrichmentsFormat,
-  ResearchClient: () => ResearchClient,
   ScopeSourceType: () => ScopeSourceType,
   UpdateMonitorStatus: () => UpdateMonitorStatus,
   WebhookStatus: () => WebhookStatus,
@@ -122,8 +121,14 @@ var WebsetsBaseClient = class {
    * @returns The response JSON
    * @throws ExaError with API error details if the request fails
    */
-  async request(endpoint, method = "POST", data, params) {
-    return this.client.request(`/websets${endpoint}`, method, data, params);
+  async request(endpoint, method = "POST", data, params, headers) {
+    return this.client.request(
+      `/websets${endpoint}`,
+      method,
+      data,
+      params,
+      headers
+    );
   }
   /**
    * Helper to build pagination parameters
@@ -732,11 +737,13 @@ var WebsetSearchesClient = class extends WebsetsBaseClient {
    * @param params The search parameters
    * @returns The created Webset Search
    */
-  async create(websetId, params) {
+  async create(websetId, params, options) {
     return this.request(
       `/v0/websets/${websetId}/searches`,
       "POST",
-      params
+      params,
+      void 0,
+      options?.headers
     );
   }
   /**
@@ -923,8 +930,14 @@ var WebsetsClient = class extends WebsetsBaseClient {
    * @param params The Webset creation parameters
    * @returns The created Webset
    */
-  async create(params) {
-    return this.request("/v0/websets", "POST", params);
+  async create(params, options) {
+    return this.request(
+      "/v0/websets",
+      "POST",
+      params,
+      void 0,
+      options?.headers
+    );
   }
   /**
    * Preview a webset
@@ -932,7 +945,11 @@ var WebsetsClient = class extends WebsetsBaseClient {
    * @returns The preview response showing how the query will be decomposed
    */
   async preview(params) {
-    return this.request("/v0/websets/preview", "POST", params);
+    return this.request(
+      "/v0/websets/preview",
+      "POST",
+      params
+    );
   }
   /**
    * Get a Webset by ID
@@ -1075,50 +1092,25 @@ function zodToJsonSchema(schema) {
 
 // src/research/base.ts
 var ResearchBaseClient = class {
-  /**
-   * Initialize a new Research base client
-   * @param client The Exa client instance
-   */
   constructor(client) {
     this.client = client;
   }
-  /**
-   * Make a request to the Research API (prefixes all paths with `/research`).
-   * @param endpoint The endpoint path, beginning with a slash (e.g. "/tasks").
-   * @param method The HTTP method. Defaults to "POST".
-   * @param data Optional request body
-   * @param params Optional query parameters
-   * @returns The parsed JSON response
-   */
   async request(endpoint, method = "POST", data, params) {
     return this.client.request(
-      `/research/v0${endpoint}`,
+      `/research/v1${endpoint}`,
       method,
       data,
       params
     );
   }
-  /**
-   * Make a request to the Research API (prefixes all paths with `/research`).
-   * @param endpoint The endpoint path, beginning with a slash (e.g. "/tasks").
-   * @param method The HTTP method. Defaults to "POST".
-   * @param data Optional request body
-   * @param params Optional query parameters
-   * @returns The parsed JSON response
-   */
   async rawRequest(endpoint, method = "POST", data, params) {
     return this.client.rawRequest(
-      `/research/v0${endpoint}`,
+      `/research/v1${endpoint}`,
       method,
       data,
       params
     );
   }
-  /**
-   * Helper to build pagination parameters.
-   * @param pagination The pagination parameters
-   * @returns QueryParams object with pagination parameters
-   */
   buildPaginationParams(pagination) {
     const params = {};
     if (!pagination) return params;
@@ -1133,26 +1125,34 @@ var ResearchClient = class extends ResearchBaseClient {
   constructor(client) {
     super(client);
   }
-  async createTask(params) {
-    const { instructions, model, output } = params;
-    let schema = output?.schema;
+  async create(params) {
+    const { instructions, model, outputSchema } = params;
+    let schema = outputSchema;
     if (schema && isZodSchema(schema)) {
       schema = zodToJsonSchema(schema);
     }
     const payload = {
       instructions,
-      model: model ?? "exa-research",
-      output: output ? {
-        schema,
-        inferSchema: output.inferSchema ?? true
-      } : { inferSchema: true }
+      model: model ?? "exa-research"
     };
-    return this.request("/tasks", "POST", payload);
+    if (schema) {
+      payload.outputSchema = schema;
+    }
+    return this.request("", "POST", payload);
   }
-  getTask(id, options) {
+  get(researchId, options) {
     if (options?.stream) {
       const promise = async () => {
-        const resp = await this.rawRequest(`/tasks/${id}?stream=true`, "GET");
+        const params = { stream: "true" };
+        if (options.events !== void 0) {
+          params.events = options.events.toString();
+        }
+        const resp = await this.rawRequest(
+          `/${researchId}`,
+          "GET",
+          void 0,
+          params
+        );
         if (!resp.body) {
           throw new Error("No response body for SSE stream");
         }
@@ -1196,59 +1196,53 @@ var ResearchClient = class extends ResearchBaseClient {
       };
       return promise();
     } else {
-      return this.request(`/tasks/${id}`, "GET");
+      const params = { stream: "false" };
+      if (options?.events !== void 0) {
+        params.events = options.events.toString();
+      }
+      return this.request(
+        `/${researchId}`,
+        "GET",
+        void 0,
+        params
+      );
     }
   }
-  /**
-   * @deprecated This method is deprecated and may be removed in a future release.
-   * @see getTask(id, {stream: true})
-   * Poll a research task until completion or failure.
-   * Polls every 1 second with a maximum timeout of 10 minutes.
-   * Resilient to up to 10 consecutive polling failures.
-   */
-  async pollTask(id) {
-    const pollingInterval = 1e3;
-    const maxPollingTime = 10 * 60 * 1e3;
-    const maxConsecutiveFailures = 10;
+  async list(options) {
+    const params = this.buildPaginationParams(options);
+    return this.request("", "GET", void 0, params);
+  }
+  async pollUntilFinished(researchId, options) {
+    const pollInterval = options?.pollInterval ?? 1e3;
+    const timeoutMs = options?.timeoutMs ?? 10 * 60 * 1e3;
+    const maxConsecutiveFailures = 5;
     const startTime = Date.now();
     let consecutiveFailures = 0;
     while (true) {
       try {
-        const task = await this.request(`/tasks/${id}`, "GET");
+        const research = await this.get(researchId, {
+          events: options?.events
+        });
         consecutiveFailures = 0;
-        if (task.status === "completed" || task.status === "failed") {
-          return task;
+        if (research.status === "completed" || research.status === "failed" || research.status === "canceled") {
+          return research;
         }
       } catch (err) {
         consecutiveFailures += 1;
         if (consecutiveFailures >= maxConsecutiveFailures) {
           throw new Error(
-            `Polling failed ${maxConsecutiveFailures} times in a row for task ${id}: ${err}`
+            `Polling failed ${maxConsecutiveFailures} times in a row for research ${researchId}: ${err}`
           );
         }
       }
-      if (Date.now() - startTime > maxPollingTime) {
+      if (Date.now() - startTime > timeoutMs) {
         throw new Error(
-          `Polling timeout: Task ${id} did not complete within 10 minutes`
+          `Polling timeout: Research ${researchId} did not complete within ${timeoutMs}ms`
         );
       }
-      await new Promise((resolve) => setTimeout(resolve, pollingInterval));
+      await new Promise((resolve) => setTimeout(resolve, pollInterval));
     }
   }
-  /**
-   * List research tasks
-   * @param options Pagination options
-   * @returns The paginated list of research tasks
-   */
-  async listTasks(options) {
-    const params = this.buildPaginationParams(options);
-    return this.request(
-      "/tasks",
-      "GET",
-      void 0,
-      params
-    );
-  }
 };
 
 // src/index.ts
@@ -1333,7 +1327,7 @@ var Exa2 = class {
    * @returns {Promise<any>} The response from the API.
    * @throws {ExaError} When any API request fails with structured error information
    */
-  async request(endpoint, method, body, params) {
+  async request(endpoint, method, body, params, headers) {
     let url = this.baseURL + endpoint;
     if (params && Object.keys(params).length > 0) {
       const searchParams = new URLSearchParams();
@@ -1348,9 +1342,20 @@ var Exa2 = class {
       }
       url += `?${searchParams.toString()}`;
     }
+    let combinedHeaders = {};
+    if (this.headers instanceof HeadersImpl) {
+      this.headers.forEach((value, key) => {
+        combinedHeaders[key] = value;
+      });
+    } else {
+      combinedHeaders = { ...this.headers };
+    }
+    if (headers) {
+      combinedHeaders = { ...combinedHeaders, ...headers };
+    }
     const response = await fetchImpl(url, {
       method,
-      headers: this.headers,
+      headers: combinedHeaders,
       body: body ? JSON.stringify(body) : void 0
     });
     if (!response.ok) {
@@ -1688,7 +1693,6 @@ var index_default = Exa2;
   MonitorRunType,
   MonitorStatus,
   PreviewWebsetResponseEnrichmentsFormat,
-  ResearchClient,
   ScopeSourceType,
   UpdateMonitorStatus,
   WebhookStatus,