askui 0.10.0 → 0.10.2

package/dist/cjs/execution/ui-control-client.js

@@ -10,71 +10,98 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UiControlClient = void 0;
-const test_case_dto_1 = require("../core/model/test-case-dto");
+const custom_element_1 = require("../core/model/custom-element");
 const dsl_1 = require("./dsl");
-const http_client_got_1 = require("../utils/http/http-client-got");
-const ui_controller_client_1 = require("./ui-controller-client");
-const execution_runtime_1 = require("./execution-runtime");
-const inference_client_1 = require("./inference-client");
 const annotation_writer_1 = require("../core/annotation/annotation-writer");
 const logger_1 = require("../lib/logger");
-const test_case_result_dto_1 = require("../core/model/test-case-result-dto");
 const annotation_level_1 = require("./annotation-level");
 const ui_control_client_error_1 = require("./ui-control-client-error");
-const read_environment_credentials_1 = require("./read-environment-credentials");
-const analytics_1 = require("../utils/analytics");
-const proxy_builder_1 = require("../utils/proxy/proxy-builder");
-const getClientArgsWithDefaults = (clientArgs = {}) => (Object.assign({ uiControllerUrl: 'http://127.0.0.1:6769', inferenceServerUrl: 'https://inference.askui.com', annotationLevel: annotation_level_1.AnnotationLevel.DISABLED }, clientArgs));
+const ui_control_client_dependency_builder_1 = require("./ui-control-client-dependency-builder");
 class UiControlClient extends dsl_1.ApiCommands {
-    constructor(httpClient, clientArgs, workspaceId) {
+    constructor(config, executionRuntime, stepReporter) {
         super();
-        this.httpClient = httpClient;
-        this.clientArgs = clientArgs;
-        this.workspaceId = workspaceId;
+        this.config = config;
+        this.executionRuntime = executionRuntime;
+        this.stepReporter = stepReporter;
         this.secretText = undefined;
     }
-    static build(clientArgs) {
+    static build(clientArgs = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const analytics = new analytics_1.Analytics();
-            const analyticsHeaders = yield analytics.getAnalyticsHeaders();
-            const analyticsCookies = yield analytics.getAnalyticsCookies();
-            const cas = getClientArgsWithDefaults(clientArgs);
-            const credentialArgs = cas.credentials || (0, read_environment_credentials_1.envCredentials)();
-            const proxyAgentArgs = cas.proxyAgents || (yield (0, proxy_builder_1.buildProxyAgentArgsFromEnvironment)());
-            const httpClient = new http_client_got_1.HttpClientGot(credentialArgs === null || credentialArgs === void 0 ? void 0 : credentialArgs.token, analyticsHeaders, analyticsCookies, proxyAgentArgs);
-            return new UiControlClient(httpClient, cas, credentialArgs === null || credentialArgs === void 0 ? void 0 : credentialArgs.workspaceId);
+            const builder = ui_control_client_dependency_builder_1.UiControlClientDependencyBuilder;
+            const clientArgsWithDefaults = yield builder.getClientArgsWithDefaults(clientArgs);
+            const { executionRuntime, stepReporter } = yield builder.build(clientArgsWithDefaults);
+            return new UiControlClient({
+                annotationLevel: clientArgsWithDefaults.annotationLevel,
+            }, executionRuntime, stepReporter);
         });
     }
-    get uiControllerClient() {
-        if (!this._uiControllerClient) {
-            this._uiControllerClient = new ui_controller_client_1.UiControllerClient(this.clientArgs.uiControllerUrl);
-        }
-        return this._uiControllerClient;
+    /**
+     * Connects to the askui UI Controller.
+     */
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.executionRuntime.connect();
+        });
+    }
+    /**
+     * Disconnects from the askui UI Controller.
+     */
+    disconnect() {
+        this.executionRuntime.disconnect();
     }
-    get inferenceClient() {
-        return new inference_client_1.InferenceClient(this.clientArgs.inferenceServerUrl, this.httpClient, this.clientArgs.resize, this.workspaceId, this.clientArgs.modelComposition);
+    /**
+     * Disconnects from the askui UI Controller.
+     *
+     * @deprecated Use {@link disconnect} instead.
+     */
+    close() {
+        this.disconnect();
     }
-    get executionRuntime() {
-        return new execution_runtime_1.ExecutionRuntime(this.uiControllerClient, this.inferenceClient);
+    startVideoRecording() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.executionRuntime.startVideoRecording();
+        });
     }
