@micrantha/react-native-amaryllis 0.1.1 → 0.1.5

package/README.md

@@ -171,19 +171,32 @@ amaryllis.generateAsync(
     images: ['file:///path/to/image.png'],
   },
   {
-    onPartialResult: (partial) => {
-      console.log('Partial result:', partial);
-    },
-    onFinalResult: (final) => {
-      console.log('Final result:', final);
-    },
-    onError: (err) => {
-      console.error('Error:', err);
+    onEvent: (event) => {
+      if (event.type === 'partial') {
+        console.log('Partial result:', event.text);
+        return;
+      }
+      if (event.type === 'final') {
+        console.log('Final result:', event.text);
+        return;
+      }
+      console.error('Error:', event.error);
     },
   }
 );
 ```
 
+Note: `onPartialResult`, `onFinalResult`, and `onError` are deprecated and will be removed in a future release. Use `onEvent` instead.
+
+`onEvent` receives a discriminated union:
+
+```ts
+type LlmEvent =
+  | { type: 'partial'; text: string }
+  | { type: 'final'; text: string }
+  | { type: 'error'; error: Error };
+```
+
 You can cancel an async generate if needed.
 
 ```javascript
@@ -192,9 +205,31 @@ amaryllis.cancelAsync();
 
 ---
 
+## 🧠 Context Engine
+
+The Context Engine is an interface-first layer for memory and retrieval. You bring your own `ContextStore` (SQLite, files, or custom DB) while the engine handles validation, policy bounds, and optional scoring.
+Context APIs are also available via the `react-native-amaryllis/context` subpath.
+
+```ts
+import { ContextEngine } from 'react-native-amaryllis/context';
+
+const engine = new ContextEngine({
+  store: myStore,
+  policy: { maxItems: 1000, defaultTtlSeconds: 60 * 60 * 24 },
+});
+
+await engine.add([{ id: 'mem-1', text: 'Quest started', createdAt: Date.now() }]);
+const results = await engine.search({ text: 'quest', limit: 5 });
+```
+
+See `docs/context-engine.md` for details.
+
+---
+
 ## 📚 Documentation
 
 - [API Reference](src/Types.ts)
+- [Context Engine](docs/context-engine.md)
 - [Example App](example/)
 - [Demo Video](docs/demo.mp4)
 - [Development workflow](CONTRIBUTING.md)

package/android/src/main/java/com/micrantha/amaryllis/Amaryllis.kt

@@ -6,6 +6,7 @@ import android.util.Log
 import androidx.core.graphics.scale
 import androidx.core.net.toFile
 import androidx.core.net.toUri
