Add more BDD infrastructure and support more features (#150)

## What is the goal of this PR?

Our previous BDD infrastructure only supported a very limited set of features. We expanded it to include more features, such as the Concept API.

## What are the changes implemented in this PR?

- Finish implementing Connection steps
- Implement Concept API steps
- Add Concept API tests
- Fix bugs exposed by Concept tests

Author: Alex Walker

dependencies/graknlabs/repositories.bzl

@@ -37,5 +37,5 @@ def graknlabs_behaviour():
     git_repository(
         name = "graknlabs_behaviour",
         remote = "https://github.com/graknlabs/behaviour",
-        commit = "7088622b9f4a3bd99cf4fb278130ad76ff35af6b" # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_behaviour
+        commit = "2279d3a284d53fdd989885c06f3c50f00f930a63" # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_behaviour
     )

grakn/concept/concept_manager.py

@@ -52,7 +52,7 @@ def put_entity_type(self, label: str):
 
     def get_entity_type(self, label: str):
         _type = self._get_thing_type(label)
-        return _type if _type.is_entity_type() else None
+        return _type if _type and _type.is_entity_type() else None
 
     def put_relation_type(self, label: str):
         req = concept_proto.ConceptManager.Req()
@@ -64,7 +64,7 @@ def put_relation_type(self, label: str):
 
     def get_relation_type(self, label: str):
         _type = self._get_thing_type(label)
-        return _type if _type.is_relation_type() else None
+        return _type if _type and _type.is_relation_type() else None
 
     def put_attribute_type(self, label: str, value_type):
         req = concept_proto.ConceptManager.Req()
@@ -77,7 +77,7 @@ def put_attribute_type(self, label: str, value_type):
 
     def get_attribute_type(self, label: str):
         _type = self._get_thing_type(label)
-        return _type if _type.is_attribute_type() else None
+        return _type if _type and _type.is_attribute_type() else None
 
     def get_thing(self, iid: str):
         req = concept_proto.ConceptManager.Req()

grakn/concept/thing/thing.py

@@ -99,7 +99,7 @@ def get_plays(self):
         req.thing_get_plays_req.CopyFrom(concept_proto.Thing.GetPlays.Req())
         return self._type_stream(req, lambda res: res.thing_get_plays_res.role_types)
 
-    def get_relations(self, role_types=None):
+    def get_relations(self, role_types: list = None):
         if not role_types:
             role_types = []
         method = concept_proto.Thing.Req()
@@ -124,7 +124,7 @@ def unset_has(self, attribute):
 
     def delete(self):
         method = concept_proto.Thing.Req()
-        method.thing_delete_req.CopyFrom(method.concept_proto.Thing.Delete.Req())
+        method.thing_delete_req.CopyFrom(concept_proto.Thing.Delete.Req())
         self._execute(method)
 
     def is_deleted(self):

grakn/concept/type/attribute_type.py

@@ -18,9 +18,11 @@
 #
 
 from datetime import datetime
+from typing import Optional
 
 import graknprotocol.protobuf.concept_pb2 as concept_proto
 
+from grakn.common.exception import GraknClientException
 from grakn.concept.proto import concept_proto_builder, concept_proto_reader
 from grakn.concept.type.thing_type import ThingType, RemoteThingType
 from grakn.concept.type.value_type import ValueType
@@ -32,6 +34,8 @@ def is_keyable(value_type: ValueType):
 
 class AttributeType(ThingType):
 
+    ROOT_LABEL = "attribute"
+
     def as_remote(self, transaction):
         return RemoteAttributeType(transaction, self.get_label(), self.is_root())
 
@@ -59,11 +63,36 @@ def is_string(self):
     def is_datetime(self):
         return False
 
+    def as_boolean(self):
+        if self.is_root():
+            return BooleanAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + BooleanAttributeType.__name__)
+
+    def as_long(self):
+        if self.is_root():
+            return LongAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + LongAttributeType.__name__)
+
+    def as_double(self):
+        if self.is_root():
+            return DoubleAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + DoubleAttributeType.__name__)
+
+    def as_string(self):
+        if self.is_root():
+            return StringAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + StringAttributeType.__name__)
+
+    def as_datetime(self):
+        if self.is_root():
+            return DateTimeAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + DateTimeAttributeType.__name__)
+
     def __eq__(self, other):
         if other is self:
             return True
         # root "attribute" should always be equal to itself regardless of which value class it holds
