type convertor fix

Author: KSemenenko

Directory.Build.props

@@ -26,8 +26,8 @@
         <RepositoryUrl>https://github.com/managedcode/graphrag</RepositoryUrl>
         <PackageProjectUrl>https://github.com/managedcode/graphrag</PackageProjectUrl>
         <Product>Managed Code GraphRag</Product>
-        <Version>10.0.3</Version>
-        <PackageVersion>10.0.3</PackageVersion>
+        <Version>10.0.4</Version>
+        <PackageVersion>10.0.4</PackageVersion>
 
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

Directory.Packages.props

@@ -13,15 +13,15 @@
     <PackageVersion Include="Microsoft.ML.Tokenizers" Version="2.0.0" />
     <PackageVersion Include="Microsoft.ML.Tokenizers.Data.O200kBase" Version="2.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageVersion Include="Gremlin.Net" Version="3.7.4" />
+    <PackageVersion Include="Gremlin.Net" Version="3.8.0" />
     <PackageVersion Include="Neo4j.Driver" Version="5.28.3" />
-    <PackageVersion Include="Npgsql" Version="9.0.4" />
+    <PackageVersion Include="Npgsql" Version="10.0.0" />
     <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39" />
-    <PackageVersion Include="Testcontainers.CosmosDb" Version="4.8.1" />
-    <PackageVersion Include="Testcontainers.JanusGraph" Version="4.8.1" />
-    <PackageVersion Include="Testcontainers.Neo4j" Version="4.8.1" />
-    <PackageVersion Include="Testcontainers.PostgreSql" Version="4.8.1" />
+    <PackageVersion Include="Testcontainers.CosmosDb" Version="4.9.0" />
+    <PackageVersion Include="Testcontainers.JanusGraph" Version="4.9.0" />
+    <PackageVersion Include="Testcontainers.Neo4j" Version="4.9.0" />
+    <PackageVersion Include="Testcontainers.PostgreSql" Version="4.9.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
   </ItemGroup>
-</Project>
+</Project>

src/ManagedCode.GraphRag.Postgres/ApacheAge/AgeConnectionManager.cs

