Merge pull request #10296 from IoannisPanagiotas/remote-mutate-node-embeddings

Node embeddings  remote mutate

Author: IoannisPanagiotas

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/FastRPStub.java

@@ -26,6 +26,6 @@
 
 public class FastRPStub extends AbstractStub<FastRPMutateConfig, DefaultNodeEmbeddingMutateResult> {
     protected MutateStub<FastRPMutateConfig, DefaultNodeEmbeddingMutateResult> stub(AlgorithmsProcedureFacade facade) {
-        return facade.nodeEmbeddings().fastRPMutateStub();
+        return facade.nodeEmbeddings().stubs().fastRP();
     }
 }

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/GraphSageStub.java

@@ -26,6 +26,6 @@
 
 public class GraphSageStub extends AbstractStub<GraphSageMutateConfig, DefaultNodeEmbeddingMutateResult> {
     protected MutateStub<GraphSageMutateConfig, DefaultNodeEmbeddingMutateResult> stub(AlgorithmsProcedureFacade facade) {
-        return facade.nodeEmbeddings().graphSageMutateStub();
+        return facade.nodeEmbeddings().stubs().graphSage();
     }
 }

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/HashGnnStub.java

@@ -26,6 +26,6 @@
 
 public class HashGnnStub extends AbstractStub<HashGNNMutateConfig, DefaultNodeEmbeddingMutateResult> {
     protected MutateStub<HashGNNMutateConfig, DefaultNodeEmbeddingMutateResult> stub(AlgorithmsProcedureFacade facade) {
-        return facade.nodeEmbeddings().hashGnnMutateStub();
+        return facade.nodeEmbeddings().stubs().hashGnn();
     }
 }

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/Node2VecStub.java

@@ -26,6 +26,6 @@
 
 public class Node2VecStub extends AbstractStub<Node2VecMutateConfig, Node2VecMutateResult> {
     protected MutateStub<Node2VecMutateConfig, Node2VecMutateResult> stub(AlgorithmsProcedureFacade facade) {
-        return facade.nodeEmbeddings().node2VecMutateStub();
+        return facade.nodeEmbeddings().stubs().node2Vec();
     }
 }

proc/embeddings/src/main/java/org/neo4j/gds/embeddings/fastrp/FastRPMutateProc.java

@@ -44,7 +44,7 @@ public Stream<DefaultNodeEmbeddingMutateResult> mutate(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
     ) {
-        return facade.algorithms().nodeEmbeddings().fastRPMutateStub().execute(graphName, configuration);
+        return facade.algorithms().nodeEmbeddings().fastRPMutate(graphName, configuration);
     }
 
     @Procedure(value = "gds.fastRP.mutate.estimate", mode = READ)
@@ -53,6 +53,6 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
     ) {
-        return facade.algorithms().nodeEmbeddings().fastRPMutateStub().estimate(graphNameOrConfiguration, algoConfiguration);
+        return facade.algorithms().nodeEmbeddings().fastRPMutateEstimate(graphNameOrConfiguration, algoConfiguration);
     }
 }

proc/embeddings/src/main/java/org/neo4j/gds/embeddings/graphsage/GraphSageMutateProc.java

@@ -45,7 +45,7 @@ public Stream<DefaultNodeEmbeddingMutateResult> mutate(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
     ) {
-        return facade.algorithms().nodeEmbeddings().graphSageMutateStub().execute(graphName, configuration);
+        return facade.algorithms().nodeEmbeddings().graphSageMutate(graphName, configuration);
     }
 
     @Procedure(value = "gds.beta.graphSage.mutate.estimate", mode = READ)
@@ -54,6 +54,6 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
     ) {
-        return facade.algorithms().nodeEmbeddings().graphSageMutateStub().estimate(graphNameOrConfiguration, algoConfiguration);
+        return facade.algorithms().nodeEmbeddings().graphSageMutateEstimate(graphNameOrConfiguration, algoConfiguration);
     }
 }

proc/embeddings/src/main/java/org/neo4j/gds/embeddings/hashgnn/HashGNNMutateProc.java

