react-native-executorch 0.4.7 → 0.5.0

package/lib/module/constants/ocr/symbols.js

@@ -12,131 +12,131 @@ export const alphabets = {
   kannada: '0123456789!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZಂಃಅಆಇಈಉಊಋಎಏಐಒಓಔಕಖಗಘಙಚಛಜಝಞಟಠಡಢಣತಥದಧನಪಫಬಭಮಯರಲಳವಶಷಸಹಾಿೀುೂೃೆೇೈೊೋೌ್೦೧೨೩೪೫೬೭೮೯'
 };
 export const symbols = {
-  //Abaza
+  // Abaza
   abq: alphabets.cyrillic,
-  //Adyghe
+  // Adyghe
   ady: alphabets.cyrillic,
-  //Africans
+  // Africans
   af: alphabets.latin,
-  //Avar
+  // Avar
   ava: alphabets.cyrillic,
-  //Azerbaijani
+  // Azerbaijani
   az: alphabets.latin,
-  //Belarusian
+  // Belarusian
   be: alphabets.cyrillic,
-  //Bulgarian
+  // Bulgarian
   bg: alphabets.cyrillic,
-  //Bosnian
+  // Bosnian
   bs: alphabets.latin,
-  //Simplified Chinese
+  // Simplified Chinese
   chSim: alphabets.zhSim,
-  //Chechen
+  // Chechen
   che: alphabets.cyrillic,
-  //Czech
+  // Czech
   cs: alphabets.latin,
-  //Welsh
+  // Welsh
   cy: alphabets.latin,
-  //Danish
+  // Danish
   da: alphabets.latin,
-  //Dargwa
+  // Dargwa
   dar: alphabets.cyrillic,
-  //German
+  // German
   de: alphabets.latin,
-  //English
+  // English
   en: alphabets.english,
-  //Spanish
+  // Spanish
   es: alphabets.latin,
-  //Estonian
+  // Estonian
   et: alphabets.latin,
-  //French
+  // French
   fr: alphabets.latin,
-  //Irish
+  // Irish
   ga: alphabets.latin,
-  //Croatian
+  // Croatian
   hr: alphabets.latin,
-  //Hungarian
+  // Hungarian
   hu: alphabets.latin,
-  //Indonesian
+  // Indonesian
   id: alphabets.latin,
-  //Ingush
+  // Ingush
   inh: alphabets.cyrillic,
-  //Icelandic
+  // Icelandic
   ic: alphabets.latin,
-  //Italian
+  // Italian
   it: alphabets.latin,
-  //Japanese
+  // Japanese
   ja: alphabets.japanese,
-  //Karbadian
+  // Karbadian
   kbd: alphabets.cyrillic,
-  //Kannada
+  // Kannada
   kn: alphabets.kannada,
-  //Korean
+  // Korean
   ko: alphabets.korean,
-  //Kurdish
+  // Kurdish
   ku: alphabets.latin,
-  //Latin
+  // Latin
   la: alphabets.latin,
-  //Lak
+  // Lak
   lbe: alphabets.cyrillic,
-  //Lezghian
+  // Lezghian
   lez: alphabets.cyrillic,
-  //Lithuanian
+  // Lithuanian
   lt: alphabets.latin,
-  //Latvian
+  // Latvian
   lv: alphabets.latin,
-  //Maori
+  // Maori
   mi: alphabets.latin,
-  //Mongolian
+  // Mongolian
   mn: alphabets.cyrillic,
-  //Malay
+  // Malay
   ms: alphabets.latin,
-  //Maltese
+  // Maltese
   mt: alphabets.latin,
-  //Dutch
+  // Dutch
   nl: alphabets.latin,
-  //Norwegian
+  // Norwegian
   no: alphabets.latin,
-  //Occitan
+  // Occitan
   oc: alphabets.latin,
-  //Pali
+  // Pali
   pi: alphabets.latin,
-  //Polish
+  // Polish
   pl: alphabets.latin,
-  //Portuguese
+  // Portuguese
   pt: alphabets.latin,
-  //Romanian
+  // Romanian
   ro: alphabets.latin,
-  //Russian
+  // Russian
   ru: alphabets.cyrillic,
-  //Serbian (cyrillic)
+  // Serbian (cyrillic)
   rsCyrillic: alphabets.cyrillic,
-  //Serbian (latin)
+  // Serbian (latin)
   rsLatin: alphabets.latin,
-  //Slovak
+  // Slovak
   sk: alphabets.latin,
-  //Slovenian
+  // Slovenian
   sl: alphabets.latin,
-  //Albanian
+  // Albanian
   sq: alphabets.latin,
-  //Swedish
+  // Swedish
   sv: alphabets.latin,
-  //Swahili
+  // Swahili
   sw: alphabets.latin,
-  //Tabassaran
+  // Tabassaran
   tab: alphabets.cyrillic,
-  //Telugu
+  // Telugu
   te: alphabets.telugu,
-  //Tajik
+  // Tajik
   tjk: alphabets.cyrillic,
-  //Tagalog
+  // Tagalog
   tl: alphabets.latin,
-  //Turkish:
+  // Turkish
   tr: alphabets.latin,
-  //Ukrainian
+  // Ukrainian
   uk: alphabets.cyrillic,
-  //Uzbek
+  // Uzbek
   uz: alphabets.latin,
-  //Vietnamese
+  // Vietnamese
   vi: alphabets.latin
 };
 //# sourceMappingURL=symbols.js.map

