github/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2025-09-24 04:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

C# Bindings - improved logging (#714)

Browse Source 
* added optional support for .NET logging

* bump version and add missing alpha suffix

* avoid creating additional namespace for extensions

* prefer NullLogger/NullLoggerFactory over null-conditional ILogger to avoid errors

---------

Signed-off-by: mvenditto <venditto.matteo@gmail.com>
This commit is contained in:
mvenditto
2023-06-01 22:01:27 +02:00
committed by GitHub
parent cf07ca3951
commit 8e89ceb54b
8 changed files with 122 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gpt4all-bindings/csharp/Gpt4All/Bindings/LLModel.cs
View File

@@ -1,4 +1,7 @@
namespace Gpt4All.Bindings;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
namespace Gpt4All.Bindings;
/// <summary>
/// Arguments for the response processing callback
@@ -40,14 +43,16 @@ public class LLModel : ILLModel
{
protected readonly IntPtr _handle;
private readonly ModelType _modelType;
private readonly ILogger _logger;
private bool _disposed;
public ModelType ModelType => _modelType;
internal LLModel(IntPtr handle, ModelType modelType)
internal LLModel(IntPtr handle, ModelType modelType, ILogger? logger = null)
{
_handle = handle;
_modelType = modelType;
_logger = logger ?? NullLogger.Instance;
}
/// <summary>
@@ -55,9 +60,9 @@ public class LLModel : ILLModel
/// </summary>
/// <param name="handle">Pointer to underlying model</param>
/// <param name="modelType">The model type</param>
public static LLModel Create(IntPtr handle, ModelType modelType)
public static LLModel Create(IntPtr handle, ModelType modelType, ILogger? logger = null)
{
return new LLModel(handle, modelType);
return new LLModel(handle, modelType, logger: logger);
}
/// <summary>
@@ -82,6 +87,8 @@ public class LLModel : ILLModel
GC.KeepAlive(recalculateCallback);
GC.KeepAlive(cancellationToken);
_logger.LogInformation("Prompt input='{Prompt}' ctx={Context}", text, context.Dump());
NativeMethods.llmodel_prompt(
_handle,
text,
@@ -94,7 +101,12 @@ public class LLModel : ILLModel
},
(tokenId, response) =>
{
if (cancellationToken.IsCancellationRequested) return false;
if (cancellationToken.IsCancellationRequested)
{
_logger.LogDebug("ResponseCallback evt=CancellationRequested");
return false;
}
if (responseCallback == null) return true;
var args = new ModelResponseEventArgs(tokenId, response);
return responseCallback(args);

4
gpt4all-bindings/csharp/Gpt4All/Bindings/LLPromptContext.cs
View File

@@ -1,6 +1,4 @@
using System.Reflection;
namespace Gpt4All.Bindings;
namespace Gpt4All.Bindings;
/// <summary>
/// Wrapper around the llmodel_prompt_context structure for holding the prompt context.