@airtop/sdk 1.0.0-alpha2.16 → 1.0.0-alpha2.18

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.16",
+      version: "1.0.0-alpha2.18",
       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.33",
         "date-fns": "4.1.0",
         loglayer: "6.3.3",
         "serialize-error": "12.0.0",
@@ -269,28 +269,32 @@ var processLogMessage = (log, logLevel, ...args) => {
 // src/session/AirtopSessionClient.ts
 
 
+
+// src/async-utils.ts
+
+
 // src/types.ts
 var AirtopError = class extends Error {
   
-  constructor(issues) {
+  
+  constructor(issues, metadata) {
     const errorMessage = issues.map((issue) => issue.message).join("\n");
-    super(errorMessage);
+    const errorMessageWithMetadata = metadata ? `${errorMessage}
+${JSON.stringify(metadata)}` : errorMessage;
+    super(errorMessageWithMetadata);
     this.issues = issues;
+    this.metadata = metadata;
   }
 };
 
-// src/window/AirtopWindowClient.ts
-
-
 // src/async-utils.ts
-
 var DEFAULT_TIMEOUT_SECONDS = 300;
 var DEFAULT_POLLING_INTERVAL_MS = 500;
 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,10 +306,22 @@ 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, {
+        requestId: thrownError.error.requestId
+      });
+    }
+    throw thrownError;
+  }
 }
 