package/lib/module/controllers/LLMController.js

@@ -8,6 +8,7 @@ import { readAsStringAsync } from 'expo-file-system';
 import { SPECIAL_TOKENS } from '../types/llm';
 import { LLMNativeModule } from '../native/RnExecutorchModules';
 import { parseToolCall } from '../utils/llm';
+import { Logger } from '../common/Logger';
 export class LLMController {
   chatConfig = DEFAULT_CHAT_CONFIG;
   onToken = null;
@@ -23,11 +24,10 @@ export class LLMController {
     responseCallback,
     messageHistoryCallback,
     isReadyCallback,
-    isGeneratingCallback,
-    onDownloadProgressCallback
+    isGeneratingCallback
   }) {
     if (responseCallback !== undefined) {
-      console.warn('Passing response callback is deprecated and will be removed in 0.6.0');
+      Logger.warn('Passing response callback is deprecated and will be removed in 0.6.0');
     }
     this.tokenCallback = token => {
       tokenCallback?.(token);
@@ -48,7 +48,6 @@ export class LLMController {
       this._isGenerating = isGenerating;
       isGeneratingCallback?.(isGenerating);
     };
-    this.onDownloadProgressCallback = onDownloadProgressCallback;
     this.nativeModule = LLMNativeModule;
   }
   get response() {
@@ -66,7 +65,8 @@ export class LLMController {
   async load({
     modelSource,
     tokenizerSource,
-    tokenizerConfigSource
+    tokenizerConfigSource,
+    onDownloadProgressCallback
   }) {
     // reset inner state when loading new model
     this.responseCallback('');
@@ -74,11 +74,17 @@ export class LLMController {
     this.isGeneratingCallback(false);
     this.isReadyCallback(false);
     try {
-      const tokenizerFileUri = await ResourceFetcher.fetch(tokenizerSource);
-      const tokenizerConfigFileUri = await ResourceFetcher.fetch(tokenizerConfigSource);
-      this.tokenizerConfig = JSON.parse(await readAsStringAsync('file://' + tokenizerConfigFileUri));
-      const modelFileUri = await ResourceFetcher.fetch(modelSource, this.onDownloadProgressCallback);
-      await this.nativeModule.loadLLM(modelFileUri, tokenizerFileUri);
+      const tokenizersPromise = ResourceFetcher.fetch(undefined, tokenizerSource, tokenizerConfigSource);
+      const modelPromise = ResourceFetcher.fetch(onDownloadProgressCallback, modelSource);
+      const [tokenizersResults, modelResult] = await Promise.all([tokenizersPromise, modelPromise]);
+      const tokenizerPath = tokenizersResults?.[0];
+      const tokenizerConfigPath = tokenizersResults?.[1];
+      const modelPath = modelResult?.[0];
+      if (!tokenizerPath || !tokenizerConfigPath || !modelPath) {
+        throw new Error('Download interrupted!');
+      }
+      this.tokenizerConfig = JSON.parse(await readAsStringAsync('file://' + tokenizerConfigPath));
+      await this.nativeModule.loadLLM(modelPath, tokenizerPath);
       this.isReadyCallback(true);
       this.onToken = this.nativeModule.onToken(data => {
         if (!data || SPECIAL_TOKENS.EOS_TOKEN in this.tokenizerConfig && data === this.tokenizerConfig.eos_token || SPECIAL_TOKENS.PAD_TOKEN in this.tokenizerConfig && data === this.tokenizerConfig.pad_token) {
@@ -148,7 +154,7 @@ export class LLMController {
       throw new Error(`Empty 'messages' array!`);
     }
     if (messages[0] && messages[0].role !== 'system') {
-      console.warn(`You are not providing system prompt. You can pass it in the first message using { role: 'system', content: YOUR_PROMPT }. Otherwise prompt from your model's chat template will be used.`);
+      Logger.warn(`You are not providing system prompt. You can pass it in the first message using { role: 'system', content: YOUR_PROMPT }. Otherwise prompt from your model's chat template will be used.`);
     }
     const renderedChat = this.applyChatTemplate(messages, this.tokenizerConfig, tools,
     // eslint-disable-next-line camelcase

package/lib/module/controllers/LLMController.js.map

@@ -1 +1 @@
-{"version":3,"names":["ResourceFetcher","ETError","getError","Template","DEFAULT_CHAT_CONFIG","readAsStringAsync","SPECIAL_TOKENS","LLMNativeModule","parseToolCall","LLMController","chatConfig","onToken","_response","_isReady","_isGenerating","_messageHistory","constructor","tokenCallback","responseCallback","messageHistoryCallback","isReadyCallback","isGeneratingCallback","onDownloadProgressCallback","undefined","console","warn","token","response","messageHistory","isReady","isGenerating","nativeModule","load","modelSource","tokenizerSource","tokenizerConfigSource","initialMessageHistory","tokenizerFileUri","fetch","tokenizerConfigFileUri","tokenizerConfig","JSON","parse","modelFileUri","loadLLM","data","EOS_TOKEN","eos_token","PAD_TOKEN","pad_token","e","Error","setTokenCallback","configure","toolsConfig","delete","ModelGenerating","remove","releaseResources","forward","input","ModuleNotLoaded","interrupt","generate","messages","tools","length","role","renderedChat","applyChatTemplate","tools_in_user_message","add_generation_prompt","sendMessage","message","content","messageHistoryWithPrompt","systemPrompt","slice","contextWindowLength","displayToolCalls","toolCalls","toolCall","executeToolCallback","then","toolResponse","deleteMessage","index","newMessageHistory","templateFlags","chat_template","template","specialTokens","Object","fromEntries","keys","filter","key","map","result","render"],"sourceRoot":"../../../src","sources":["controllers/LLMController.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ResourceFetcher","ETError","getError","Template","DEFAULT_CHAT_CONFIG","readAsStringAsync","SPECIAL_TOKENS","LLMNativeModule","parseToolCall","Logger","LLMController","chatConfig","onToken","_response","_isReady","_isGenerating","_messageHistory","constructor","tokenCallback","responseCallback","messageHistoryCallback","isReadyCallback","isGeneratingCallback","undefined","warn","token","response","messageHistory","isReady","isGenerating","nativeModule","load","modelSource","tokenizerSource","tokenizerConfigSource","onDownloadProgressCallback","initialMessageHistory","tokenizersPromise","fetch","modelPromise","tokenizersResults","modelResult","Promise","all","tokenizerPath","tokenizerConfigPath","modelPath","Error","tokenizerConfig","JSON","parse","loadLLM","data","EOS_TOKEN","eos_token","PAD_TOKEN","pad_token","e","setTokenCallback","configure","toolsConfig","delete","ModelGenerating","remove","releaseResources","forward","input","ModuleNotLoaded","interrupt","generate","messages","tools","length","role","renderedChat","applyChatTemplate","tools_in_user_message","add_generation_prompt","sendMessage","message","content","messageHistoryWithPrompt","systemPrompt","slice","contextWindowLength","displayToolCalls","toolCalls","toolCall","executeToolCallback","then","toolResponse","deleteMessage","index","newMessageHistory","templateFlags","chat_template","template","specialTokens","Object","fromEntries","keys","filter","key","map","result","render"],"sourceRoot":"../../../src","sources":["controllers/LLMController.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/controllers/OCRController.js

@@ -2,25 +2,21 @@
 
 import { symbols } from '../constants/ocr/symbols';
 import { ETError, getError } from '../Error';
-import { OCRNativeModule } from '../native/RnExecutorchModules';
 import { ResourceFetcher } from '../utils/ResourceFetcher';
 export class OCRController {
   isReady = false;
   isGenerating = false;
   error = null;
   constructor({
-    modelDownloadProgressCallback = _downloadProgress => {},
     isReadyCallback = _isReady => {},
     isGeneratingCallback = _isGenerating => {},
     errorCallback = _error => {}
-  }) {
-    this.nativeModule = OCRNativeModule;
-    this.modelDownloadProgressCallback = modelDownloadProgressCallback;
+  } = {}) {
     this.isReadyCallback = isReadyCallback;
     this.isGeneratingCallback = isGeneratingCallback;
     this.errorCallback = errorCallback;
   }
-  loadModel = async (detectorSource, recognizerSources, language) => {
+  load = async (detectorSource, recognizerSources, language, onDownloadProgressCallback) => {
     try {
       if (!detectorSource || Object.keys(recognizerSources).length !== 3) return;
       if (!symbols[language]) {
@@ -28,8 +24,11 @@ export class OCRController {
       }
       this.isReady = false;
       this.isReadyCallback(false);
-      const paths = await ResourceFetcher.fetchMultipleResources(this.modelDownloadProgressCallback, detectorSource, recognizerSources.recognizerLarge, recognizerSources.recognizerMedium, recognizerSources.recognizerSmall);
-      await this.nativeModule.loadModule(paths[0], paths[1], paths[2], paths[3], symbols[language]);
+      const paths = await ResourceFetcher.fetch(onDownloadProgressCallback, detectorSource, recognizerSources.recognizerLarge, recognizerSources.recognizerMedium, recognizerSources.recognizerSmall);
+      if (paths === null || paths?.length < 4) {
+        throw new Error('Download interrupted!');
+      }
+      this.nativeModule = global.loadOCR(paths[0], paths[1], paths[2], paths[3], symbols[language]);
       this.isReady = true;
       this.isReadyCallback(this.isReady);
     } catch (e) {
@@ -50,7 +49,7 @@ export class OCRController {
     try {
       this.isGenerating = true;
       this.isGeneratingCallback(this.isGenerating);
-      return await this.nativeModule.forward(input);
+      return await this.nativeModule.generate(input);
     } catch (e) {
       throw new Error(getError(e));
     } finally {
@@ -58,5 +57,13 @@ export class OCRController {
       this.isGeneratingCallback(this.isGenerating);
     }
   };
+  delete() {
+    if (this.isGenerating) {
+      throw new Error(getError(ETError.ModelGenerating) + 'You cannot delete the model. You must wait until the generating is finished.');
+    }
+    this.nativeModule.unload();
+    this.isReadyCallback(false);
+    this.isGeneratingCallback(false);
+  }
 }
 //# sourceMappingURL=OCRController.js.map

package/lib/module/controllers/OCRController.js.map

@@ -1 +1 @@
-{"version":3,"names":["symbols","ETError","getError","OCRNativeModule","ResourceFetcher","OCRController","isReady","isGenerating","error","constructor","modelDownloadProgressCallback","_downloadProgress","isReadyCallback","_isReady","isGeneratingCallback","_isGenerating","errorCallback","_error","nativeModule","loadModel","detectorSource","recognizerSources","language","Object","keys","length","Error","LanguageNotSupported","paths","fetchMultipleResources","recognizerLarge","recognizerMedium","recognizerSmall","loadModule","e","forward","input","ModuleNotLoaded","ModelGenerating"],"sourceRoot":"../../../src","sources":["controllers/OCRController.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["symbols","ETError","getError","ResourceFetcher","OCRController","isReady","isGenerating","error","constructor","isReadyCallback","_isReady","isGeneratingCallback","_isGenerating","errorCallback","_error","load","detectorSource","recognizerSources","language","onDownloadProgressCallback","Object","keys","length","Error","LanguageNotSupported","paths","fetch","recognizerLarge","recognizerMedium","recognizerSmall","nativeModule","global","loadOCR","e","forward","input","ModuleNotLoaded","ModelGenerating","generate","delete","unload"],"sourceRoot":"../../../src","sources":["controllers/OCRController.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/controllers/VerticalOCRController.js

@@ -2,25 +2,21 @@
 
 import { symbols } from '../constants/ocr/symbols';
 import { ETError, getError } from '../Error';
-import { VerticalOCRNativeModule } from '../native/RnExecutorchModules';
 import { ResourceFetcher } from '../utils/ResourceFetcher';
 export class VerticalOCRController {
   isReady = false;
   isGenerating = false;
   error = null;
   constructor({
-    modelDownloadProgressCallback = _downloadProgress => {},
     isReadyCallback = _isReady => {},
     isGeneratingCallback = _isGenerating => {},
     errorCallback = _error => {}
-  }) {
-    this.ocrNativeModule = VerticalOCRNativeModule;
-    this.modelDownloadProgressCallback = modelDownloadProgressCallback;
+  } = {}) {
     this.isReadyCallback = isReadyCallback;
     this.isGeneratingCallback = isGeneratingCallback;
     this.errorCallback = errorCallback;
   }
-  loadModel = async (detectorSources, recognizerSources, language, independentCharacters) => {
+  load = async (detectorSources, recognizerSources, language, independentCharacters, onDownloadProgressCallback) => {
     try {
       if (Object.keys(detectorSources).length !== 2 || Object.keys(recognizerSources).length !== 2) return;
       if (!symbols[language]) {
@@ -28,8 +24,11 @@ export class VerticalOCRController {
       }
       this.isReady = false;
       this.isReadyCallback(this.isReady);
-      const paths = await ResourceFetcher.fetchMultipleResources(this.modelDownloadProgressCallback, detectorSources.detectorLarge, detectorSources.detectorNarrow, independentCharacters ? recognizerSources.recognizerSmall : recognizerSources.recognizerLarge);
-      await this.ocrNativeModule.loadModule(paths[0], paths[1], paths[2], symbols[language], independentCharacters);
+      const paths = await ResourceFetcher.fetch(onDownloadProgressCallback, detectorSources.detectorLarge, detectorSources.detectorNarrow, independentCharacters ? recognizerSources.recognizerSmall : recognizerSources.recognizerLarge);
+      if (paths === null || paths.length < 3) {
+        throw new Error('Download interrupted');
+      }
+      this.ocrNativeModule = global.loadVerticalOCR(paths[0], paths[1], paths[2], symbols[language], independentCharacters);
       this.isReady = true;
       this.isReadyCallback(this.isReady);
     } catch (e) {
@@ -50,7 +49,7 @@ export class VerticalOCRController {
     try {
       this.isGenerating = true;
       this.isGeneratingCallback(this.isGenerating);
-      return await this.ocrNativeModule.forward(input);
+      return await this.ocrNativeModule.generate(input);
     } catch (e) {
       throw new Error(getError(e));
     } finally {
@@ -58,5 +57,13 @@ export class VerticalOCRController {
       this.isGeneratingCallback(this.isGenerating);
     }
   };
+  delete() {
+    if (this.isGenerating) {
+      throw new Error(getError(ETError.ModelGenerating) + 'You cannot delete the model. You must wait until the generating is finished.');
+    }
+    this.ocrNativeModule.unload();
+    this.isReadyCallback(false);
+    this.isGeneratingCallback(false);
+  }
 }
 //# sourceMappingURL=VerticalOCRController.js.map

package/lib/module/controllers/VerticalOCRController.js.map

@@ -1 +1 @@
-{"version":3,"names":["symbols","ETError","getError","VerticalOCRNativeModule","ResourceFetcher","VerticalOCRController","isReady","isGenerating","error","constructor","modelDownloadProgressCallback","_downloadProgress","isReadyCallback","_isReady","isGeneratingCallback","_isGenerating","errorCallback","_error","ocrNativeModule","loadModel","detectorSources","recognizerSources","language","independentCharacters","Object","keys","length","Error","LanguageNotSupported","paths","fetchMultipleResources","detectorLarge","detectorNarrow","recognizerSmall","recognizerLarge","loadModule","e","forward","input","ModuleNotLoaded","ModelGenerating"],"sourceRoot":"../../../src","sources":["controllers/VerticalOCRController.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["symbols","ETError","getError","ResourceFetcher","VerticalOCRController","isReady","isGenerating","error","constructor","isReadyCallback","_isReady","isGeneratingCallback","_isGenerating","errorCallback","_error","load","detectorSources","recognizerSources","language","independentCharacters","onDownloadProgressCallback","Object","keys","length","Error","LanguageNotSupported","paths","fetch","detectorLarge","detectorNarrow","recognizerSmall","recognizerLarge","ocrNativeModule","global","loadVerticalOCR","e","forward","input","ModuleNotLoaded","ModelGenerating","generate","delete","unload"],"sourceRoot":"../../../src","sources":["controllers/VerticalOCRController.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/computer_vision/useClassification.js

@@ -1,13 +1,13 @@
 "use strict";
 
+import { useNonStaticModule } from '../useNonStaticModule';
 import { ClassificationModule } from '../../modules/computer_vision/ClassificationModule';
-import { useModule } from '../useModule';
 export const useClassification = ({
-  modelSource,
+  model,
   preventLoad = false
-}) => useModule({
+}) => useNonStaticModule({
   module: ClassificationModule,
-  loadArgs: [modelSource],
-  preventLoad
+  model,
+  preventLoad: preventLoad
 });
 //# sourceMappingURL=useClassification.js.map

package/lib/module/hooks/computer_vision/useClassification.js.map

@@ -1 +1 @@
-{"version":3,"names":["ClassificationModule","useModule","useClassification","modelSource","preventLoad","module","loadArgs"],"sourceRoot":"../../../../src","sources":["hooks/computer_vision/useClassification.ts"],"mappings":";;AAAA,SAASA,oBAAoB,QAAQ,oDAAoD;AAEzF,SAASC,SAAS,QAAQ,cAAc;AAExC,OAAO,MAAMC,iBAAiB,GAAGA,CAAC;EAChCC,WAAW;EACXC,WAAW,GAAG;AAIhB,CAAC,KACCH,SAAS,CAAC;EACRI,MAAM,EAAEL,oBAAoB;EAC5BM,QAAQ,EAAE,CAACH,WAAW,CAAC;EACvBC;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["useNonStaticModule","ClassificationModule","useClassification","model","preventLoad","module"],"sourceRoot":"../../../../src","sources":["hooks/computer_vision/useClassification.ts"],"mappings":";;AACA,SAASA,kBAAkB,QAAQ,uBAAuB;AAC1D,SAASC,oBAAoB,QAAQ,oDAAoD;AAOzF,OAAO,MAAMC,iBAAiB,GAAGA,CAAC;EAAEC,KAAK;EAAEC,WAAW,GAAG;AAAa,CAAC,KACrEJ,kBAAkB,CAAC;EACjBK,MAAM,EAAEJ,oBAAoB;EAC5BE,KAAK;EACLC,WAAW,EAAEA;AACf,CAAC,CAAC","ignoreList":[]}

package/lib/module/hooks/computer_vision/useImageEmbeddings.js

@@ -0,0 +1,13 @@
+"use strict";
+
+import { ImageEmbeddingsModule } from '../../modules/computer_vision/ImageEmbeddingsModule';
+import { useNonStaticModule } from '../useNonStaticModule';
+export const useImageEmbeddings = ({
+  model,
+  preventLoad = false
+}) => useNonStaticModule({
+  module: ImageEmbeddingsModule,
+  model,
+  preventLoad
+});
+//# sourceMappingURL=useImageEmbeddings.js.map

package/lib/module/hooks/computer_vision/useImageEmbeddings.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ImageEmbeddingsModule","useNonStaticModule","useImageEmbeddings","model","preventLoad","module"],"sourceRoot":"../../../../src","sources":["hooks/computer_vision/useImageEmbeddings.ts"],"mappings":";;AAAA,SAASA,qBAAqB,QAAQ,qDAAqD;AAE3F,SAASC,kBAAkB,QAAQ,uBAAuB;AAO1D,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAAEC,KAAK;EAAEC,WAAW,GAAG;AAAa,CAAC,KACtEH,kBAAkB,CAAC;EACjBI,MAAM,EAAEL,qBAAqB;EAC7BG,KAAK;EACLC;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/hooks/computer_vision/useImageSegmentation.js

@@ -1,13 +1,13 @@
 "use strict";
 
-import { useModule } from '../useModule';
+import { useNonStaticModule } from '../useNonStaticModule';
 import { ImageSegmentationModule } from '../../modules/computer_vision/ImageSegmentationModule';
 export const useImageSegmentation = ({
-  modelSource,
+  model,
   preventLoad = false
-}) => useModule({
+}) => useNonStaticModule({
   module: ImageSegmentationModule,
-  loadArgs: [modelSource],
+  model,
   preventLoad
 });
 //# sourceMappingURL=useImageSegmentation.js.map

package/lib/module/hooks/computer_vision/useImageSegmentation.js.map

@@ -1 +1 @@
-{"version":3,"names":["useModule","ImageSegmentationModule","useImageSegmentation","modelSource","preventLoad","module","loadArgs"],"sourceRoot":"../../../../src","sources":["hooks/computer_vision/useImageSegmentation.ts"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,cAAc;AACxC,SAASC,uBAAuB,QAAQ,uDAAuD;AAQ/F,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACnCC,WAAW;EACXC,WAAW,GAAG;AACT,CAAC,KACNJ,SAAS,CAAC;EACRK,MAAM,EAAEJ,uBAAuB;EAC/BK,QAAQ,EAAE,CAACH,WAAW,CAAC;EACvBC;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["useNonStaticModule","ImageSegmentationModule","useImageSegmentation","model","preventLoad","module"],"sourceRoot":"../../../../src","sources":["hooks/computer_vision/useImageSegmentation.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,uBAAuB;AAC1D,SAASC,uBAAuB,QAAQ,uDAAuD;AAQ/F,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EAAEC,KAAK;EAAEC,WAAW,GAAG;AAAa,CAAC,KACxEJ,kBAAkB,CAAC;EACjBK,MAAM,EAAEJ,uBAAuB;EAC/BE,KAAK;EACLC;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/hooks/computer_vision/useOCR.js

@@ -3,37 +3,36 @@
 import { useEffect, useMemo, useState } from 'react';
 import { OCRController } from '../../controllers/OCRController';
 export const useOCR = ({
-  detectorSource,
-  recognizerSources,
-  language = 'en',
+  model,
   preventLoad = false
 }) => {
   const [error, setError] = useState(null);
   const [isReady, setIsReady] = useState(false);
   const [isGenerating, setIsGenerating] = useState(false);
   const [downloadProgress, setDownloadProgress] = useState(0);
-  const model = useMemo(() => new OCRController({
-    modelDownloadProgressCallback: setDownloadProgress,
+  const controllerInstance = useMemo(() => new OCRController({
     isReadyCallback: setIsReady,
     isGeneratingCallback: setIsGenerating,
     errorCallback: setError
   }), []);
   useEffect(() => {
-    const loadModel = async () => {
-      await model.loadModel(detectorSource, recognizerSources, language);
+    if (preventLoad) return;
+    (async () => {
+      await controllerInstance.load(model.detectorSource, {
+        recognizerLarge: model.recognizerLarge,
+        recognizerMedium: model.recognizerMedium,
+        recognizerSmall: model.recognizerSmall
+      }, model.language, setDownloadProgress);
+    })();
+    return () => {
+      controllerInstance.delete();
     };
-    if (!preventLoad) {
-      loadModel();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [model, detectorSource, language,
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  JSON.stringify(recognizerSources), preventLoad]);
+  }, [controllerInstance, model.detectorSource, model.recognizerLarge, model.recognizerMedium, model.recognizerSmall, model.language, preventLoad]);
   return {
     error,
     isReady,
     isGenerating,
-    forward: model.forward,
+    forward: controllerInstance.forward,
     downloadProgress
   };
 };

package/lib/module/hooks/computer_vision/useOCR.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useMemo","useState","OCRController","useOCR","detectorSource","recognizerSources","language","preventLoad","error","setError","isReady","setIsReady","isGenerating","setIsGenerating","downloadProgress","setDownloadProgress","model","modelDownloadProgressCallback","isReadyCallback","isGeneratingCallback","errorCallback","loadModel","JSON","stringify","forward"],"sourceRoot":"../../../../src","sources":["hooks/computer_vision/useOCR.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AAGpD,SAASC,aAAa,QAAQ,iCAAiC;AAU/D,OAAO,MAAMC,MAAM,GAAGA,CAAC;EACrBC,cAAc;EACdC,iBAAiB;EACjBC,QAAQ,GAAG,IAAI;EACfC,WAAW,GAAG;AAUhB,CAAC,KAAgB;EACf,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAGR,QAAQ,CAAgB,IAAI,CAAC;EACvD,MAAM,CAACS,OAAO,EAAEC,UAAU,CAAC,GAAGV,QAAQ,CAAC,KAAK,CAAC;EAC7C,MAAM,CAACW,YAAY,EAAEC,eAAe,CAAC,GAAGZ,QAAQ,CAAC,KAAK,CAAC;EACvD,MAAM,CAACa,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGd,QAAQ,CAAC,CAAC,CAAC;EAE3D,MAAMe,KAAK,GAAGhB,OAAO,CACnB,MACE,IAAIE,aAAa,CAAC;IAChBe,6BAA6B,EAAEF,mBAAmB;IAClDG,eAAe,EAAEP,UAAU;IAC3BQ,oBAAoB,EAAEN,eAAe;IACrCO,aAAa,EAAEX;EACjB,CAAC,CAAC,EACJ,EACF,CAAC;EAEDV,SAAS,CAAC,MAAM;IACd,MAAMsB,SAAS,GAAG,MAAAA,CAAA,KAAY;MAC5B,MAAML,KAAK,CAACK,SAAS,CAACjB,cAAc,EAAEC,iBAAiB,EAAEC,QAAQ,CAAC;IACpE,CAAC;IAED,IAAI,CAACC,WAAW,EAAE;MAChBc,SAAS,CAAC,CAAC;IACb;IACA;EACF,CAAC,EAAE,CACDL,KAAK,EACLZ,cAAc,EACdE,QAAQ;EACR;EACAgB,IAAI,CAACC,SAAS,CAAClB,iBAAiB,CAAC,EACjCE,WAAW,CACZ,CAAC;EAEF,OAAO;IACLC,KAAK;IACLE,OAAO;IACPE,YAAY;IACZY,OAAO,EAAER,KAAK,CAACQ,OAAO;IACtBV;EACF,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useEffect","useMemo","useState","OCRController","useOCR","model","preventLoad","error","setError","isReady","setIsReady","isGenerating","setIsGenerating","downloadProgress","setDownloadProgress","controllerInstance","isReadyCallback","isGeneratingCallback","errorCallback","load","detectorSource","recognizerLarge","recognizerMedium","recognizerSmall","language","delete","forward"],"sourceRoot":"../../../../src","sources":["hooks/computer_vision/useOCR.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AAGpD,SAASC,aAAa,QAAQ,iCAAiC;AAU/D,OAAO,MAAMC,MAAM,GAAGA,CAAC;EACrBC,KAAK;EACLC,WAAW,GAAG;AAUhB,CAAC,KAAgB;EACf,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAGN,QAAQ,CAAgB,IAAI,CAAC;EACvD,MAAM,CAACO,OAAO,EAAEC,UAAU,CAAC,GAAGR,QAAQ,CAAC,KAAK,CAAC;EAC7C,MAAM,CAACS,YAAY,EAAEC,eAAe,CAAC,GAAGV,QAAQ,CAAC,KAAK,CAAC;EACvD,MAAM,CAACW,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGZ,QAAQ,CAAC,CAAC,CAAC;EAE3D,MAAMa,kBAAkB,GAAGd,OAAO,CAChC,MACE,IAAIE,aAAa,CAAC;IAChBa,eAAe,EAAEN,UAAU;IAC3BO,oBAAoB,EAAEL,eAAe;IACrCM,aAAa,EAAEV;EACjB,CAAC,CAAC,EACJ,EACF,CAAC;EAEDR,SAAS,CAAC,MAAM;IACd,IAAIM,WAAW,EAAE;IAEjB,CAAC,YAAY;MACX,MAAMS,kBAAkB,CAACI,IAAI,CAC3Bd,KAAK,CAACe,cAAc,EACpB;QACEC,eAAe,EAAEhB,KAAK,CAACgB,eAAe;QACtCC,gBAAgB,EAAEjB,KAAK,CAACiB,gBAAgB;QACxCC,eAAe,EAAElB,KAAK,CAACkB;MACzB,CAAC,EACDlB,KAAK,CAACmB,QAAQ,EACdV,mBACF,CAAC;IACH,CAAC,EAAE,CAAC;IAEJ,OAAO,MAAM;MACXC,kBAAkB,CAACU,MAAM,CAAC,CAAC;IAC7B,CAAC;EACH,CAAC,EAAE,CACDV,kBAAkB,EAClBV,KAAK,CAACe,cAAc,EACpBf,KAAK,CAACgB,eAAe,EACrBhB,KAAK,CAACiB,gBAAgB,EACtBjB,KAAK,CAACkB,eAAe,EACrBlB,KAAK,CAACmB,QAAQ,EACdlB,WAAW,CACZ,CAAC;EAEF,OAAO;IACLC,KAAK;IACLE,OAAO;IACPE,YAAY;IACZe,OAAO,EAAEX,kBAAkB,CAACW,OAAO;IACnCb;EACF,CAAC;AACH,CAAC","ignoreList":[]}