Neo4jDFG still uses base64(JSON2.write(fdata))

Author: dehann

src/Neo4jDFG/services/Neo4jDFG.jl

@@ -271,7 +271,9 @@ function getFactor(dfg::Neo4jDFG, label::Union{Symbol, String})
     props = result.results[1]["data"][1]["row"][1]
 
     # NOTE: Until we address #590, base64 decode the data to ensure robustness, #833
-    props["data"] = String(base64decode(props["data"]))
+    # TODO: consolidate with top level only JSON, #848
+    packedData = String(base64decode(props["data"]))
+    props["data"] = JSON2.read(packedData)
 
     return rebuildFactorMetadata!(dfg, unpackFactor(dfg, props))
 end

src/services/Serialization.jl

@@ -298,10 +298,10 @@ function _packSolverData(
     #
     packtype = convertPackedType(fnctype)
     try
-        packedJson = convert( PackedFunctionNodeData{packtype}, getSolverData(f) )
-        # packedJson = JSON2.write(packed) # NOTE SINGLE TOP LEVEL JSON.write ONLY
+        packed = convert( PackedFunctionNodeData{packtype}, getSolverData(f) )
+        packedJson = packed # JSON2.write(packed) # NOTE SINGLE TOP LEVEL JSON.write ONLY
         if base64Encode
-            # 833
+            # 833, 848, Neo4jDFG still using base64(JSON2.write(solverdata))...
             packedJson = JSON2.write(packed)
             packedJson = base64encode(packedJson)
         end
@@ -354,7 +354,6 @@ function Base.convert(::Type{PF}, nt::NamedTuple) where {PF <: AbstractPackedFac
 end
 
 function Base.convert(::Type{GenericFunctionNodeData{P}}, nt::NamedTuple) where P
-    @show P
     GenericFunctionNodeData{P}(
         nt.eliminated,
         nt.potentialused,
@@ -389,6 +388,14 @@ function unpackFactor(dfg::G, packedProps::Dict{String, Any}) where G <: Abstrac
             tags = Vector{Symbol}()
         end
     end
+    
+    # Get the stored variable order
+    _variableOrderSymbols = if packedProps["_variableOrderSymbols"] isa String
+        JSON2.read(packedProps["_variableOrderSymbols"], Vector{Symbol})
+    else
+        Symbol.(packedProps["_variableOrderSymbols"])
+    end
+
     data = packedProps["data"]
     datatype = packedProps["fnctype"]
     @debug "DECODING factor type = '$(datatype)' for factor '$label'"
@@ -398,13 +405,6 @@ function unpackFactor(dfg::G, packedProps::Dict{String, Any}) where G <: Abstrac
     packed = nothing
     fullFactorData = nothing
 
-    # Get the stored variable order
-    _variableOrderSymbols = if packedProps["_variableOrderSymbols"] isa String
-        JSON2.read(packedProps["_variableOrderSymbols"], Vector{Symbol})
-    else
-        Symbol.(packedProps["_variableOrderSymbols"])
-    end
-    
     # @show packtype
     # @show data
     try

test/testBlocks.jl

@@ -56,7 +56,7 @@ end
 
 
 Base.@kwdef struct PackedTestAbstractPrior <: AbstractPackedFactor
-    s::String
+    s::String = ""
 end
 # PackedTestAbstractPrior() = PackedTestAbstractPrior("")