Community + refactoring

Author: KSemenenko

src/ManagedCode.GraphRag.Postgres/GraphRagConfigExtensions.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GraphRag.Config;
 
 namespace GraphRag.Storage.Postgres;

src/ManagedCode.GraphRag.Postgres/PostgresExplainService.cs

@@ -1,23 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace GraphRag.Storage.Postgres;
 
-public sealed class PostgresExplainService
+public sealed class PostgresExplainService(PostgresGraphStore graphStore, ILogger<PostgresExplainService> logger)
 {
-    private readonly PostgresGraphStore _graphStore;
-    private readonly ILogger<PostgresExplainService> _logger;
-
-    public PostgresExplainService(PostgresGraphStore graphStore, ILogger<PostgresExplainService> logger)
-    {
-        _graphStore = graphStore ?? throw new ArgumentNullException(nameof(graphStore));
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-    }
+    private readonly PostgresGraphStore _graphStore = graphStore ?? throw new ArgumentNullException(nameof(graphStore));
+    private readonly ILogger<PostgresExplainService> _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
     public async Task<string> GetFormattedPlanAsync(string cypherQuery, IReadOnlyDictionary<string, object?>? parameters = null, CancellationToken cancellationToken = default)
     {

src/ManagedCode.GraphRag.Postgres/PostgresGraphIngestionBenchmark.cs

@@ -1,24 +1,12 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace GraphRag.Storage.Postgres;
 
-public sealed class PostgresGraphIngestionBenchmark
+public sealed class PostgresGraphIngestionBenchmark(PostgresGraphStore graphStore, ILogger<PostgresGraphIngestionBenchmark> logger)
 {
-    private readonly PostgresGraphStore _graphStore;
-    private readonly ILogger<PostgresGraphIngestionBenchmark> _logger;
-
-    public PostgresGraphIngestionBenchmark(PostgresGraphStore graphStore, ILogger<PostgresGraphIngestionBenchmark> logger)
-    {
-        _graphStore = graphStore ?? throw new ArgumentNullException(nameof(graphStore));
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-    }
+    private readonly PostgresGraphStore _graphStore = graphStore ?? throw new ArgumentNullException(nameof(graphStore));
+    private readonly ILogger<PostgresGraphIngestionBenchmark> _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
     public async Task<PostgresIngestionBenchmarkResult> RunAsync(Stream csvStream, PostgresIngestionBenchmarkOptions options, CancellationToken cancellationToken = default)
     {
@@ -31,7 +19,7 @@ public async Task<PostgresIngestionBenchmarkResult> RunAsync(Stream csvStream, P
         }
 
         using var reader = new StreamReader(csvStream, leaveOpen: true);
-        var headerLine = await reader.ReadLineAsync().ConfigureAwait(false);
+        var headerLine = await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false);
         if (string.IsNullOrWhiteSpace(headerLine))
         {
             return new PostgresIngestionBenchmarkResult(0, 0, TimeSpan.Zero, options.EnsurePropertyIndexes);
@@ -63,7 +51,7 @@ public async Task<PostgresIngestionBenchmarkResult> RunAsync(Stream csvStream, P
         var relationshipsWritten = 0;
 
         string? line;
-        while ((line = await reader.ReadLineAsync().ConfigureAwait(false)) is not null)
+        while ((line = await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) is not null)
         {
             cancellationToken.ThrowIfCancellationRequested();
             if (string.IsNullOrWhiteSpace(line))

src/ManagedCode.GraphRag.Postgres/PostgresGraphStore.cs

@@ -1,9 +1,6 @@
-using System;
 using System.Collections;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.Json;
@@ -482,10 +479,7 @@ private static string BuildGraphNameLiteral(string graphName)
 
     private static NpgsqlParameter CreateAgTypeParameter(string name, string jsonPayload)
     {
-        if (jsonPayload is null)
-        {
-            throw new ArgumentNullException(nameof(jsonPayload));
-        }
+        ArgumentNullException.ThrowIfNull(jsonPayload);
 
         return new NpgsqlParameter(name, NpgsqlDbType.Unknown)
         {

src/ManagedCode.GraphRag.Postgres/PostgresGraphStoreConfig.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GraphRag.Storage.Postgres;
 
 public sealed class PostgresGraphStoreConfig
@@ -16,5 +13,5 @@ public sealed class PostgresGraphStoreConfig
     public Dictionary<string, string[]> EdgePropertyIndexes { get; set; } = new(StringComparer.OrdinalIgnoreCase);
 
     public bool MakeDefault { get; set; }
-        = false;
+
 }

src/ManagedCode.GraphRag.Postgres/PostgresIngestionBenchmarkOptions.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GraphRag.Storage.Postgres;
 
 public sealed class PostgresIngestionBenchmarkOptions

src/ManagedCode.GraphRag.Postgres/PostgresIngestionBenchmarkResult.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace GraphRag.Storage.Postgres;
 
 public sealed record PostgresIngestionBenchmarkResult(

src/ManagedCode.GraphRag.Postgres/ServiceCollectionExtensions.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using GraphRag.Config;
 using GraphRag.Graphs;
 using Microsoft.Extensions.DependencyInjection;

src/ManagedCode.GraphRag/Cache/IPipelineCache.cs

@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace GraphRag.Cache;
 
 public interface IPipelineCache

src/ManagedCode.GraphRag/Cache/InMemoryPipelineCache.cs

@@ -1,8 +1,4 @@
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace GraphRag.Cache;