Add blazor example; Release 2.3.0

rodion-m · rodion-m · commit bf93d0e24e22 · 2023-04-20T06:36:10.000+06:00
diff --git a/.gitignore b/.gitignore
@@ -477,3 +477,4 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
+*.db
diff --git a/OpenAI.ChatGpt.AspNetCore/OpenAI.ChatGpt.AspNetCore.csproj b/OpenAI.ChatGpt.AspNetCore/OpenAI.ChatGpt.AspNetCore.csproj
@@ -8,7 +8,7 @@
         <PackageId>OpenAI.ChatGPT.AspNetCore</PackageId>
         <PackageProjectUrl>https://github.com/rodion-m/ChatGPT_API_dotnet</PackageProjectUrl>
         <Product>OpenAI ChatGPT integration for .NET with DI</Product>
-        <Version>2.2.2</Version>
+        <Version>2.3.0</Version>
         <Description>OpenAI Chat Completions API (ChatGPT) integration with easy DI supporting (Microsoft.Extensions.DependencyInjection). It allows you to use the API in your .NET applications. Also, the client supports streaming responses (like ChatGPT) via async streams.</Description>
         <RepositoryUrl>https://github.com/rodion-m/ChatGPT_API_dotnet</RepositoryUrl>
         <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
diff --git a/OpenAI.ChatGpt.EntityFrameworkCore/OpenAI.ChatGpt.EntityFrameworkCore.csproj b/OpenAI.ChatGpt.EntityFrameworkCore/OpenAI.ChatGpt.EntityFrameworkCore.csproj
@@ -9,7 +9,7 @@
         <PackageId>OpenAI.ChatGPT.EntityFrameworkCore</PackageId>
         <PackageProjectUrl>https://github.com/rodion-m/ChatGPT_API_dotnet</PackageProjectUrl>
         <Product>OpenAI ChatGPT integration for .NET with EF Core storage</Product>
-        <Version>2.2.2</Version>
+        <Version>2.3.0</Version>
         <Description>OpenAI Chat Completions API (ChatGPT) integration with DI and EF Core supporting. It allows you to use the API in your .NET applications. Also, the client supports streaming responses (like ChatGPT) via async streams.</Description>
         <RepositoryUrl>https://github.com/rodion-m/ChatGPT_API_dotnet</RepositoryUrl>
         <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