@@ -53,6 +53,7 @@ private AgeConnectionManager(PostgresGraphStoreOptions? options, string connecti
 
         ConnectionString = connectionBuilder.ConnectionString;
         var dataSourceBuilder = new NpgsqlDataSourceBuilder(ConnectionString);
+        dataSourceBuilder.UseAge();
         options?.ConfigureDataSourceBuilder?.Invoke(dataSourceBuilder);
         _dataSource = dataSourceBuilder.Build();
         _logger = logger ?? NullLogger<AgeConnectionManager>.Instance;

src/ManagedCode.GraphRag.Postgres/ApacheAge/Converters/AgtypeConverter.cs

@@ -4,20 +4,20 @@
 
 namespace GraphRag.Storage.Postgres.ApacheAge.Converters;
 
-#pragma warning disable NPG9001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 internal sealed class AgtypeConverter : PgBufferedConverter<Agtype>
 {
+    public override Size GetSize(SizeContext context, Agtype value, ref object? writeState)
+    {
+        var byteCount = Encoding.UTF8.GetByteCount(value.GetString());
+        return byteCount;
+    }
+
     public override bool CanConvert(DataFormat format, out BufferRequirements bufferRequirements)
     {
         bufferRequirements = BufferRequirements.None;
         return format is DataFormat.Text;
     }
 
-    /// <summary>
-    /// Read agtype from its binary representation.
-    /// </summary>
-    /// <param name="reader"></param>
-    /// <returns></returns>
     protected override Agtype ReadCore(PgReader reader)
     {
         var textBytes = reader.ReadBytes(reader.CurrentRemaining);
@@ -26,16 +26,9 @@ protected override Agtype ReadCore(PgReader reader)
         return new(text);
     }
 
-    /// <summary>
-    /// Write agtype to its binary representation.
-    /// </summary>
-    /// <param name="writer"></param>
-    /// <param name="value"></param>
     protected override void WriteCore(PgWriter writer, Agtype value)
     {
         var bytes = Encoding.UTF8.GetBytes(value.GetString());
         writer.WriteBytes(bytes);
     }
 }
-#pragma warning restore NPG9001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-

src/ManagedCode.GraphRag.Postgres/ApacheAge/Extensions/NpgsqlExtensions.cs

@@ -5,14 +5,15 @@ namespace Npgsql;
 
 public static class NpgsqlExtensions
 {
-    /// <summary>
-    /// Use Apache AGE types.
-    /// </summary>
-    /// <param name="mapper">Npgsql type mapper.</param>
-    /// <returns></returns>
     public static INpgsqlTypeMapper UseAge(this INpgsqlTypeMapper mapper)
     {
         mapper.AddTypeInfoResolverFactory(new AgtypeResolverFactory());
         return mapper;
     }
+
+    public static NpgsqlDataSourceBuilder UseAge(this NpgsqlDataSourceBuilder builder)
+    {
+        builder.AddTypeInfoResolverFactory(new AgtypeResolverFactory());
+        return builder;
+    }
 }

src/ManagedCode.GraphRag.Postgres/ApacheAge/Resolvers/AgtypeResolverFactory.cs

@@ -5,16 +5,6 @@
 
 namespace GraphRag.Storage.Postgres.ApacheAge.Resolvers;
 
-#pragma warning disable NPG9001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-/// <summary>
-/// Factory class to resolve type information and specify which converters should be used
-/// to convert the PostgreSQL type 'ag_catalog.agtype' to our CLR <see cref="Agtype"/>.
-/// </summary>
-/// <remarks>
-/// <seealso href="https://medium.com/@dsylebee/nethereums-bigdecimal-support-for-npgsql-c21ec48897de">
-/// This article
-/// </seealso> was of great help.
-/// </remarks>
 internal sealed class AgtypeResolverFactory : PgTypeInfoResolverFactory
 {
     public override IPgTypeInfoResolver CreateResolver() => new Resolver();
@@ -59,4 +49,3 @@ private static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection m
         }
     }
 }
-#pragma warning restore NPG9001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.

src/ManagedCode.GraphRag.Postgres/ManagedCode.GraphRag.Postgres.csproj

@@ -10,6 +10,9 @@
   <ItemGroup>
     <ProjectReference Include="../ManagedCode.GraphRag/ManagedCode.GraphRag.csproj" />
   </ItemGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);NPG9001</NoWarn>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Npgsql" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />

src/ManagedCode.GraphRag.Postgres/PostgresGraphStore.cs

@@ -8,11 +8,11 @@
 using GraphRag.Constants;
 using GraphRag.Graphs;
 using GraphRag.Storage.Postgres.ApacheAge;
+using GraphRag.Storage.Postgres.ApacheAge.Types;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Npgsql;
-using NpgsqlTypes;
 
 namespace GraphRag.Storage.Postgres;
 
