ClearML/clearml-web
1
0
Fork 0
mirror of https://github.com/clearml/clearml-web synced 2025-06-26 18:27:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Release v1.12 (#61)

Browse Source 
Co-authored-by: shallegro <shay@allego.ai>
This commit is contained in:
shyallegro
2023-08-02 15:35:38 +03:00
committed by GitHub
parent 37ee7b5c7e
commit aa038f4f82
482 changed files with 8743 additions and 6056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/app/webapp-common/select-model/select-model.effects.ts
View File

@@ -1,43 +1,43 @@
import {Injectable} from '@angular/core';
import {Store} from '@ngrx/store';
import {Actions, createEffect, ofType} from '@ngrx/effects';
import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects';
import * as actions from './select-model.actions';
import * as exSelectors from './select-model.reducer';
import {MODELS_PAGE_SIZE} from '../models/models.consts';
import {catchError, mergeMap, map, switchMap, withLatestFrom, debounceTime} from 'rxjs/operators';
import {catchError, mergeMap, map, switchMap, debounceTime} from 'rxjs/operators';
import {get} from 'lodash-es';
import {MODEL_TAGS, MODELS_TABLE_COL_FIELDS} from '../models/shared/models.const';
import {IModelsViewState} from '../models/reducers/models-view.reducer';
import {ApiModelsService} from '~/business-logic/api-services/models.service';
import {requestFailed} from '../core/actions/http.actions';
import {activeLoader, deactivateLoader, setServerError} from '../core/actions/layout.actions';
import {selectRouterParams} from '../core/reducers/router-reducer';
import {addMultipleSortColumns} from '../shared/utils/shared-utils';
import {of} from 'rxjs';
import {FilterMetadata} from 'primeng/api/filtermetadata';
import {ModelsGetAllExRequest} from '~/business-logic/model/models/modelsGetAllExRequest';
import {SortMeta} from 'primeng/api';
import {encodeOrder} from '../shared/utils/tableParamEncode';
import {addExcludeFilters, createFiltersFromStore, encodeOrder} from '../shared/utils/tableParamEncode';
import {selectTableSortFields} from './select-model.reducer';
import {escapeRegex} from '@common/shared/utils/escape-regex';
import {getNextModels, getSelectedModels, setSelectedModels, setSelectedModelsList, tableFilterChanged, tableSortChanged} from './select-model.actions';
import {getNextModels, getSelectedModels, setSelectedModels, setSelectedModelsList} from './select-model.actions';
import {selectMetadataColsForProject} from '@common/models/reducers';
import {ISmCol} from '@common/shared/ui-components/data/table/table.consts';
import {selectRouterProjectId} from '@common/core/reducers/projects.reducer';
@Injectable()
export class SelectModelEffects {
private selectModelsOnlyFields = ['created', 'framework', 'id', 'labels', 'name', 'ready', 'tags', 'system_tags', 'task.name', 'uri', 'user.name', 'parent', 'design', 'company', 'project.name', 'comment', 'last_update'];
constructor(private actions$: Actions, private store: Store<IModelsViewState>, private apiModels: ApiModelsService) {
constructor(private actions$: Actions, private store: Store, private apiModels: ApiModelsService) {
}
activeLoader = createEffect(() => this.actions$.pipe(
ofType(actions.getNextModels, actions.globalFilterChanged,
actions.allProjectsModeChanged, actions.tableSortChanged, actions.tableFilterChanged),
ofType(actions.getNextModels, actions.globalFilterChanged, actions.tableSortChanged, actions.tableFilterChanged),
map(action => activeLoader(action.type))
));
tableSortChange = createEffect(() => this.actions$.pipe(
ofType(actions.tableSortChanged),
withLatestFrom(this.store.select(selectTableSortFields)),
concatLatestFrom(() => this.store.select(selectTableSortFields)),
switchMap(([action, oldOrders]) => {
const orders = addMultipleSortColumns(oldOrders, action.colId, action.isShift);
return [actions.setTableSort({orders})];
@@ -45,7 +45,7 @@ export class SelectModelEffects {
));
modelsFilterChanged = createEffect(() => this.actions$.pipe(
ofType(actions.globalFilterChanged, actions.allProjectsModeChanged, actions.tableSortChanged, actions.tableFilterChanged, actions.showArchive, actions.clearTableFilter),
ofType(actions.globalFilterChanged, actions.tableSortChanged, actions.tableFilterChanged, actions.showArchive, actions.clearTableFilter),
debounceTime(0), // Let other effects finish first
switchMap((action) => this.fetchModels$(null)
.pipe(
@@ -62,7 +62,7 @@ export class SelectModelEffects {
getModels = createEffect(() => this.actions$.pipe(
ofType(getNextModels),
withLatestFrom(this.store.select(exSelectors.selectCurrentScrollId)),
concatLatestFrom(() => this.store.select(exSelectors.selectCurrentScrollId)),
switchMap(([action, scrollId]) =>
this.fetchModels$(scrollId)
.pipe(
@@ -91,29 +91,33 @@ export class SelectModelEffects {
));
getGetAllQuery(
scrollId: string, projectId: string, searchQuery: string, isAllProjects: boolean,
orderFields: SortMeta[], tableFilters: { [s: string]: FilterMetadata }, showArchived: boolean
scrollId: string, projectId: string, searchQuery: string, orderFields: SortMeta[],
tableFilters: { [s: string]: FilterMetadata }, showArchived: boolean, metadataCols: ISmCol[]
): ModelsGetAllExRequest {
const userFilter = get(tableFilters, [MODELS_TABLE_COL_FIELDS.USER, 'value']);
const tagsFilter = tableFilters?.[MODELS_TABLE_COL_FIELDS.TAGS]?.value;
const tagsFilterAnd = tableFilters?.[MODELS_TABLE_COL_FIELDS.TAGS]?.matchMode === 'AND';
const projectFilter = get(tableFilters, [MODELS_TABLE_COL_FIELDS.PROJECT, 'value']);
const systemTags = tableFilters?.system_tags?.value;
const systemTagsFilter = (showArchived ? [] :
false ? ['__$and', MODEL_TAGS.HIDDEN] : ['__$and', '__$not', MODEL_TAGS.HIDDEN]).concat(systemTags ? systemTags : []);
['__$and', '__$not', MODEL_TAGS.HIDDEN]).concat(systemTags ? systemTags : []);
const filters = createFiltersFromStore(tableFilters, true);
return {
...filters,
_any_: searchQuery ? {
pattern: escapeRegex(searchQuery),
fields: ['id', 'name', 'framework', 'system_tags', 'uri']
} : undefined,
/* eslint-disable @typescript-eslint/naming-convention */
project: projectFilter ? projectFilter : ((isAllProjects || !projectId || projectId === '*') ? undefined : [projectId]),
project: projectFilter,
scroll_id: scrollId || null, // null to create new scroll (undefined doesn't generate scroll)
size: MODELS_PAGE_SIZE,
order_by: encodeOrder(orderFields),
tags: (tagsFilter && tagsFilter.length > 0) ? tagsFilter : [],
...(tagsFilter?.length > 0 && {tags: addExcludeFilters(tagsFilterAnd ? ['__$and', ...tagsFilter] : tagsFilter)}),
system_tags: (systemTagsFilter && systemTagsFilter.length > 0) ? systemTagsFilter : [],
only_fields: this.selectModelsOnlyFields,
...(![0, 2].includes(tableFilters?.[MODELS_TABLE_COL_FIELDS.READY]?.value.length) && !!tableFilters && {ready: tableFilters?.[MODELS_TABLE_COL_FIELDS.READY]?.value[0] === 'true'}),
only_fields: [...this.selectModelsOnlyFields, ...metadataCols.map(col => col.id)],
...(tableFilters?.[MODELS_TABLE_COL_FIELDS.READY]?.value.length == 1 && !!tableFilters) ?
{ready: tableFilters?.[MODELS_TABLE_COL_FIELDS.READY]?.value[0] === 'true'} : {ready: undefined},
...(!window.location.href.includes('compare') && {ready: true}),
framework: tableFilters?.[MODELS_TABLE_COL_FIELDS.FRAMEWORK]?.value ?? undefined,
user: (userFilter && userFilter.length > 0) ? userFilter : undefined
@@ -124,17 +128,17 @@ export class SelectModelEffects {
fetchModels$(scrollId1: string) {
return of(scrollId1)
.pipe(
withLatestFrom(
concatLatestFrom(() => [
// TODO: refactor with ngrx router.
this.store.select(selectRouterParams).pipe(map(params => params?.projectId)),
this.store.select(exSelectors.selectIsAllProjectsMode),
this.store.select(selectRouterProjectId),
this.store.select(exSelectors.selectGlobalFilter),
this.store.select(exSelectors.selectTableSortFields),
this.store.select(exSelectors.selectTableFilters),
this.store.select(exSelectors.selectSelectModelTableFilters),
this.store.select(exSelectors.selectShowArchive),
),
switchMap(([scrollId, projectId, isAllProjects, gb, sortFields, filters, showArchive]) =>
this.apiModels.modelsGetAllEx(this.getGetAllQuery(scrollId, projectId, gb, isAllProjects, sortFields, filters, showArchive))
this.store.select(selectMetadataColsForProject),
]),
switchMap(([scrollId, projectId, gb, sortFields, filters, showArchive, metadataCols]) =>
this.apiModels.modelsGetAllEx(this.getGetAllQuery(scrollId, projectId, gb, sortFields, filters, showArchive, metadataCols))
)
);
}