+ getting ai sample

NicklausBrain · Jul 31, 2024 · 850de06 · 850de06
1 parent b8a827a
commit 850de06
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 32 deletions.
diff --git a/My1kWordsEe/Components/Layout/Sample.razor b/My1kWordsEe/Components/Layout/Sample.razor
@@ -1,22 +1,42 @@
-@code {
-    [Parameter]
-    public string Ee { get; set; }
+@using My1kWordsEe.Services;
+@using My1kWordsEe.Models;
+@using CSharpFunctionalExtensions;
+
+@inject OpenAiService OpenAiService
+
+@code {
     [Parameter]
-    public string En { get; set; }
+    public string EeWord { get; set; }
 
+    private Result<Sentence>? sentence;
+
+    protected override async Task OnInitializedAsync()
+    {
+        sentence = await OpenAiService.GetSampleSentence(EeWord);
+    }
 }
 
 <div>
     <div class="row">
-
-        <ul class="list-group">
-            <li class="list-group-item">
-                @Ee
-            </li>
-            <li class="list-group-item">
-                @En
-            </li>
-        </ul>
+        @if (sentence == null)
+        {
+            <p><em>Loading...</em></p>
+        }
+        else if (sentence.Value.IsSuccess)
+        {
+            <ul class="list-group">
+                <li class="list-group-item">
+                    @sentence.Value.Value.Ee
+                </li>
+                <li class="list-group-item">
+                    @sentence.Value.Value.En
+                </li>
+            </ul>
+        }
+        else
+        {
+            <p><em>@sentence.Value.Error</em></p>
+        }
 
     </div>
 </div>
diff --git a/My1kWordsEe/Components/Pages/Words.razor b/My1kWordsEe/Components/Pages/Words.razor
@@ -3,8 +3,9 @@
 
 @using My1kWordsEe.Services;
 @using My1kWordsEe.Models;
-@inject OpenAiService OpenAiService
+@using My1kWordsEe.Components.Layout;
 
+@inject OpenAiService OpenAiService
 
 @code {
     public Ee1kWords Ee1KWords { get; private set; } = new Ee1kWords();
@@ -44,6 +45,11 @@
                             @onclick="@(e => SelectWord(e, word))">@word</li>
                     </div>
                     <div class="col">
+                        @if (word == Ee1KWords.SelectedWord)
+                        {
+                            <Sample EeWord="@word">
+                            </Sample>
+                        }
                     </div>
                 </div>
             }

diff --git a/My1kWordsEe/My1kWordsEe.csproj b/My1kWordsEe/My1kWordsEe.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="CSharpFunctionalExtensions" Version="2.42.5" />
     <PackageReference Include="OpenAI" Version="2.0.0-beta.1" />
   </ItemGroup>
 </Project>
diff --git a/My1kWordsEe/Services/OpenAiService.cs b/My1kWordsEe/Services/OpenAiService.cs
@@ -1,9 +1,7 @@
-using OpenAI.Chat;
-using System;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
+using CSharpFunctionalExtensions;
+using OpenAI.Chat;
 
 namespace My1kWordsEe.Services
 {
@@ -16,7 +14,7 @@ public OpenAiService(string apiKey)
 
         private string ApiKey { get; }
 
-        public async Task<SentenceResult> GetSampleSentence(string word)
+        public async Task<Result<Sentence>> GetSampleSentence(string word)
         {
             ChatClient client = new(model: "gpt-4o-mini", ApiKey);
 
@@ -30,28 +28,31 @@ public async Task<SentenceResult> GetSampleSentence(string word)
                         "Your task is to provide a sample sentence using this word, " +
                         "preferably in combination with some of the other 1000 most common Estonian words. " +
                         "Your output is JSON object with the sample sentence in Estonian and its respective English translation:\n" +
-                        "```\n{\n     \"ee_sentence\": \"<sample in Estonian>\",\n     \"en_sentence\": \"<sample in English>\"\n}\n```"),
+                        "```\n" +
+                        "{\"ee_sentence\": \"<sample in Estonian>\", \"en_sentence\": \"<sample in English>\" }" +
+                        "\n```"),
                     new UserChatMessage(word),
                 ]);
 
             foreach (var c in chatCompletion.Content)
             {
-                var sentence = JsonSerializer.Deserialize<Sentence>(c.Text);
-                return new SentenceResult { Sentence = sentence };
+                var jsonStr = c.Text.Trim('`', ' ', '\'', '"');
+                var sentence = JsonSerializer.Deserialize<Sentence>(jsonStr);
+                if (sentence == null)
+                {
+                    break;
+                }
+                else
+                {
+                    return Result.Success(sentence);
+                }
             }
 
-            return new SentenceResult { Error = "No response found" };
+            return Result.Failure<Sentence>("Empty response");
         }
     }
 }
 
-public class SentenceResult
-{
-    public Sentence? Sentence { get; set; }
-
-    public string Error { get; set; }
-}
-
 public class Sentence
 {
     [JsonPropertyName("ee_sentence")]