@@ -401,6 +401,10 @@ async IAsyncEnumerable<GraphRelationship> FetchAsync(string nodeId, [EnumeratorC
             await client.OpenConnectionAsync(token).ConfigureAwait(false);
 
             await using var command = client.Connection.CreateCommand();
+            var payload = JsonSerializer.Serialize(new Dictionary<string, object?>
+            {
+                [CypherParameterNames.NodeId] = nodeId
+            });
             command.CommandText = string.Concat(
                 "SELECT ",
                 "\n    source_id::text,",
@@ -410,13 +414,8 @@ async IAsyncEnumerable<GraphRelationship> FetchAsync(string nodeId, [EnumeratorC
                 "\nFROM ag_catalog.cypher(", _graphNameLiteral, ", $$",
                 "\n    MATCH (source { id: $node_id })-[rel]->(target)",
                 "\n    RETURN source.id AS source_id, target.id AS target_id, type(rel) AS edge_type, properties(rel) AS edge_props",
-                "\n$$, @params::ag_catalog.agtype) AS (source_id agtype, target_id agtype, edge_type agtype, edge_props agtype);");
-            var payload = JsonSerializer.Serialize(new Dictionary<string, object?>
-            {
-                [CypherParameterNames.NodeId] = nodeId
-            });
+                "\n$$, @params) AS (source_id agtype, target_id agtype, edge_type agtype, edge_props agtype);");
             command.Parameters.Add(CreateAgTypeParameter(CypherParameterNames.Parameters, payload));
-
             await using var reader = await command.ExecuteReaderAsync(token).ConfigureAwait(false);
             while (await reader.ReadAsync(token).ConfigureAwait(false))
             {
@@ -445,6 +444,7 @@ async IAsyncEnumerable<GraphRelationship> FetchRelationships(GraphTraversalOptio
 
             await using var command = client.Connection.CreateCommand();
             var pagination = BuildPaginationClause(traversalOptions);
+            var parametersJson = SerializeParameters(null);
             command.CommandText = string.Concat(
                 "SELECT ",
                 "\n    source_id::text,",
@@ -456,9 +456,8 @@ async IAsyncEnumerable<GraphRelationship> FetchRelationships(GraphTraversalOptio
                 "\n    RETURN source.id AS source_id, target.id AS target_id, type(rel) AS edge_type, properties(rel) AS edge_props",
                 "\n    ORDER BY source.id, target.id, type(rel)",
                 pagination,
-                "\n$$, @params::ag_catalog.agtype) AS (source_id agtype, target_id agtype, edge_type agtype, edge_props agtype);");
-            command.Parameters.Add(CreateAgTypeParameter(CypherParameterNames.Parameters, SerializeParameters(null)));
-
+                "\n$$, @params) AS (source_id agtype, target_id agtype, edge_type agtype, edge_props agtype);");
+            command.Parameters.Add(CreateAgTypeParameter(CypherParameterNames.Parameters, parametersJson));
             await using var reader = await command.ExecuteReaderAsync(token).ConfigureAwait(false);
             while (await reader.ReadAsync(token).ConfigureAwait(false))
             {
@@ -487,6 +486,7 @@ async IAsyncEnumerable<GraphNode> FetchNodes(GraphTraversalOptions? traversalOpt
 
             await using var command = client.Connection.CreateCommand();
             var pagination = BuildPaginationClause(traversalOptions);
+            var parametersJson = SerializeParameters(null);
             command.CommandText = string.Concat(
                 "SELECT ",
                 "\n    node_label::text,",
@@ -497,9 +497,8 @@ async IAsyncEnumerable<GraphNode> FetchNodes(GraphTraversalOptions? traversalOpt
                 "\n    RETURN head(labels(n)) AS node_label, n.id AS node_id, properties(n) AS node_props",
                 "\n    ORDER BY n.id",
                 pagination,
-                "\n$$, @params::ag_catalog.agtype) AS (node_label agtype, node_id agtype, node_props agtype);");
-            command.Parameters.Add(CreateAgTypeParameter(CypherParameterNames.Parameters, SerializeParameters(null)));
-
+                "\n$$, @params) AS (node_label agtype, node_id agtype, node_props agtype);");
+            command.Parameters.Add(CreateAgTypeParameter(CypherParameterNames.Parameters, parametersJson));
             await using var reader = await command.ExecuteReaderAsync(token).ConfigureAwait(false);
             while (await reader.ReadAsync(token).ConfigureAwait(false))
             {
@@ -525,17 +524,16 @@ protected virtual async Task ExecuteCypherAsync(string query, IReadOnlyDictionar
     private async Task ExecuteCypherAsync(IAgeClient client, string query, IReadOnlyDictionary<string, object?> parameters, CancellationToken cancellationToken)
     {
         var queryLiteral = WrapInDollarQuotes(query);
+        var payload = SerializeParameters(parameters);
         var commandText = string.Concat(
             "SELECT *",
-            "\nFROM ag_catalog.cypher(", _graphNameLiteral, ", ", queryLiteral, "::cstring, @params::ag_catalog.agtype) AS (result agtype);");
-        var payload = SerializeParameters(parameters);
+            "\nFROM ag_catalog.cypher(", _graphNameLiteral, ", ", queryLiteral, "::cstring, @params) AS (result agtype);");
 
         for (var attempt = 0; attempt < 2; attempt++)
         {
             await using var command = client.Connection.CreateCommand();
             command.CommandText = commandText;
             command.Parameters.Add(CreateAgTypeParameter(CypherParameterNames.Parameters, payload));
-
             try
             {
                 await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false);
@@ -856,7 +854,7 @@ protected virtual async Task<IReadOnlyList<string>> ExecuteExplainAsync(string e
         var explainLiteral = WrapInDollarQuotes(explainQuery);
         command.CommandText = string.Concat(
             "SELECT plan",
-            "\nFROM ag_catalog.cypher(", _graphNameLiteral, ", ", explainLiteral, "::cstring, @params::ag_catalog.agtype) AS (plan text);");
+            "\nFROM ag_catalog.cypher(", _graphNameLiteral, ", ", explainLiteral, "::cstring, @params) AS (plan text);");
         command.Parameters.Add(CreateAgTypeParameter(CypherParameterNames.Parameters, parameterJson));
 
         var plan = new List<string>();
@@ -892,10 +890,10 @@ private static NpgsqlParameter CreateAgTypeParameter(string name, string jsonPay
     {
         ArgumentNullException.ThrowIfNull(jsonPayload);
 
-        return new NpgsqlParameter(name, NpgsqlDbType.Unknown)
+        var agtype = new Agtype(jsonPayload);
+        return new NpgsqlParameter<Agtype>(name, agtype)
         {
-            DataTypeName = "ag_catalog.agtype",
-            Value = jsonPayload
+            DataTypeName = "ag_catalog.agtype"
         };
     }
 

tests/ManagedCode.GraphRag.Tests/GraphRagApplicationFixture.cs

@@ -69,7 +69,9 @@ public async Task InitializeAsync()
             .WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(5432))
             .Build();
 
-        _janusContainer = new JanusGraphBuilder().Build();
+        _janusContainer = new JanusGraphBuilder()
+            .WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(8182))
+            .Build();
 
         if (IsCosmosSupported())
         {

tests/ManagedCode.GraphRag.Tests/Integration/GraphStoreIntegrationTests.cs

@@ -246,6 +246,35 @@ public async Task GraphStores_HandlePagination(string providerKey)
         Assert.Equal(2, pagedEdges.Count);
     }
 
+    [Theory]
+    [MemberData(nameof(GraphProviders))]
+    public async Task PostgresGraphStore_PersistsStringPropertiesWithAgtypeParameters(string providerKey)
+    {
+        if (!string.Equals(providerKey, "postgres", StringComparison.OrdinalIgnoreCase))
+        {
+            // Other providers do not use agtype parameters.
+            return;
+        }
+
+        var store = GetStore(providerKey);
+        Assert.NotNull(store);
+        await store!.InitializeAsync();
+
+        var label = GraphStoreTestProviders.GetLabel(providerKey);
+        var nodeId = $"{providerKey}-agtype-{Guid.NewGuid():N}";
+        var payload = "line1\nline2 \"quoted\" \\ backslash and {braces}";
+
+        await store.UpsertNodeAsync(nodeId, label, new Dictionary<string, object?>
+        {
+            ["content"] = payload,
+            ["note"] = "ensure-agtype-parameter"
+        });
+
+        var stored = await FindNodeAsync(store, nodeId);
+        Assert.NotNull(stored);
+        Assert.Equal(payload, stored!.Properties["content"]?.ToString());
+    }
+
     [Fact]
     [Trait("Category", "Cosmos")]
     public async Task CosmosGraphStore_RoundTrips_WhenEmulatorAvailable()