@nyris/nyris-webapp 0.3.2 → 0.3.5

package/src/services/image.ts

@@ -1,110 +1,40 @@
-import { ImageSearchOptions, urlOrBlobToCanvas } from "@nyris/nyris-api";
-import NyrisAPICT from "./findRegionsCustom";
+import {
+  NyrisAPISettings,
+  RectCoords,
+  selectFirstCenteredRegion,
+  urlOrBlobToCanvas
+} from "@nyris/nyris-api";
 import NyrisAPI from "@nyris/nyris-api";
-import { fileOrBlobToCanvas, rectToCrop } from "./nyris";
+import {isEqual} from "lodash";
 
-export const serviceImage = async (file: any, stateStore: any) => {
-  try {
-    const { settings } = stateStore;
-    let options = settings;
-    const nyrisApi = new NyrisAPICT(settings);
-    const randomId = Math.random().toString();
+export const defaultRect = {x1: 0, x2: 1, y1: 0, y2: 1};
 
-    const image: any = await fileOrBlobToCanvas(file);
-    const imageFileCanvas = { canvas: image, id: randomId };
+export const createImage = async (fileOrUrl: File|string|HTMLCanvasElement) => {
+  const image = fileOrUrl instanceof HTMLCanvasElement ? fileOrUrl : await urlOrBlobToCanvas(fileOrUrl);
+  return image;
+}
 
-    const searchServiceSettings: any = {
-      ...settings,
-      responseHook: (r: any) => ({ offerInfos: r.results }),
-    };
+export const findRegions = async (image: HTMLCanvasElement, settings: NyrisAPISettings) => {
+  const nyrisApi = new NyrisAPI(settings);
+  let regions = await nyrisApi.findRegions(image);
 
-    const regions: any = await nyrisApi.findRegions(
-      image,
-      searchServiceSettings
-    );
-    const { results, requestId, duration, categoryPredictions, codes } =
-      await nyrisApi.findByImage(image, options);
-    const payload = {
-      results,
-      requestId,
-      categoryPredictions,
-      codes,
-      duration,
-      regions,
-      requestImage: imageFileCanvas,
-    };
-
-    return payload;
-  } catch (error) {
-    console.log("error serviceImage", error);
-    return;
+  const selectedRegion = selectFirstCenteredRegion(regions, 0.3, defaultRect);
+  return {
+    selectedRegion: isEqual(selectedRegion, defaultRect) ? undefined : selectedRegion,
+    regions
   }
 };
 
-export const serviceImageNonRegion = async (
-  file: any,
-  stateStore: any,
-  rectCoords: any
-) => {
-  const { settings } = stateStore;
-  const api = new NyrisAPI(settings);
-  const image = await urlOrBlobToCanvas(file);
-  const randomId = Math.random().toString();
-  const imageFileCanvas = { canvas: image, id: randomId };
-  let options: ImageSearchOptions = {
-    cropRect: rectCoords,
-  };
-  try {
-    const { results, duration, requestId, categoryPredictions, codes } =
-      await api.findByImage(image, options);
-    return {
-      results,
-      requestId,
-      duration,
-      categoryPredictions,
-      codes,
-      requestImage: imageFileCanvas,
-    };
-  } catch (e) {
-    console.warn("search failed serviceImageNonRegion", e);
+export const findByImage = (image: HTMLCanvasElement, settings: NyrisAPISettings, region?: RectCoords) => {
+  const nyrisApi = new NyrisAPI(settings);
+  let options = {};
+  if (region) {
+    options = { cropRect: region };
   }
+  return nyrisApi.findByImage(image, options);
 };
 
-export const searchImageByPosition = async (
-  image: HTMLCanvasElement,
-  stateStore: any,
-  region?: any
-) => {
-  try {
-    const { settings } = stateStore;
-
-    let options = settings;
-    const nyrisApi = new NyrisAPICT(settings);
-    if (region) {
-      let { x1, x2, y1, y2 } = region;
-      let crop = rectToCrop({
-        x1: x1 * image.width,
-        x2: x2 * image.width,
-        y1: y1 * image.height,
-        y2: y2 * image.height,
-      });
-      options = {
-        ...options,
-        crop,
-      };
-    }
-    const { results, duration, requestId, categoryPredictions, codes } =
-      await nyrisApi.findByImage(image, options);
-    const payload = {
-      results,
-      requestId,
-      categoryPredictions,
-      codes,
-      duration,
-      regions: region,
-    };
-    return payload;
-  } catch (error: any) {
-    console.log("error searchImageByPosition", error);
-  }
+export const findByCadFile = (file: File, settings: NyrisAPISettings) => {
+  const nyrisApi = new NyrisAPI(settings);
+  return nyrisApi.findByCad(file, {});
 };

package/src/services/session.ts

@@ -1,20 +1,17 @@
-import NyrisAPI from "@nyris/nyris-api";
-import axios, { AxiosInstance } from "axios";
+import axios from "axios";
+import {NyrisAPISettings} from "@nyris/nyris-api";
 
 const httpClient = axios.create();
 
-export const createSessionByApi = async (state: any) => {
-  const { search, settings } = state;
-  try {
-    let headers: any = {
-      "X-Api-Key": settings.apiKey,
-    };
-    return await httpClient.request({
-      method: "POST",
-      url: `${settings.imageMatchingUrl}/session`,
-      headers,
-    });
-  } catch (error: any) {
-    console.log("error createAction:", error);
-  }
+export const createSessionByApi = async (settings: NyrisAPISettings) => {
+  const { apiKey, baseUrl} = settings;
+  let headers = {
+    "X-Api-Key": apiKey,
+  };
+  let response = await httpClient.request({
+    method: "POST",
+    url: `${baseUrl}/find/v1/session`,
+    headers,
+  });
+  return response.data.session;
 };

package/src/services/types.ts

@@ -1,22 +1,8 @@
 // import {SearchAction, SearchState} from "./actions/searchActions";
 // import {NyrisAction, NyrisAppState} from "./actions/nyrisAppActions";
 
-export interface MDSettings {
-    customFontFamily?: string,
 
-    appBarLogoUrl: string,
-    appBarTitle: string,
-    appBarCustomBackgroundColor?: string,
-    appBarCustomTextColor?: string,
-
-    primaryColor: string,
-    secondaryColor: string,
-    resultFirstRowProperty: string,
-    resultSecondRowProperty: string,
-
-    resultLinkText?: string,
-    resultLinkIcon?: string,
-}
+import {MDSettings} from "../types";
 
 export interface SearchServiceSettings {
     xOptions: boolean | string,
@@ -41,27 +27,6 @@ export interface SearchServiceSettings {
     useRecommendations: boolean
 }
 
-export interface ImageSearchOptions {
-    geoLocation?: { lat: number, lon: number, dist: number };
-    crop?: { x: number, y: number, w: number, h: number };
-    maxWidth: number;
-    maxHeight: number;
-    useRecommendations: boolean;
-    jpegQuality: number;
-}
-
-export interface RectCoords {
-    x1: number,
-    y1: number,
-    x2: number,
-    y2: number
-}
-
-export type Region = {
-    className?: string,
-    confidence?: number
-} & RectCoords
-
 export interface Crop {
     x: number,
     y: number,
@@ -74,23 +39,12 @@ export interface WH {
     h: number
 }
 
-// export type AppState = {
-//     search: SearchState,
-//     settings: SearchServiceSettings,
-//     nyrisDesign: NyrisAppState
-// };
-
-// export type AppAction =
-//     | SearchAction
-//     | NyrisAction
-
-
 export interface Result {
     position: number,
     sku?: string,
     title?: string,
     l?: string,
     img?: { url?: string },
-    // There can be also any other ddata
+    // There can be also any other data
     [x: string]: any
 }

package/src/types.ts

@@ -1,7 +1,6 @@
 import {NyrisAPISettings} from "@nyris/nyris-api";
-import { NyrisAction } from "Store/common";
 import { NyrisAppState } from "Store/Nyris";
-import { SearchAction, SearchState } from "Store/Search";
+import { SearchState } from "Store/Search";
 
 export interface MDSettings {
     customFontFamily?: string,
@@ -21,6 +20,12 @@ export interface MDSettings {
     active?: boolean
 }
 
+export interface AlgoliaSettings {
+    apiKey: string,
+    appId: string,
+    indexName: string
+}
+
 export interface AppSettings extends NyrisAPISettings {
     exampleImages: string[],
     preview: boolean,
@@ -28,9 +33,9 @@ export interface AppSettings extends NyrisAPISettings {
     noImageUrl?: string,
     resultTemplate?: string,
     regions: boolean,
-    materialDesign?: MDSettings,
     instantRedirectPatterns: string[],
-    themePage: ThemeChoice
+    themePage: ThemeChoice,
+    algolia?: AlgoliaSettings
 }
 
 export interface DefaultThemeSettings  {
@@ -53,10 +58,6 @@ export type AppState = {
     nyrisDesign: NyrisAppState
 };
 
-export type AppAction =
-    | SearchAction
-    | NyrisAction
-
 export interface CanvasWithId {
     canvas: HTMLCanvasElement
     id: string
@@ -85,3 +86,6 @@ export interface SearchServiceSettings {
     useRecommendations: boolean
 }
 
+export interface AlgoliaResult {
+    sku: string
+}