Add ability to retrieve all rules (#238)

## What is the goal of this PR?

Since Rule was refactored in Grakn 2.0 to no longer be a subtype of Concept, we lost the ability to retrieve all rules using `match $x sub rule; get;`.

So, to allow the user to retrieve all rules, we now add `getRules` to the `LogicManager`, enabling use of `tx().logic().getRules()`.

## What are the changes implemented in this PR?

Add getRules to LogicManager

Author: Alex Walker

dependencies/graknlabs/repositories.bzl

@@ -51,7 +51,7 @@ def graknlabs_protocol():
     git_repository(
         name = "graknlabs_protocol",
         remote = "https://github.com/graknlabs/protocol",
-        commit = "a763a1ce558d47bcfb93b18165126403e1472912", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_protocol
+        commit = "3b8f0d6dc7cd176e59b13e447c64ba41a2ecff7e", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_protocol
     )
 
 def graknlabs_behaviour():

logic/LogicManager.java

@@ -19,15 +19,21 @@
 
 package grakn.client.logic;
 
+import grakn.client.concept.type.impl.TypeImpl;
 import grakn.client.logic.impl.RuleImpl;
 import grakn.client.rpc.RPCTransaction;
+import grakn.protocol.ConceptProto;
 import grakn.protocol.LogicProto;
 import grakn.protocol.TransactionProto;
 import graql.lang.pattern.Pattern;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nullable;
 
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
 import static grakn.client.common.tracing.TracingProtoBuilder.tracingData;
 
 public final class LogicManager {
@@ -64,10 +70,24 @@ public Rule getRule(String label) {
         }
     }
 
+    @CheckReturnValue
+    public Stream<RuleImpl> getRules() {
+        final LogicProto.LogicManager.Req.Builder method = LogicProto.LogicManager.Req.newBuilder()
+                .setGetRulesReq(LogicProto.LogicManager.GetRules.Req.getDefaultInstance());
+        return ruleStream(method, res -> res.getGetRulesRes().getRulesList());
+    }
+
     private LogicProto.LogicManager.Res execute(LogicProto.LogicManager.Req request) {
         final TransactionProto.Transaction.Req.Builder req = TransactionProto.Transaction.Req.newBuilder()
                 .putAllMetadata(tracingData())
                 .setLogicManagerReq(request);
         return rpcTransaction.execute(req).getLogicManagerRes();
     }
+
+    private Stream<RuleImpl> ruleStream(LogicProto.LogicManager.Req.Builder method, Function<LogicProto.LogicManager.Res, List<LogicProto.Rule>> ruleListGetter) {
+        final TransactionProto.Transaction.Req.Builder request = TransactionProto.Transaction.Req.newBuilder()
+                .putAllMetadata(tracingData())
+                .setLogicManagerReq(method);
+        return rpcTransaction.stream(request, res -> ruleListGetter.apply(res.getLogicManagerRes()).stream().map(RuleImpl::of));
+    }
 }

logic/impl/RuleImpl.java

@@ -52,7 +52,7 @@ public class RuleImpl implements Rule {
     }
 
     public static RuleImpl of(LogicProto.Rule ruleProto) {
-        return new RuleImpl(ruleProto.getLabel(), Graql.and(Graql.parsePatterns(ruleProto.getWhen())), Graql.parseVariable(ruleProto.getThen()).asThing());
+        return new RuleImpl(ruleProto.getLabel(), Graql.parsePattern(ruleProto.getWhen()).asConjunction(), Graql.parseVariable(ruleProto.getThen()).asThing());
     }
 
     @Override

test/integration/ClientQueryTest.java

@@ -39,6 +39,9 @@
 import java.util.function.Consumer;
 
 import static grakn.client.Grakn.Transaction.Type.WRITE;
+import static graql.lang.Graql.and;
+import static graql.lang.Graql.rel;
+import static graql.lang.Graql.rule;
 import static graql.lang.Graql.type;
 import static graql.lang.Graql.var;
 
@@ -53,6 +56,7 @@ public static void setUpClass() throws InterruptedException, IOException, Timeou
         grakn = new GraknCoreRunner();
         grakn.start();
         graknClient = GraknClient.core(grakn.address());
+        if (graknClient.databases().contains("grakn")) graknClient.databases().delete("grakn");
         graknClient.databases().create("grakn");
     }
 
@@ -76,19 +80,17 @@ public void applicationTest() {
                     type("lion").sub("entity").owns("name").plays("mating", "male-partner").plays("mating", "female-partner").plays("child-bearing", "offspring").plays("parentship", "parent").plays("parentship", "child")
             );
 
-            // TODO: re-enable when defining rules is supported
-//            final GraqlDefine ruleQuery = Graql.define(type("infer-parentship-from-mating-and-child-bearing").sub("rule")
-//                     .when(and(
-//                             rel("male-partner", var("male")).rel("female-partner", var("female")).isa("mating"),
-//                             var("childbearing").rel("child-bearer").rel("offspring", var("offspring")).isa("child-bearing")
-//                     ))
-//                     .then(and(
-//                             rel("parent", var("male")).rel("parent", var("female")).rel("child", var("offspring")).isa("parentship")
-//                     )));
+            final GraqlDefine ruleQuery = Graql.define(rule("infer-parentship-from-mating-and-child-bearing")
+                     .when(and(
+                             rel("male-partner", var("male")).rel("female-partner", var("female")).isa("mating"),
+                             var("childbearing").rel("child-bearer").rel("offspring", var("offspring")).isa("child-bearing")))
+                     .then(rel("parent", var("male"))
+                             .rel("parent", var("female"))
+                             .rel("child", var("offspring")).isa("parentship")));
             LOG.info("clientJavaE2E() - define a schema...");
             LOG.info("clientJavaE2E() - '" + defineQuery + "'");
             tx.query().define(defineQuery);
-//            tx.query().define(ruleQuery);
+            tx.query().define(ruleQuery);
             tx.commit();
             LOG.info("clientJavaE2E() - done.");
         }, Session.Type.SCHEMA);