-    annotateByDefault(testStepState, customElements = []) {
+    stopVideoRecording() {
         return __awaiter(this, void 0, void 0, function* () {
-            if ((testStepState === test_case_result_dto_1.TestStepState.FAILED
-                && this.clientArgs.annotationLevel === annotation_level_1.AnnotationLevel.DISABLED)
-                || (testStepState === test_case_result_dto_1.TestStepState.PASSED
-                    && this.clientArgs.annotationLevel !== annotation_level_1.AnnotationLevel.ALL)) {
-                return;
-            }
-            yield this.annotate({
-                customElements,
-                fileNamePrefix: `${testStepState.toLowerCase()}_testStep_annotation`,
-            });
+            yield this.executionRuntime.stopVideoRecording();
         });
     }
-    connect() {
+    readVideoRecording() {
         return __awaiter(this, void 0, void 0, function* () {
-            const connectionState = yield this.uiControllerClient.connect();
-            return connectionState;
+            return this.executionRuntime.readVideoRecording();
+        });
+    }
+    shouldWriteAnntotationAfterCommandExecution(error) {
+        const { annotationLevel } = this.config;
+        return annotationLevel === annotation_level_1.AnnotationLevel.ALL
+            || (annotationLevel === annotation_level_1.AnnotationLevel.ON_FAILURE && error !== undefined);
+    }
+    shouldAnnotateAfterCommandExecution(error) {
+        return this.shouldWriteAnntotationAfterCommandExecution(error)
+            || (this.stepReporter.config.withDetectedElements === 'onFailure' && error !== undefined)
+            || (this.stepReporter.config.withDetectedElements === 'always');
+    }
+    afterCommandExecution(instruction, error) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdAt = new Date();
+            let annotation;
+            let screenshot;
+            if (this.shouldAnnotateAfterCommandExecution(error)) {
+                annotation = yield this.executionRuntime.annotateImage(undefined, instruction.customElements);
+            }
+            if (annotation !== undefined && this.shouldWriteAnntotationAfterCommandExecution(error)) {
+                annotation_writer_1.AnnotationWriter.write(annotation.toHtml(), undefined, `${error !== undefined ? 'failed' : 'passed'}_testStep_annotation`);
+            }
+            if (annotation !== undefined || this.stepReporter.config.withScreenshots === 'always') {
+                screenshot = (_a = annotation === null || annotation === void 0 ? void 0 : annotation.image) !== null && _a !== void 0 ? _a : yield this.executionRuntime.getScreenshot();
+            }
+            yield this.stepReporter.onStepEnd({
+                createdAt,
+                detectedElements: annotation === null || annotation === void 0 ? void 0 : annotation.detected_elements,
+                screenshot,
+            }, error);
         });
     }
     annotate(annotationRequest = {}) {
@@ -98,36 +125,45 @@ class UiControlClient extends dsl_1.ApiCommands {
     escapeSeparatorString(instruction) {
         return instruction.split(dsl_1.Separators.STRING).join('"');
     }
-    fluentCommandExecutor(instruction, customElementJson = []) {
+    buildInstruction(instructionString, customElementJson = []) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { secretText } = this;
-            const customElements = yield test_case_dto_1.CustomElement.fromJsonListWithImagePathOrImage(customElementJson);
-            const stringWithoutSeparators = this.escapeSeparatorString(instruction);
-            logger_1.logger.debug(stringWithoutSeparators);
+            return {
+                customElements: yield custom_element_1.CustomElement.fromJsonListWithImagePathOrImage(customElementJson),
+                value: instructionString,
+                secretText: this.getAndResetSecretText(),
+                valueHumanReadable: this.escapeSeparatorString(instructionString),
+            };
+        });
+    }
+    fluentCommandExecutor(instructionString, customElementJson = []) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const instruction = yield this.buildInstruction(instructionString, customElementJson);
+            logger_1.logger.debug(instruction);
             try {
-                yield this.executionRuntime.executeTestStep({
-                    instruction,
-                    customElements,
-                    secretText,
-                });
-                this.secretText = undefined;
-                yield this.annotateByDefault(test_case_result_dto_1.TestStepState.PASSED, customElements);
+                yield this.stepReporter.resetStep(instruction);
+                yield this.executionRuntime.executeInstruction(instruction);
+                yield this.afterCommandExecution(instruction);
                 return yield Promise.resolve();
             }
             catch (error) {
-                yield this.annotateByDefault(test_case_result_dto_1.TestStepState.FAILED, customElements);
-                return Promise.reject(new ui_control_client_error_1.UiControlClientError(`A problem occurred while executing the instruction: ${stringWithoutSeparators}. Reason ${error}`));
+                yield this.afterCommandExecution(instruction, error instanceof Error ? error : new Error(String(error)));
+                return Promise.reject(new ui_control_client_error_1.UiControlClientError(`A problem occurred while executing the instruction: ${instruction.valueHumanReadable}. Reason ${error}`));
             }
         });
     }
     getterExecutor(instruction, customElementJson = []) {
         return __awaiter(this, void 0, void 0, function* () {
-            const customElements = yield test_case_dto_1.CustomElement.fromJsonListWithImagePathOrImage(customElementJson);
+            const customElements = yield custom_element_1.CustomElement.fromJsonListWithImagePathOrImage(customElementJson);
             const stringWithoutSeparators = this.escapeSeparatorString(instruction);
             logger_1.logger.debug(stringWithoutSeparators);
             return this.executionRuntime.getDetectedElements(instruction, customElements);
         });
     }