-        if not other or not isinstance(AttributeType, other):
+        if not other or not isinstance(other, AttributeType):
             return False
         return self.get_label() == other.get_label()
 
@@ -73,6 +102,8 @@ def __hash__(self):
 
 class RemoteAttributeType(RemoteThingType):
 
+    ROOT_LABEL = "attribute"
+
     def get_value_type(self):
         return ValueType.OBJECT
 
@@ -82,6 +113,13 @@ def is_keyable(self):
     def as_remote(self, transaction):
         return RemoteAttributeType(transaction, self.get_label(), self.is_root())
 
+    def get_subtypes(self):
+        stream = super(RemoteAttributeType, self).get_subtypes()
+        if self.is_root() and self.get_value_type() is not ValueType.OBJECT:
+            return [subtype for subtype in stream if subtype.get_value_type() is self.get_value_type() or subtype.get_label() == self.get_label()]
+        else:
+            return stream
+
     def get_owners(self, only_key=False):
         method = concept_proto.Type.Req()
         get_owners_req = concept_proto.AttributeType.GetOwners.Req()
@@ -122,6 +160,31 @@ def is_string(self):
     def is_datetime(self):
         return False
 
+    def as_boolean(self):
+        if self.is_root():
+            return BooleanAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + BooleanAttributeType.__name__)
+
+    def as_long(self):
+        if self.is_root():
+            return LongAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + LongAttributeType.__name__)
+
+    def as_double(self):
+        if self.is_root():
+            return DoubleAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + DoubleAttributeType.__name__)
+
+    def as_string(self):
+        if self.is_root():
+            return StringAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + StringAttributeType.__name__)
+
+    def as_datetime(self):
+        if self.is_root():
+            return DateTimeAttributeType(self.ROOT_LABEL, is_root=True)
+        raise GraknClientException("Invalid conversion to " + DateTimeAttributeType.__name__)
+
     def __eq__(self, other):
         if other is self:
             return True
@@ -148,6 +211,9 @@ def as_remote(self, transaction):
     def is_boolean(self):
         return True
 
+    def as_boolean(self):
+        return self
+
 
 class RemoteBooleanAttributeType(RemoteAttributeType):
 
@@ -166,6 +232,9 @@ def get(self, value: bool):
     def is_boolean(self):
         return True
 
+    def as_boolean(self):
+        return self
+
 
 class LongAttributeType(AttributeType):
 
@@ -182,6 +251,9 @@ def as_remote(self, transaction):
     def is_long(self):
         return True
 
+    def as_long(self):
+        return self
+
 
 class RemoteLongAttributeType(RemoteAttributeType):
 
@@ -200,6 +272,9 @@ def get(self, value: int):
     def is_long(self):
         return True
 
+    def as_long(self):
+        return self
+
 
 class DoubleAttributeType(AttributeType):
 
@@ -216,6 +291,9 @@ def as_remote(self, transaction):
     def is_double(self):
         return True
 
+    def as_double(self):
+        return self
+
 
 class RemoteDoubleAttributeType(RemoteAttributeType):
 
@@ -234,6 +312,9 @@ def get(self, value: float):
     def is_double(self):
         return True
 
+    def as_double(self):
+        return self
+
 
 class StringAttributeType(AttributeType):
 
@@ -250,6 +331,9 @@ def as_remote(self, transaction):
     def is_string(self):
         return True
 
+    def as_string(self):
+        return self
+
 
 class RemoteStringAttributeType(RemoteAttributeType):
 
@@ -272,7 +356,9 @@ def get_regex(self):
         regex = self._execute(method).attribute_type_get_regex_res.regex
         return None if len(regex) == 0 else regex
 
