Fixing CGDFG

Author: GearsAD

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

@@ -4,23 +4,6 @@ export copySession!
 # With great power comes great "Oh crap, I deleted everything..."
 export clearSession!!, clearRobot!!, clearUser!!
 
-function _getNodeType(dfg::CloudGraphsDFG, nodeLabel::Symbol)::Symbol
-    dfg.useCache && haskey(dfg.variableDict, nodeLabel) && return :VARIABLE
-    dfg.useCache && haskey(dfg.factorDict, nodeLabel) && return :FACTOR
-    nodeId = nothing
-    if dfg.useCache && haskey(dfg.labelDict)
-        nodeId = dfg.labelDict[nodeLabel]
-    else
-        nodeId = _tryGetNeoNodeIdFromNodeLabel(dfg.neo4jInstance, dfg.userId, dfg.robotId, dfg.sessionId, nodeLabel)
-    end
-    # Erk, little expensive to do this...
-    nodeId == nothing && error("Cannot find node with label '$nodeLabel'!")
-    labels = getnodelabels(getnode(dfg.neo4jInstance.graph, nodeId))
-    "VARIABLE" in labels && return :VARIABLE
-    "FACTOR" in labels && return :FACTOR
-    error("Node with label '$nodeLabel' has neither FACTOR nor VARIABLE labels")
-end
-
 ## End
 
 """
@@ -157,6 +140,22 @@ DANGER: Copies the source to a new unique destination.
 """
 copySession!(sourceDFG::CloudGraphsDFG)::CloudGraphsDFG = copySession!(sourceDFG, nothing)
 
+"""
+    $SIGNATURES
+
+Return whether `sym::Symbol` represents a variable vertex in the graph.
+"""
+isVariable(dfg::CloudGraphsDFG, sym::Symbol)::Bool =
+    "VARIABLE" in _getNodeTags(dfg.neo4jInstance, dfg.userId, dfg.robotId, dfg.sessionId, sym)
+
+"""
+    $SIGNATURES
+
+Return whether `sym::Symbol` represents a factor vertex in the graph.
+"""
+isFactor(dfg::CloudGraphsDFG, sym::Symbol)::Bool =
+    "FACTOR" in _getNodeTags(dfg.neo4jInstance, dfg.userId, dfg.robotId, dfg.sessionId, sym)
+
 """
     $(SIGNATURES)
 Add a DFGVariable to a DFG.
@@ -659,15 +658,16 @@ hasOrphans(dfg::CloudGraphsDFG)::Bool = !isFullyConnected(dfg)
 Retrieve a list of labels of the immediate neighbors around a given variable or factor.
 """
 function getNeighbors(dfg::CloudGraphsDFG, node::T; ready::Union{Nothing, Int}=nothing, backendset::Union{Nothing, Int}=nothing)::Vector{Symbol}  where T <: DFGNode
-    query = "(n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(node.label))--(node) where node:VARIABLE or node:FACTOR "
+    query = "(n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(node.label))--(node) where (node:VARIABLE or node:FACTOR) "
     if ready != nothing || backendset != nothing
         if ready != nothing
-            query = query * "and node.ready = $(ready)"
+            query = query * " and node.ready = $(ready)"
         end
         if backendset != nothing
-            query = query * "and node.backendset = $(backendset)"
+            query = query * " and node.backendset = $(backendset)"
         end
     end
+    @debug "[Query] $query"
     neighbors = _getLabelsFromCyphonQuery(dfg.neo4jInstance, query)
     # If factor, need to do variable ordering
     if T <: DFGFactor
@@ -681,21 +681,22 @@ end
 Retrieve a list of labels of the immediate neighbors around a given variable or factor specified by its label.
 """
 function getNeighbors(dfg::CloudGraphsDFG, label::Symbol; ready::Union{Nothing, Int}=nothing, backendset::Union{Nothing, Int}=nothing)::Vector{Symbol}
-    query = "(n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(label))--(node) where node:VARIABLE or node:FACTOR "
+    query = "(n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(label))--(node) where (node:VARIABLE or node:FACTOR) "
     if ready != nothing || backendset != nothing
         if ready != nothing
-            query = query * "and node.ready = $(ready)"
+            query = query * " and node.ready = $(ready)"
         end
         if backendset != nothing
-            query = query * "and node.backendset = $(backendset)"
+            query = query * " and node.backendset = $(backendset)"
         end
     end
+    @debug "[Query] $query"
     neighbors = _getLabelsFromCyphonQuery(dfg.neo4jInstance, query)
     # If factor, need to do variable ordering
-    if _getNodeType(dfg, label) == :FACTOR
-        # TODO: Implement shortcut for this.
-        factor = getFactor(dfg, label)
-        neighbors = intersect(factor._variableOrderSymbols, neighbors)
+    if isFactor(dfg, label)
+        # Server is authority
+        serverOrder = Symbol.(JSON2.read(_getNodeProperty(dfg.neo4jInstance, dfg.userId, dfg.robotId, dfg.sessionId, label, "_variableOrderSymbols")))
+        neighbors = intersect(serverOrder, neighbors)
     end
     return neighbors
 end

src/CloudGraphsDFG/services/CommonFunctions.jl

@@ -33,6 +33,28 @@ function _getLabelsFromCyphonQuery(neo4jInstance::Neo4jInstance, matchCondition:
     return Symbol.(nodeIds)
 end
 
+"""
+$(SIGNATURES)
+Get a node property - returns nothing if not found
+"""
+function _getNodeProperty(neo4jInstance::Neo4jInstance, userId::String, robotId::String, sessionId::String, nodeId::Symbol, property::String)
+    query = "match (n:$userId:$robotId:$sessionId:$nodeId) return n.$property"
+    result = DistributedFactorGraphs._queryNeo4j(neo4jInstance, query)
+    
+    return result.results[1]["data"][1]["row"][1]
+end
+
+"""
+$(SIGNATURES)
+Get a node's tags
+"""
+function _getNodeTags(neo4jInstance::Neo4jInstance, userId::String, robotId::String, sessionId::String, nodeId::Symbol)::Union{Nothing, Vector{String}}
+    query = "match (n:$userId:$robotId:$sessionId:$nodeId) return labels(n)"
+    result = DistributedFactorGraphs._queryNeo4j(neo4jInstance, query)
+    length(result.results[1]["data"]) != 1 && return nothing
+    return result.results[1]["data"][1]["row"][1]
+end
+
 """
 $(SIGNATURES)
 Returns the list of CloudGraph nodes that matches the Cyphon query.