+    getAndResetSecretText() {
+        const { secretText } = this;
+        this.secretText = undefined;
+        return secretText;
+    }
     /**
      * Types a text inside the filtered element.
      *
@@ -195,11 +231,5 @@ class UiControlClient extends dsl_1.ApiCommands {
             },
         };
     }
-    /**
-    * Closes the connection to the askui UI Controller
-    */
-    close() {
-        this.uiControllerClient.close();
-    }
 }
 exports.UiControlClient = UiControlClient;

package/dist/cjs/execution/ui-controller-client-interface.d.ts

@@ -2,6 +2,7 @@ import { AnnotationLevel } from './annotation-level';
 import { CredentialArgs } from './credentials-args';
 import { ProxyAgentArgs } from '../shared/proxy-agent-args';
 import { ModelCompositionBranch } from './model-composition-branch';
+import { Reporter, ReporterConfig } from '@/core/reporting';
 /**
  * Configuration options for the askui UI Control Client
  *
@@ -25,18 +26,26 @@ import { ModelCompositionBranch } from './model-composition-branch';
  * the authentication of the askui Inference Server.
  * You have three options: `DISABLED`, `ON_FAILURE`, `ALL`.
  * @param {ProxyAgentArgs} proxyAgents - To configure the proxy agents for http(s) requests.
+ * @param {Reporter} reporter - To configure the reporter to report on step runs.
  */
 export interface ClientArgs {
     readonly uiControllerUrl?: string;
     readonly inferenceServerUrl?: string;
     readonly annotationLevel?: AnnotationLevel;
-    readonly credentials?: CredentialArgs;
-    readonly proxyAgents?: ProxyAgentArgs;
+    readonly credentials?: CredentialArgs | undefined;
+    readonly proxyAgents?: ProxyAgentArgs | undefined;
     readonly resize?: number;
     readonly modelComposition?: ModelCompositionBranch[];
+    readonly reporter?: Reporter | undefined;
 }
 export interface ClientArgsWithDefaults extends ClientArgs {
     readonly uiControllerUrl: string;
     readonly inferenceServerUrl: string;
     readonly annotationLevel: AnnotationLevel;
+    readonly reporter: Required<Reporter> & {
+        config: Required<ReporterConfig>;
+    };
+}
+export interface UiControlClientConfig {
+    annotationLevel: AnnotationLevel;
 }

package/dist/cjs/execution/ui-controller-client.d.ts

@@ -17,14 +17,14 @@ export declare class UiControllerClient {
     private clearResponse;
     private onMessage;
     connect(): Promise<UiControllerClientConnectionState>;
-    close(): void;
+    disconnect(): void;
     private sendAndReceive;
     private send;
     requestScreenshot(): Promise<CaptureScreenshotResponse>;
     getServerPid(): Promise<GetProcessPidResponse>;
-    startRecording(): Promise<StartRecordingResponse>;
-    stopRecording(): Promise<StopRecordingResponse>;
-    readRecording(): Promise<ReadRecordingPartResponse>;
+    startVideoRecording(): Promise<StartRecordingResponse>;
+    stopVideoRecording(): Promise<StopRecordingResponse>;
+    readVideoRecording(): Promise<ReadRecordingPartResponse>;
     annotateInteractively(boundingBoxes: DetectedElement[], imageString: string): Promise<InteractiveAnnotationResponse>;
     requestControl(controlCommand: ControlCommand): Promise<ControlResponse>;
 }

package/dist/cjs/execution/ui-controller-client.js

@@ -57,7 +57,7 @@ class UiControllerClient {
             }
         });
     }