diff --git a/OpenAI.ChatGpt/ChatGPT.cs b/OpenAI.ChatGpt/ChatGPT.cs
@@ -11,7 +11,7 @@ namespace OpenAI.ChatGpt;
 public class ChatGPT : IDisposable
 {
     private readonly string _userId;
-    private readonly IChatHistoryStorage _chatHistoryStorage;
+    private readonly IChatHistoryStorage _storage;
     private readonly ITimeProvider _clock;
     private readonly ChatGPTConfig? _config;
     private readonly OpenAiClient _client;
@@ -29,7 +29,7 @@ public ChatGPT(
     {
         _client = client ?? throw new ArgumentNullException(nameof(client));
         _userId = userId ?? throw new ArgumentNullException(nameof(userId));
-        _chatHistoryStorage = chatHistoryStorage ?? throw new ArgumentNullException(nameof(chatHistoryStorage));
+        _storage = chatHistoryStorage ?? throw new ArgumentNullException(nameof(chatHistoryStorage));
         _clock = clock ?? throw new ArgumentNullException(nameof(clock));
         _config = config;
     }
@@ -44,7 +44,7 @@ public ChatGPT(
         ChatGPTConfig? config)
     {
         _client = client ?? throw new ArgumentNullException(nameof(client));
-        _chatHistoryStorage = chatHistoryStorage ?? throw new ArgumentNullException(nameof(chatHistoryStorage));
+        _storage = chatHistoryStorage ?? throw new ArgumentNullException(nameof(chatHistoryStorage));
         _clock = clock ?? throw new ArgumentNullException(nameof(clock));
         _userId = Guid.Empty.ToString();
         _config = config;
@@ -71,12 +71,10 @@ public void Dispose()
     }
 
     /// <summary> Continues the last topic or starts a new one.</summary>
-    public async Task<Chat> ContinueOrStartNewTopic(
-        DateTimeOffset? createdAt = null,
-        CancellationToken cancellationToken = default)
+    public async Task<Chat> ContinueOrStartNewTopic(CancellationToken cancellationToken = default)
     {
         if (_currentChat is not null) return _currentChat;
-        var topic = await _chatHistoryStorage.GetMostRecentTopicOrNull(_userId, cancellationToken);
+        var topic = await _storage.GetMostRecentTopicOrNull(_userId, cancellationToken);
         return topic is null
             ? await StartNewTopic(cancellationToken: cancellationToken)
             : await SetTopic(topic, cancellationToken);
@@ -91,13 +89,13 @@ public async Task<Chat> StartNewTopic(
         CancellationToken cancellationToken = default)
     {
         config = ChatGPTConfig.CombineOrDefault(_config, config);
-        var topic = new Topic(_chatHistoryStorage.NewTopicId(), _userId, name, _clock.GetCurrentTime(), config);
-        await _chatHistoryStorage.AddTopic(topic, cancellationToken);
+        var topic = new Topic(_storage.NewTopicId(), _userId, name, _clock.GetCurrentTime(), config);
+        await _storage.AddTopic(topic, cancellationToken);
         initialDialog ??= config.GetInitialDialogOrNull();
         if (initialDialog is not null)
         {
             var messages = ConvertToPersistentMessages(initialDialog, topic);
-            await _chatHistoryStorage.SaveMessages(_userId, topic.Id, messages, cancellationToken);
+            await _storage.SaveMessages(_userId, topic.Id, messages, cancellationToken);
         }
 
         _currentChat = CreateChat(topic, initialDialog is null, clearOnDisposal: clearOnDisposal);
@@ -108,13 +106,13 @@ private IEnumerable<PersistentChatMessage> ConvertToPersistentMessages(ChatCompl
     {
         return dialog.GetMessages()
             .Select(m => new PersistentChatMessage(
-                _chatHistoryStorage.NewMessageId(), _userId, topic.Id, _clock.GetCurrentTime(), m)
+                _storage.NewMessageId(), _userId, topic.Id, _clock.GetCurrentTime(), m)
             );
     }
 
     public async Task<Chat> SetTopic(Guid topicId, CancellationToken cancellationToken = default)
     {
-        var topic = await _chatHistoryStorage.GetTopic(_userId, topicId, cancellationToken);
+        var topic = await _storage.GetTopic(_userId, topicId, cancellationToken);
         if (topic is null)
         {
             throw new ArgumentException($"Chat with id {topicId} not found for user {_userId}");
@@ -132,12 +130,12 @@ private Task<Chat> SetTopic(Topic topic, CancellationToken cancellationToken = d
     private Chat CreateChat(Topic topic, bool isNew, bool clearOnDisposal)
     {
         if (topic == null) throw new ArgumentNullException(nameof(topic));
-        return new Chat(_chatHistoryStorage, _clock, _client, _userId, topic, isNew, clearOnDisposal);
+        return new Chat(_storage, _clock, _client, _userId, topic, isNew, clearOnDisposal);
     }
     
     public async Task<IReadOnlyList<Topic>> GetTopics(CancellationToken cancellationToken = default)
     {
-        var chats = await _chatHistoryStorage.GetTopics(_userId, cancellationToken);
+        var chats = await _storage.GetTopics(_userId, cancellationToken);
         return chats.ToList();
     }
 
diff --git a/OpenAI.ChatGpt/OpenAI.ChatGpt.csproj b/OpenAI.ChatGpt/OpenAI.ChatGpt.csproj
@@ -10,7 +10,7 @@
         <PackageId>OpenAI.ChatGPT</PackageId>
         <PackageProjectUrl>https://github.com/rodion-m/ChatGPT_API_dotnet</PackageProjectUrl>
         <Product>OpenAI ChatGPT integration for .NET</Product>
-        <Version>2.2.2</Version>
+        <Version>2.3.0</Version>
         <Description>.NET integration for ChatGPT with streaming responses supporting (like ChatGPT) via async streams.</Description>
         <RepositoryUrl>https://github.com/rodion-m/ChatGPT_API_dotnet</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression> 
diff --git a/samples/ChatGpt.BlazorExample/ChatGpt.BlazorExample.csproj b/samples/ChatGpt.BlazorExample/ChatGpt.BlazorExample.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" />
-    <PackageReference Include="OpenAI.ChatGPT.EntityFrameworkCore" Version="2.2.0" />
+    <PackageReference Include="OpenAI.ChatGPT.EntityFrameworkCore" Version="2.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/ChatGpt.BlazorExample/Pages/Counter.razor b/samples/ChatGpt.BlazorExample/Pages/Counter.razor
diff --git a/samples/ChatGpt.BlazorExample/Pages/Index.razor b/samples/ChatGpt.BlazorExample/Pages/Index.razor
@@ -1,10 +1,12 @@
 ﻿@page "/"
 @using OpenAI.ChatGpt.AspNetCore
 @using OpenAI.ChatGpt
+@using OpenAI.ChatGpt.Interfaces
 @using OpenAI.ChatGpt.Models
 @using OpenAI.ChatGpt.Models.ChatCompletion
 @inject IJSRuntime JsRuntime
 @inject ChatGPTFactory ChatGPTFactory
+@inject IChatHistoryStorage ChatHistoryStorage
 
 <PageTitle>Index</PageTitle>
 @if (_messages is null)
@@ -77,7 +79,7 @@
     @foreach (var item in _messages)
     {
         <div>
-            @if (item.role == item.content)
+            @if (item.role == ChatCompletionRoles.User)
             {
                 <div style="float: right; margin-right: 20px; margin-top: 10px">
                     <b>Human</b>
@@ -134,6 +136,7 @@ else
     bool _processing = false;
     int _totalTokens = 0;
     private Chat _chat;
+    private string _userId = "test-user-id";
 
     protected override async Task OnInitializedAsync()
     {
@@ -144,9 +147,10 @@ else
     private async Task CreateNewChat()
     {
         if(_chat != null) await _chat.DisposeAsync();
-        var chatGpt = await ChatGPTFactory.Create("test-user-id");
-        _chat = await chatGpt.StartNewTopic("Test Topic", clearOnDisposal: true);
-		 
+        var chatGpt = await ChatGPTFactory.Create(_userId);
+        _chat = await chatGpt.ContinueOrStartNewTopic();
+        _messages = (await _chat.GetMessages()).Select(m => (m.Role, m.Content))
+            .ToList();
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -180,7 +184,7 @@ else
             _messages.Add((ChatCompletionRoles.User, _prompt));
             _messages.Add((ChatCompletionRoles.Assistant, response));
 
-            //TotalTokens = _chat.LastResponse.Usage.TotalTokens;
+            _totalTokens = (int) (_chat.LastResponse?.Usage.TotalTokens ?? 0);
         }
         catch (Exception ex)
         {
@@ -204,6 +208,7 @@ else
     async Task RestartChatGpt()
     {
         _prompt = "Write a 10 word description of OpenAI ChatGPT";
+        await ChatHistoryStorage.ClearTopics(_userId, default);
         await CreateNewChat();
         _messages = new();
         _totalTokens = 0;
diff --git a/samples/ChatGpt.BlazorExample/Shared/NavMenu.razor b/samples/ChatGpt.BlazorExample/Shared/NavMenu.razor
@@ -14,16 +14,6 @@
                 <span class="oi oi-home" aria-hidden="true"></span> Home
             </NavLink>
         </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
-            </NavLink>
-        </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="fetchdata">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
-            </NavLink>
-        </div>
     </nav>
 </div>
 

Original file line number	Diff line number	Diff line change
`@@ -477,3 +477,4 @@ FodyWeavers.xsd`
`477`	`477`	`# JetBrains Rider`
`478`	`478`	`*.sln.iml`
`479`	`479`
	`480`	`+*.db`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace OpenAI.ChatGpt;`
`11`	`11`	`public class ChatGPT : IDisposable`
`12`	`12`	`{`
`13`	`13`	`private readonly string _userId;`
`14`		`- private readonly IChatHistoryStorage _chatHistoryStorage;`
	`14`	`+ private readonly IChatHistoryStorage _storage;`
`15`	`15`	`private readonly ITimeProvider _clock;`
`16`	`16`	`private readonly ChatGPTConfig? _config;`
`17`	`17`	`private readonly OpenAiClient _client;`
`@@ -29,7 +29,7 @@ public ChatGPT(`
`29`	`29`	`{`
`30`	`30`	`_client = client ?? throw new ArgumentNullException(nameof(client));`
`31`	`31`	`_userId = userId ?? throw new ArgumentNullException(nameof(userId));`
`32`		`- _chatHistoryStorage = chatHistoryStorage ?? throw new ArgumentNullException(nameof(chatHistoryStorage));`
	`32`	`+ _storage = chatHistoryStorage ?? throw new ArgumentNullException(nameof(chatHistoryStorage));`
`33`	`33`	`_clock = clock ?? throw new ArgumentNullException(nameof(clock));`
`34`	`34`	`_config = config;`
`35`	`35`	`}`
`@@ -44,7 +44,7 @@ public ChatGPT(`
`44`	`44`	`ChatGPTConfig? config)`
`45`	`45`	`{`
`46`	`46`	`_client = client ?? throw new ArgumentNullException(nameof(client));`
`47`		`- _chatHistoryStorage = chatHistoryStorage ?? throw new ArgumentNullException(nameof(chatHistoryStorage));`
	`47`	`+ _storage = chatHistoryStorage ?? throw new ArgumentNullException(nameof(chatHistoryStorage));`
`48`	`48`	`_clock = clock ?? throw new ArgumentNullException(nameof(clock));`
`49`	`49`	`_userId = Guid.Empty.ToString();`
`50`	`50`	`_config = config;`
`@@ -71,12 +71,10 @@ public void Dispose()`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/// <summary> Continues the last topic or starts a new one.</summary>`
`74`		`- public async Task<Chat> ContinueOrStartNewTopic(`
`75`		`- DateTimeOffset? createdAt = null,`
`76`		`- CancellationToken cancellationToken = default)`
	`74`	`+ public async Task<Chat> ContinueOrStartNewTopic(CancellationToken cancellationToken = default)`
`77`	`75`	`{`
`78`	`76`	`if (_currentChat is not null) return _currentChat;`
`79`		`- var topic = await _chatHistoryStorage.GetMostRecentTopicOrNull(_userId, cancellationToken);`
	`77`	`+ var topic = await _storage.GetMostRecentTopicOrNull(_userId, cancellationToken);`
`80`	`78`	`return topic is null`
`81`	`79`	`? await StartNewTopic(cancellationToken: cancellationToken)`
`82`	`80`	`: await SetTopic(topic, cancellationToken);`
`@@ -91,13 +89,13 @@ public async Task<Chat> StartNewTopic(`
`91`	`89`	`CancellationToken cancellationToken = default)`
`92`	`90`	`{`
`93`	`91`	`config = ChatGPTConfig.CombineOrDefault(_config, config);`
`94`		`- var topic = new Topic(_chatHistoryStorage.NewTopicId(), _userId, name, _clock.GetCurrentTime(), config);`
`95`		`- await _chatHistoryStorage.AddTopic(topic, cancellationToken);`
	`92`	`+ var topic = new Topic(_storage.NewTopicId(), _userId, name, _clock.GetCurrentTime(), config);`
	`93`	`+ await _storage.AddTopic(topic, cancellationToken);`
`96`	`94`	`initialDialog ??= config.GetInitialDialogOrNull();`
`97`	`95`	`if (initialDialog is not null)`
`98`	`96`	`{`
`99`	`97`	`var messages = ConvertToPersistentMessages(initialDialog, topic);`
`100`		`- await _chatHistoryStorage.SaveMessages(_userId, topic.Id, messages, cancellationToken);`
	`98`	`+ await _storage.SaveMessages(_userId, topic.Id, messages, cancellationToken);`
`101`	`99`	`}`
`102`	`100`
`103`	`101`	`_currentChat = CreateChat(topic, initialDialog is null, clearOnDisposal: clearOnDisposal);`
`@@ -108,13 +106,13 @@ private IEnumerable<PersistentChatMessage> ConvertToPersistentMessages(ChatCompl`
`108`	`106`	`{`
`109`	`107`	`return dialog.GetMessages()`
`110`	`108`	`.Select(m => new PersistentChatMessage(`
`111`		`- _chatHistoryStorage.NewMessageId(), _userId, topic.Id, _clock.GetCurrentTime(), m)`
	`109`	`+ _storage.NewMessageId(), _userId, topic.Id, _clock.GetCurrentTime(), m)`
`112`	`110`	`);`
`113`	`111`	`}`
`114`	`112`
`115`	`113`	`public async Task<Chat> SetTopic(Guid topicId, CancellationToken cancellationToken = default)`
`116`	`114`	`{`
`117`		`- var topic = await _chatHistoryStorage.GetTopic(_userId, topicId, cancellationToken);`
	`115`	`+ var topic = await _storage.GetTopic(_userId, topicId, cancellationToken);`
`118`	`116`	`if (topic is null)`
`119`	`117`	`{`
`120`	`118`	`throw new ArgumentException($"Chat with id {topicId} not found for user {_userId}");`
`@@ -132,12 +130,12 @@ private Task<Chat> SetTopic(Topic topic, CancellationToken cancellationToken = d`
`132`	`130`	`private Chat CreateChat(Topic topic, bool isNew, bool clearOnDisposal)`
`133`	`131`	`{`
`134`	`132`	`if (topic == null) throw new ArgumentNullException(nameof(topic));`
`135`		`- return new Chat(_chatHistoryStorage, _clock, _client, _userId, topic, isNew, clearOnDisposal);`
	`133`	`+ return new Chat(_storage, _clock, _client, _userId, topic, isNew, clearOnDisposal);`
`136`	`134`	`}`
`137`	`135`
`138`	`136`	`public async Task<IReadOnlyList<Topic>> GetTopics(CancellationToken cancellationToken = default)`
`139`	`137`	`{`
`140`		`- var chats = await _chatHistoryStorage.GetTopics(_userId, cancellationToken);`
	`138`	`+ var chats = await _storage.GetTopics(_userId, cancellationToken);`
`141`	`139`	`return chats.ToList();`
`142`	`140`	`}`
`143`	`141`