From aadab97133f012442a40ef15cd32ab6d1ad9054d Mon Sep 17 00:00:00 2001 From: Marco Minerva Date: Thu, 21 Nov 2024 17:51:35 +0100 Subject: [PATCH] Update code style, ChatService, VectorSearch, and .NET 9.0 Updated .editorconfig with new code style preferences. Enhanced ChatService prompt string with a new directive. Modified VectorSearchService using directives and tuple order. Upgraded SqlDatabaseVectorSearch to target .NET 9.0 and updated packages. --- .editorconfig | 1 + SqlDatabaseVectorSearch/Services/ChatService.cs | 1 + SqlDatabaseVectorSearch/Services/VectorSearchService.cs | 3 +-- SqlDatabaseVectorSearch/SqlDatabaseVectorSearch.csproj | 7 +++---- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index def8856..263f5c7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -131,6 +131,7 @@ csharp_prefer_braces = true:silent csharp_prefer_simple_using_statement = true:suggestion csharp_style_namespace_declarations = file_scoped:suggestion csharp_style_prefer_method_group_conversion = true:silent +csharp_prefer_system_threading_lock = true:suggestion # Expression-level preferences csharp_prefer_simple_default_expression = true:suggestion diff --git a/SqlDatabaseVectorSearch/Services/ChatService.cs b/SqlDatabaseVectorSearch/Services/ChatService.cs index 8b07b2c..e6f3727 100644 --- a/SqlDatabaseVectorSearch/Services/ChatService.cs +++ b/SqlDatabaseVectorSearch/Services/ChatService.cs @@ -55,6 +55,7 @@ public class ChatService(IMemoryCache cache, IChatCompletionService chatCompleti } prompt.AppendLine($""" + ===== Answer the following question: --- diff --git a/SqlDatabaseVectorSearch/Services/VectorSearchService.cs b/SqlDatabaseVectorSearch/Services/VectorSearchService.cs index f21249d..4285da7 100644 --- a/SqlDatabaseVectorSearch/Services/VectorSearchService.cs +++ b/SqlDatabaseVectorSearch/Services/VectorSearchService.cs @@ -9,7 +9,6 @@ using Microsoft.SemanticKernel.Embeddings; using Microsoft.SemanticKernel.Text; using SqlDatabaseVectorSearch.Models; using SqlDatabaseVectorSearch.Settings; -using TinyHelpers.Extensions; using UglyToad.PdfPig; using UglyToad.PdfPig.DocumentLayoutAnalysis.TextExtractor; @@ -45,7 +44,7 @@ public class VectorSearchService(SqlConnection sqlConnection, ITextEmbeddingGene var embeddings = await textEmbeddingGenerationService.GenerateEmbeddingsAsync(paragraphs); // Save the document chunks and the corresponding embedding in the database. - foreach (var (paragraph, index) in paragraphs.WithIndex()) + foreach (var (index, paragraph) in paragraphs.Index()) { await sqlConnection.ExecuteAsync($""" INSERT INTO DocumentChunks (DocumentId, [Index], Content, Embedding) diff --git a/SqlDatabaseVectorSearch/SqlDatabaseVectorSearch.csproj b/SqlDatabaseVectorSearch/SqlDatabaseVectorSearch.csproj index 690ba34..8b8cb22 100644 --- a/SqlDatabaseVectorSearch/SqlDatabaseVectorSearch.csproj +++ b/SqlDatabaseVectorSearch/SqlDatabaseVectorSearch.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable $(NoWarn);SKEXP0001;SKEXP0010;SKEXP0050; @@ -9,13 +9,12 @@ - + - - +