+// src/window/AirtopWindowClient.ts
+
+
 // src/window/AirtopNode.ts
 var AirtopNode = class {
   /**
@@ -363,7 +379,7 @@ var AirtopNode = class {
    * @param requestOptions - The request options to use for the LLM call
    */
   async llm(prompt, config, requestOptions = {}) {
-    return this.windowClient.llm(prompt, config, requestOptions);
+    return this.windowClient.llm(prompt, { ...config, nodeHandleId: this.nodeHandleId }, requestOptions);
   }
   /**
    * Find one element in the node
@@ -572,17 +588,20 @@ var AirtopWindowClient = class extends AirtopBase {
     this.log.withMetadata({
       elementDescription
     }).info("Clicking on element");
-    return this.client.windows.click(
-      this.getWindowId(),
-      {
-        ...config,
-        elementDescription,
-        sessionId: this.sessionId
-      },
-      {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
-        ...this.resolveRequestOptions(requestOptions)
-      }
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.clickAsync(
+        this.getWindowId(),
+        {
+          ...config,
+          elementDescription,
+          sessionId: this.sessionId
+        },
+        {
+          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
     );
   }
   /**
@@ -604,17 +623,20 @@ var AirtopWindowClient = class extends AirtopBase {
    */
   async hover(elementDescription, config, requestOptions = {}) {
     this.log.withMetadata(config).info("Hovering over window");
-    return this.client.windows.hover(
-      this.getWindowId(),
-      {
-        elementDescription,
-        sessionId: this.sessionId,
-        ...config || {}
-      },
-      {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
-        ...this.resolveRequestOptions(requestOptions)
-      }
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.hoverAsync(
+        this.getWindowId(),
+        {
+          elementDescription,
+          sessionId: this.sessionId,
+          ...config || {}
+        },
+        {
+          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
     );
   }
   /**
@@ -650,17 +672,20 @@ var AirtopWindowClient = class extends AirtopBase {
    */
   async monitor(condition, config, requestOptions = {}) {
     this.log.withMetadata().info("Monitoring window");
-    return this.client.windows.monitor(
-      this.getWindowId(),
-      {
-        condition,
-        sessionId: this.sessionId,
-        ...config || {}
-      },
-      {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
-        ...this.resolveRequestOptions(requestOptions)
-      }
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.monitorAsync(
+        this.getWindowId(),
+        {
+          condition,
+          sessionId: this.sessionId,
+          ...config || {}
+        },
+        {
+          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
     );
   }
   /**
@@ -675,20 +700,23 @@ 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(
-      this.getWindowId(),
-      {
-        sessionId: this.sessionId,
-        prompt,
-        ...newConfig || {}
-      },
-      {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
-        ...this.resolveRequestOptions(requestOptions)
-      }
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.pageQueryAsync(
+        this.getWindowId(),
+        {
+          sessionId: this.sessionId,
+          prompt,
+          ...newConfig || {}
+        },
+        {
+          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
     );
   }
   /**
@@ -703,20 +731,23 @@ 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(
-      this.getWindowId(),
-      {
-        prompt,
-        sessionId: this.sessionId,
-        ...newConfig || {}
-      },
-      {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
-        ...this.resolveRequestOptions(requestOptions)
-      }
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.paginatedExtractionAsync(
+        this.getWindowId(),
+        {
+          prompt,
+          sessionId: this.sessionId,
+          ...newConfig || {}
+        },
+        {
+          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
     );
   }
   /**
@@ -747,16 +778,19 @@ var AirtopWindowClient = class extends AirtopBase {
    */
   async screenshot(config, requestOptions = {}) {
     this.log.info("Screenshotting window");
-    const resp = await this.client.windows.screenshot(
-      this.getWindowId(),
-      {
-        sessionId: this.sessionId,
-        ...config || {}
-      },
-      {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
-        ...this.resolveRequestOptions(requestOptions)
-      }
+    const resp = await withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.screenshotAsync(
+        this.getWindowId(),
+        {
+          sessionId: this.sessionId,
+          ...config || {}
+        },
+        {
+          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
     );
     return new AirtopWindowScreenshot(resp);
   }
@@ -791,17 +825,20 @@ var AirtopWindowClient = class extends AirtopBase {
     this.log.withMetadata({
       text
     }).info("Typing text");
-    return this.client.windows.type(
-      this.getWindowId(),
-      {
-        sessionId: this.sessionId,
-        text,
-        ...config || {}
-      },
-      {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
-        ...this.resolveRequestOptions(requestOptions)
-      }
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.typeAsync(
+        this.getWindowId(),
+        {
+          sessionId: this.sessionId,
+          text,
+          ...config || {}
+        },
+        {
+          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
     );
   }
   async extract(prompt, config, requestOptions = {}) {
@@ -851,7 +888,11 @@ var AirtopWindowClient = class extends AirtopBase {
         {
           prompt,
           sessionId: this.sessionId,
-          ...config || {}
+          jobId: this.jobId,
+          ...config || {},
+          includeWebContext: true,
+          // Always include web context for window.llm() calls
+          outputSchema: _optionalChain([config, 'optionalAccess', _12 => _12.outputSchema]) ? this.convertToJsonSchema(config.outputSchema) : void 0
         },
         {
           timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
@@ -882,16 +923,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;
     }
   }
@@ -924,21 +961,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 };
@@ -955,6 +979,7 @@ var AirtopWindowClient = class extends AirtopBase {
         this.getWindowId(),
         {
           sessionId: this.sessionId,
+          jobId: this.jobId,
           ...config || {}
         },
         {
@@ -972,6 +997,7 @@ var AirtopWindowClient = class extends AirtopBase {
         {
           direction,
           sessionId: this.sessionId,
+          jobId: this.jobId,
           ...config || {}
         },
         {
@@ -981,6 +1007,27 @@ var AirtopWindowClient = class extends AirtopBase {
       )
     );
   }
+  async fillForm(formData, config, requestOptions = {}) {
+    return await withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.executeAutomation(
+        this.getWindowId(),
+        {
+          sessionId: this.sessionId,
+          ...config || {},
+          automationId: _optionalChain([config, 'optionalAccess', _13 => _13.automationId]) || "auto",
+          parameters: {
+            customData: typeof formData === "string" ? formData : JSON.stringify(formData)
+            // Will be interpreted by the LLM
+          }
+        },
+        {
+          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
+    );
+  }
 };
 
 // src/window/AirtopWindow.ts
@@ -1054,6 +1101,9 @@ var AirtopSessionClient = class extends AirtopBase {
   getSessionId() {
     return this.sessionId;
   }
+  async listWindows(requestOptions = {}) {
+    return this.client.sessions.listWindows(this.sessionId, this.resolveRequestOptions(requestOptions));
+  }
   /**
    * Gets the state of the session using the attached session id.
    * @param requestOptions - Request options
@@ -1172,6 +1222,51 @@ var AirtopSessionClient = class extends AirtopBase {
       this.resolveRequestOptions(requestOptions)
     );
   }
+  async llm(prompt, config, requestOptions = {}) {
+    this.log.withMetadata({ prompt }).info("Executing LLM call");
+    const currentWindows = await this.listWindows();
+    if (currentWindows.data.windows.length === 0) {
+      throw new AirtopError([
+        {
+          message: "No windows found in the session. Please create a window before calling the llm() method."
+        }
+      ]);
+    }
+    const firstWindow = currentWindows.data.windows[0];
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.llm(
+        firstWindow.windowId,
+        {
+          prompt,
+          sessionId: this.sessionId,
+          jobId: this.jobId,
+          ...config || {},
+          includeWebContext: false,
+          // Do not include web context for session.llm() calls
+          outputSchema: _optionalChain([config, 'optionalAccess', _14 => _14.outputSchema]) ? this.convertToJsonSchema(config.outputSchema) : void 0
+        },
+        {
+          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
+    );
+  }
+  /**
+   * Calls the service endpoint.
+   * @param prompt - The prompt to send to the service, describing the actions to take
+   * @param service - The service to call, if not provided, the service will be inferred from the prompt
+   * @param requestOptions - Request options
+   */
+  async service(prompt, service, requestOptions = {}) {
+    this.log.withMetadata({ prompt }).info("Service");
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.sessions.service(this.sessionId, { prompt, service }),
+      requestOptions
+    );
+  }
 };
 
 // src/session/AirtopSession.ts
@@ -1230,19 +1325,19 @@ var AirtopClient = class extends AirtopBase {
    */
   constructor(config) {
     super({
-      logLevel: _optionalChain([config, 'optionalAccess', _10 => _10.logLevel]),
+      logLevel: _optionalChain([config, 'optionalAccess', _15 => _15.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', _16 => _16.airtopUrl]),
+        logLevel: _optionalChain([config, 'optionalAccess', _17 => _17.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', _18 => _18.logger]) || new (0, _loglayer.LogLayer)({
         errorSerializer: _serializeerror.serializeError,
         transport: new (0, _loglayer.ConsoleTransport)({
           logger: console,
@@ -1281,8 +1376,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', _19 => _19.skipWaitSessionReady]), () => ( false));
+     _optionalChainDelete([config, 'optionalAccess', _20 => delete _20.skipWaitSessionReady]);
     const sessionResponse = await this.client.sessions.create(
       {
         configuration: config
@@ -1489,19 +1584,19 @@ var AirtopAgentClient = class extends AirtopBase {
    */
   constructor(config) {
     super({
-      logLevel: _optionalChain([config, 'optionalAccess', _16 => _16.logLevel]),
+      logLevel: _optionalChain([config, 'optionalAccess', _21 => _21.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', _22 => _22.airtopUrl]),
+        logLevel: _optionalChain([config, 'optionalAccess', _23 => _23.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', _24 => _24.logger]) || new (0, _loglayer.LogLayer)({
         errorSerializer: _serializeerror.serializeError,
         transport: new (0, _loglayer.ConsoleTransport)({
           logger: console,