get queuesize and check up to date

UST-QuAntiL · Aug 6, 2024 · 817d4d6 · 817d4d6
1 parent 6550b5b
commit 817d4d6
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 34 deletions.
diff --git a/src/app/components/algorithms/nisq-analyzer/nisq-analyzer.component.html b/src/app/components/algorithms/nisq-analyzer/nisq-analyzer.component.html
@@ -143,10 +143,6 @@ <h3>Analysis Job from {{ analyzerJob.time }}</h3>
                       <span>{{ resParam.key }} = {{ resParam.value }}</span>
                   </div>
                   <p></p>
-                  <div *ngIf="!qpuCheckFinished" class="spinner-wrapper">
-                      <span><i>Check if QPU data is up-to-date</i></span>
-                      <mat-spinner class="mat-spinner-left" [diameter]="20"></mat-spinner>
-                  </div>
               </div>
               <div
                       *ngIf="jobReady && analyzerResults && analyzerResults.length === 0"

diff --git a/src/app/components/algorithms/nisq-analyzer/nisq-analyzer.component.ts b/src/app/components/algorithms/nisq-analyzer/nisq-analyzer.component.ts
@@ -25,6 +25,7 @@ import {
   EntityModelMcdaWeightLearningJob,
   CriterionValue,
   EntityModelMcdaJob,
+  QpuSelectionJobDto,
 } from 'api-nisq/models';
 import { AnalysisResultService } from 'api-nisq/services/analysis-result.service';
 import { ImplementationService } from 'api-nisq/services/implementation.service';
@@ -353,6 +354,7 @@ export class NisqAnalyzerComponent implements OnInit {
       this.jobReady = jobResult.ready;
       this.analyzerJob = jobResult;
       this.analyzerResults = jobResult.analysisResultList;
+      this.allQpuSelectionResults = [];
       this.analyzerResults.forEach((analysisResult) => {
         this.qpuSelectionService
           .getQpuSelectionJob({ resId: analysisResult.qpuSelectionJobId })
@@ -363,19 +365,25 @@ export class NisqAnalyzerComponent implements OnInit {
             this.dataSource = new MatTableDataSource(
               this.allQpuSelectionResults
             );
+            for (const analysisQpuSelectionResult of qpuSelectionJob.qpuSelectionResultList) {
+              this.queueLengths[analysisQpuSelectionResult.qpu] =
+                analysisQpuSelectionResult.queueSize;
+              this.hasExecutionResult(analysisQpuSelectionResult);
+              this.checkIfQpuDataIsOutdated(
+                analysisQpuSelectionResult,
+                qpuSelectionJob
+              );
+            }
           });
       });
-      for (const analysisResult of this.allQpuSelectionResults) {
-        this.showBackendQueueSize(analysisResult);
-        setInterval(() => this.showBackendQueueSize(analysisResult), 300000);
-        this.hasExecutionResult(analysisResult);
-        this.checkIfQpuDataIsOutdated(analysisResult);
-      }
     });
     return true;
   }
 
-  checkIfQpuDataIsOutdated(analysisResult: QpuSelectionResultDto): void {
+  checkIfQpuDataIsOutdated(
+    analysisResult: QpuSelectionResultDto,
+    qpuSelectionJob: QpuSelectionJobDto
+  ): void {
     let provider = null;
     this.qprovService.getProviders().subscribe((providers) => {
       for (const providerDto of providers._embedded.providerDtoes) {
@@ -391,29 +399,26 @@ export class NisqAnalyzerComponent implements OnInit {
       this.qprovService
         .getQpUs({ providerId: provider.id })
         .subscribe((qpuResult) => {
-          for (const qpuDto of qpuResult._embedded.qpuDtoes) {
-            if (
-              qpuDto.name.toLowerCase() === analysisResult.qpu.toLowerCase()
-            ) {
+          if (analysisResult.qpu.toLowerCase() === 'aer_simulator') {
+            this.qpuDataIsUpToDate.set(analysisResult, true);
+          } else {
+            for (const qpuDto of qpuResult._embedded.qpuDtoes) {
               if (
-                qpuDto.lastCalibrated === null ||
-                Date.parse(analysisResult.time) >=
-                  Date.parse(qpuDto.lastCalibrated)
+                qpuDto.name.toLowerCase() === analysisResult.qpu.toLowerCase()
               ) {
-                this.qpuDataIsUpToDate.set(analysisResult, true);
-              } else {
-                this.qpuDataIsUpToDate.set(analysisResult, false);
+                if (
+                  qpuDto.lastCalibrated === null ||
+                  Date.parse(analysisResult.time) >=
+                    Date.parse(qpuDto.lastCalibrated)
+                ) {
+                  this.qpuDataIsUpToDate.set(analysisResult, true);
+                } else {
+                  this.qpuDataIsUpToDate.set(analysisResult, false);
+                }
+                break;
               }
-              break;
             }
           }
-          this.qpuCounter++;
-          if (this.qpuCounter === this.analyzerJob.analysisResultList.length) {
-            this.qpuCheckFinished = true;
-            this.qpuCounter = 0;
-          } else {
-            this.qpuCheckFinished = false;
-          }
         });
     });
   }
@@ -582,11 +587,15 @@ export class NisqAnalyzerComponent implements OnInit {
   }
 
   showBackendQueueSize(analysisResult: QpuSelectionResultDto): void {
-    this.nisqAnalyzerService
-      .getIBMQBackendState(analysisResult.qpu)
-      .subscribe((data) => {
-        this.queueLengths[analysisResult.qpu] = data.lengthQueue;
-      });
+    if (analysisResult.qpu !== 'aer_simluator') {
+      this.nisqAnalyzerService
+        .getIBMQBackendState(analysisResult.qpu)
+        .subscribe((data) => {
+          this.queueLengths[analysisResult.qpu] = data.lengthQueue;
+        });
+    } else {
+      this.queueLengths[analysisResult.qpu] = analysisResult.queueSize;
+    }
   }
 
   setVendorTokens(