Skip to content

Commit 60f8a20

Browse files
committed
removed boxed event handler references
1 parent 356d0db commit 60f8a20

File tree

10 files changed

+9
-24
lines changed

10 files changed

+9
-24
lines changed

samples/csharp/autogen/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
var cacheDir = Path.Combine(Directory.GetCurrentDirectory(), ".cache");
77

8-
var handler = new StreamingEventHandler();
98
var modelBuilder = new PhiEngineBuilder();
10-
modelBuilder.WithEventHandler(new BoxedPhiEventHandler(handler));
9+
modelBuilder.WithEventHandler(new StreamingEventHandler());
1110
var model = modelBuilder.Build(cacheDir);
1211

1312
var demo = AnsiConsole.Prompt(

samples/csharp/chatclient/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
var cacheDir = Path.Combine(Directory.GetCurrentDirectory(), ".cache");
77

8-
var handler = new StreamingEventHandler();
8+
var handler = ;
99
var modelBuilder = new PhiEngineBuilder();
10-
modelBuilder.WithEventHandler(new BoxedPhiEventHandler(handler));
10+
modelBuilder.WithEventHandler(new StreamingEventHandler());
1111
var model = modelBuilder.Build(cacheDir);
1212

1313
var chatClient = model.AsChatClient("Local Phi-3 Demo", handler,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Phi3ViewModel: ObservableObject {
3232
let modelProvider = PhiModelProvider.huggingFaceGguf(modelRepo: "microsoft/Phi-3-mini-4k-instruct-gguf", modelFileName: "Phi-3-mini-4k-instruct-q4.gguf", modelRevision: "main")
3333
let engineBuilder = PhiEngineBuilder()
3434
try! engineBuilder.withModelProvider(modelProvider: modelProvider)
35-
try! engineBuilder.withEventHandler(eventHandler: BoxedPhiEventHandler(handler: ModelEventsHandler(parent: self)))
35+
try! engineBuilder.withEventHandler(eventHandler: ModelEventsHandler(parent: self))
3636

3737
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.")
3838
DispatchQueue.main.async {

samples/kotlin/main.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import strathweb.phi.engine.InferenceOptionsBuilder
22
import strathweb.phi.engine.PhiEventHandler
33
import strathweb.phi.engine.PhiEngineBuilder
4-
import strathweb.phi.engine.BoxedPhiEventHandler
54
import strathweb.phi.engine.PhiModelProvider
65
import java.io.File
76

@@ -53,7 +52,7 @@ fun main(args: Array<String>) {
5352
}
5453

5554
val modelBuilder = PhiEngineBuilder()
56-
modelBuilder.withEventHandler(BoxedPhiEventHandler(ModelEventsHandler()))
55+
modelBuilder.withEventHandler(ModelEventsHandler())
5756
modelBuilder.withModelProvider(modelProvider)
5857
val model = modelBuilder.buildStateful(cacheDir, "You are a hockey poet")
5958

samples/python/console/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def on_model_loaded(self):
2626
""")
2727

2828
model_builder = PhiEngineBuilder()
29-
model_builder.with_event_handler(event_handler=BoxedPhiEventHandler(handler=ModelEventsHandler()))
29+
model_builder.with_event_handler(event_handler=ModelEventsHandler())
3030
gpu_enabled = model_builder.try_use_gpu()
3131
model = model_builder.build_stateful(cache_dir=cache_dir, system_instruction="You are a hockey poet")
3232

samples/python/jupyter/demo.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
},
5353
{
5454
"cell_type": "code",
55-
"execution_count": 4,
55+
"execution_count": null,
5656
"metadata": {},
5757
"outputs": [
5858
{
@@ -70,7 +70,7 @@
7070
"# Build the model\n",
7171
"# This might be slow when it downloads the model for the first time\n",
7272
"model_builder = PhiEngineBuilder()\n",
73-
"model_builder.with_event_handler(event_handler=BoxedPhiEventHandler(handler=ModelEventsHandler()))\n",
73+
"model_builder.with_event_handler(event_handler=ModelEventsHandler())\n",
7474
"gpu_enabled = model_builder.try_use_gpu()\n",
7575
"model = model_builder.build_stateful(cache_dir=cache_dir, system_instruction=\"You are a hockey poet\")"
7676
]

samples/swift/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class ModelEventsHandler: PhiEventHandler {
6565
}
6666

6767
let modelBuilder = PhiEngineBuilder()
68-
try! modelBuilder.withEventHandler(eventHandler: BoxedPhiEventHandler(handler: ModelEventsHandler()))
68+
try! modelBuilder.withEventHandler(eventHandler: ModelEventsHandler())
6969
try! modelBuilder.withModelProvider(modelProvider: modelProvider)
7070

7171
if isPhi4 {

strathweb-phi-engine/src/engine.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,16 +163,6 @@ pub trait PhiEventHandler: Send + Sync {
163163
fn on_inference_token(&self, token: String) -> Result<(), PhiError>;
164164
}
165165

166-
// pub struct BoxedPhiEventHandler {
167-
// pub handler: Box<dyn PhiEventHandler>,
168-
// }
169-
170-
// impl BoxedPhiEventHandler {
171-
// pub fn new(handler: Arc<dyn PhiEventHandler>) -> Self {
172-
// Self { handler }
173-
// }
174-
// }
175-
176166
pub struct PhiEngineBuilder {
177167
inner: Mutex<PhiEngineBuilderInner>,
178168
}

strathweb-phi-engine/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ uniffi::include_scaffolding!("strathweb-phi-engine");
33
use std::sync::atomic::AtomicBool;
44
use std::sync::atomic::Ordering;
55

6-
// use crate::engine::BoxedPhiEventHandler;
76
use crate::engine::ConversationContext;
87
use crate::engine::ConversationMessage;
98
use crate::engine::InferenceOptions;

strathweb-phi-engine/src/strathweb-phi-engine.udl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ interface PhiEventHandler {
144144
void on_inference_ended();
145145
};
146146

147-
148-
149147
[Error]
150148
interface PhiError {
151149
InitalizationError(string error_text);

0 commit comments

Comments
 (0)