@shapediver/viewer.session-engine.session-engine 2.12.8 → 3.0.1

package/src/implementation/SessionEngine.ts

@@ -43,10 +43,16 @@ import { FileParameter } from './dto/FileParameter';
 import { IExport } from '../interfaces/dto/IExport';
 import { IFileParameter } from '../interfaces/dto/IFileParameter';
 import { IOutput } from '../interfaces/dto/IOutput';
+import {
+    IOutputEvent,
+    ISettingsSections,
+    ITaskEvent,
+    PARAMETER_TYPE,
+    TASK_TYPE
+} from '@shapediver/viewer.shared.types';
 import { IParameter } from '../interfaces/dto/IParameter';
-import { ISessionEngine, ISettingsSections, PARAMETER_TYPE } from '../interfaces/ISessionEngine';
+import { ISessionEngine } from '../interfaces/ISessionEngine';
 import { ISessionTreeNode } from '../interfaces/ISessionTreeNode';
-import { IOutputEvent, ITaskEvent, TASK_TYPE } from '@shapediver/viewer.shared.types';
 import {
     ITree,
     ITreeNode,
@@ -63,7 +69,7 @@ import { vec3 } from 'gl-matrix';
 /* eslint-disable @typescript-eslint/no-empty-function */
 
 export class SessionEngine implements ISessionEngine {
-    // #region Properties (44)
+    // #region Properties (46)
 
     private readonly _eventEngine = EventEngine.instance;
     private readonly _exports: { [key: string]: IExport; } = {};
@@ -100,6 +106,7 @@ export class SessionEngine implements ISessionEngine {
             valueString: string
         }
     }[] = [];
+    private _allowOutputLoading: boolean = true;
     private _automaticSceneUpdate: boolean = true;
     private _closeOnFailure: () => Promise<void> = async () => { };
     private _closed: boolean = false;
@@ -116,6 +123,7 @@ export class SessionEngine implements ISessionEngine {
     };
     private _initialized: boolean = false;
     private _jwtToken?: string;
+    private _loadSdtf: boolean = false;
     private _modelId?: string;
     private _node: ITreeNode;
     private _refreshJwtToken?: () => Promise<string>;
@@ -128,7 +136,7 @@ export class SessionEngine implements ISessionEngine {
     private _viewerSettingsVersion: string = latestVersion;
     private _viewerSettingsVersionBackend: string = latestVersion;
 
-    // #endregion Properties (44)
+    // #endregion Properties (46)
 
     // #region Constructors (1)
 
@@ -136,7 +144,7 @@ export class SessionEngine implements ISessionEngine {
      * Can be use to initialize a session with the ticket/guid and modelViewUrl and returns a scene graph node with the result.
      * Can be use to customize the session with updated parameters to get the updated scene graph node.
      */
-    constructor(properties: { id: string, ticket?: string, guid?: string, modelViewUrl: string, buildVersion: string, buildDate: string, jwtToken?: string, excludeViewports?: string[] }) {
+    constructor(properties: { id: string, ticket?: string, guid?: string, modelViewUrl: string, buildVersion: string, buildDate: string, jwtToken?: string, excludeViewports?: string[], allowOutputLoading: boolean, loadSdtf: boolean }) {
         this._id = properties.id;
         this._node = new TreeNode(properties.id);
         this._guid = properties.guid;
@@ -144,6 +152,8 @@ export class SessionEngine implements ISessionEngine {
         this._modelViewUrl = properties.modelViewUrl;
         this._excludeViewports = properties.excludeViewports || [];
         this._jwtToken = properties.jwtToken;
+        this._allowOutputLoading = properties.allowOutputLoading;
+        this._loadSdtf = properties.loadSdtf;
         this._headers['X-ShapeDiver-BuildDate'] = properties.buildDate;
         this._headers['X-ShapeDiver-BuildVersion'] = properties.buildVersion;
         this._outputLoader = new OutputLoader(this);
@@ -158,7 +168,7 @@ export class SessionEngine implements ISessionEngine {
 
     // #endregion Constructors (1)
 
-    // #region Public Accessors (25)
+    // #region Public Getters And Setters (26)
 
     public get automaticSceneUpdate(): boolean {
         return this._automaticSceneUpdate;
@@ -215,6 +225,22 @@ export class SessionEngine implements ISessionEngine {
         return this._jwtToken;
     }
 
+    public get loadSdtf(): boolean {
+        return this._loadSdtf;
+    }
+
+    public set loadSdtf(value: boolean) {
+        this._loadSdtf = value;
+        if(this._initialized === true && this._loadSdtf === true) {
+            (async () => {
+                this._outputLoader.reloadSdtf = true;
+                await this.updateOutputs();
+                this._outputLoader.reloadSdtf = false;
+                this._eventEngine.emitEvent(EVENTTYPE.SESSION.SESSION_SDTF_DELAYED_LOADED, { sessionId: this.id });
+            })();
+        }
+    }
+
     public get modelViewUrl(): string {
         return this._modelViewUrl;
     }
@@ -267,9 +293,9 @@ export class SessionEngine implements ISessionEngine {
         return this._viewerSettings;
     }
 
-    // #endregion Public Accessors (25)
+    // #endregion Public Getters And Setters (26)
 
-    // #region Public Methods (27)
+    // #region Public Methods (30)
 
     public applySettings(response: ShapeDiverResponseDto, sections?: ISettingsSections) {
         sections = sections || {};
@@ -416,9 +442,9 @@ export class SessionEngine implements ISessionEngine {
             this.removeBusyMode(this.#customizationProcess);
 
         for (const busyId of this.#customizationBusyModes) {
-            for (const r in this._stateEngine.renderingEngines) {
-                if (this._stateEngine.renderingEngines[r].busy.includes(busyId))
-                    this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(busyId), 1);
+            for (const r in this._stateEngine.viewportEngines) {
+                if (this._stateEngine.viewportEngines[r].busy.includes(busyId))
+                    this._stateEngine.viewportEngines[r].busy.splice(this._stateEngine.viewportEngines[r].busy.indexOf(busyId), 1);
             }
         }
 
@@ -474,26 +500,13 @@ export class SessionEngine implements ISessionEngine {
             const eventFileUpload: ITaskEvent = { type: TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0.1, data: { sessionId: this.id }, status: 'Uploading file parameters' };
             this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventFileUpload);
 
-            const fileParameterIds: { [key: string]: string } = {};
-            // load file parameter first
-            for (const parameterId in this.parameters) {
-                if (this.parameters[parameterId] instanceof FileParameter) {
-                    fileParameterIds[parameterId] = await (<IFileParameter>this.parameters[parameterId]).upload();
-
-                    // OPTION TO SKIP - PART 1a
-                    const cancelResult = this.cancelProcess(customizationId, eventId, TASK_TYPE.SESSION_CUSTOMIZATION, 1, { sessionId: this.id });
-                    if (cancelResult) return cancelResult;
-                }
-            }
+            // upload file parameters
+            await this.uploadFileParameters();
 
             // OPTION TO SKIP - PART 1b
             const cancelResult = this.cancelProcess(customizationId, eventId, TASK_TYPE.SESSION_CUSTOMIZATION, 1, { sessionId: this.id });
             if (cancelResult) return cancelResult;
 
-            // assign the uploaded parameters
-            for (const parameterId in fileParameterIds)
-                this.parameters[parameterId].value = fileParameterIds[parameterId];
-
             const parameterSet: {
                 [key: string]: {
                     value: unknown,
@@ -599,9 +612,9 @@ export class SessionEngine implements ISessionEngine {
 
             // update the viewports
             if (waitForViewportUpdate) {
-                for (const r in this._stateEngine.renderingEngines)
-                    if (!this.excludeViewports.includes(this._stateEngine.renderingEngines[r].id))
-                        this._stateEngine.renderingEngines[r].update(`SessionEngine(${this.id}).customize`);
+                for (const r in this._stateEngine.viewportEngines)
+                    if (!this.excludeViewports.includes(this._stateEngine.viewportEngines[r].id))
+                        this._stateEngine.viewportEngines[r].update(`SessionEngine(${this.id}).customize`);
 
                 for (const outputId in this.outputs) {
                     if (oldOutputVersions[outputId] !== newOutputVersions[outputId]) {
@@ -623,9 +636,9 @@ export class SessionEngine implements ISessionEngine {
 
             if (!waitForViewportUpdate) {
                 setTimeout(() => {
-                    for (const r in this._stateEngine.renderingEngines)
-                        if (!this.excludeViewports.includes(this._stateEngine.renderingEngines[r].id))
-                            this._stateEngine.renderingEngines[r].update(`SessionEngine(${this.id}).customize`);
+                    for (const r in this._stateEngine.viewportEngines)
+                        if (!this.excludeViewports.includes(this._stateEngine.viewportEngines[r].id))
+                            this._stateEngine.viewportEngines[r].update(`SessionEngine(${this.id}).customize`);
                 }, 0);
             }
 
@@ -640,19 +653,22 @@ export class SessionEngine implements ISessionEngine {
         }
     }
 
-    public async customizeParallel(parameterValues: { [key: string]: string }, loadOutputs = true): Promise<ISessionTreeNode | ShapeDiverResponseDto> {
+    public async customizeParallel(parameterValues: { [key: string]: unknown }, loadOutputs = true): Promise<ISessionTreeNode | ShapeDiverResponseDto> {
         const eventId = this._uuidGenerator.create();
 
         const eventStart: ITaskEvent = { type: TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0, data: { sessionId: this.id }, status: 'Customizing session' };
         this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_START, eventStart);
 
+        // upload file parameters
+        await this.uploadFileParameters(parameterValues);
+
         const parameterSet: {
             [key: string]: string
         } = {};
 
         // create a set of the current validated parameter values
         for (const parameterId in this.parameters)
-            parameterSet[parameterId] = parameterValues[parameterId] !== undefined ? (' ' + parameterValues[parameterId]).slice(1) : this.parameters[parameterId].stringify();
+            parameterSet[parameterId] = (' ' + this.parameters[parameterId].stringify(parameterValues[parameterId])).slice(1);
 
         const result = await this.customizeSession(parameterSet, () => false, {
             eventId,
@@ -938,9 +954,10 @@ export class SessionEngine implements ISessionEngine {
         }
     }
 
-    public async requestExport(exportId: string, parameters: { [key: string]: string }, maxWaitTime: number, retry = false): Promise<ShapeDiverResponseExport> {
+    public async requestExport(exportId: string, parameters: { [key: string]: unknown }, maxWaitTime: number, retry = false): Promise<ShapeDiverResponseExport> {
         this.checkAvailability('export');
         try {
+            await this.uploadFileParameters(parameters);
             const requestParameterSet = this.cleanExportParameters(parameters);
             const responseDto = await this._sdk.utils.submitAndWaitForExport(this._sdk, this._sessionId!, { exports: { id: exportId }, parameters: requestParameterSet }, maxWaitTime);
             this.updateResponseDto(responseDto);
@@ -952,14 +969,28 @@ export class SessionEngine implements ISessionEngine {
     }
 
     public async requestExports(body: ShapeDiverRequestExport, loadOutputs: boolean = false, maxWaitMsec?: number, retry = false): Promise<ShapeDiverResponseDto> {
+        let processId;
         this.checkAvailability('export');
         try {
+
+            // activate the busy mode if outputs are loaded
+            if (loadOutputs === true && this._allowOutputLoading === true &&
+                body.outputs && Object.keys(body.outputs).length > 0) {
+                processId = this._uuidGenerator.create();
+                this.addBusyMode(processId);
+            }
+
+            await this.uploadFileParameters(body.parameters as { [key: string]: string | File | Blob });
             const requestParameterSet = this.cleanExportParameters(body.parameters);
+
             const responseDto = await this._sdk.utils.submitAndWaitForExport(this._sdk, this._sessionId!, { exports: body.exports, parameters: requestParameterSet, outputs: body.outputs, max_wait_time: body.max_wait_time }, maxWaitMsec);
             this.updateResponseDto(responseDto);
-            if(loadOutputs === true) this.updateOutputs();
+            if (loadOutputs === true && this._allowOutputLoading === true) this.updateOutputs();
+
+            if (processId) this.removeBusyMode(processId);
             return responseDto;
         } catch (e) {
+            if (processId) this.removeBusyMode(processId);
             await this.handleError(e, retry);
             return await this.requestExports(body, loadOutputs, maxWaitMsec, true);
         }
@@ -1267,9 +1298,9 @@ export class SessionEngine implements ISessionEngine {
 
         // update the viewports
         if (waitForViewportUpdate) {
-            for (const r in this._stateEngine.renderingEngines)
-                if (!this.excludeViewports.includes(this._stateEngine.renderingEngines[r].id))
-                    this._stateEngine.renderingEngines[r].update(`SessionEngine(${this.id}).updateOutputs`);
+            for (const r in this._stateEngine.viewportEngines)
+                if (!this.excludeViewports.includes(this._stateEngine.viewportEngines[r].id))
+                    this._stateEngine.viewportEngines[r].update(`SessionEngine(${this.id}).updateOutputs`);
 
             for (const outputId in this.outputs) {
                 if (oldOutputVersions[outputId] !== newOutputVersions[outputId]) {
@@ -1314,6 +1345,36 @@ export class SessionEngine implements ISessionEngine {
         }
     }
 
+    /**
+     * Uploads all file parameters and returns the file parameter values.
+     * If parameterValues is provided, the file parameter values are added to it.
+     * 
+     * @param parameterValues 
+     * @returns 
+     */
+    public async uploadFileParameters(parameterValues?: { [key: string]: unknown }): Promise<{ [key: string]: string }> {
+        const parameterValueSet = parameterValues !== undefined ? this.getFileParameterSet(parameterValues) : undefined;
+
+        const fileParameterValues: { [key: string]: string } = {};
+        // load file parameter first
+        for (const parameterId in this.parameters) {
+            if (this.parameters[parameterId] instanceof FileParameter) {
+                fileParameterValues[parameterId] = await (<IFileParameter>this.parameters[parameterId]).upload(parameterValueSet ? parameterValueSet[parameterId] : undefined);
+                if (parameterValues) {
+                    parameterValues[parameterId] = fileParameterValues[parameterId];
+
+                    // if the parameter value of the file parameter was used, set the value to the parameter
+                    if(parameterValues[parameterId] === undefined && this.parameters[parameterId].value !== fileParameterValues[parameterId]) 
+                        this.parameters[parameterId].value = fileParameterValues[parameterId];
+                } else if(this.parameters[parameterId].value !== fileParameterValues[parameterId]) {
+                    this.parameters[parameterId].value = fileParameterValues[parameterId];
+                }
+            }
+        }
+
+        return fileParameterValues;
+    }
+
     public async uploadGLTF(blob: Blob, conversion: ShapeDiverRequestGltfUploadQueryConversion = ShapeDiverRequestGltfUploadQueryConversion.NONE, retry = false): Promise<ShapeDiverResponseDto> {
         this.checkAvailability('gltf-upload');
         try {
@@ -1327,9 +1388,9 @@ export class SessionEngine implements ISessionEngine {
         }
     }
 
-    // #endregion Public Methods (27)
+    // #endregion Public Methods (30)
 
-    // #region Private Methods (15)
+    // #region Private Methods (16)
 
     private _saveSessionSettings() {
         const parameters = this.parameters;
@@ -1388,9 +1449,9 @@ export class SessionEngine implements ISessionEngine {
     }
 
     private addBusyMode(busyId: string) {
-        for (const r in this._stateEngine.renderingEngines) {
+        for (const r in this._stateEngine.viewportEngines) {
             if (!this.excludeViewports.includes(r)) {
-                this._stateEngine.renderingEngines[r].busy.push(busyId);
+                this._stateEngine.viewportEngines[r].busy.push(busyId);
                 this.#customizationBusyModes.push(busyId);
             }
         }
@@ -1444,7 +1505,7 @@ export class SessionEngine implements ISessionEngine {
             throw new ShapeDiverViewerSessionError(`Session.checkAvailability: action ${action} not available.`);
     }
 
-    private cleanExportParameters(parameters: ShapeDiverRequestCustomization): ShapeDiverRequestCustomization {
+    private cleanExportParameters(parameters: { [key: string]: unknown }): ShapeDiverRequestCustomization {
         const requestParameterSet: ShapeDiverRequestCustomization = {};
 
         // first step, we convert all our names and displaynames to ids
@@ -1457,7 +1518,7 @@ export class SessionEngine implements ISessionEngine {
             if (!parameterObject) continue;
 
             // copy into new dictionary
-            requestParameterSet[parameterObject.id] = parameters[parameterIdOrName];
+            requestParameterSet[parameterObject.id] = (' ' + parameterObject.stringify(parameters[parameterIdOrName])).slice(1);
         }
 
         // seconds step, fill all other parameter values that are currently not set
@@ -1474,16 +1535,16 @@ export class SessionEngine implements ISessionEngine {
     }
 
     private async customizeInternal(cancelRequest: () => boolean, taskEventInfo: OutputLoaderTaskEventInfo): Promise<ISessionTreeNode> {
-        return this.customizeSession(this._parameterValues, cancelRequest, taskEventInfo) as Promise<ISessionTreeNode>;
+        return this.customizeSession(this._parameterValues, cancelRequest, taskEventInfo);
     }
 
-    private async customizeSession(parameters: { [key: string]: string }, cancelRequest: () => boolean, taskEventInfo: OutputLoaderTaskEventInfo, parallel = false, loadOutputs = true, retry = false): Promise<ISessionTreeNode | ShapeDiverResponseDto> {
+    private async customizeSession(parameters: { [key: string]: string }, cancelRequest: () => boolean, taskEventInfo: OutputLoaderTaskEventInfo, parallel = false, loadOutputs = true, retry = false): Promise<ISessionTreeNode> {
         this.checkAvailability('customize');
         try {
             this._performanceEvaluator.startSection('sessionResponse');
             const responseDto = await this._sdk.utils.submitAndWaitForCustomization(this._sdk, this._sessionId!, parameters);
             this._performanceEvaluator.endSection('sessionResponse');
-            if (loadOutputs === true) {
+            if (loadOutputs === true && this._allowOutputLoading === true) {
                 if (cancelRequest()) return new SessionTreeNode();
                 if (parallel === true) {
                     // special case, we load the outputs put don't add them to the scene
@@ -1495,7 +1556,9 @@ export class SessionEngine implements ISessionEngine {
                 }
             } else {
                 // special case, we don't load the outputs and only return the responseDto
-                return responseDto;
+                const node = new SessionTreeNode();
+                node.data.push(new SessionData(responseDto));
+                return node;
             }
         } catch (e) {
             await this.handleError(e, retry);
@@ -1504,6 +1567,23 @@ export class SessionEngine implements ISessionEngine {
         }
     }
 
+    /**
+     * Get all file parameters from the parameter set.
+     * If the parameter is not set in the parameter set, the value from the parameter object is used.
+     * 
+     * @param parameters 
+     * @returns 
+     */
+    private getFileParameterSet(parameters: { [key: string]: unknown }): { [key: string]: string | File | Blob } {
+        const fileParameterSet: { [key: string]: string | File | Blob } = {};
+        for (const parameterId in this.parameters) {
+            if (this.parameters[parameterId] instanceof FileParameter) {
+                fileParameterSet[parameterId] = parameters[parameterId] !== undefined ? parameters[parameterId] as string | File | Blob : (this.parameters[parameterId] as FileParameter).value;
+            }
+        }
+        return fileParameterSet;
+    }
+
     private async handleError(e: ShapeDiverBackendError | ShapeDiverViewerError | Error | unknown, retry = false) {
         if (isGBResponseError(e)) {
             if (e.error === ShapeDiverResponseErrorType.SESSION_GONE_ERROR) {
@@ -1556,9 +1636,9 @@ export class SessionEngine implements ISessionEngine {
     }
 
     private removeBusyMode(busyId: string) {
-        for (const r in this._stateEngine.renderingEngines) {
-            if (this._stateEngine.renderingEngines[r].busy.includes(busyId))
-                this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(busyId), 1);
+        for (const r in this._stateEngine.viewportEngines) {
+            if (this._stateEngine.viewportEngines[r].busy.includes(busyId))
+                this._stateEngine.viewportEngines[r].busy.splice(this._stateEngine.viewportEngines[r].busy.indexOf(busyId), 1);
 
             if (this.#customizationBusyModes.includes(busyId))
                 this.#customizationBusyModes.splice(this.#customizationBusyModes.indexOf(busyId), 1);
@@ -1714,5 +1794,5 @@ export class SessionEngine implements ISessionEngine {
         await Promise.all(promises);
     }
 
-    // #endregion Private Methods (15)
+    // #endregion Private Methods (16)
 }

package/src/implementation/SessionOutputData.ts

@@ -1,6 +1,6 @@
-import { ShapeDiverResponseOutput } from '@shapediver/sdk.geometry-api-sdk-v2';
-import { AbstractTreeNodeData, ITreeNodeData } from '@shapediver/viewer.shared.node-tree'
+import { AbstractTreeNodeData } from '@shapediver/viewer.shared.node-tree';
 import { ISessionOutputData } from '../interfaces/ISessionOutputData';
+import { ShapeDiverResponseOutput } from '@shapediver/sdk.geometry-api-sdk-v2';
 
 export class SessionOutputData extends AbstractTreeNodeData implements ISessionOutputData {
     // #region Properties (1)
@@ -22,17 +22,17 @@ export class SessionOutputData extends AbstractTreeNodeData implements ISessionO
 
     // #endregion Constructors (1)
 
-    // #region Public Accessors (2)
+    // #region Public Getters And Setters (2)
 
     public get responseOutput(): ShapeDiverResponseOutput {
-		return this.#responseOutput;
-	}
+        return this.#responseOutput;
+    }
 
     public set responseOutput(value: ShapeDiverResponseOutput) {
-		this.#responseOutput = value;
-	}
+        this.#responseOutput = value;
+    }
 
-    // #endregion Public Accessors (2)
+    // #endregion Public Getters And Setters (2)
 
     // #region Public Methods (1)
 

package/src/implementation/SessionTreeNode.ts

@@ -1,6 +1,10 @@
-import { mat4 } from 'gl-matrix'
-import { ITransformation, ITreeNode, ITreeNodeData, TreeNode } from '@shapediver/viewer.shared.node-tree'
 import { ISessionTreeNode } from '../interfaces/ISessionTreeNode';
+import {
+  ITransformation,
+  ITreeNode,
+  ITreeNodeData,
+  TreeNode
+} from '@shapediver/viewer.shared.node-tree';
 
 export class SessionTreeNode extends TreeNode implements ISessionTreeNode {
   // #region Properties (1)
@@ -30,12 +34,11 @@ export class SessionTreeNode extends TreeNode implements ISessionTreeNode {
 
   // #endregion Constructors (1)
 
-  // #region Public Accessors (1)
+  // #region Public Getters And Setters (1)
 
   public get sessionNode(): boolean {
     return this.#sessionNode;
   }
 
-  // #endregion Public Accessors (1)
-
+  // #endregion Public Getters And Setters (1)
 }

package/src/implementation/dto/Export.ts

@@ -1,8 +1,21 @@
-import { ShapeDiverResponseExport, ShapeDiverResponseExportContent, ShapeDiverResponseExportDefinitionType, ShapeDiverResponseExportResult, ShapeDiverResponseModelComputationStatus, ShapeDiverResponseParameterGroup } from "@shapediver/sdk.geometry-api-sdk-v2";
-import { EventEngine, EVENTTYPE, InputValidator, Logger, UuidGenerator } from "@shapediver/viewer.shared.services";
-import { ITaskEvent, TASK_TYPE } from "@shapediver/viewer.shared.types";
-import { IExport } from "../../interfaces/dto/IExport";
-import { SessionEngine } from "../SessionEngine";
+import {
+  EventEngine,
+  EVENTTYPE,
+  InputValidator,
+  Logger,
+  UuidGenerator
+} from '@shapediver/viewer.shared.services';
+import { IExport } from '../../interfaces/dto/IExport';
+import { ITaskEvent, TASK_TYPE } from '@shapediver/viewer.shared.types';
+import { SessionEngine } from '../SessionEngine';
+import {
+  ShapeDiverResponseExport,
+  ShapeDiverResponseExportContent,
+  ShapeDiverResponseExportDefinitionType,
+  ShapeDiverResponseExportResult,
+  ShapeDiverResponseModelComputationStatus,
+  ShapeDiverResponseParameterGroup
+} from '@shapediver/sdk.geometry-api-sdk-v2';
 
 export class Export implements IExport {
   // #region Properties (24)
@@ -24,9 +37,9 @@ export class Export implements IExport {
   #group?: ShapeDiverResponseParameterGroup;
   #hidden: boolean = false;
   #maxWaitTime: number = 300000;
-  #msg?: string
+  #msg?: string;
   #order?: number;
-  #result?: ShapeDiverResponseExportResult
+  #result?: ShapeDiverResponseExportResult;
   #status_collect?: ShapeDiverResponseModelComputationStatus;
   #status_computation?: ShapeDiverResponseModelComputationStatus;
   #tooltip?: string;
@@ -48,7 +61,7 @@ export class Export implements IExport {
 
   // #endregion Constructors (1)
 
-  // #region Public Accessors (24)
+  // #region Public Getters And Setters (24)
 
   public get content(): ShapeDiverResponseExportContent[] | undefined {
     return this.#content;
@@ -146,17 +159,17 @@ export class Export implements IExport {
     return this.#version;
   }
 
-  // #endregion Public Accessors (24)
+  // #endregion Public Getters And Setters (24)
 
   // #region Public Methods (3)
 
-  public async request(parameterValues: { [key: string]: string } = {}): Promise<ShapeDiverResponseExport> {
+  public async request(parameterValues: { [key: string]: unknown } = {}): Promise<ShapeDiverResponseExport> {
     const eventId = this.#uuidGenerator.create();
     try {
       const event: ITaskEvent = { type: TASK_TYPE.EXPORT_REQUEST, id: eventId, progress: 0, status: 'Requesting export' };
       this.#eventEngine.emitEvent(EVENTTYPE.TASK.TASK_START, event);
 
-      if(Object.keys(parameterValues).length === 0) {
+      if (Object.keys(parameterValues).length === 0) {
         this.#logger.info(`Export(${this.#id}).request: Sending export request with parameters ${JSON.stringify(parameterValues)}.`);
       } else {
         this.#logger.debugLow(`Export(${this.#id}).request: Sending export request.`);