-    close() {
+    disconnect() {
         var _a;
         (_a = this.ws) === null || _a === void 0 ? void 0 : _a.close();
     }
@@ -88,17 +88,17 @@ class UiControllerClient {
     getServerPid() {
         return this.sendAndReceive(new runner_protocol_1.GetProcessPidRequest());
     }
-    startRecording() {
+    startVideoRecording() {
         return this.sendAndReceive(new runner_protocol_1.StartRecordingRequest());
     }
-    stopRecording() {
+    stopVideoRecording() {
         return this.sendAndReceive(new runner_protocol_1.StopRecordingRequest());
     }
-    readRecording() {
+    readVideoRecording() {
         return new Promise((resolve, reject) => {
             const readRecordingStreamHandler = new read_recording_response_stream_handler_1.ReadRecordingResponseStreamHandler(resolve, reject);
-            this.currentResolve = readRecordingStreamHandler.onMessage;
-            this.currentReject = readRecordingStreamHandler.onError;
+            this.currentResolve = readRecordingStreamHandler.onMessage.bind(readRecordingStreamHandler);
+            this.currentReject = readRecordingStreamHandler.onError.bind(readRecordingStreamHandler);
             this.send(new runner_protocol_1.ReadRecordingRequest(), 60 * 15 * 1000);
         });
     }

package/dist/cjs/lib/ui-controller-facade.js

@@ -36,7 +36,7 @@ class UiControllerFacade {
             const argsWithDefaults = (0, ui_controller_args_1.createArgsWithDefaults)(args);
             const argsWithLogPath = this.serverLogFilePath(argsWithDefaults);
             this.binaryFilePath = (0, download_binaries_1.getBinaryFilePath)(argsWithLogPath.binaryVersion);
-            yield this.getBinary(argsWithLogPath.binaryVersion, argsWithLogPath.overWriteBinary, argsWithLogPath.proxyAgents || (yield (0, proxy_builder_1.buildProxyAgentArgsFromEnvironment)()));
+            yield this.getBinary(argsWithLogPath.binaryVersion, argsWithLogPath.overWriteBinary, argsWithLogPath.proxyAgents || (yield (0, proxy_builder_1.envProxyAgents)()));
             this.makeBinaryExecutable();
             logger_1.logger.debug(`UI Controller log path "${this.serverLogFile}"`);
             yield this.startWithDefaults(argsWithLogPath, maxWaitingForStartingInSeconds);

package/dist/cjs/main.d.ts

@@ -1,3 +1,4 @@
 export { UiController } from './lib';
-export { UiControlClient, AnnotationLevel } from './execution';
+export { AnnotationLevel, UiControlClient } from './execution';
+export { Instruction, Reporter, ReporterConfig, Snapshot, SnapshotDetailLevel, Step, StepStatus, StepStatusEnd, } from './core/reporting';
 export { LogLevels } from './shared';

package/dist/cjs/main.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogLevels = exports.AnnotationLevel = exports.UiControlClient = exports.UiController = void 0;
+exports.LogLevels = exports.UiControlClient = exports.AnnotationLevel = exports.UiController = void 0;
 var lib_1 = require("./lib");
 Object.defineProperty(exports, "UiController", { enumerable: true, get: function () { return lib_1.UiController; } });
 var execution_1 = require("./execution");
-Object.defineProperty(exports, "UiControlClient", { enumerable: true, get: function () { return execution_1.UiControlClient; } });
 Object.defineProperty(exports, "AnnotationLevel", { enumerable: true, get: function () { return execution_1.AnnotationLevel; } });
+Object.defineProperty(exports, "UiControlClient", { enumerable: true, get: function () { return execution_1.UiControlClient; } });
 var shared_1 = require("./shared");
 Object.defineProperty(exports, "LogLevels", { enumerable: true, get: function () { return shared_1.LogLevels; } });

package/dist/cjs/utils/proxy/proxy-builder.d.ts

@@ -1,4 +1,4 @@
 import { ProxyAgentArgs } from '../../shared/proxy-agent-args';
 export declare class ProxyImportError extends Error {
 }
-export declare function buildProxyAgentArgsFromEnvironment(): Promise<ProxyAgentArgs | undefined>;
+export declare function envProxyAgents(): Promise<ProxyAgentArgs | undefined>;

package/dist/cjs/utils/proxy/proxy-builder.js

@@ -28,7 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildProxyAgentArgsFromEnvironment = exports.ProxyImportError = void 0;
+exports.envProxyAgents = exports.ProxyImportError = void 0;
 const logger_1 = require("../../lib/logger");
 class ProxyImportError extends Error {
 }
@@ -44,7 +44,7 @@ function dynmicImportHpagent() {
         }
     });
 }
-function buildProxyAgentArgsFromEnvironment() {
+function envProxyAgents() {
     return __awaiter(this, void 0, void 0, function* () {
         const httpProxyUrl = process.env['HTTP_PROXY'];
         const httpsProxyUrl = process.env['HTTPS_PROXY'];
@@ -64,4 +64,4 @@ function buildProxyAgentArgsFromEnvironment() {
         };
     });
 }
-exports.buildProxyAgentArgsFromEnvironment = buildProxyAgentArgsFromEnvironment;
+exports.envProxyAgents = envProxyAgents;