@@ -45,7 +45,7 @@ public Stream<DefaultNodeEmbeddingMutateResult> mutate(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
     ) {
-        return facade.algorithms().nodeEmbeddings().hashGnnMutateStub().execute(graphName, configuration);
+        return facade.algorithms().nodeEmbeddings().hashGnnMutate(graphName, configuration);
     }
 
     @Internal
@@ -70,7 +70,7 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
     ) {
-        return facade.algorithms().nodeEmbeddings().hashGnnMutateStub().estimate(
+        return facade.algorithms().nodeEmbeddings().hashGnnMutateEstimate(
             graphNameOrConfiguration,
             algoConfiguration
         );

proc/embeddings/src/main/java/org/neo4j/gds/embeddings/node2vec/Node2VecMutateProc.java

@@ -45,7 +45,7 @@ public Stream<Node2VecMutateResult> mutate(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
     ) {
-        return facade.algorithms().nodeEmbeddings().node2VecMutateStub().execute(graphName, configuration);
+        return facade.algorithms().nodeEmbeddings().node2VecMutate(graphName, configuration);
     }
 
     @Procedure(value = "gds.node2vec.mutate.estimate", mode = READ)
@@ -54,7 +54,7 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
     ) {
-        return facade.algorithms().nodeEmbeddings().node2VecMutateStub().estimate(graphNameOrConfiguration, algoConfiguration);
+        return facade.algorithms().nodeEmbeddings().node2VecMutateEstimate(graphNameOrConfiguration, algoConfiguration);
     }
 
     @Procedure(value = "gds.beta.node2vec.mutate", mode = READ, deprecatedBy = "gds.node2vec.mutate")

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/LocalNodeEmbeddingsProcedureFacade.java

@@ -40,14 +40,11 @@
 import org.neo4j.gds.embeddings.node2vec.Node2VecStreamConfig;
 import org.neo4j.gds.embeddings.node2vec.Node2VecWriteConfig;
 import org.neo4j.gds.procedures.algorithms.configuration.UserSpecificConfigurationParser;
-import org.neo4j.gds.procedures.algorithms.embeddings.stubs.FastRPMutateStub;
-import org.neo4j.gds.procedures.algorithms.embeddings.stubs.GraphSageMutateStub;
-import org.neo4j.gds.procedures.algorithms.embeddings.stubs.HashGnnMutateStub;
 import org.neo4j.gds.procedures.algorithms.embeddings.stubs.LocalFastRPMutateStub;
 import org.neo4j.gds.procedures.algorithms.embeddings.stubs.LocalGraphSageMutateStub;
 import org.neo4j.gds.procedures.algorithms.embeddings.stubs.LocalHashGnnMutateStub;
 import org.neo4j.gds.procedures.algorithms.embeddings.stubs.LocalNode2VecMutateStub;
-import org.neo4j.gds.procedures.algorithms.embeddings.stubs.Node2VecMutateStub;
+import org.neo4j.gds.procedures.algorithms.embeddings.stubs.NodeEmbeddingsStubs;
 import org.neo4j.gds.procedures.algorithms.stubs.GenericStub;
 
 import java.util.Map;
@@ -56,25 +53,17 @@
 
 public final class LocalNodeEmbeddingsProcedureFacade implements NodeEmbeddingsProcedureFacade {
 
-    private final FastRPMutateStub fastRPMutateStub;
-    private final GraphSageMutateStub graphSageMutateStub;
-    private final HashGnnMutateStub hashGnnMutateStub;
-    private final Node2VecMutateStub node2VecMutateStub;
-
+    private final NodeEmbeddingsStubs stubs;
     private final NodeEmbeddingAlgorithmsEstimationModeBusinessFacade estimationModeBusinessFacade;
     private final NodeEmbeddingAlgorithmsStatsModeBusinessFacade statsModeBusinessFacade;
     private final NodeEmbeddingAlgorithmsStreamModeBusinessFacade streamModeBusinessFacade;
     private final NodeEmbeddingAlgorithmsTrainModeBusinessFacade trainModeBusinessFacade;
     private final NodeEmbeddingAlgorithmsWriteModeBusinessFacade writeModeBusinessFacade;
-
     private final UserSpecificConfigurationParser configurationParser;
     private final User user;
 
     private LocalNodeEmbeddingsProcedureFacade(
-        FastRPMutateStub fastRPMutateStub,
-        GraphSageMutateStub graphSageMutateStub,
-        HashGnnMutateStub hashGnnMutateStub,
-        Node2VecMutateStub node2VecMutateStub,
+        NodeEmbeddingsStubs stubs,
         NodeEmbeddingAlgorithmsEstimationModeBusinessFacade estimationModeBusinessFacade,
         NodeEmbeddingAlgorithmsStatsModeBusinessFacade statsModeBusinessFacade,
         NodeEmbeddingAlgorithmsStreamModeBusinessFacade streamModeBusinessFacade,
@@ -83,10 +72,7 @@ private LocalNodeEmbeddingsProcedureFacade(
         UserSpecificConfigurationParser configurationParser,
         User user
     ) {
-        this.fastRPMutateStub = fastRPMutateStub;
-        this.graphSageMutateStub = graphSageMutateStub;
-        this.hashGnnMutateStub = hashGnnMutateStub;
-        this.node2VecMutateStub = node2VecMutateStub;
+        this.stubs = stubs;
         this.estimationModeBusinessFacade = estimationModeBusinessFacade;
         this.statsModeBusinessFacade = statsModeBusinessFacade;
         this.streamModeBusinessFacade = streamModeBusinessFacade;
@@ -128,10 +114,12 @@ public static NodeEmbeddingsProcedureFacade create(
         );
 
         return new LocalNodeEmbeddingsProcedureFacade(
-            fastRPMutateStub,
-            graphSageMutateStub,
-            hashGnnMutateStub,
-            node2VecMutateStub,
+            new NodeEmbeddingsStubs(
+                fastRPMutateStub,
+                graphSageMutateStub,
+                hashGnnMutateStub,
+                node2VecMutateStub
+            ),
             applicationsFacade.nodeEmbeddings().estimate(),
             applicationsFacade.nodeEmbeddings().stats(),
             applicationsFacade.nodeEmbeddings().stream(),
@@ -142,9 +130,10 @@ public static NodeEmbeddingsProcedureFacade create(
         );
     }
 
+
     @Override
-    public FastRPMutateStub fastRPMutateStub() {
-        return fastRPMutateStub;
+    public NodeEmbeddingsStubs stubs() {
+        return stubs;
     }
 
     @Override
@@ -200,6 +189,20 @@ public Stream<MemoryEstimateResult> fastRPStreamEstimate(
         return Stream.of(result);
     }
 
+    @Override
+    public Stream<DefaultNodeEmbeddingMutateResult> fastRPMutate(String graphName, Map<String, Object> configuration) {
+        return stubs.fastRP().execute(graphName,configuration);
+    }
+
+    @Override
+    public Stream<MemoryEstimateResult> fastRPMutateEstimate(
+        Object graphNameOrConfiguration,
+        Map<String, Object> algorithmConfiguration
+    ) {
+        return stubs.fastRP().estimate(graphNameOrConfiguration, algorithmConfiguration);
+
+    }
+
     @Override
     public Stream<DefaultNodeEmbeddingsWriteResult> fastRPWrite(
         String graphName,
@@ -226,10 +229,6 @@ public Stream<MemoryEstimateResult> fastRPWriteEstimate(
         return Stream.of(result);
     }
 
-    @Override
-    public GraphSageMutateStub graphSageMutateStub() {
-        return graphSageMutateStub;
-    }
 
     @Override
     public Stream<DefaultNodeEmbeddingsStreamResult> graphSageStream(
@@ -267,6 +266,22 @@ public Stream<MemoryEstimateResult> graphSageStreamEstimate(
         return Stream.of(result);
     }
 
+    @Override
+    public Stream<DefaultNodeEmbeddingMutateResult> graphSageMutate(
+        String graphName,
+        Map<String, Object> configuration
+    ) {
+        return stubs.graphSage().execute(graphName,configuration);
+    }
+
+    @Override
+    public Stream<MemoryEstimateResult> graphSageMutateEstimate(
+        Object graphNameOrConfiguration,
+        Map<String, Object> algorithmConfiguration
+    ) {
+        return stubs.graphSage().estimate(graphNameOrConfiguration, algorithmConfiguration);
+    }
+
     @Override
     public Stream<GraphSageTrainResult> graphSageTrain(
         String graphName,
@@ -336,10 +351,6 @@ public Stream<MemoryEstimateResult> graphSageWriteEstimate(
         return Stream.of(result);
     }
 
-    @Override
-    public HashGnnMutateStub hashGnnMutateStub() {
-        return hashGnnMutateStub;
-    }
 
     @Override
     public Stream<DefaultNodeEmbeddingsStreamResult> hashGnnStream(
@@ -368,13 +379,27 @@ public Stream<MemoryEstimateResult> hashGnnStreamEstimate(
         return Stream.of(result);
     }
 
+    @Override
+    public Stream<DefaultNodeEmbeddingMutateResult> hashGnnMutate(String graphName, Map<String, Object> configuration) {
+        return stubs.hashGnn().execute(graphName,configuration);
+    }
+
+    @Override
+    public Stream<MemoryEstimateResult> hashGnnMutateEstimate(
+        Object graphNameOrConfiguration,
+        Map<String, Object> algorithmConfiguration
+    ) {
+        return  stubs.hashGnn().estimate(graphNameOrConfiguration,algorithmConfiguration);
+    }
+
     @Override
     public Stream<DefaultNodeEmbeddingsWriteResult> hashGnnWrite(String graphName, Map<String, Object> configuration) {
         var resultBuilder = new HashGNNResultBuilderForWriteMode();
         return writeModeBusinessFacade.hashGnn(
             GraphName.parse(graphName),
             configurationParser.parseConfiguration(configuration, HashGNNWriteConfig::of),
-            resultBuilder);
+            resultBuilder
+        );
     }
 
     @Override
@@ -389,11 +414,6 @@ public Stream<MemoryEstimateResult> hashGnnWriteEstimate(
         return Stream.of(result);
     }
 
-    @Override
-    public Node2VecMutateStub node2VecMutateStub() {
-        return node2VecMutateStub;
-    }
-
     @Override
     public Stream<DefaultNodeEmbeddingsStreamResult> node2VecStream(
         String graphName,
@@ -420,6 +440,19 @@ public Stream<MemoryEstimateResult> node2VecStreamEstimate(
         return Stream.of(result);
     }
 
+    @Override
+    public Stream<Node2VecMutateResult> node2VecMutate(String graphName, Map<String, Object> configuration) {
+        return stubs.node2Vec().execute(graphName, configuration);
+    }
+
+    @Override
+    public Stream<MemoryEstimateResult> node2VecMutateEstimate(
+        Object graphNameOrConfiguration,
+        Map<String, Object> algorithmConfiguration
+    ) {
+        return stubs.node2Vec().estimate(graphNameOrConfiguration, algorithmConfiguration);
+    }
+
     @Override
     public Stream<Node2VecWriteResult> node2VecWrite(
         String graphName,

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/embeddings/stubs/GraphSageResultBuilderForMutateMode.java

@@ -29,7 +29,7 @@
 
 import java.util.Optional;
 
-class GraphSageResultBuilderForMutateMode implements ResultBuilder<GraphSageMutateConfig, GraphSageResult, DefaultNodeEmbeddingMutateResult, NodePropertiesWritten> {
+public class GraphSageResultBuilderForMutateMode implements ResultBuilder<GraphSageMutateConfig, GraphSageResult, DefaultNodeEmbeddingMutateResult, NodePropertiesWritten> {
     @Override
     public DefaultNodeEmbeddingMutateResult build(
         Graph graph,