+import java.io.File as JavaFile
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.google.mediapipe.framework.image.BitmapImageBuilder
@@ -33,6 +34,9 @@ import com.micrantha.amaryllis.AmaryllisModule.Companion.PARAM_VISION_ENCODER
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+import android.os.Build
 
 
 class Amaryllis {
@@ -42,6 +46,10 @@ class Amaryllis {
 
     fun init(context: Context, config: ReadableMap) {
         val modelPath = config.getString(PARAM_MODEL_PATH) ?: throw InvalidModelPathException()
+        
+        if (!isValidFilePath(modelPath)) {
+            throw InvalidModelPathException()
+        }
 
         val taskOptions = LlmInference.LlmInferenceOptions.builder()
             .setModelPath(modelPath).apply {
@@ -168,19 +176,73 @@ class Amaryllis {
         targetWidth: Int = 512,
         targetHeight: Int = 512
     ): MPImage? {
-        val file = uri.toUri().toFile()
+        if (!isValidFilePath(uri)) {
+            Log.w(NAME, "Invalid file URI: $uri")
+            return null
+        }
+
+        val file: File
+        try {
+            val parsedUri = uri.toUri()
+            if (parsedUri.scheme != "file") {
+                Log.w(NAME, "Only file:// URIs are supported: $uri")
+                return null
+            }
+            file = parsedUri.toFile()
+        } catch (e: Exception) {
+            Log.w(NAME, "Failed to parse URI: $uri", e)
+            return null
+        }
+
+        if (!file.exists()) {
+            Log.w(NAME, "File does not exist: ${file.absolutePath}")
+            return null
+        }
 
-        if (!file.exists()) return null
+        // Check file size to prevent memory exhaustion (max 10MB)
+        val fileSize = file.length()
+        val maxFileSize = 10 * 1024 * 1024 // 10MB
+        if (fileSize > maxFileSize) {
+            Log.w(NAME, "File too large: ${fileSize} bytes, max allowed: $maxFileSize bytes")
+            return null
+        }
 
-        // Decode bitmap
-        val bitmap = BitmapFactory.decodeFile(file.absolutePath)
+        // Decode bitmap with options to limit memory usage
+        val options = BitmapFactory.Options().apply {
+            inJustDecodeBounds = true
+        }
+        
+        BitmapFactory.decodeFile(file.absolutePath, options)
+        
+        // Calculate sample size to reduce memory usage if image is too large
+        val maxSize = 2048
+        var sampleSize = 1
+        while (options.outWidth / sampleSize > maxSize || options.outHeight / sampleSize > maxSize) {
+            sampleSize *= 2
+        }
+        
+        options.inJustDecodeBounds = false
+        options.inSampleSize = sampleSize
+        
+        val bitmap = BitmapFactory.decodeFile(file.absolutePath, options)
             ?: return null
 
-        // Resize bitmap
-        val resized = bitmap.scale(targetWidth, targetHeight)
+        try {
+            // Resize bitmap
+            val resized = bitmap.scale(targetWidth, targetHeight)
+            
+            // Clean up original bitmap
+            if (resized != bitmap) {
+                bitmap.recycle()
+            }
 
-        // Convert to MPImage
-        return BitmapImageBuilder(resized).build()
+            // Convert to MPImage
+            return BitmapImageBuilder(resized).build()
+        } catch (e: OutOfMemoryError) {
+            Log.w(NAME, "Out of memory when processing image: $uri", e)
+            bitmap.recycle()
+            return null
+        }
     }
 
     internal fun preprocessImages(
@@ -192,6 +254,19 @@ class Amaryllis {
         preprocessImage(uri, targetWidth, targetHeight)
     }
 
+    private fun isValidFilePath(path: String): Boolean {
+        if (path.isBlank()) return false
+        
+        // Check for path traversal attempts
+        if (path.contains("..") || path.contains("~")) return false
+        
+        // Check for invalid characters
+        val invalidChars = setOf('|', '<', '>', '"', '?', '*')
+        if (invalidChars.any { char -> path.contains(char) }) return false
+        
+        return true
+    }
+
     inner class NotInitializedException : Exception()
     inner class SessionRequiredException : Exception()
     inner class InvalidModelPathException : Exception()

package/lib/module/Amaryllis.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { toNativeEngineConfig, toNativeSessionParams, toNativeRequestParams } from "./TypeConverters.js";
 const EVENT_ON_PARTIAL_RESULT = 'onPartialResult';
 const EVENT_ON_FINAL_RESULT = 'onFinalResult';
 const EVENT_ON_ERROR = 'onError';
@@ -10,45 +11,99 @@ export class LlmPipe {
     this.llmEmitter = params.eventEmitter;
   }
   async init(params) {
-    await this.llmNative.init(params);
+    const nativeConfig = toNativeEngineConfig(params);
+    await this.llmNative.init(nativeConfig);
   }
   newSession(params) {
-    return this.llmNative.newSession(params);
+    const nativeParams = toNativeSessionParams(params);
+    return this.llmNative.newSession(nativeParams);
   }
   async generate(params) {
-    return await this.llmNative.generate(params);
+    const nativeParams = toNativeRequestParams(params);
+    return await this.llmNative.generate(nativeParams);
   }
   async generateAsync(params, callbacks) {
     if (callbacks) {
       this.setupAsyncCallbacks(callbacks);
     }
-    return await this.llmNative.generateAsync(params);
+    const nativeParams = toNativeRequestParams(params);
+    return await this.llmNative.generateAsync(nativeParams);
   }
   close() {
-    this.llmNative.close();
     this.cancelAsync();
+    this.llmNative.close();
   }
   cancelAsync() {
     this.llmNative.cancelAsync();
-    this.subscriptions.forEach(sub => sub.remove());
+    const subsToRemove = [...this.subscriptions];
+    this.subscriptions = [];
+    subsToRemove.forEach(sub => {
+      try {
+        sub.remove();
+      } catch (error) {
+        console.warn('Failed to remove subscription:', error);
+      }
+    });
   }
   setupAsyncCallbacks(callbacks) {
-    if (callbacks.onPartialResult) {
-      this.subscriptions.push(this.llmEmitter.addListener(EVENT_ON_PARTIAL_RESULT, result => {
-        callbacks.onPartialResult?.(result);
-      }));
+    if (callbacks.onPartialResult || callbacks.onEvent) {
+      const subscription = this.llmEmitter.addListener(EVENT_ON_PARTIAL_RESULT, result => {
+        try {
+          callbacks.onEvent?.({
+            type: 'partial',
+            text: result
+          });
+        } catch (error) {
+          console.error('Error in onEvent callback:', error);
+        }
+        try {
+          callbacks.onPartialResult?.(result);
+        } catch (error) {
+          console.error('Error in onPartialResult callback:', error);
+        }
+      });
+      this.subscriptions.push(subscription);
     }
-    if (callbacks.onFinalResult) {
-      this.subscriptions.push(this.llmEmitter.addListener(EVENT_ON_FINAL_RESULT, result => {
-        callbacks.onFinalResult?.(result);
-        this.cancelAsync();
-      }));
+    if (callbacks.onFinalResult || callbacks.onEvent) {
+      const subscription = this.llmEmitter.addListener(EVENT_ON_FINAL_RESULT, result => {
+        try {
+          callbacks.onEvent?.({
+            type: 'final',
+            text: result
+          });
+        } catch (error) {
+          console.error('Error in onEvent callback:', error);
+        }
+        try {
+          callbacks.onFinalResult?.(result);
+        } catch (error) {
+          console.error('Error in onFinalResult callback:', error);
+        } finally {
+          this.cancelAsync();
+        }
+      });
+      this.subscriptions.push(subscription);
     }
-    if (callbacks.onError) {
-      this.subscriptions.push(this.llmEmitter.addListener(EVENT_ON_ERROR, error => {
-        callbacks.onError?.(new Error(error));
-        this.cancelAsync();
-      }));
+    if (callbacks.onError || callbacks.onEvent) {
+      const subscription = this.llmEmitter.addListener(EVENT_ON_ERROR, error => {
+        const errorObj = new Error(error);
+        try {
+          callbacks.onEvent?.({
+            type: 'error',
+            error: errorObj
+          });
+        } catch (callbackError) {
+          console.error('Error in onEvent callback:', callbackError);
+        }
+        try {
+          callbacks.onError?.(errorObj);
+        } catch (callbackError) {
+          console.error('Error in onError callback:', callbackError);
+        } finally {
+          this.cancelAsync();
+        }
+      });
+      this.subscriptions.push(subscription);
     }
   }
 }

package/lib/module/Amaryllis.js.map

@@ -1 +1 @@
-{"version":3,"names":["EVENT_ON_PARTIAL_RESULT","EVENT_ON_FINAL_RESULT","EVENT_ON_ERROR","LlmPipe","subscriptions","constructor","params","llmNative","nativeModule","llmEmitter","eventEmitter","init","newSession","generate","generateAsync","callbacks","setupAsyncCallbacks","close","cancelAsync","forEach","sub","remove","onPartialResult","push","addListener","result","onFinalResult","onError","error","Error"],"sourceRoot":"../../src","sources":["Amaryllis.ts"],"mappings":";;AAYA,MAAMA,uBAAuB,GAAG,iBAAiB;AACjD,MAAMC,qBAAqB,GAAG,eAAe;AAC7C,MAAMC,cAAc,GAAG,SAAS;AAEhC,OAAO,MAAMC,OAAO,CAAsB;EACxCC,aAAa,GAA2B,EAAE;EAI1CC,WAAWA,CAACC,MAAqB,EAAE;IACjC,IAAI,CAACC,SAAS,GAAGD,MAAM,CAACE,YAAY;IACpC,IAAI,CAACC,UAAU,GAAGH,MAAM,CAACI,YAAY;EACvC;EAEA,MAAMC,IAAIA,CAACL,MAAuB,EAAiB;IACjD,MAAM,IAAI,CAACC,SAAS,CAACI,IAAI,CAACL,MAAM,CAAC;EACnC;EAEAM,UAAUA,CAACN,MAAwB,EAAiB;IAClD,OAAO,IAAI,CAACC,SAAS,CAACK,UAAU,CAACN,MAAM,CAAC;EAC1C;EAEA,MAAMO,QAAQA,CAACP,MAAwB,EAAmB;IACxD,OAAO,MAAM,IAAI,CAACC,SAAS,CAACM,QAAQ,CAACP,MAAM,CAAC;EAC9C;EAEA,MAAMQ,aAAaA,CACjBR,MAAwB,EACxBS,SAAwB,EACT;IACf,IAAIA,SAAS,EAAE;MACb,IAAI,CAACC,mBAAmB,CAACD,SAAS,CAAC;IACrC;IAEA,OAAO,MAAM,IAAI,CAACR,SAAS,CAACO,aAAa,CAACR,MAAM,CAAC;EACnD;EAEAW,KAAKA,CAAA,EAAS;IACZ,IAAI,CAACV,SAAS,CAACU,KAAK,CAAC,CAAC;IACtB,IAAI,CAACC,WAAW,CAAC,CAAC;EACpB;EAEAA,WAAWA,CAAA,EAAS;IAClB,IAAI,CAACX,SAAS,CAACW,WAAW,CAAC,CAAC;IAC5B,IAAI,CAACd,aAAa,CAACe,OAAO,CAAEC,GAAG,IAAKA,GAAG,CAACC,MAAM,CAAC,CAAC,CAAC;EACnD;EAEAL,mBAAmBA,CAACD,SAAuB,EAAQ;IACjD,IAAIA,SAAS,CAACO,eAAe,EAAE;MAC7B,IAAI,CAAClB,aAAa,CAACmB,IAAI,CACrB,IAAI,CAACd,UAAU,CAACe,WAAW,CACzBxB,uBAAuB,EACtByB,MAAc,IAAK;QAClBV,SAAS,CAACO,eAAe,GAAGG,MAAM,CAAC;MACrC,CACF,CACF,CAAC;IACH;IAEA,IAAIV,SAAS,CAACW,aAAa,EAAE;MAC3B,IAAI,CAACtB,aAAa,CAACmB,IAAI,CACrB,IAAI,CAACd,UAAU,CAACe,WAAW,CAACvB,qBAAqB,EAAGwB,MAAc,IAAK;QACrEV,SAAS,CAACW,aAAa,GAAGD,MAAM,CAAC;QACjC,IAAI,CAACP,WAAW,CAAC,CAAC;MACpB,CAAC,CACH,CAAC;IACH;IACA,IAAIH,SAAS,CAACY,OAAO,EAAE;MACrB,IAAI,CAACvB,aAAa,CAACmB,IAAI,CACrB,IAAI,CAACd,UAAU,CAACe,WAAW,CAACtB,cAAc,EAAG0B,KAAa,IAAK;QAC7Db,SAAS,CAACY,OAAO,GAAG,IAAIE,KAAK,CAACD,KAAK,CAAC,CAAC;QACrC,IAAI,CAACV,WAAW,CAAC,CAAC;MACpB,CAAC,CACH,CAAC;IACH;EACF;AACF;AAEA,eAAef,OAAO","ignoreList":[]}
+{"version":3,"names":["toNativeEngineConfig","toNativeSessionParams","toNativeRequestParams","EVENT_ON_PARTIAL_RESULT","EVENT_ON_FINAL_RESULT","EVENT_ON_ERROR","LlmPipe","subscriptions","constructor","params","llmNative","nativeModule","llmEmitter","eventEmitter","init","nativeConfig","newSession","nativeParams","generate","generateAsync","callbacks","setupAsyncCallbacks","close","cancelAsync","subsToRemove","forEach","sub","remove","error","console","warn","onPartialResult","onEvent","subscription","addListener","result","type","text","push","onFinalResult","onError","errorObj","Error","callbackError"],"sourceRoot":"../../src","sources":["Amaryllis.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/AmaryllisContext.js

@@ -2,6 +2,7 @@
 
 import { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { newLlmPipe } from "./NativePipe.js";
+import { InitializationError, isAmaryllisError } from "./Errors.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const LLMContext = /*#__PURE__*/createContext({
   config: null,
@@ -26,22 +27,31 @@ export const LLMProvider = ({
     try {
       return llmPipe ?? newLlmPipe();
     } catch (e) {
-      setError(e);
+      const initError = isAmaryllisError(e) ? e : new InitializationError(e?.message || 'Failed to create LLM pipe');
+      setError(initError);
       return null;
     }
   }, [llmPipe]);
   useEffect(() => {
     const start = async () => {
+      if (!controller) return;
       try {
-        await controller?.init(config);
+        await controller.init(config);
         setReady(true);
       } catch (e) {
         console.error('unable to start amaryllis', e);
-        setError(e);
+        const initError = isAmaryllisError(e) ? e : new InitializationError(e?.message || 'Failed to initialize LLM');
+        setError(initError);
       }
     };
     start();
-    return () => controller?.close();
+    return () => {
+      try {
+        controller?.close();
+      } catch (e) {
+        console.warn('Error closing LLM controller:', e);
+      }
+    };
   }, [config, controller]);
   return /*#__PURE__*/_jsx(LLMContext.Provider, {
     value: {

package/lib/module/AmaryllisContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","useContext","useEffect","useMemo","useState","newLlmPipe","jsx","_jsx","LLMContext","config","controller","error","undefined","isReady","useLLMContext","LLMProvider","llmPipe","children","setError","ready","setReady","e","start","init","console","close","Provider","value"],"sourceRoot":"../../src","sources":["AmaryllisContext.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AAE/E,SAASC,UAAU,QAAQ,iBAAc;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE1C,MAAMC,UAAU,gBAAGR,aAAa,CAAkB;EAChDS,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,IAAI;EAChBC,KAAK,EAAEC,SAAS;EAChBC,OAAO,EAAE;AACX,CAAC,CAAC;AAEF,OAAO,MAAMC,aAAa,GAAGA,CAAA,KAAMb,UAAU,CAACO,UAAU,CAAC;;AAEzD;AACA;AACA;AACA;AACA,OAAO,MAAMO,WAAW,GAAGA,CAAC;EAC1BN,MAAM;EACNO,OAAO;EACPC;AACgB,CAAC,KAAK;EACtB,MAAM,CAACN,KAAK,EAAEO,QAAQ,CAAC,GAAGd,QAAQ,CAAoB,CAAC;EACvD,MAAM,CAACe,KAAK,EAAEC,QAAQ,CAAC,GAAGhB,QAAQ,CAAC,KAAK,CAAC;EACzC,MAAMM,UAAU,GAAGP,OAAO,CAAC,MAAM;IAC/B,IAAI;MACF,OAAOa,OAAO,IAAIX,UAAU,CAAC,CAAC;IAChC,CAAC,CAAC,OAAOgB,CAAM,EAAE;MACfH,QAAQ,CAACG,CAAC,CAAC;MACX,OAAO,IAAI;IACb;EACF,CAAC,EAAE,CAACL,OAAO,CAAC,CAAC;EAEbd,SAAS,CAAC,MAAM;IACd,MAAMoB,KAAK,GAAG,MAAAA,CAAA,KAAY;MACxB,IAAI;QACF,MAAMZ,UAAU,EAAEa,IAAI,CAACd,MAAM,CAAC;QAC9BW,QAAQ,CAAC,IAAI,CAAC;MAChB,CAAC,CAAC,OAAOC,CAAM,EAAE;QACfG,OAAO,CAACb,KAAK,CAAC,2BAA2B,EAAEU,CAAC,CAAC;QAC7CH,QAAQ,CAACG,CAAC,CAAC;MACb;IACF,CAAC;IACDC,KAAK,CAAC,CAAC;IACP,OAAO,MAAMZ,UAAU,EAAEe,KAAK,CAAC,CAAC;EAClC,CAAC,EAAE,CAAChB,MAAM,EAAEC,UAAU,CAAC,CAAC;EAExB,oBACEH,IAAA,CAACC,UAAU,CAACkB,QAAQ;IAACC,KAAK,EAAE;MAAElB,MAAM;MAAEC,UAAU;MAAEG,OAAO,EAAEM,KAAK;MAAER;IAAM,CAAE;IAAAM,QAAA,EACvEA;EAAQ,CACU,CAAC;AAE1B,CAAC","ignoreList":[]}
+{"version":3,"names":["createContext","useContext","useEffect","useMemo","useState","newLlmPipe","InitializationError","isAmaryllisError","jsx","_jsx","LLMContext","config","controller","error","undefined","isReady","useLLMContext","LLMProvider","llmPipe","children","setError","ready","setReady","e","initError","message","start","init","console","close","warn","Provider","value"],"sourceRoot":"../../src","sources":["AmaryllisContext.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AAE/E,SAASC,UAAU,QAAQ,iBAAc;AACzC,SAASC,mBAAmB,EAAEC,gBAAgB,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEjE,MAAMC,UAAU,gBAAGV,aAAa,CAAkB;EAChDW,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,IAAI;EAChBC,KAAK,EAAEC,SAAS;EAChBC,OAAO,EAAE;AACX,CAAC,CAAC;AAEF,OAAO,MAAMC,aAAa,GAAGA,CAAA,KAAMf,UAAU,CAACS,UAAU,CAAC;;AAEzD;AACA;AACA;AACA;AACA,OAAO,MAAMO,WAAW,GAAGA,CAAC;EAC1BN,MAAM;EACNO,OAAO;EACPC;AACgB,CAAC,KAAK;EACtB,MAAM,CAACN,KAAK,EAAEO,QAAQ,CAAC,GAAGhB,QAAQ,CAAoB,CAAC;EACvD,MAAM,CAACiB,KAAK,EAAEC,QAAQ,CAAC,GAAGlB,QAAQ,CAAC,KAAK,CAAC;EACzC,MAAMQ,UAAU,GAAGT,OAAO,CAAC,MAAM;IAC/B,IAAI;MACF,OAAOe,OAAO,IAAIb,UAAU,CAAC,CAAC;IAChC,CAAC,CAAC,OAAOkB,CAAM,EAAE;MACf,MAAMC,SAAS,GAAGjB,gBAAgB,CAACgB,CAAC,CAAC,GACjCA,CAAC,GACD,IAAIjB,mBAAmB,CAACiB,CAAC,EAAEE,OAAO,IAAI,2BAA2B,CAAC;MACtEL,QAAQ,CAACI,SAAS,CAAC;MACnB,OAAO,IAAI;IACb;EACF,CAAC,EAAE,CAACN,OAAO,CAAC,CAAC;EAEbhB,SAAS,CAAC,MAAM;IACd,MAAMwB,KAAK,GAAG,MAAAA,CAAA,KAAY;MACxB,IAAI,CAACd,UAAU,EAAE;MAEjB,IAAI;QACF,MAAMA,UAAU,CAACe,IAAI,CAAChB,MAAM,CAAC;QAC7BW,QAAQ,CAAC,IAAI,CAAC;MAChB,CAAC,CAAC,OAAOC,CAAM,EAAE;QACfK,OAAO,CAACf,KAAK,CAAC,2BAA2B,EAAEU,CAAC,CAAC;QAC7C,MAAMC,SAAS,GAAGjB,gBAAgB,CAACgB,CAAC,CAAC,GACjCA,CAAC,GACD,IAAIjB,mBAAmB,CAACiB,CAAC,EAAEE,OAAO,IAAI,0BAA0B,CAAC;QACrEL,QAAQ,CAACI,SAAS,CAAC;MACrB;IACF,CAAC;IACDE,KAAK,CAAC,CAAC;IACP,OAAO,MAAM;MACX,IAAI;QACFd,UAAU,EAAEiB,KAAK,CAAC,CAAC;MACrB,CAAC,CAAC,OAAON,CAAM,EAAE;QACfK,OAAO,CAACE,IAAI,CAAC,+BAA+B,EAAEP,CAAC,CAAC;MAClD;IACF,CAAC;EACH,CAAC,EAAE,CAACZ,MAAM,EAAEC,UAAU,CAAC,CAAC;EAExB,oBACEH,IAAA,CAACC,UAAU,CAACqB,QAAQ;IAACC,KAAK,EAAE;MAAErB,MAAM;MAAEC,UAAU;MAAEG,OAAO,EAAEM,KAAK;MAAER;IAAM,CAAE;IAAAM,QAAA,EACvEA;EAAQ,CACU,CAAC;AAE1B,CAAC","ignoreList":[]}

package/lib/module/AmaryllisHooks.js

@@ -3,6 +3,27 @@
 import { useCallback, useMemo, useEffect } from 'react';
 import { useLLMContext } from "./AmaryllisContext.js";
 import { createLLMObservable } from "./AmaryllisRx.js";
+import { useContextEngine } from "./ContextEngineContext.js";
+const useContextAugmentation = (contextEngine, query) => {
+  const engineFromProvider = useContextEngine();
+  const engine = contextEngine ?? engineFromProvider;
+  return useCallback(async params => {
+    if (!engine) {
+      return params;
+    }
+    const resolvedQuery = query ?? engine.deriveQuery(params.prompt, params);
+    if (!resolvedQuery) {
+      return params;
+    }
+    const items = await engine.search(resolvedQuery);
+    return engine.formatRequest({
+      prompt: params.prompt,
+      items,
+      query: resolvedQuery,
+      request: params
+    });
+  }, [engine, query]);
+};
 export const useInferenceAsync = (props = {}) => {
   const {
     controller
@@ -15,14 +36,20 @@ export const useInferenceAsync = (props = {}) => {
   } = props;
   const llm$ = useMemo(() => createLLMObservable(), []);
   const generate = useCallback(async params => {
+    if (!controller) {
+      onError?.(new Error('Controller not initialized'));
+      return () => {
+        onComplete?.();
+      };
+    }
     try {
       onGenerate?.();
-      await controller?.generateAsync(params, llm$.callbacks);
+      await controller.generateAsync(params, llm$.callbacks);
     } catch (err) {
       onError?.(err instanceof Error ? err : new Error('An unknown error occurred'));
     }
     return () => {
-      controller?.cancelAsync();
+      controller.cancelAsync();
       onComplete?.();
     };
   }, [controller, llm$.callbacks, onComplete, onGenerate, onError]);
@@ -61,18 +88,74 @@ export const useInference = (props = {}) => {
     }
   }, [contextError, onError]);
   const generate = useCallback(async params => {
+    if (!controller) {
+      onError?.(new Error('Controller not initialized'));
+      return () => {
+        onComplete?.();
+      };
+    }
     try {
       onGenerate?.();
-      const response = await controller?.generate(params);
+      const response = await controller.generate(params);
       onResult?.(response ?? '', true);
     } catch (err) {
       onError?.(err instanceof Error ? err : new Error('An unknown error occurred'));
     }
     return () => {
-      controller?.cancelAsync();
+      controller.cancelAsync();
       onComplete?.();
     };
   }, [onGenerate, controller, onResult, onError, onComplete]);
   return generate;
 };
+export const useContextInferenceAsync = (props = {}) => {
+  const {
+    contextEngine,
+    query,
+    ...inferenceProps
+  } = props;
+  const {
+    onComplete,
+    onError
+  } = inferenceProps;
+  const augmentRequest = useContextAugmentation(contextEngine, query);
+  const generateBase = useInferenceAsync(inferenceProps);
+  const generate = useCallback(async params => {
+    try {
+      const augmented = await augmentRequest(params);
+      return await generateBase(augmented);
+    } catch (err) {
+      onError?.(err instanceof Error ? err : new Error('An unknown error occurred'));
+      return () => {
+        onComplete?.();
+      };
+    }
+  }, [augmentRequest, generateBase, onComplete, onError]);
+  return generate;
+};
+export const useContextInference = (props = {}) => {
+  const {
+    contextEngine,
+    query,
+    ...inferenceProps
+  } = props;
+  const {
+    onComplete,
+    onError
+  } = inferenceProps;
+  const augmentRequest = useContextAugmentation(contextEngine, query);
+  const generateBase = useInference(inferenceProps);
+  const generate = useCallback(async params => {
+    try {
+      const augmented = await augmentRequest(params);
+      return await generateBase(augmented);
+    } catch (err) {
+      onError?.(err instanceof Error ? err : new Error('An unknown error occurred'));
+      return () => {
+        onComplete?.();
+      };
+    }
+  }, [augmentRequest, generateBase, onComplete, onError]);
+  return generate;
+};
 //# sourceMappingURL=AmaryllisHooks.js.map

package/lib/module/AmaryllisHooks.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useMemo","useEffect","useLLMContext","createLLMObservable","useInferenceAsync","props","controller","onResult","onGenerate","onError","onComplete","llm$","generate","params","generateAsync","callbacks","err","Error","cancelAsync","sub","observable","subscribe","next","text","isFinal","complete","error","unsubscribe","useInference","contextError","response"],"sourceRoot":"../../src","sources":["AmaryllisHooks.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","useEffect","useLLMContext","createLLMObservable","useContextEngine","useContextAugmentation","contextEngine","query","engineFromProvider","engine","params","resolvedQuery","deriveQuery","prompt","items","search","formatRequest","request","useInferenceAsync","props","controller","onResult","onGenerate","onError","onComplete","llm$","generate","Error","generateAsync","callbacks","err","cancelAsync","sub","observable","subscribe","next","text","isFinal","complete","error","unsubscribe","useInference","contextError","response","useContextInferenceAsync","inferenceProps","augmentRequest","generateBase","augmented","useContextInference"],"sourceRoot":"../../src","sources":["AmaryllisHooks.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/AmaryllisRx.js

@@ -2,25 +2,26 @@
 
 import { Observable } from 'rxjs';
 export function createLLMObservable() {
-  let subscriber;
+  let subscriber = null;
   const observable = new Observable(sub => {
     subscriber = sub;
+    return () => {
+      subscriber = null;
+    };
   });
   const callbacks = {
-    onPartialResult: partial => {
-      subscriber?.next({
-        text: partial,
-        isFinal: false
+    onEvent: event => {
+      if (!subscriber) {
+        return;
+      }
+      if (event.type === 'error') {
+        subscriber.error(event.error);
+        return;
+      }
+      subscriber.next({
+        text: event.text,
+        isFinal: event.type === 'final'
       });
-    },
-    onFinalResult: final => {
-      subscriber?.next({
-        text: final,
-        isFinal: true
-      });
-    },
-    onError: error => {
-      subscriber?.error(error);
     }
   };
   return {

package/lib/module/AmaryllisRx.js.map

@@ -1 +1 @@
-{"version":3,"names":["Observable","createLLMObservable","subscriber","observable","sub","callbacks","onPartialResult","partial","next","text","isFinal","onFinalResult","final","onError","error"],"sourceRoot":"../../src","sources":["AmaryllisRx.ts"],"mappings":";;AACA,SAASA,UAAU,QAAoB,MAAM;AAE7C,OAAO,SAASC,mBAAmBA,CAAA,EAAwB;EACzD,IAAIC,UAAiC;EAErC,MAAMC,UAAU,GAAG,IAAIH,UAAU,CAAaI,GAAG,IAAK;IACpDF,UAAU,GAAGE,GAAG;EAClB,CAAC,CAAC;EAEF,MAAMC,SAAuB,GAAG;IAC9BC,eAAe,EAAGC,OAAO,IAAK;MAC5BL,UAAU,EAAEM,IAAI,CAAC;QAAEC,IAAI,EAAEF,OAAO;QAAEG,OAAO,EAAE;MAAM,CAAC,CAAC;IACrD,CAAC;IACDC,aAAa,EAAGC,KAAK,IAAK;MACxBV,UAAU,EAAEM,IAAI,CAAC;QAAEC,IAAI,EAAEG,KAAK;QAAEF,OAAO,EAAE;MAAK,CAAC,CAAC;IAClD,CAAC;IACDG,OAAO,EAAGC,KAAK,IAAK;MAClBZ,UAAU,EAAEY,KAAK,CAACA,KAAK,CAAC;IAC1B;EACF,CAAC;EAED,OAAO;IAAEX,UAAU;IAAEE;EAAU,CAAC;AAClC","ignoreList":[]}
+{"version":3,"names":["Observable","createLLMObservable","subscriber","observable","sub","callbacks","onEvent","event","type","error","next","text","isFinal"],"sourceRoot":"../../src","sources":["AmaryllisRx.ts"],"mappings":";;AACA,SAASA,UAAU,QAAoB,MAAM;AAE7C,OAAO,SAASC,mBAAmBA,CAAA,EAAwB;EACzD,IAAIC,UAAwC,GAAG,IAAI;EAEnD,MAAMC,UAAU,GAAG,IAAIH,UAAU,CAAaI,GAAG,IAAK;IACpDF,UAAU,GAAGE,GAAG;IAChB,OAAO,MAAM;MACXF,UAAU,GAAG,IAAI;IACnB,CAAC;EACH,CAAC,CAAC;EAEF,MAAMG,SAAuB,GAAG;IAC9BC,OAAO,EAAGC,KAAK,IAAK;MAClB,IAAI,CAACL,UAAU,EAAE;QACf;MACF;MACA,IAAIK,KAAK,CAACC,IAAI,KAAK,OAAO,EAAE;QAC1BN,UAAU,CAACO,KAAK,CAACF,KAAK,CAACE,KAAK,CAAC;QAC7B;MACF;MACAP,UAAU,CAACQ,IAAI,CAAC;QAAEC,IAAI,EAAEJ,KAAK,CAACI,IAAI;QAAEC,OAAO,EAAEL,KAAK,CAACC,IAAI,KAAK;MAAQ,CAAC,CAAC;IACxE;EACF,CAAC;EAED,OAAO;IAAEL,UAAU;IAAEE;EAAU,CAAC;AAClC","ignoreList":[]}