Move Model FFI Pointer creation to Model class

Author: crasm

lib/src/ensemble_llama_base.dart

@@ -19,9 +19,9 @@ void main() async {
     progressCallback: (p) => stdout.write("."),
   );
 
-  print(model.rawPointer);
+  print(model);
 
-  // final ctx = await llama.newContext(model, params);
+  final ctx = await llama.newContext(model, params);
   // await llama.freeContext(ctx);
 
   await llama.freeModel(model);
@@ -94,13 +94,14 @@ class Llama {
     await _response.firstWhere((e) => e is FreeModelResp && e.id == ctl.id);
   }
 
-  // Future<Context> newContext(Model model, ContextParams params) async {
-  //   final ctl = NewContextCtl(model, params);
-  //   _controlPort.send(ctl);
-  //   final resp =
-  //       await _response.firstWhere((e) => e is NewContextResp && e.id == ctl.id)
-  //           as NewContextResp;
-  // }
+  Future<Context> newContext(Model model, ContextParams params) async {
+    final ctl = NewContextCtl(model, params);
+    _controlPort.send(ctl);
+    final resp =
+        await _response.firstWhere((e) => e is NewContextResp && e.id == ctl.id)
+            as NewContextResp;
+    return resp.ctx!; // TODO
+  }
 
   // Future<void> freeContext(Context ctx) async {
   //   final ctl = FreeContextCtl(ctx);

lib/src/llama_cpp_isolate_wrapper.dart

@@ -36,6 +36,7 @@ extension on llama_context_params {
     embedding = p.willUseEmbedding;
   }
 }
+
 class ContextParams {
   final int seed;
   final int contextSizeTokens;
@@ -191,8 +192,12 @@ class EntryArgs {
 }
 
 class Model {
-  final int rawPointer;
-  const Model._(this.rawPointer);
+  final int _rawPointer;
+  const Model._(this._rawPointer);
+  Pointer<llama_model> get _ffiPointer =>
+      Pointer.fromAddress(_rawPointer).cast<llama_model>();
+  @override
+  String toString() => "Model{$_rawPointer}";
 }
 
 class Context {
@@ -284,20 +289,18 @@ void _onControl(ControlMessage ctl) {
       _response.send(ctl.done(Model._(rawModelPointer)));
 
     case FreeModelCtl():
-      assert(ctl.model.rawPointer != 0);
-      _modelAllocs[ctl.model.rawPointer]?.forEach((p) {
+      assert(ctl.model._rawPointer != 0);
+      _modelAllocs[ctl.model._rawPointer]?.forEach((p) {
         calloc.free(p);
       });
-      _modelAllocs.clear(ctl.model.rawPointer);
-
-      final modelPointer =
-          Pointer.fromAddress(ctl.model.rawPointer).cast<llama_model>();
-      libllama.llama_free_model(modelPointer);
+      _modelAllocs.clear(ctl.model._rawPointer);
 
+      libllama.llama_free_model(ctl.model._ffiPointer);
       _response.send(ctl.done());
 
     case NewContextCtl():
-      assert(ctl.model.rawPointer != 0);
+      assert(ctl.model._rawPointer != 0);
+    // libllama.llama_new_context_with_model(model, params)
 
     case FreeContextCtl():
   }