Merge pull request #9913 from lassewesth/diespecs19

diespecs19
neo4j · Dec 5, 2024 · 3c148c0 · 3c148c0
2 parents cfd664c + df5a90d
commit 3c148c0
Show file tree

Hide file tree

Showing 30 changed files with 11 additions and 1,920 deletions.
diff --git a/model-catalog-api/src/main/java/org/neo4j/gds/core/model/ModelCatalog.java b/model-catalog-api/src/main/java/org/neo4j/gds/core/model/ModelCatalog.java
@@ -22,7 +22,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.neo4j.gds.core.model.Model.CustomInfo;
 import org.neo4j.gds.model.ModelConfig;
-import org.neo4j.graphdb.GraphDatabaseService;
 
 import java.nio.file.Path;
 import java.util.Collection;
@@ -62,10 +61,6 @@ <D, C extends ModelConfig, I extends CustomInfo> Model<D, C, I> get(
 
     Model<?, ?, ?> publish(String username, String modelName);
 
-    void checkLicenseBeforeStoreModel(GraphDatabaseService db, String detail);
-
-    Path getModelDirectory(GraphDatabaseService db);
-
     Model<?, ?, ?> store(String username, String modelName, Path modelDir);
 
     boolean isEmpty();
@@ -146,12 +141,6 @@ public boolean exists(String username, String modelName) {
             return null;
         }
 
-        @Override
-        public void checkLicenseBeforeStoreModel(GraphDatabaseService db, String detail) { }
-
-        @Override
-        public Path getModelDirectory(GraphDatabaseService db) { return null; }
-
         @Override
         public Model<?, ?, ?> store(String username, String modelName, Path modelDir) { return null; }
 

diff --git a/open-model-catalog/src/main/java/org/neo4j/gds/core/model/OpenModelCatalog.java b/open-model-catalog/src/main/java/org/neo4j/gds/core/model/OpenModelCatalog.java
@@ -23,7 +23,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.neo4j.gds.core.model.Model.CustomInfo;
 import org.neo4j.gds.model.ModelConfig;
-import org.neo4j.graphdb.GraphDatabaseService;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -145,18 +144,6 @@ public boolean exists(String username, String modelName) {
         );
     }
 
-    @Override
-    public void checkLicenseBeforeStoreModel(GraphDatabaseService db, String detail) { }
-
-    @Override
-    public Path getModelDirectory(org.neo4j.graphdb.GraphDatabaseService db) {
-        throw new IllegalStateException(
-            "There is no model directory path. Storing models is not available in openGDS. " +
-            "Please consider licensing the Graph Data Science library. " +
-            "See documentation at https://neo4j.com/docs/graph-data-science/"
-        );
-    }
-
     @Override
     public Model<?, ?, ?> store(String username, String modelName, Path modelDir) {
         throw new IllegalStateException(

diff --git a/proc/common/src/main/java/org/neo4j/gds/VerifyThatModelCanBeStored.java b/proc/common/src/main/java/org/neo4j/gds/VerifyThatModelCanBeStored.java
diff --git a/.../neo4j/gds/ml/linkmodels/pipeline/predict/LinkPredictionPipelineMutateResultConsumer.java b/.../neo4j/gds/ml/linkmodels/pipeline/predict/LinkPredictionPipelineMutateResultConsumer.java
diff --git a/...n/java/org/neo4j/gds/ml/linkmodels/pipeline/predict/LinkPredictionPipelineMutateSpec.java b/...n/java/org/neo4j/gds/ml/linkmodels/pipeline/predict/LinkPredictionPipelineMutateSpec.java
diff --git a/...n/java/org/neo4j/gds/ml/linkmodels/pipeline/predict/LinkPredictionPipelineStreamSpec.java b/...n/java/org/neo4j/gds/ml/linkmodels/pipeline/predict/LinkPredictionPipelineStreamSpec.java