Move NodePipelineInfoResult

Co-authored-by: Mats Rydberg <mats@neotechnology.com>

Author: FlorentinD

…e/classification/PipelineInfoResult.java …ipeline/node/NodePipelineInfoResult.javaproc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/PipelineInfoResult.java renamed to proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/NodePipelineInfoResult.java proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/PipelineInfoResult.java renamed to proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/NodePipelineInfoResult.java

@@ -17,25 +17,25 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.gds.ml.pipeline.node.classification;
+package org.neo4j.gds.ml.pipeline.node;
 
 import org.neo4j.gds.ml.pipeline.ExecutableNodePropertyStep;
 import org.neo4j.gds.ml.pipeline.TrainingPipeline;
-import org.neo4j.gds.ml.pipeline.nodePipeline.classification.NodeClassificationTrainingPipeline;
+import org.neo4j.gds.ml.pipeline.nodePipeline.NodePropertyTrainingPipeline;
 
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public class PipelineInfoResult {
+public class NodePipelineInfoResult {
     public final String name;
     public final List<Map<String, Object>> nodePropertySteps;
     public final List<String> featureProperties;
     public final Map<String, Object> splitConfig;
     public final Map<String, Object> autoTuningConfig;
     public final Object parameterSpace;
 
-    PipelineInfoResult(String pipelineName, NodeClassificationTrainingPipeline pipeline) {
+    public NodePipelineInfoResult(String pipelineName, NodePropertyTrainingPipeline pipeline) {
         this.name = pipelineName;
         this.nodePropertySteps = pipeline
             .nodePropertySteps()

proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddStepProcs.java

@@ -21,6 +21,7 @@
 
 import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.ml.pipeline.PipelineCatalog;
+import org.neo4j.gds.ml.pipeline.node.NodePipelineInfoResult;
 import org.neo4j.gds.ml.pipeline.nodePipeline.NodeFeatureStep;
 import org.neo4j.gds.ml.pipeline.nodePipeline.classification.NodeClassificationTrainingPipeline;
 import org.neo4j.procedure.Description;
@@ -36,7 +37,7 @@
 
 public class NodeClassificationPipelineAddStepProcs extends BaseProc {
 
-    public static PipelineInfoResult addNodeProperty(
+    public static NodePipelineInfoResult addNodeProperty(
         String username,
         String pipelineName,
         String taskName,
@@ -46,10 +47,10 @@ public static PipelineInfoResult addNodeProperty(
 
         pipeline.addNodePropertyStep(createNodePropertyStep(taskName, procedureConfig));
 
-        return new PipelineInfoResult(pipelineName, pipeline);
+        return new NodePipelineInfoResult(pipelineName, pipeline);
     }
 
-    public static PipelineInfoResult selectFeatures(
+    public static NodePipelineInfoResult selectFeatures(
         String username,
         String pipelineName,
         Object nodeProperties
@@ -71,12 +72,12 @@ public static PipelineInfoResult selectFeatures(
             throw new IllegalArgumentException("The value of `nodeProperties` is required to be a list of strings.");
         }
 
-        return new PipelineInfoResult(pipelineName, pipeline);
+        return new NodePipelineInfoResult(pipelineName, pipeline);
     }
 
     @Procedure(name = "gds.beta.pipeline.nodeClassification.addNodeProperty", mode = READ)
     @Description("Add a node property step to an existing node classification training pipeline.")
-    public Stream<PipelineInfoResult> addNodeProperty(
+    public Stream<NodePipelineInfoResult> addNodeProperty(
         @Name("pipelineName") String pipelineName,
         @Name("procedureName") String taskName,
         @Name("procedureConfiguration") Map<String, Object> procedureConfig
@@ -91,7 +92,7 @@ public Stream<PipelineInfoResult> addNodeProperty(
 
     @Procedure(name = "gds.beta.pipeline.nodeClassification.selectFeatures", mode = READ)
     @Description("Add one or several features to an existing node classification training pipeline.")
-    public Stream<PipelineInfoResult> selectFeatures(
+    public Stream<NodePipelineInfoResult> selectFeatures(
         @Name("pipelineName") String pipelineName,
         @Name("nodeProperties") Object nodeProperties
     ) {

proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineAddTrainerMethodProcs.java

@@ -26,6 +26,7 @@
 import org.neo4j.gds.ml.models.logisticregression.LogisticRegressionTrainConfig;
 import org.neo4j.gds.ml.models.randomforest.RandomForestTrainerConfig;
 import org.neo4j.gds.ml.pipeline.PipelineCatalog;
+import org.neo4j.gds.ml.pipeline.node.NodePipelineInfoResult;
 import org.neo4j.gds.ml.pipeline.nodePipeline.classification.NodeClassificationTrainingPipeline;
 import org.neo4j.procedure.Description;
 import org.neo4j.procedure.Name;
@@ -40,7 +41,7 @@ public class NodeClassificationPipelineAddTrainerMethodProcs extends BaseProc {
 
     @Procedure(name = "gds.beta.pipeline.nodeClassification.addLogisticRegression", mode = READ)
     @Description("Add a logistic regression configuration to the parameter space of the node classification train pipeline.")
-    public Stream<PipelineInfoResult> addLogisticRegression(
+    public Stream<NodePipelineInfoResult> addLogisticRegression(
         @Name("pipelineName") String pipelineName,
         @Name(value = "config", defaultValue = "{}") Map<String, Object> config
     ) {
@@ -54,12 +55,12 @@ public Stream<PipelineInfoResult> addLogisticRegression(
             tunableTrainerConfig
         );
 
-        return Stream.of(new PipelineInfoResult(pipelineName, pipeline));
+        return Stream.of(new NodePipelineInfoResult(pipelineName, pipeline));
     }
 
     @Procedure(name = "gds.alpha.pipeline.nodeClassification.addRandomForest", mode = READ)
     @Description("Add a random forest configuration to the parameter space of the node classification train pipeline.")
-    public Stream<PipelineInfoResult> addRandomForest(
+    public Stream<NodePipelineInfoResult> addRandomForest(
         @Name("pipelineName") String pipelineName,
         @Name(value = "config") Map<String, Object> randomForestConfig
     ) {
@@ -73,6 +74,6 @@ public Stream<PipelineInfoResult> addRandomForest(
             tunableTrainerConfig
         );
 
-        return Stream.of(new PipelineInfoResult(pipelineName, pipeline));
+        return Stream.of(new NodePipelineInfoResult(pipelineName, pipeline));
     }
 }

proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureAutoTuningProc.java

@@ -22,6 +22,7 @@
 import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.ml.PipelineCompanion;
 import org.neo4j.gds.ml.pipeline.PipelineCatalog;
+import org.neo4j.gds.ml.pipeline.node.NodePipelineInfoResult;
 import org.neo4j.gds.ml.pipeline.nodePipeline.classification.NodeClassificationTrainingPipeline;
 import org.neo4j.procedure.Description;
 import org.neo4j.procedure.Name;
@@ -36,13 +37,13 @@ public class NodeClassificationPipelineConfigureAutoTuningProc extends BaseProc
 
     @Procedure(name = "gds.alpha.pipeline.nodeClassification.configureAutoTuning", mode = READ)
     @Description("Configures the auto-tuning of the node classification pipeline.")
-    public Stream<PipelineInfoResult> configureAutoTuning(@Name("pipelineName") String pipelineName, @Name("configuration") Map<String, Object> configMap) {
+    public Stream<NodePipelineInfoResult> configureAutoTuning(@Name("pipelineName") String pipelineName, @Name("configuration") Map<String, Object> configMap) {
         PipelineCatalog.getTyped(username(), pipelineName, NodeClassificationTrainingPipeline.class);
         return PipelineCompanion.configureAutoTuning(
             username(),
             pipelineName,
             configMap,
-            pipeline -> new PipelineInfoResult(pipelineName, (NodeClassificationTrainingPipeline) pipeline)
+            pipeline -> new NodePipelineInfoResult(pipelineName, (NodeClassificationTrainingPipeline) pipeline)
         );
     }
 

proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineConfigureSplitProc.java

@@ -22,6 +22,7 @@
 import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.core.CypherMapWrapper;
 import org.neo4j.gds.ml.pipeline.PipelineCatalog;
+import org.neo4j.gds.ml.pipeline.node.NodePipelineInfoResult;
 import org.neo4j.gds.ml.pipeline.nodePipeline.NodePropertyPredictionSplitConfig;
 import org.neo4j.gds.ml.pipeline.nodePipeline.classification.NodeClassificationTrainingPipeline;
 import org.neo4j.procedure.Description;
@@ -37,7 +38,7 @@ public class NodeClassificationPipelineConfigureSplitProc extends BaseProc {
 
     @Procedure(name = "gds.beta.pipeline.nodeClassification.configureSplit", mode = READ)
     @Description("Configures the split of the node classification training pipeline.")
-    public Stream<PipelineInfoResult> configureSplit(@Name("pipelineName") String pipelineName, @Name("configuration") Map<String, Object> configMap) {
+    public Stream<NodePipelineInfoResult> configureSplit(@Name("pipelineName") String pipelineName, @Name("configuration") Map<String, Object> configMap) {
         var pipeline = PipelineCatalog.getTyped(username(), pipelineName, NodeClassificationTrainingPipeline.class);
 
         var cypherConfig = CypherMapWrapper.create(configMap);
@@ -47,6 +48,6 @@ public Stream<PipelineInfoResult> configureSplit(@Name("pipelineName") String pi
 
         pipeline.setSplitConfig(config);
 
-        return Stream.of(new PipelineInfoResult(pipelineName, pipeline));
+        return Stream.of(new NodePipelineInfoResult(pipelineName, pipeline));
     }
 }

proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/NodeClassificationPipelineCreateProc.java

@@ -22,6 +22,7 @@
 import org.neo4j.gds.BaseProc;
 import org.neo4j.gds.core.StringIdentifierValidations;
 import org.neo4j.gds.ml.pipeline.PipelineCatalog;
+import org.neo4j.gds.ml.pipeline.node.NodePipelineInfoResult;
 import org.neo4j.gds.ml.pipeline.nodePipeline.classification.NodeClassificationTrainingPipeline;
 import org.neo4j.procedure.Description;
 import org.neo4j.procedure.Name;
@@ -34,19 +35,19 @@
 @SuppressWarnings("immutables:subtype")
 public class NodeClassificationPipelineCreateProc extends BaseProc {
 
-    public static PipelineInfoResult create(String username, String pipelineName) {
+    public static NodePipelineInfoResult create(String username, String pipelineName) {
         StringIdentifierValidations.validateNoWhiteCharacter(pipelineName, "pipelineName");
 
         var pipeline = new NodeClassificationTrainingPipeline();
 
         PipelineCatalog.set(username, pipelineName, pipeline);
 
-        return new PipelineInfoResult(pipelineName, pipeline);
+        return new NodePipelineInfoResult(pipelineName, pipeline);
     }
 
     @Procedure(name = "gds.beta.pipeline.nodeClassification.create", mode = READ)
     @Description("Creates a node classification training pipeline in the model catalog.")
-    public Stream<PipelineInfoResult> create(@Name("pipelineName") String pipelineName) {
+    public Stream<NodePipelineInfoResult> create(@Name("pipelineName") String pipelineName) {
         return Stream.of(create(username(), pipelineName));
     }
 }