From a714da0ca7cecdf2d74d129dde8982f8de40d2f3 Mon Sep 17 00:00:00 2001 From: femsci Date: Sat, 18 Nov 2023 16:31:51 +0100 Subject: [PATCH] nonull --- .../Models/Api/ApiRequest.cs | 2 +- src/Nyanlabs.Umogen.Core/Models/Person.cs | 2 +- .../Models/UmoAnalModel.cs | 10 +++++----- .../Models/UmoDocumentResult.cs | 2 +- .../Pages/Contracts.razor | 8 ++++---- .../GenerationTests.cs | 20 ------------------- test/Nyanlabs.Umogen.WebTests/PdfTest.cs | 2 +- 7 files changed, 13 insertions(+), 33 deletions(-) diff --git a/src/Nyanlabs.Umogen.Core/Models/Api/ApiRequest.cs b/src/Nyanlabs.Umogen.Core/Models/Api/ApiRequest.cs index 4646f18..d06f947 100644 --- a/src/Nyanlabs.Umogen.Core/Models/Api/ApiRequest.cs +++ b/src/Nyanlabs.Umogen.Core/Models/Api/ApiRequest.cs @@ -2,7 +2,7 @@ namespace Nyanlabs.Umogen.Core.Models; public record ApiRequest { - public string Model { get; set; } = "gpt-3.5-turbo"; + public string Model { get; set; } = "gpt-4"; public float Temperature { get; set; } = 0.7f; public ICollection Messages { get; set; } = new List(); public bool Stream { get; set; } diff --git a/src/Nyanlabs.Umogen.Core/Models/Person.cs b/src/Nyanlabs.Umogen.Core/Models/Person.cs index 2546060..c1aaefe 100644 --- a/src/Nyanlabs.Umogen.Core/Models/Person.cs +++ b/src/Nyanlabs.Umogen.Core/Models/Person.cs @@ -16,7 +16,7 @@ public record Person(string Name, string Surname, string IdC, string Pesel, Date public DateTime? DoB { get; set; } = DoB; [JsonIgnore] - public virtual ICollection Companies { get; set; } + public virtual ICollection Companies { get; set; } = default!; public string GetName() { diff --git a/src/Nyanlabs.Umogen.Core/Models/UmoAnalModel.cs b/src/Nyanlabs.Umogen.Core/Models/UmoAnalModel.cs index 5240185..1b7004a 100644 --- a/src/Nyanlabs.Umogen.Core/Models/UmoAnalModel.cs +++ b/src/Nyanlabs.Umogen.Core/Models/UmoAnalModel.cs @@ -5,13 +5,13 @@ namespace Nyanlabs.Umogen.Core.Models; public class UmoAnalModel { [JsonPropertyName("c_type")] - public string ContractType { get; set; } + public string ContractType { get; set; } = default!; [JsonPropertyName("j_pos")] - public string JobPosition { get; set; } + public string JobPosition { get; set; } = default!; [JsonPropertyName("k_lit")] - public string ValueLiteral { get; set; } + public string ValueLiteral { get; set; } = default!; [JsonPropertyName("conds")] - public ICollection Conditions { get; set; } + public ICollection Conditions { get; set; } = default!; - public UmoDoctype Doctype => UmoDoctypeBindings.GetFromName(ContractType).Value; + public UmoDoctype Doctype => UmoDoctypeBindings.GetFromName(ContractType)!.Value; } diff --git a/src/Nyanlabs.Umogen.Core/Models/UmoDocumentResult.cs b/src/Nyanlabs.Umogen.Core/Models/UmoDocumentResult.cs index e9aa3f9..caaf6fe 100644 --- a/src/Nyanlabs.Umogen.Core/Models/UmoDocumentResult.cs +++ b/src/Nyanlabs.Umogen.Core/Models/UmoDocumentResult.cs @@ -32,7 +32,7 @@ public class UmoDocumentResult(UmoDoctype? type, Person employee, IEntity employ .Replace(ENACT_DATE, DateTime.Now.ToString("dd.MM.yyyy")) .Replace(ISSUE_DATE, DateTime.Now.ToString("dd.MM.yyyy")) .Replace(PAYMENT_LIT, Anal.ValueLiteral) - .Replace(PAYMENT, Payment.Value.ToString()) + .Replace(PAYMENT, Payment!.Value.ToString()) .Replace(WORK_TYPE, Anal.JobPosition) .Replace(DYNAMIC_DATA, string.Join(", ", Anal.Conditions)); string tmp = Path.GetTempFileName(); diff --git a/src/Nyanlabs.Umogen.Server/Pages/Contracts.razor b/src/Nyanlabs.Umogen.Server/Pages/Contracts.razor index 4bd4b4b..f05c469 100644 --- a/src/Nyanlabs.Umogen.Server/Pages/Contracts.razor +++ b/src/Nyanlabs.Umogen.Server/Pages/Contracts.razor @@ -71,7 +71,7 @@ private string _validityText = ""; - private async Task ChgValidity(ChangeEventArgs e) + private void ChgValidity(ChangeEventArgs e) { string val = (string)e.Value!; _validityText = val; @@ -129,11 +129,11 @@ } var anal = System.Text.Json.JsonSerializer.Deserialize(output, Umogen.JSON_OPTS); - UmoDocumentResult res = new(null, employee, employer, _validity, _payment, - anal); + UmoDocumentResult res = new(null, employee!, employer!, _validity, _payment, + anal!); var bytes = await res.ProcessPdf(Path.Combine(Environment.GetEnvironmentVariable("UMO_TEMPLATES")!, - anal.Doctype.TemplateDoc())); + anal!.Doctype.TemplateDoc())); await js.InvokeVoidAsync("blobby", bytes); disB = false; diff --git a/test/Nyanlabs.Umogen.WebTests/GenerationTests.cs b/test/Nyanlabs.Umogen.WebTests/GenerationTests.cs index eed01b6..f682096 100644 --- a/test/Nyanlabs.Umogen.WebTests/GenerationTests.cs +++ b/test/Nyanlabs.Umogen.WebTests/GenerationTests.cs @@ -8,24 +8,4 @@ public class GenerationTests private Person ModelEmployer => new("Kotek", "Miauczyński", "CBS4327563", "04281308999", new DateTime(2004, 08, 13)); private Person ModelEmployee => new("Miau", "Kotczyński", "CBS69696969", "76011694336", new DateTime(1976, 1, 16)); - - [Fact] - public async Task Meow4Me() - { - // Given - var rootDir = Environment.CurrentDirectory.Replace("test/Nyanlabs.Umogen.WebTests/bin/Debug/net8.0", ""); - - UmoEngine eng = new(Path.Combine(rootDir, Core.Umogen.DEFAULT_API_KEY_FILE)); - - // When - UmoDocument doc = new(UmoDoctype.CONTR_EMPLOYMENT, ModelEmployer, ModelEmployee); - - UmoProcess proc = new(eng); - // var enu = proc.Ask("I would like to employ Jan Kowalski ID NO CBS3727348 for part time job as a shopkeeper and pay 1400zł."); - - // await foreach (var str in enu) - // { - // Console.Write(str); - // } - } } diff --git a/test/Nyanlabs.Umogen.WebTests/PdfTest.cs b/test/Nyanlabs.Umogen.WebTests/PdfTest.cs index 0c1ebb5..ab58059 100644 --- a/test/Nyanlabs.Umogen.WebTests/PdfTest.cs +++ b/test/Nyanlabs.Umogen.WebTests/PdfTest.cs @@ -31,7 +31,7 @@ public class PdfTest } var anal = JsonSerializer.Deserialize(sb.ToString(), Core.Umogen.JSON_OPTS); - UmoDocumentResult r = new(null, ModelEmployer, ModelEmployee, ValidTime.Invalid, 2137, anal); + UmoDocumentResult r = new(null, ModelEmployer, ModelEmployee, ValidTime.Invalid, 2137, anal!); // When byte[] b = await r.ProcessPdf(Path.Combine(root, $"templates/{r.DocType.TemplateDoc()}"));