@airtop/sdk 1.0.0-alpha2.15 → 1.0.0-alpha2.17

package/dist/index.cjs

@@ -9,7 +9,7 @@ var require_package = __commonJS({
     module.exports = {
       name: "@airtop/sdk",
       description: "Airtop SDK for TypeScript",
-      version: "1.0.0-alpha2.15",
+      version: "1.0.0-alpha2.17",
       type: "module",
       main: "./dist/index.cjs",
       module: "./dist/index.js",
@@ -47,7 +47,7 @@ var require_package = __commonJS({
       },
       dependencies: {
         "@airtop/json-schema-adapter": "workspace:*",
-        "@airtop/core": "0.1.0-alpha.29",
+        "@airtop/core": "0.1.0-alpha.30",
         "date-fns": "4.1.0",
         loglayer: "6.3.3",
         "serialize-error": "12.0.0",
@@ -290,7 +290,7 @@ async function waitForRequestCompletion(client, requestId, requestOptions) {
   const startTime = Date.now();
   const timeoutMs = _datefns.secondsToMilliseconds.call(void 0, _optionalChain([requestOptions, 'optionalAccess', _5 => _5.timeoutInSeconds]) || DEFAULT_TIMEOUT_SECONDS);
   while (Date.now() - startTime < timeoutMs) {
-    const apiResponse = await client.requests.getRequestStatus(requestId, requestOptions);
+    const apiResponse = await client.requests.getRequestStatusV2(requestId, requestOptions);
     if (apiResponse.status === "completed") {
       return apiResponse.response;
     }
@@ -302,8 +302,15 @@ async function waitForRequestCompletion(client, requestId, requestOptions) {
   throw new Error("Waiting for request timed out");
 }
 async function withRequestCompletionPolling(client, fn, requestOptions) {
-  const response = await fn();
-  return waitForRequestCompletion(client, response.requestId, requestOptions);
+  try {
+    const response = await fn();
+    return waitForRequestCompletion(client, response.requestId, requestOptions);
+  } catch (thrownError) {
+    if (_optionalChain([thrownError, 'access', _6 => _6.error, 'optionalAccess', _7 => _7.errors])) {
+      throw new AirtopError(thrownError.error.errors);
+    }
+    throw thrownError;
+  }
 }
 
 // src/window/AirtopNode.ts
@@ -521,8 +528,7 @@ var AirtopWindowClient = class extends AirtopBase {
     this.client.windows.get(
       this.windowId,
       {
-        sessionId: this.sessionId,
-        ...config
+        sessionId: this.sessionId
       },
       this.resolveRequestOptions()
     ).then((results) => {
@@ -676,7 +682,7 @@ var AirtopWindowClient = class extends AirtopBase {
       prompt
     }).info("Performing a page query");
     const newConfig = config;
-    if (_optionalChain([config, 'optionalAccess', _6 => _6.configuration, 'access', _7 => _7.outputSchema])) {
+    if (_optionalChain([config, 'optionalAccess', _8 => _8.configuration, 'access', _9 => _9.outputSchema])) {
       newConfig.configuration.outputSchema = this.convertToJsonSchema(config.configuration.outputSchema);
     }
     return this.client.windows.pageQuery(
@@ -704,7 +710,7 @@ var AirtopWindowClient = class extends AirtopBase {
       prompt
     }).info("Performing a paginated extraction");
     const newConfig = config;
-    if (_optionalChain([config, 'optionalAccess', _8 => _8.configuration, 'access', _9 => _9.outputSchema])) {
+    if (_optionalChain([config, 'optionalAccess', _10 => _10.configuration, 'access', _11 => _11.outputSchema])) {
       newConfig.configuration.outputSchema = this.convertToJsonSchema(config.configuration.outputSchema);
     }
     return this.client.windows.paginatedExtraction(
@@ -852,6 +858,7 @@ var AirtopWindowClient = class extends AirtopBase {
         {
           prompt,
           sessionId: this.sessionId,
+          jobId: this.jobId,
           ...config || {}
         },
         {
@@ -883,16 +890,12 @@ var AirtopWindowClient = class extends AirtopBase {
       throw new AirtopError(apiResponse.errors);
     }
     try {
-      if (!apiResponse.data.modelResponse) {
+      if (!apiResponse.data.nodeHandle) {
         return null;
       }
-      const nodeData = JSON.parse(apiResponse.data.modelResponse);
-      if (Object.keys(nodeData).length === 0) {
-        return null;
-      }
-      return new AirtopNode(this, nodeData);
+      return new AirtopNode(this, apiResponse.data.nodeHandle);
     } catch (error) {
-      this.log.withMetadata({ nodeDataStr: apiResponse.data.modelResponse }).withError(error).error("Error parsing node data");
+      this.log.withMetadata({ nodeDataStr: apiResponse.data.nodeHandle }).withError(error).error("Error parsing node data");
       throw error;
     }
   }
@@ -925,21 +928,8 @@ var AirtopWindowClient = class extends AirtopBase {
     if (apiResponse.errors.length > 0) {
       throw new AirtopError(apiResponse.errors);
     }
-    const nodeHandles = apiResponse.data.modelResponse.split("___DELIM___");
-    return nodeHandles.map((nodeDataStr) => {
-      try {
-        if (!nodeDataStr) {
-          return null;
-        }
-        const nodeData = JSON.parse(nodeDataStr);
-        if (Object.keys(nodeData).length === 0) {
-          return null;
-        }
-        return new AirtopNode(this, nodeData);
-      } catch (error) {
-        this.log.withMetadata({ nodeDataStr }).withError(error).error("Error parsing node data");
-      }
-    }).filter((node) => !!node);
+    const nodeHandleData = apiResponse.data.nodeHandles;
+    return nodeHandleData.map((nodeHandle) => new AirtopNode(this, nodeHandle));
   }
   async findMany(prompt, config, requestOptions = {}) {
     const configOverride = { ...config, optional: false };
@@ -956,6 +946,7 @@ var AirtopWindowClient = class extends AirtopBase {
         this.getWindowId(),
         {
           sessionId: this.sessionId,
+          jobId: this.jobId,
           ...config || {}
         },
         {
@@ -973,6 +964,7 @@ var AirtopWindowClient = class extends AirtopBase {
         {
           direction,
           sessionId: this.sessionId,
+          jobId: this.jobId,
           ...config || {}
         },
         {
@@ -1231,19 +1223,19 @@ var AirtopClient = class extends AirtopBase {
    */
   constructor(config) {
     super({
-      logLevel: _optionalChain([config, 'optionalAccess', _10 => _10.logLevel]),
+      logLevel: _optionalChain([config, 'optionalAccess', _12 => _12.logLevel]),
       client: new (0, _core.Airtop)({
         maxRetries: 0,
         timeout: _minutesToMilliseconds.minutesToMilliseconds.call(void 0, 1),
         apiKey: config.apiKey,
-        baseURL: _optionalChain([config, 'optionalAccess', _11 => _11.airtopUrl]),
-        logLevel: _optionalChain([config, 'optionalAccess', _12 => _12.logLevel]) || "off",
+        baseURL: _optionalChain([config, 'optionalAccess', _13 => _13.airtopUrl]),
+        logLevel: _optionalChain([config, 'optionalAccess', _14 => _14.logLevel]) || "off",
         defaultHeaders: {
           "x-airtop-sdk-source": "typescript",
           "x-airtop-sdk-version": version
         }
       }),
-      log: _optionalChain([config, 'optionalAccess', _13 => _13.logger]) || new (0, _loglayer.LogLayer)({
+      log: _optionalChain([config, 'optionalAccess', _15 => _15.logger]) || new (0, _loglayer.LogLayer)({
         errorSerializer: _serializeerror.serializeError,
         transport: new (0, _loglayer.ConsoleTransport)({
           logger: console,
@@ -1282,8 +1274,8 @@ var AirtopClient = class extends AirtopBase {
    * @returns A new AirtopSession instance
    */
   async createSession(config, options = {}) {
-    const skipWaitSessionReady = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _14 => _14.skipWaitSessionReady]), () => ( false));
-     _optionalChainDelete([config, 'optionalAccess', _15 => delete _15.skipWaitSessionReady]);
+    const skipWaitSessionReady = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _16 => _16.skipWaitSessionReady]), () => ( false));
+     _optionalChainDelete([config, 'optionalAccess', _17 => delete _17.skipWaitSessionReady]);
     const sessionResponse = await this.client.sessions.create(
       {
         configuration: config
@@ -1490,19 +1482,19 @@ var AirtopAgentClient = class extends AirtopBase {
    */
   constructor(config) {
     super({
-      logLevel: _optionalChain([config, 'optionalAccess', _16 => _16.logLevel]),
+      logLevel: _optionalChain([config, 'optionalAccess', _18 => _18.logLevel]),
       client: new (0, _core.Airtop)({
         maxRetries: 0,
         timeout: _datefns.minutesToMilliseconds.call(void 0, 1),
         apiKey: config.apiKey,
-        baseURL: _optionalChain([config, 'optionalAccess', _17 => _17.airtopUrl]),
-        logLevel: _optionalChain([config, 'optionalAccess', _18 => _18.logLevel]) || "off",
+        baseURL: _optionalChain([config, 'optionalAccess', _19 => _19.airtopUrl]),
+        logLevel: _optionalChain([config, 'optionalAccess', _20 => _20.logLevel]) || "off",
         defaultHeaders: {
           "x-airtop-sdk-source": "typescript",
           "x-airtop-sdk-version": _process.version
         }
       }),
-      log: _optionalChain([config, 'optionalAccess', _19 => _19.logger]) || new (0, _loglayer.LogLayer)({
+      log: _optionalChain([config, 'optionalAccess', _21 => _21.logger]) || new (0, _loglayer.LogLayer)({
         errorSerializer: _serializeerror.serializeError,
         transport: new (0, _loglayer.ConsoleTransport)({
           logger: console,