[82812] Remove deprecated OMZ tab and components (part 1) (#69)

Author: yatarkan

.features.json

@@ -1,5 +1,3 @@
 {
-  "DYNAMIC_SHAPES": 0,
-  "OMZ_REDESIGN": 1,
-  "HUGGING_FACE_MODELS": 1
+  "DYNAMIC_SHAPES": 0
 }

client/e2e/src/model-import-form.e2e-spec.ts

@@ -1,10 +1,9 @@
 import { browser, by, element, ElementArrayFinder, ElementFinder, protractor } from 'protractor';
 
-import { ModelColorChannels, TransformationsConfigType } from '@store/model-store/model.model';
+import { ModelColorChannels, ModelPrecisionEnum, TransformationsConfigType } from '@store/model-store/model.model';
 
 import { TestUtils } from './pages/test-utils';
 import { Helpers } from './pages/helpers';
-import { OMZModelPrecisionEnum } from '../../src/app/modules/model-manager/components/model-downloader-table/model-downloader-table.component';
 import { isMXNetModel, isTensorFlowModel, ModelFile } from './pages/model-file';
 
 describe('UI tests for model import form', () => {
@@ -234,8 +233,8 @@ describe('UI tests for model import form', () => {
       browser.params.defaultTimeout
     );
     await checkDropDownAndSetValue(testUtils.modelManagerPage.precisionContainer, conversionSettings.precision, [
-      OMZModelPrecisionEnum.FP32,
-      OMZModelPrecisionEnum.FP16,
+      ModelPrecisionEnum.FP32,
+      ModelPrecisionEnum.FP16,
     ]);
     expect(await testUtils.modelManagerPage.isParameterSatisfied('dataType-tip')).toBeTruthy(
       'Precision tip should shows that precision drop down is filled'

client/e2e/src/pages/hugging-face-model-download.po.ts

@@ -1,8 +1,9 @@
 import { browser, by, element, ElementArrayFinder, ElementFinder, protractor } from 'protractor';
 
+import { ModelPrecisionEnum } from '@store/model-store/model.model';
+
 import { TestUtils } from './test-utils';
 import { ModelFile } from './model-file';
-import { OMZModelPrecisionEnum } from '../../../src/app/modules/model-manager/components/model-downloader-table/model-downloader-table.component';
 
 export const filterGroupNames = ['task', 'library', 'model-type', 'language', 'license'];
 type FilterGroupName = typeof filterGroupNames[number];
@@ -163,7 +164,7 @@ export class HFModelDownloadPage {
   }
 
   async convertDownloadedModelToIR(
-    precision?: OMZModelPrecisionEnum,
+    precision?: ModelPrecisionEnum.FP32 | ModelPrecisionEnum.FP16,
     configurationMultiplier: number = 4
   ): Promise<void> {
     // Wait for the environment preparing to complete
@@ -183,14 +184,14 @@ export class HFModelDownloadPage {
     );
 
     if (precision) {
-      if (precision !== OMZModelPrecisionEnum.FP16) {
+      if (precision !== ModelPrecisionEnum.FP16) {
         await this.selectPrecision(precision);
       } else {
         console.log('select FP16');
         await browser.sleep(2000);
       }
     } else {
-      await this.selectPrecision(OMZModelPrecisionEnum.FP32);
+      await this.selectPrecision(ModelPrecisionEnum.FP32);
     }
 
     await browser.wait(this.until.elementToBeClickable(this.elements.convertButton), browser.params.defaultTimeout * 3);

client/e2e/src/pages/model-download.po.ts

@@ -8,8 +8,7 @@ export class ModelDownloadPage {
   until = protractor.ExpectedConditions;
 
   private readonly elements = {
-    // TODO: change test-id
-    OMZTab: TestUtils.getElementByDataTestId('open_model_zoo_(v2)'),
+    OMZTab: TestUtils.getElementByDataTestId('open_model_zoo'),
     searchField: TestUtils.getNestedElementByDataTestId(
       TestUtils.getElementByDataTestId('search-form-field'),
       'search'

client/e2e/src/pages/model-file.ts

@@ -1,4 +1,4 @@
-import { OMZModelPrecisionEnum } from '../../../src/app/modules/model-manager/components/model-downloader-table/model-downloader-table.component';
+import { ModelPrecisionEnum } from '@store/model-store/model.model';
 
 export type FrameworkType = 'OpenVINO IR' | 'MxNet' | 'Caffe' | 'ONNX' | 'TensorFlow' | 'TensorFlow V2';
 export type ColorSpace = 'RGB' | 'BGR' | 'Grayscale';
@@ -82,7 +82,7 @@ interface Tokenizer {
 
 interface ConversionSettings {
   colourSpace?: ColorSpace;
-  precision?: OMZModelPrecisionEnum;
+  precision?: ModelPrecisionEnum.FP32 | ModelPrecisionEnum.FP16;
   framework: FrameworkType;
   outputs: string[];
   irVersion: number;

client/e2e/src/pages/model-manager.po.ts

@@ -46,10 +46,6 @@ export class ModelManagerPage {
     return TestUtils.getElementByDataTestId('original_model');
   }
 
-  get OMZTab(): ElementFinder {
-    return TestUtils.getElementByDataTestId('open_model_zoo');
-  }
-
   get modelFrameworkContainer() {
     return element(by.id('framework'));
   }

client/src/app/modules/model-manager/components/base-model-zoo-import/base-model-zoo-import.component.ts

@@ -59,12 +59,20 @@ export abstract class BaseModelZooImportComponent<T, U = string> implements Afte
     },
   };
 
+  readonly failedModelsFetchingTemplateContext = {
+    action: () => {
+      this._triggerModelsLoading();
+    },
+  };
+
   protected readonly _unsubscribe$ = new Subject<void>();
 
   protected constructor() {
     this._subscribeToSortAndFiltersChanges();
   }
 
+  protected abstract _triggerModelsLoading(): void;
+
   protected abstract get _dataSourceFilter(): U;
 
   abstract importModel(): void;

client/src/app/modules/model-manager/components/hugging-face-import-ribbon-content/hugging-face-import-ribbon-content.component.html

@@ -1,5 +1,5 @@
 <wb-model-zoo-layout [isDetailsOpened]="!!selectedModel">
-  <wb-model-zoo-content #modelZooContent [loading]="isLoading$ | async">
+  <wb-model-zoo-content #modelZooContent [loading]="isLoading$ | async" [hasError]="!!(error$ | async)">
     <wb-config-form-field
       ngProjectAs="model-zoo-sort"
       [field]="sortField"
@@ -65,6 +65,8 @@
         </wb-card-content-row>
       </wb-card>
     </wb-card-grid>
+
+    <ng-container ngProjectAs="wb-model-zoo-error" [ngTemplateOutlet]="failedModelsFetchingTemplate"></ng-container>
   </wb-model-zoo-content>
 
   <wb-huggingface-model-details
@@ -152,3 +154,9 @@
     *ngTemplateOutlet="modelZooContent.emptyFilteredModelsTemplate; context: emptyFilteredModelsTemplateContext"
   ></ng-container>
 </ng-template>
+
+<ng-template #failedModelsFetchingTemplate>
+  <ng-container
+    *ngTemplateOutlet="modelZooContent.failedModelsFetchingTemplate; context: failedModelsFetchingTemplateContext"
+  ></ng-container>
+</ng-template>

client/src/app/modules/model-manager/components/hugging-face-import-ribbon-content/hugging-face-import-ribbon-content.component.ts

@@ -43,6 +43,7 @@ export class HuggingFaceImportRibbonContentComponent
 
   private readonly _modelData$ = this._store$.select(HuggingfaceModelStoreSelectors.selectModelsData);
   readonly isLoading$ = this._store$.select(HuggingfaceModelStoreSelectors.selectLoading);
+  readonly error$ = this._store$.select(HuggingfaceModelStoreSelectors.selectError);
 
   readonly dataSource = new HuggingfaceModelZooDataSource();
 
@@ -80,14 +81,18 @@ export class HuggingFaceImportRibbonContentComponent
         this._cdr.detectChanges();
       });
 
-    this._store$.dispatch(HuggingfaceModelStoreActions.loadModelData());
+    this._triggerModelsLoading();
   }
 
   ngOnDestroy(): void {
     super.ngOnDestroy();
     this._store$.dispatch(HuggingfaceModelStoreActions.reset());
   }
 
+  protected _triggerModelsLoading(): void {
+    this._store$.dispatch(HuggingfaceModelStoreActions.loadModelData());
+  }
+
   protected get _dataSourceFilter(): IHuggingfaceModelZooFilter {
     return {
       id: this.searchControl.value,