Merge pull request #36 from filipw/feature/uniffi-0.28.3

updated to uniffi 0.28.3 and removed boxed event handler

Author: filipw

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install uniffi-bindgen-cs
       if: matrix.os == 'ubuntu-latest'
-      run: cargo install uniffi-bindgen-cs --git https://github.com/NordSecurity/uniffi-bindgen-cs --tag v0.8.0+v0.25.0
+      run: cargo install uniffi-bindgen-cs --git https://github.com/NordSecurity/uniffi-bindgen-cs --tag v0.9.1+v0.28.3
     - name: Build default target
       run: |
         cd strathweb-phi-engine

samples/csharp/autogen/Program.cs

@@ -5,9 +5,8 @@
 
 var cacheDir = Path.Combine(Directory.GetCurrentDirectory(), ".cache");
 
-var handler = new StreamingEventHandler();
 var modelBuilder = new PhiEngineBuilder();
-modelBuilder.WithEventHandler(new BoxedPhiEventHandler(handler));
+modelBuilder.WithEventHandler(new StreamingEventHandler());
 var model = modelBuilder.Build(cacheDir);
 
 var demo = AnsiConsole.Prompt(

samples/csharp/chatclient/Program.cs

@@ -5,9 +5,9 @@
 
 var cacheDir = Path.Combine(Directory.GetCurrentDirectory(), ".cache");
 
-var handler = new StreamingEventHandler();
+var handler = ;
 var modelBuilder = new PhiEngineBuilder();
-modelBuilder.WithEventHandler(new BoxedPhiEventHandler(handler));
+modelBuilder.WithEventHandler(new StreamingEventHandler());
 var model = modelBuilder.Build(cacheDir);
 
 var chatClient = model.AsChatClient("Local Phi-3 Demo", handler,

samples/csharp/console/Program.cs

@@ -25,7 +25,7 @@
     new PhiModelProvider.HuggingFace("microsoft/Phi-3-mini-4k-instruct", "main") :
     new PhiModelProvider.HuggingFaceGguf("microsoft/Phi-3-mini-4k-instruct-gguf", "Phi-3-mini-4k-instruct-q4.gguf", "main");
 
-modelBuilder.WithEventHandler(new BoxedPhiEventHandler(new ModelEventsHandler()));
+modelBuilder.WithEventHandler(new ModelEventsHandler());
 modelBuilder.WithModelProvider(modelProvider);
 var model = modelBuilder.BuildStateful(cacheDir, "You are a hockey poet");
 

samples/csharp/console/console.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

samples/ios/phi.engine.sample/phi.engine.sample/AiViewModel.swift

@@ -32,7 +32,7 @@ class Phi3ViewModel: ObservableObject {
         let modelProvider = PhiModelProvider.huggingFaceGguf(modelRepo: "microsoft/Phi-3-mini-4k-instruct-gguf", modelFileName: "Phi-3-mini-4k-instruct-q4.gguf", modelRevision: "main") 
         let engineBuilder = PhiEngineBuilder()
         try! engineBuilder.withModelProvider(modelProvider: modelProvider)
-        try! engineBuilder.withEventHandler(eventHandler: BoxedPhiEventHandler(handler: ModelEventsHandler(parent: self)))
+        try! engineBuilder.withEventHandler(eventHandler: ModelEventsHandler(parent: self))
 
         self.engine = try! engineBuilder.buildStateful(cacheDir: FileManager.default.temporaryDirectory.path(), systemInstruction: "You are a hockey wise old man. Share your wisdom briefly like an oracle. Be brief and to the point.")
         DispatchQueue.main.async {

samples/kotlin/main.kt

@@ -1,7 +1,6 @@
 import strathweb.phi.engine.InferenceOptionsBuilder
 import strathweb.phi.engine.PhiEventHandler
 import strathweb.phi.engine.PhiEngineBuilder
-import strathweb.phi.engine.BoxedPhiEventHandler
 import strathweb.phi.engine.PhiModelProvider
 import java.io.File
 
@@ -53,7 +52,7 @@ fun main(args: Array<String>) {
     }
 
     val modelBuilder = PhiEngineBuilder()
-    modelBuilder.withEventHandler(BoxedPhiEventHandler(ModelEventsHandler()))
+    modelBuilder.withEventHandler(ModelEventsHandler())
     modelBuilder.withModelProvider(modelProvider)
     val model = modelBuilder.buildStateful(cacheDir, "You are a hockey poet")
 

samples/python/console/main.py

@@ -26,7 +26,7 @@ def on_model_loaded(self):
 """)
 
 model_builder = PhiEngineBuilder()
-model_builder.with_event_handler(event_handler=BoxedPhiEventHandler(handler=ModelEventsHandler()))
+model_builder.with_event_handler(event_handler=ModelEventsHandler())
 gpu_enabled = model_builder.try_use_gpu()
 model = model_builder.build_stateful(cache_dir=cache_dir, system_instruction="You are a hockey poet")
 

samples/python/jupyter/demo.ipynb

@@ -52,7 +52,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -70,7 +70,7 @@
     "# Build the model\n",
     "# This might be slow when it downloads the model for the first time\n",
     "model_builder = PhiEngineBuilder()\n",
-    "model_builder.with_event_handler(event_handler=BoxedPhiEventHandler(handler=ModelEventsHandler()))\n",
+    "model_builder.with_event_handler(event_handler=ModelEventsHandler())\n",
     "gpu_enabled = model_builder.try_use_gpu()\n",
     "model = model_builder.build_stateful(cache_dir=cache_dir, system_instruction=\"You are a hockey poet\")"
    ]

samples/swift/main.swift

@@ -65,7 +65,7 @@ class ModelEventsHandler: PhiEventHandler {
 }
 
 let modelBuilder = PhiEngineBuilder()
-try! modelBuilder.withEventHandler(eventHandler: BoxedPhiEventHandler(handler: ModelEventsHandler()))
+try! modelBuilder.withEventHandler(eventHandler: ModelEventsHandler())
 try! modelBuilder.withModelProvider(modelProvider: modelProvider)
 
 if isPhi4 {

strathweb-phi-engine/Cargo.lock

@@ -8,7 +8,7 @@ crate-type = ["lib", "cdylib", "staticlib"]
 
 [dependencies]
 thiserror = "1.0"
-uniffi = { version = "0.25.0", features=["build"] }
+uniffi = { version = "0.28.3", features=["build"] }
 anyhow = "1.0.81"
 candle-nn = { version = "0.8.3" }
 candle-core = { version = "0.8.3" }
@@ -25,6 +25,6 @@ candle-core = { version = "0.8.3", features = ["metal"] }
 candle-transformers = { version = "0.8.3", features = ["metal"] }
 
 [build-dependencies]
-uniffi = { version = "0.25.0", features=["build"] }
-uniffi_build = "0.25.0"
-uniffi_bindgen = "0.25.0"
+uniffi = { version = "0.28.3", features=["build"] }
+uniffi_build = "0.28.3"
+uniffi_bindgen = "0.28.3"