-    def set_regex(self, regex: str):
+    def set_regex(self, regex: Optional[str]):
+        if regex is None:
+            regex = ""
         method = concept_proto.Type.Req()
         set_regex_req = concept_proto.AttributeType.SetRegex.Req()
         set_regex_req.regex = regex
@@ -282,6 +368,9 @@ def set_regex(self, regex: str):
     def is_string(self):
         return True
 
+    def as_string(self):
+        return self
+
 
 class DateTimeAttributeType(AttributeType):
 
@@ -298,6 +387,9 @@ def as_remote(self, transaction):
     def is_datetime(self):
         return True
 
+    def as_datetime(self):
+        return self
+
 
 class RemoteDateTimeAttributeType(RemoteAttributeType):
 
@@ -315,3 +407,6 @@ def get(self, value: datetime):
 
     def is_datetime(self):
         return True
+
+    def as_datetime(self):
+        return self

grakn/rpc/database_manager.py

@@ -19,7 +19,9 @@
 
 from graknprotocol.protobuf.grakn_pb2_grpc import GraknStub
 import graknprotocol.protobuf.database_pb2 as database_proto
-from grpc import Channel
+from grpc import Channel, RpcError
+
+from grakn.common.exception import GraknClientException
 
 
 class DatabaseManager(object):
@@ -30,17 +32,29 @@ def __init__(self, channel: Channel):
     def contains(self, name: str):
         request = database_proto.Database.Contains.Req()
         request.name = name
-        return self._grpc_stub.database_contains(request).contains
+        try:
+            return self._grpc_stub.database_contains(request).contains
+        except RpcError as e:
+            raise GraknClientException(e)
 
     def create(self, name: str):
         request = database_proto.Database.Create.Req()
         request.name = name
-        self._grpc_stub.database_create(request)
+        try:
+            self._grpc_stub.database_create(request)
+        except RpcError as e:
+            raise GraknClientException(e)
 
     def delete(self, name: str):
         request = database_proto.Database.Delete.Req()
         request.name = name
-        self._grpc_stub.database_delete(request)
+        try:
+            self._grpc_stub.database_delete(request)
+        except RpcError as e:
+            raise GraknClientException(e)
 
     def all(self):
-        return list(self._grpc_stub.database_all(database_proto.Database.All.Req()).names)
+        try:
+            return list(self._grpc_stub.database_all(database_proto.Database.All.Req()).names)
+        except RpcError as e:
+            raise GraknClientException(e)

grakn/rpc/session.py

@@ -24,7 +24,10 @@
 import graknprotocol.protobuf.session_pb2 as session_proto
 import enum
 
+from grpc import RpcError
+
 from grakn import grakn_proto_builder
+from grakn.common.exception import GraknClientException
 from grakn.options import GraknOptions
 from grakn.rpc.transaction import Transaction, TransactionType
 
@@ -71,7 +74,10 @@ def close(self):
             self._scheduler.empty()
             req = session_proto.Session.Close.Req()
             req.session_id = self._session_id
-            self._grpc_stub.session_close(req)
+            try:
+                self._grpc_stub.session_close(req)
+            except RpcError as e:
+                raise GraknClientException(e)
 
     def database(self): return self._database
 

requirements.txt

@@ -28,9 +28,3 @@ graknprotocol==2.0.0a5
 grpcio==1.33.2
 protobuf==3.6.1
 six>=1.11.0
-
-
-# Dev dependencies (not required to use the grakn-client package, but necessary for its development)
-
-behave==1.2.6
-PyHamcrest==2.0.2

requirements_dev.txt

@@ -0,0 +1,36 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+## Configuration options
+
+# --extra-index-url https://repo.grakn.ai/repository/pypi-snapshot/simple  # Allow importing of snapshots
+
+
+## Dependencies
+
+graknprotocol==2.0.0a5
+grpcio==1.33.2
+protobuf==3.6.1
+six>=1.11.0
+
+
+# Dev dependencies (not required to use the grakn-client package, but necessary for its development)
+
+behave==1.2.6
+PyHamcrest==2.0.2