Adding in callback for factor metadata rebuild

Author: GearsAD

src/CloudGraphsDFG/entities/CloudGraphsDFG.jl

@@ -14,6 +14,7 @@ mutable struct CloudGraphsDFG{T <: AbstractParams} <: AbstractDFG
     encodePackedTypeFunc
     getPackedTypeFunc
     decodePackedTypeFunc
+    rebuildFactorMetadata!
     labelDict::Dict{Symbol, Int64}
     variableCache::Dict{Symbol, DFGVariable}
     factorCache::Dict{Symbol, DFGFactor}
@@ -23,8 +24,8 @@ mutable struct CloudGraphsDFG{T <: AbstractParams} <: AbstractDFG
 end
 
 function show(io::IO, c::CloudGraphsDFG)
-    println("CloudGraphsDFG:")
-    println(" - Neo4J instance: $(c.neo4jInstance.connection.host)")
-    println(" - Session: $(c.userId):$(c.robotId):$(c.sessionId)")
-    println(" - Caching: $(c.useCache)")
+    println(io, "CloudGraphsDFG:")
+    println(io, " - Neo4J instance: $(c.neo4jInstance.connection.host)")
+    println(io, " - Session: $(c.userId):$(c.robotId):$(c.sessionId)")
+    println(io, " - Caching: $(c.useCache)")
 end

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

@@ -41,18 +41,18 @@ end
     $(SIGNATURES)
 Create a new CloudGraphs-based DFG factor graph using a Neo4j.Connection.
 """
-function CloudGraphsDFG{T}(neo4jConnection::Neo4j.Connection, userId::String, robotId::String, sessionId::String, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc; description::String="CloudGraphs DFG", solverParams::T=NoSolverParams(), useCache::Bool=false) where T <: AbstractParams
+function CloudGraphsDFG{T}(neo4jConnection::Neo4j.Connection, userId::String, robotId::String, sessionId::String, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, rebuildFactorMetadata!; description::String="CloudGraphs DFG", solverParams::T=NoSolverParams(), useCache::Bool=false) where T <: AbstractParams
     graph = Neo4j.getgraph(neo4jConnection)
     neo4jInstance = Neo4jInstance(neo4jConnection, graph)
-    return CloudGraphsDFG{T}(neo4jInstance, description, userId, robotId, sessionId, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, Dict{Symbol, Int64}(), Dict{Symbol, DFGVariable}(), Dict{Symbol, DFGFactor}(), Symbol[], solverParams, useCache)
+    return CloudGraphsDFG{T}(neo4jInstance, description, userId, robotId, sessionId, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, rebuildFactorMetadata!, Dict{Symbol, Int64}(), Dict{Symbol, DFGVariable}(), Dict{Symbol, DFGFactor}(), Symbol[], solverParams, useCache)
 end
 """
     $(SIGNATURES)
 Create a new CloudGraphs-based DFG factor graph by specifying the Neo4j connection information.
 """
-function CloudGraphsDFG{T}(host::String, port::Int, dbUser::String, dbPassword::String, userId::String, robotId::String, sessionId::String, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc; description::String="CloudGraphs DFG", solverParams::T=NoSolverParams(), useCache::Bool=false) where T <: AbstractParams
+function CloudGraphsDFG{T}(host::String, port::Int, dbUser::String, dbPassword::String, userId::String, robotId::String, sessionId::String, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, rebuildFactorMetadata!; description::String="CloudGraphs DFG", solverParams::T=NoSolverParams(), useCache::Bool=false) where T <: AbstractParams
     neo4jConnection = Neo4j.Connection(host, port=port, user=dbUser, password=dbPassword);
-    return CloudGraphsDFG{T}(neo4jConnection, userId, robotId, sessionId, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, description=description, solverParams=solverParams, useCache=useCache)
+    return CloudGraphsDFG{T}(neo4jConnection, userId, robotId, sessionId, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, rebuildFactorMetadata!, description=description, solverParams=solverParams, useCache=useCache)
 end
 
 """
@@ -323,10 +323,10 @@ function getFactor(dfg::CloudGraphsDFG, factorId::Int64)::DFGFactor
 
     data = props["data"]
     datatype = props["fnctype"]
-    fulltype = getfield(Main, Symbol(datatype))
+    # fulltype = getfield(Main, Symbol(datatype))
     packtype = getfield(Main, Symbol("Packed"*datatype))
     packed = JSON2.read(data, GenericFunctionNodeData{packtype,String})
-    fullFactor = dfg.decodePackedTypeFunc(packed, "")
+    fullFactor = dfg.decodePackedTypeFunc(dfg, packed)
 
     # Include the type
     _variableOrderSymbols = JSON2.read(props["_variableOrderSymbols"], Vector{Symbol})
@@ -341,6 +341,9 @@ function getFactor(dfg::CloudGraphsDFG, factorId::Int64)::DFGFactor
     factor.ready = ready
     factor.backendset = backendset
 
+    # Lastly, rebuild the metadata
+    factor = dfg.rebuildFactorMetadata!(dfg, factor)
+
     # Add to cache
     push!(dfg.factorCache, factor.label=>factor)
 

src/entities/DFGFactor.jl

@@ -43,9 +43,6 @@ mutable struct DFGFactor{T, S} <: DFGNode
     DFGFactor{T, S}(label::Symbol, _internalId::Int64) where {T, S} = new{T, S}(label, Symbol[], GenericFunctionNodeData{T, S}(), 0, 0, _internalId, Symbol[])
 end
 
-# const FunctionNodeData{T} = GenericFunctionNodeData{T, Symbol}
-# FunctionNodeData(x1, x2, x3, x4, x5::Symbol, x6::T, x7::String="", x8::Vector{Int}=Int[]) where {T <: Union{FunctorInferenceType, ConvolutionObject}}= GenericFunctionNodeData{T, Symbol}(x1, x2, x3, x4, x5, x6, x7, x8)
-
 label(f::F) where F <: DFGFactor = f.label
 data(f::F) where F <: DFGFactor = f.data
 id(f::F) where F <: DFGFactor = f._internalId