Release v1.6 (#31)

2025-06-26 18:27:02 +00:00 · 2022-07-10 14:10:46 +03:00
parent c7c4e73645
commit b96f723af1
339 changed files with 9471 additions and 7768 deletions
--- a/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.html
+++ b/src/app/features/experiments/containers/experiment-info-navbar/experiment-info-navbar.component.html
@@ -1,58 +1,66 @@
-<nav [smOverflows]="splitSize" (onOverflows)="navbarOverflowed($event)" [class.minimized]="minimized">
-    <span [routerLink]="['execution']" routerLinkActive #rlaExecution="routerLinkActive" queryParamsHandling="preserve">
-      <sm-navbar-item header="execution" [active]="rlaExecution.isActive" class="small-nav"></sm-navbar-item>
-    </span>
-      <span [routerLink]="['hyper-params/hyper-param/_empty_']" queryParamsHandling="merge">
-      <sm-navbar-item header="configuration"
-                      class="small-nav"
-                      [active]="(routerConfig$| async)?.includes('hyper-params')"></sm-navbar-item>
-    </span>
-      <span [routerLink]="['artifacts']" routerLinkActive #rlaModel="routerLinkActive" queryParamsHandling="preserve">
-      <sm-navbar-item header="artifacts"
-                      class="small-nav"
-                      [active]="rlaModel.isActive"></sm-navbar-item>
-    </span>
-      <span [routerLink]="['general']" routerLinkActive #rlaGeneral="routerLinkActive" queryParamsHandling="preserve">
-      <sm-navbar-item header="info"
-                      class="small-nav"
-                      [active]="rlaGeneral.isActive"></sm-navbar-item>
-    </span>
-
+<nav (smOverflows)="navbarOverflowed($event)" [overflowTrigger]="splitSize" [overflowDelay]="800"
+     [class.minimized]="minimized">
+  <span [routerLink]="['execution']" routerLinkActive="active" #rlaExecution="routerLinkActive"
+        queryParamsHandling="preserve">
+    <sm-navbar-item header="execution" [active]="rlaExecution.isActive" class="small-nav"></sm-navbar-item>
+  </span>
+  <span [routerLink]="['hyper-params/hyper-param/_empty_']" queryParamsHandling="merge">
+    <sm-navbar-item header="configuration" class="small-nav" [active]="(routerConfig$| async)?.includes('hyper-params')"></sm-navbar-item>
+  </span>
+  <span [routerLink]="['artifacts']" routerLinkActive="active" #rlaModel="routerLinkActive" queryParamsHandling="preserve">
+    <sm-navbar-item header="artifacts" class="small-nav" [active]="rlaModel.isActive"></sm-navbar-item>
+  </span>
+  <span [routerLink]="['general']" routerLinkActive="active" #rlaGeneral="routerLinkActive" queryParamsHandling="preserve">
+    <sm-navbar-item header="info" class="small-nav" [active]="rlaGeneral.isActive"></sm-navbar-item>
+  </span>
  <span [matMenuTriggerFor]="results" *ngIf="overflow">
-        <sm-navbar-item header="results"
-                        class="small-nav"
-                        [multi]="true"
-                        [active]="rlaDebug.isActive || rlaPlots.isActive || rlaScalars.isActive || rlaLog.isActive"></sm-navbar-item>
+    <sm-navbar-item
+      header="results" class="small-nav" [multi]="true"
+      [active]="rlaDebug.isActive || rlaPlots.isActive || rlaScalars.isActive || rlaLog.isActive"
+    ></sm-navbar-item>
  </span>
  <div class="d-inline-block" [style.visibility]="overflow ? 'hidden' : 'visible'">
-  <span [routerLink]="baseInfoRoute.concat(['log'])" routerLinkActive queryParamsHandling="preserve"
-        #rlaLog="routerLinkActive">
-        <sm-navbar-item class="small-nav" header="console" [active]="rlaLog.isActive"></sm-navbar-item>
-      </span>
-    <span [routerLink]="baseInfoRoute.concat(['metrics','scalar'])" routerLinkActive queryParamsHandling="preserve"
-          #rlaScalars="routerLinkActive">
-        <sm-navbar-item class="small-nav" header="Scalars" [active]="rlaScalars.isActive"></sm-navbar-item>
-      </span>
-    <span [routerLink]="baseInfoRoute.concat(['metrics','plots'])" routerLinkActive queryParamsHandling="preserve"
-          #rlaPlots="routerLinkActive">
-        <sm-navbar-item class="small-nav" header="PLOTS" [active]="rlaPlots.isActive"></sm-navbar-item>
-      </span>
-    <span [routerLink]="baseInfoRoute.concat(['debugImages'])" routerLinkActive queryParamsHandling="preserve"
-          #rlaDebug="routerLinkActive">
-        <sm-navbar-item class="small-nav" header="DEBUG SAMPLES" [active]="rlaDebug.isActive"></sm-navbar-item>
-      </span>
+    <span
+      [routerLink]="baseInfoRoute.concat(['log'])"
+      routerLinkActive="active"
+      queryParamsHandling="preserve"
+      #rlaLog="routerLinkActive"
+    >
+      <sm-navbar-item class="small-nav" header="console" [active]="rlaLog.isActive"></sm-navbar-item>
+    </span>
+    <span
+      [routerLink]="baseInfoRoute.concat(['metrics','scalar'])"
+      routerLinkActive="active"
+      queryParamsHandling="preserve"
+      #rlaScalars="routerLinkActive"
+    >
+      <sm-navbar-item class="small-nav" header="Scalars" [active]="rlaScalars.isActive"></sm-navbar-item>
+    </span>
+    <span
+      [routerLink]="baseInfoRoute.concat(['metrics','plots'])" routerLinkActive="active"
+      queryParamsHandling="preserve"
+      #rlaPlots="routerLinkActive"
+    >
+      <sm-navbar-item class="small-nav" header="PLOTS" [active]="rlaPlots.isActive"></sm-navbar-item>
+    </span>
+    <span
+      [routerLink]="baseInfoRoute.concat(['debugImages'])"
+      routerLinkActive="active"
+      queryParamsHandling="preserve"
+      #rlaDebug="routerLinkActive"
+    >
+      <sm-navbar-item class="small-nav" header="DEBUG SAMPLES" [active]="rlaDebug.isActive"></sm-navbar-item>
+    </span>
  </div>
  <mat-menu #results="matMenu">
-    <button mat-menu-item [routerLink]="baseInfoRoute.concat(['log'])" [class.active]="rlaLog.isActive">CONSOLE</button>
-    <button mat-menu-item [routerLink]="baseInfoRoute.concat(['metrics','scalar'])"
-            [class.active]="rlaScalars.isActive">SCALARS
-    </button>
-    <button mat-menu-item [routerLink]="baseInfoRoute.concat(['metrics','plots'])" [class.active]="rlaPlots.isActive">
-      PLOTS
-    </button>
-    <button mat-menu-item [routerLink]="baseInfoRoute.concat(['debugImages'])" [class.active]="rlaDebug.isActive">DEBUG
-      SAMPLES
-    </button>
+    <button mat-menu-item [routerLink]="baseInfoRoute.concat(['log'])" [class.active]="rlaLog.isActive"
+    >CONSOLE</button>
+    <button mat-menu-item [routerLink]="baseInfoRoute.concat(['metrics','scalar'])" [class.active]="rlaScalars.isActive"
+    >SCALARS</button>
+    <button mat-menu-item [routerLink]="baseInfoRoute.concat(['metrics','plots'])" [class.active]="rlaPlots.isActive"
+    >PLOTS</button>
+    <button mat-menu-item [routerLink]="baseInfoRoute.concat(['debugImages'])" [class.active]="rlaDebug.isActive"
+    >DEBUG SAMPLES</button>
  </mat-menu>
  <ng-content select="[refresh]"></ng-content>
 </nav>
--- a/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.html
+++ b/src/app/features/experiments/containers/experiment-ouptut/experiment-output.component.html
@@ -1,7 +1,6 @@
 <sm-overlay [backdropActive]="backdropActive$|async"></sm-overlay>
 <sm-experiment-info-header-status-icon-label
  [status]=" (selectedExperiment)?.status || selectedExperiment?.status"
-  [development]="isDevelopment"
 ></sm-experiment-info-header-status-icon-label>
 <div class="experiment-output-container light-theme" [class.minimized]="minimized">
  <sm-experiment-info-header
--- a/src/app/features/experiments/effects/experiment-output.effects.ts
+++ b/src/app/features/experiments/effects/experiment-output.effects.ts
@@ -1,19 +1,25 @@
 import {Injectable} from '@angular/core';
-import {Actions} from '@ngrx/effects';
-import {Store} from '@ngrx/store';
-import {ApiTasksService} from '../../../business-logic/api-services/tasks.service';
-import {ApiAuthService} from '../../../business-logic/api-services/auth.service';
-import {BlTasksService} from '../../../business-logic/services/tasks.service';
-import {ApiEventsService} from '../../../business-logic/api-services/events.service';
-import {CommonExperimentOutputState} from '../../../webapp-common/experiments/reducers/common-experiment-output.reducer';
+import {Actions, createEffect, ofType} from '@ngrx/effects';
+import { downloadFullLog } from '@common/experiments/actions/common-experiment-output.actions';
+import {filter, map} from 'rxjs/operators';
+import {HTTP} from '~/app.constants';


@Injectable()
 export class ExperimentOutputEffects {

-  constructor(private actions$: Actions, private store: Store<CommonExperimentOutputState>, private apiTasks: ApiTasksService,
-              private authApi: ApiAuthService, private taskBl: BlTasksService, private eventsApi: ApiEventsService) {
+  constructor(private actions$: Actions) {
  }

-
+  downloadFullLog$ = createEffect(() => this.actions$.pipe(
+    ofType(downloadFullLog),
+    filter(action => !!action.experimentId),
+    map(action => {
+      const a = document.createElement('a');
+      a.href = `${HTTP.API_BASE_URL}/events.download_task_log?line_type=text&task=${action.experimentId}`;
+      a.target = '_blank';
+      a.download = 'Log';
+      a.click();
+    })
+  ), {dispatch: false});
 }
--- a/src/app/features/experiments/shared/experiments.const.ts
+++ b/src/app/features/experiments/shared/experiments.const.ts
@@ -1,7 +1,5 @@
-import {TaskStatusEnum} from '../../../business-logic/model/tasks/taskStatusEnum';
+import {TaskStatusEnum} from '~/business-logic/model/tasks/taskStatusEnum';
 import {ExperimentTableColFieldsEnum} from './experiments.model';
-import {TaskTypeEnum} from '~/business-logic/model/tasks/taskTypeEnum';
-import {Model} from '~/business-logic/model/models/model';

 export type experimentSectionsEnum =
  'MODEL_INPUT'
@@ -62,3 +60,11 @@ export const EXPERIMENTS_STATUS_LABELS = {
 export const DevWarningEnabled = false;

 export const excludeTypes = [];
+
+export const DATASETS_STATUS_LABEL = {
+  [TaskStatusEnum.InProgress]: 'Uploading',
+  [TaskStatusEnum.Completed]: 'Final',
+  Running: 'Uploading',
+  Completed: 'Final'
+};
+