Feature/support ionq (#249)

* adapt token handling for multiple provider * set multiple tokens for qpu selection * remove debugger * check if execution dialog was canceled or not * receive queue size for ionq devices * fix queuesize presentation * fix execution tab collection of IonQ devices * add ionq besides aws as provider * initial commit for advanced nisq analyzer selection * expand analysis dialog * add ranking method selection to dialog * fix attribute name * fix parameters in dto * fix parameters * wip expand nisq analyzer selection table * get queuesize and check up to date * fix request execution result * fix execute * stop infinity requests * show post processing results * show used weights * improve code * fix linting errors
UST-QuAntiL · Sep 2, 2024 · 1bbf4f8 · 1bbf4f8
1 parent 5fbcfa1
commit 1bbf4f8
Show file tree

Hide file tree

Showing 37 changed files with 1,928 additions and 887 deletions.
diff --git a/generated/api-nisq/models/analysis-job-dto.ts b/generated/api-nisq/models/analysis-job-dto.ts
@@ -8,5 +8,7 @@ export type AnalysisJobDto = {
   time?: string;
   inputParameters?: Map<string, string>;
   ready?: boolean;
+  initialMcdaJob?: string;
+  initialMcdaMethod?: string;
   _links?: Links;
 };
diff --git a/generated/api-nisq/models/analysis-result-dto.ts b/generated/api-nisq/models/analysis-result-dto.ts
@@ -2,29 +2,11 @@
 import { ImplementationDto } from './implementation-dto';
 import { Links } from './links';
 export type AnalysisResultDto = {
-  id?: string;
-  provider?: string;
-  qpu?: string;
-  compiler?: string;
-  analyzedDepth?: number;
-  analyzedWidth?: number;
-  analyzedTotalNumberOfOperations?: number;
-  analyzedNumberOfSingleQubitGates?: number;
-  analyzedNumberOfMultiQubitGates?: number;
-  analyzedNumberOfMeasurementOperations?: number;
-  analyzedMultiQubitGateDepth?: number;
-  numberOfQubits?: number;
-  t1?: number;
-  t2?: number;
-  avgReadoutError?: number;
-  avgSingleQubitGateError?: number;
-  avgMultiQubitGateError?: number;
-  avgSingleQubitGateTime?: number;
-  avgMultiQubitGateTime?: number;
-  maxGateTime?: number;
-  simulator?: boolean;
-  time?: string;
   implementation?: ImplementationDto;
+  id?: string;
   inputParameters?: {};
+  originalCircuitResultId?: string;
+  qpuSelectionJobId?: string;
+  correlationId?: string;
   _links?: Links;
 };
diff --git a/generated/api-nisq/models/compiler-selection-dto.ts b/generated/api-nisq/models/compiler-selection-dto.ts
@@ -6,6 +6,6 @@ export type CompilerSelectionDto = {
   circuitName?: string;
   circuitUrl?: string;
   qasmCode?: string;
-  token?: string;
+  tokens?: Map<string, string>;
   refreshToken?: string;
 };
diff --git a/generated/api-nisq/models/execute-analysis-result-request-dto.ts b/generated/api-nisq/models/execute-analysis-result-request-dto.ts
@@ -1,5 +1,6 @@
 /* tslint:disable */
 export type ExecuteAnalysisResultRequestDto = {
   refreshToken?: string;
-  token?: string;
+  tokens?: {};
+  correlationId?: string;
 };
diff --git a/generated/api-nisq/models/execution-result-dto.ts b/generated/api-nisq/models/execution-result-dto.ts
@@ -7,5 +7,6 @@ export type ExecutionResultDto = {
   result?: string;
   shots?: number;
   histogramIntersectionValue?: number;
+  resultLocation?: string;
   _links?: Links;
 };
diff --git a/generated/api-nisq/models/implementation-dto.ts b/generated/api-nisq/models/implementation-dto.ts
@@ -7,7 +7,6 @@ export type ImplementationDto = {
   implementedAlgorithm?: string;
   algorithmName?: string;
   language?: string;
-  selectionRule?: string;
   sdk?: string;
   fileLocation?: string;
   inputParameters?: ParameterListDto;

diff --git a/generated/api-nisq/models/selection-request-dto.ts b/generated/api-nisq/models/selection-request-dto.ts
@@ -1,6 +1,17 @@
 /* tslint:disable */
 export type SelectionRequestDto = {
   parameters?: {};
+  allowedProviders?: Array<string>;
+  compilers?: Array<string>;
+  preciseResultsPreference?: boolean;
+  shortWaitingTimesPreference?: boolean;
+  queueImportanceRatio?: number;
+  maxNumberOfCompiledCircuits?: number;
+  predictionAlgorithm?: string;
+  metaOptimizer?: string;
+  tokens?: {};
   algorithmId?: string;
   refreshToken?: string;
+  mcdaMethodName?: string;
+  mcdaWeightLearningMethod?: string;
 };
diff --git a/generated/api-nisq/services/analysis-result.service.ts b/generated/api-nisq/services/analysis-result.service.ts
@@ -12,8 +12,6 @@ import { AnalysisJobDto } from '../models/analysis-job-dto';
 import { AnalysisJobListDto } from '../models/analysis-job-list-dto';
 import { AnalysisResultDto } from '../models/analysis-result-dto';
 import { AnalysisResultListDto } from '../models/analysis-result-list-dto';
-import { ExecuteAnalysisResultRequestDto } from '../models/execute-analysis-result-request-dto';
-import { ExecutionResultDto } from '../models/execution-result-dto';
 
 @Injectable({
   providedIn: 'root',
@@ -99,7 +97,7 @@ export class AnalysisResultService extends BaseService {
   static readonly GetAnalysisJobsPath = '/analysis-results/jobs';
 
   /**
-   * Retrieve all compiler analysis jobs
+   * Retrieve all analysis jobs
    *
    * This method provides access to the full `HttpResponse`, allowing access to response headers.
    * To access only the response body, use `getAnalysisJobs()` instead.
@@ -132,7 +130,7 @@ export class AnalysisResultService extends BaseService {
   }
 
   /**
-   * Retrieve all compiler analysis jobs
+   * Retrieve all analysis jobs
    *
    * This method provides access to only to the response body.
    * To access the full response (for headers, for example), `getAnalysisJobs$Response()` instead.
@@ -326,67 +324,4 @@ export class AnalysisResultService extends BaseService {
       )
     );
   }
-
-  /**
-   * Path part for operation executeAnalysisResult
-   */
-  static readonly ExecuteAnalysisResultPath =
-    '/analysis-results/{resId}/execute';
-
-  /**
-   * Execute an analysis configuration
-   *
-   * This method provides access to the full `HttpResponse`, allowing access to response headers.
-   * To access only the response body, use `executeAnalysisResult()` instead.
-   *
-   * This method sends `application/json` and handles request body of type `application/json`.
-   */
-  executeAnalysisResult$Response(params: {
-    resId: string;
-    body?: ExecuteAnalysisResultRequestDto;
-  }): Observable<StrictHttpResponse<ExecutionResultDto>> {
-    const rb = new RequestBuilder(
-      this.rootUrl,
-      AnalysisResultService.ExecuteAnalysisResultPath,
-      'post'
-    );
-    if (params) {
-      rb.path('resId', params.resId, {});
-
-      rb.body(params.body, 'application/json');
-    }
-    return this.http
-      .request(
-        rb.build({
-          responseType: 'json',
-          accept: 'application/hal+json',
-        })
-      )
-      .pipe(
-        filter((r: any) => r instanceof HttpResponse),
-        map((r: HttpResponse<any>) => {
-          return r as StrictHttpResponse<ExecutionResultDto>;
-        })
-      );
-  }
-
-  /**
-   * Execute an analysis configuration
-   *
-   * This method provides access to only to the response body.
-   * To access the full response (for headers, for example), `executeAnalysisResult$Response()` instead.
-   *
-   * This method sends `application/json` and handles request body of type `application/json`.
-   */
-  executeAnalysisResult(params: {
-    resId: string;
-    body?: ExecuteAnalysisResultRequestDto;
-  }): Observable<ExecutionResultDto> {
-    return this.executeAnalysisResult$Response(params).pipe(
-      map(
-        (r: StrictHttpResponse<ExecutionResultDto>) =>
-          r.body as ExecutionResultDto
-      )
-    );
-  }
 }
diff --git a/generated/api-nisq/services/compiler-analysis-result.service.ts b/generated/api-nisq/services/compiler-analysis-result.service.ts
@@ -68,7 +68,9 @@ export class CompilerAnalysisResultService extends BaseService {
    *
    * This method doesn't expect any request body.
    */
-  getCompilerAnalysisResults(params?: {}): Observable<CompilerAnalysisResultListDto> {
+  getCompilerAnalysisResults(params?: {}): Observable<
+    CompilerAnalysisResultListDto
+  > {
     return this.getCompilerAnalysisResults$Response(params).pipe(
       map(
         (r: StrictHttpResponse<CompilerAnalysisResultListDto>) =>
@@ -264,7 +266,7 @@ export class CompilerAnalysisResultService extends BaseService {
    */
   executeCompilationResult$Response(params: {
     resId: string;
-    token: string;
+    tokens: Map<string, string>;
   }): Observable<StrictHttpResponse<ExecutionResultDto>> {
     const rb = new RequestBuilder(
       this.rootUrl,
@@ -273,7 +275,7 @@ export class CompilerAnalysisResultService extends BaseService {
     );
     if (params) {
       rb.path('resId', params.resId, {});
-      rb.query('token', params.token, {});
+      rb.query('tokens', params.tokens, {});
     }
     return this.http
       .request(
@@ -300,7 +302,7 @@ export class CompilerAnalysisResultService extends BaseService {
    */
   executeCompilationResult(params: {
     resId: string;
-    token: string;
+    tokens: Map<string, string>;
   }): Observable<ExecutionResultDto> {
     return this.executeCompilationResult$Response(params).pipe(
       map(

diff --git a/generated/api-nisq/services/qpu-selection-result.service.ts b/generated/api-nisq/services/qpu-selection-result.service.ts
@@ -8,6 +8,7 @@ import { RequestBuilder } from '../request-builder';
 import { Observable } from 'rxjs';
 import { map, filter } from 'rxjs/operators';
 
+import { ExecuteAnalysisResultRequestDto } from '../models/execute-analysis-result-request-dto';
 import { ExecutionResultDto } from '../models/execution-result-dto';
 import { QpuSelectionJobDto } from '../models/qpu-selection-job-dto';
 import { QpuSelectionJobListDto } from '../models/qpu-selection-job-list-dto';
@@ -273,11 +274,11 @@ export class QpuSelectionResultService extends BaseService {
    * This method provides access to the full `HttpResponse`, allowing access to response headers.
    * To access only the response body, use `executeQpuSelectionResult()` instead.
    *
-   * This method doesn't expect any request body.
+   * This method sends `application/json` and handles request body of type `application/json`.
    */
   executeQpuSelectionResult$Response(params: {
     resId: string;
-    token: string;
+    body: ExecuteAnalysisResultRequestDto;
   }): Observable<StrictHttpResponse<ExecutionResultDto>> {
     const rb = new RequestBuilder(
       this.rootUrl,
@@ -286,7 +287,8 @@ export class QpuSelectionResultService extends BaseService {
     );
     if (params) {
       rb.path('resId', params.resId, {});
-      rb.query('token', params.token, {});
+
+      rb.body(params.body, 'application/json');
     }
     return this.http
       .request(
@@ -309,11 +311,11 @@ export class QpuSelectionResultService extends BaseService {
    * This method provides access to only to the response body.
    * To access the full response (for headers, for example), `executeQpuSelectionResult$Response()` instead.
    *
-   * This method doesn't expect any request body.
+   * This method sends `application/json` and handles request body of type `application/json`.
    */
   executeQpuSelectionResult(params: {
     resId: string;
-    token: string;
+    body: ExecuteAnalysisResultRequestDto;
   }): Observable<ExecutionResultDto> {
     return this.executeQpuSelectionResult$Response(params).pipe(
       map(