Add 'get_type' to local Thing concepts (#200)

## What is the goal of this PR?

Previously, `get_type` was only available on remote `Thing` concepts. Now, we include type information whenever a Graql query or Concept API method returns a `Thing`, enabling users to use it without an additional network roundtrip per concept.

## What are the changes implemented in this PR?

Add 'get_type' to local Thing concepts

Author: Alex Walker

.bazelrc

@@ -19,6 +19,6 @@
 
 build --incompatible_strict_action_env
 run --incompatible_strict_action_env
-test --incompatible_strict_action_env --test_env=PATH
+test --incompatible_strict_action_env --test_env=PATH --cache_test_results=no
 
 try-import /opt/credentials/bazel-remote-cache.rc

.grabl/automation.yml

@@ -106,8 +106,7 @@ build:
         bazel run @graknlabs_dependencies//distribution/artifact:create-netrc
         bazel test //tests/behaviour/graql/language/insert/... --test_output=errors
         bazel test //tests/behaviour/graql/language/delete/... --test_output=errors
-        bazel test //tests/behaviour/graql/language/update:checkstyle --test_output=errors
-        bazel test //tests/behaviour/graql/language/update:test-core --test_output=errors
+        bazel test //tests/behaviour/graql/language/update/... --test_output=errors
     test-behaviour-definable:
       image: graknlabs-ubuntu-20.04
       type: foreground
@@ -121,10 +120,8 @@ build:
         export ARTIFACT_USERNAME=$REPO_GRAKN_USERNAME
         export ARTIFACT_PASSWORD=$REPO_GRAKN_PASSWORD
         bazel run @graknlabs_dependencies//distribution/artifact:create-netrc
-        bazel test //tests/behaviour/graql/language/define:checkstyle --test_output=errors
-        bazel test //tests/behaviour/graql/language/define:test-core --test_output=errors
-        bazel test //tests/behaviour/graql/language/undefine:checkstyle --test_output=errors
-        bazel test //tests/behaviour/graql/language/undefine:test-core --test_output=errors
+        bazel test //tests/behaviour/graql/language/define/... --test_output=errors
+        bazel test //tests/behaviour/graql/language/undefine/... --test_output=errors
     test-cluster-failover:
       machine: 4-core-8-gb
       image: graknlabs-ubuntu-20.04
@@ -139,7 +136,7 @@ build:
         export ARTIFACT_USERNAME=$REPO_GRAKN_USERNAME
         export ARTIFACT_PASSWORD=$REPO_GRAKN_PASSWORD
         bazel run @graknlabs_dependencies//distribution/artifact:create-netrc
-        bazel test //tests:test_cluster_failover --test_output=streamed
+        bazel test //tests:test_cluster_failover --test_output=errors
     deploy-pip-snapshot:
       image: graknlabs-ubuntu-20.04
       dependencies: [build, test-behaviour-connection, test-behaviour-concept, test-behaviour-match, test-behaviour-writable, test-behaviour-definable, test-cluster-failover]

dependencies/graknlabs/artifacts.bzl

@@ -27,7 +27,7 @@ def graknlabs_grakn_core_artifacts():
         artifact_name = "grakn-core-server-{platform}-{version}.{ext}",
         tag_source = deployment["artifact.release"],
         commit_source = deployment["artifact.snapshot"],
-        commit = "c04b5f105914c690cbd54e6bdc6a4eb9dda2b3e7",
+        commit = "8a556849a42a54a0f69277da212540f00b9a783c",
     )
 
 def graknlabs_grakn_cluster_artifacts():
@@ -37,5 +37,5 @@ def graknlabs_grakn_cluster_artifacts():
         artifact_name = "grakn-cluster-all-{platform}-{version}.{ext}",
         tag_source = deployment_private["artifact.release"],
         commit_source = deployment_private["artifact.snapshot"],
-        commit = "ae8aeb4919887d96aca24aa9029e9827b6437b35",
+        commit = "e1e96cdb1d2c5cfd4309221c5003e7d54a341960",
     )

grakn/concept/proto/concept_proto_builder.py

@@ -33,14 +33,13 @@ def iid(iid_: str):
 def thing(thing_):
     proto_thing = concept_proto.Thing()
     proto_thing.iid = iid(thing_.get_iid())
-    proto_thing.encoding = thing_encoding(thing_)
     return proto_thing
 
 
 def type_(_type):
     proto_type = concept_proto.Type()
     proto_type.label = _type.get_label()
-    proto_type.encoding = type_encoding(_type)
+    proto_type.encoding = encoding(_type)
 
     if _type.is_role_type():
         proto_type.scope = _type.get_scope()
@@ -99,18 +98,7 @@ def value_type(value_type_: ValueType):
         raise GraknClientException("Unrecognised value type: " + str(value_type_))
 
 
-def thing_encoding(thing_):
-    if thing_.is_entity():
-        return concept_proto.Thing.Encoding.Value("ENTITY")
-    elif thing_.is_relation():
-        return concept_proto.Thing.Encoding.Value("RELATION")
-    elif thing_.is_attribute():
-        return concept_proto.Thing.Encoding.Value("ATTRIBUTE")
-    else:
-        raise GraknClientException("Unrecognised thing encoding: " + str(thing_))
-
-
-def type_encoding(_type):
+def encoding(_type):
     if _type.is_entity_type():
         return concept_proto.Type.Encoding.Value("ENTITY_TYPE")
     elif _type.is_relation_type():

grakn/concept/proto/concept_proto_reader.py

@@ -46,29 +46,29 @@ def concept(con_proto: concept_proto.Concept):
 
 
 def thing(thing_proto: concept_proto.Thing):
-    if thing_proto.encoding == concept_proto.Thing.Encoding.Value("ENTITY"):
+    if thing_proto.type.encoding == concept_proto.Type.Encoding.Value("ENTITY_TYPE"):
         return Entity._of(thing_proto)
-    elif thing_proto.encoding == concept_proto.Thing.Encoding.Value("RELATION"):
+    elif thing_proto.type.encoding == concept_proto.Type.Encoding.Value("RELATION_TYPE"):
         return Relation._of(thing_proto)
-    elif thing_proto.encoding == concept_proto.Thing.Encoding.Value("ATTRIBUTE"):
+    elif thing_proto.type.encoding == concept_proto.Type.Encoding.Value("ATTRIBUTE_TYPE"):
         return attribute(thing_proto)
     else:
-        raise GraknClientException("The encoding " + thing_proto.encoding + " was not recognised.")
+        raise GraknClientException("The encoding " + thing_proto.type.encoding + " was not recognised.")
 
 
 def attribute(thing_proto: concept_proto.Thing):
-    if thing_proto.value_type == concept_proto.AttributeType.ValueType.Value("BOOLEAN"):
+    if thing_proto.type.value_type == concept_proto.AttributeType.ValueType.Value("BOOLEAN"):
         return BooleanAttribute._of(thing_proto)
-    elif thing_proto.value_type == concept_proto.AttributeType.ValueType.Value("LONG"):
+    elif thing_proto.type.value_type == concept_proto.AttributeType.ValueType.Value("LONG"):
         return LongAttribute._of(thing_proto)
-    elif thing_proto.value_type == concept_proto.AttributeType.ValueType.Value("DOUBLE"):
+    elif thing_proto.type.value_type == concept_proto.AttributeType.ValueType.Value("DOUBLE"):
         return DoubleAttribute._of(thing_proto)
-    elif thing_proto.value_type == concept_proto.AttributeType.ValueType.Value("STRING"):
+    elif thing_proto.type.value_type == concept_proto.AttributeType.ValueType.Value("STRING"):
         return StringAttribute._of(thing_proto)
-    elif thing_proto.value_type == concept_proto.AttributeType.ValueType.Value("DATETIME"):
+    elif thing_proto.type.value_type == concept_proto.AttributeType.ValueType.Value("DATETIME"):
         return DateTimeAttribute._of(thing_proto)
     else:
-        raise GraknClientException("The value type " + str(thing_proto.value_type) + " was not recognised.")
+        raise GraknClientException("The value type " + str(thing_proto.type.value_type) + " was not recognised.")
 
 
 def type_(type_proto: concept_proto.Type):

grakn/concept/thing/attribute.py

@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-
 from datetime import datetime
 
 import grakn_protocol.protobuf.concept_pb2 as concept_proto
@@ -77,13 +76,13 @@ def is_datetime(self):
 
 class BooleanAttribute(Attribute):
 
-    def __init__(self, iid: str, value: bool):
-        super(BooleanAttribute, self).__init__(iid)
+    def __init__(self, iid: str, type_, value: bool):
+        super(BooleanAttribute, self).__init__(iid, type_)
         self._value = value
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return BooleanAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.value.boolean)
+        return BooleanAttribute(concept_proto_reader.iid(thing_proto.iid), concept_proto_reader.attribute_type(thing_proto.type), thing_proto.value.boolean)
 
     def get_value(self):
         return self._value
@@ -92,13 +91,13 @@ def is_boolean(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteBooleanAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteBooleanAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())
 
 
 class RemoteBooleanAttribute(RemoteAttribute):
 
-    def __init__(self, transaction, iid: str, value: bool):
-        super(RemoteBooleanAttribute, self).__init__(transaction, iid)
+    def __init__(self, transaction, iid: str, type_, value: bool):
+        super(RemoteBooleanAttribute, self).__init__(transaction, iid, type_)
         self._value = value
 
     def get_value(self):
@@ -108,18 +107,18 @@ def is_boolean(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteBooleanAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteBooleanAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())
 
 
 class LongAttribute(Attribute):
 
-    def __init__(self, iid: str, value: int):
-        super(LongAttribute, self).__init__(iid)
+    def __init__(self, iid: str, type_, value: int):
+        super(LongAttribute, self).__init__(iid, type_)
         self._value = value
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return LongAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.value.long)
+        return LongAttribute(concept_proto_reader.iid(thing_proto.iid), concept_proto_reader.attribute_type(thing_proto.type), thing_proto.value.long)
 
     def get_value(self):
         return self._value
@@ -128,13 +127,13 @@ def is_long(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteLongAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteLongAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())
 
 
 class RemoteLongAttribute(RemoteAttribute):
 
-    def __init__(self, transaction, iid: str, value: int):
-        super(RemoteLongAttribute, self).__init__(transaction, iid)
+    def __init__(self, transaction, iid: str, type_, value: int):
+        super(RemoteLongAttribute, self).__init__(transaction, iid, type_)
         self._value = value
 
     def get_value(self):
@@ -144,18 +143,18 @@ def is_long(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteLongAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteLongAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())
 
 
 class DoubleAttribute(Attribute):
 
-    def __init__(self, iid: str, value: float):
-        super(DoubleAttribute, self).__init__(iid)
+    def __init__(self, iid: str, type_, value: float):
+        super(DoubleAttribute, self).__init__(iid, type_)
         self._value = value
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return DoubleAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.value.double)
+        return DoubleAttribute(concept_proto_reader.iid(thing_proto.iid), concept_proto_reader.attribute_type(thing_proto.type), thing_proto.value.double)
 
     def get_value(self):
         return self._value
@@ -164,13 +163,13 @@ def is_double(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteDoubleAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteDoubleAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())
 
 
 class RemoteDoubleAttribute(RemoteAttribute):
 
-    def __init__(self, transaction, iid: str, value: float):
-        super(RemoteDoubleAttribute, self).__init__(transaction, iid)
+    def __init__(self, transaction, iid: str, type_, value: float):
+        super(RemoteDoubleAttribute, self).__init__(transaction, iid, type_)
         self._value = value
 
     def get_value(self):
@@ -180,18 +179,18 @@ def is_double(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteDoubleAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteDoubleAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())
 
 
 class StringAttribute(Attribute):
 
-    def __init__(self, iid: str, value: str):
-        super(StringAttribute, self).__init__(iid)
+    def __init__(self, iid: str, type_, value: str):
+        super(StringAttribute, self).__init__(iid, type_)
         self._value = value
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return StringAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.value.string)
+        return StringAttribute(concept_proto_reader.iid(thing_proto.iid), concept_proto_reader.attribute_type(thing_proto.type), thing_proto.value.string)
 
     def get_value(self):
         return self._value
@@ -200,13 +199,13 @@ def is_string(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteStringAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteStringAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())
 
 
 class RemoteStringAttribute(RemoteAttribute):
 
-    def __init__(self, transaction, iid: str, value: str):
-        super(RemoteStringAttribute, self).__init__(transaction, iid)
+    def __init__(self, transaction, iid: str, type_, value: str):
+        super(RemoteStringAttribute, self).__init__(transaction, iid, type_)
         self._value = value
 
     def get_value(self):
@@ -216,18 +215,18 @@ def is_string(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteStringAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteStringAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())
 
 
 class DateTimeAttribute(Attribute):
 
-    def __init__(self, iid: str, value: datetime):
-        super(DateTimeAttribute, self).__init__(iid)
+    def __init__(self, iid: str, type_, value: datetime):
+        super(DateTimeAttribute, self).__init__(iid, type_)
         self._value = value
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return DateTimeAttribute(concept_proto_reader.iid(thing_proto.iid), datetime.fromtimestamp(float(thing_proto.value.date_time) / 1000.0))
+        return DateTimeAttribute(concept_proto_reader.iid(thing_proto.iid), concept_proto_reader.attribute_type(thing_proto.type), datetime.fromtimestamp(float(thing_proto.value.date_time) / 1000.0))
 
     def get_value(self):
         return self._value
@@ -236,13 +235,13 @@ def is_datetime(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteDateTimeAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteDateTimeAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())
 
 
 class RemoteDateTimeAttribute(RemoteAttribute):
 
-    def __init__(self, transaction, iid: str, value: datetime):
-        super(RemoteDateTimeAttribute, self).__init__(transaction, iid)
+    def __init__(self, transaction, iid: str, type_, value: datetime):
+        super(RemoteDateTimeAttribute, self).__init__(transaction, iid, type_)
         self._value = value
 
     def get_value(self):
@@ -252,4 +251,4 @@ def is_datetime(self):
         return True
 
     def as_remote(self, transaction):
-        return RemoteDateTimeAttribute(transaction, self.get_iid(), self.get_value())
+        return RemoteDateTimeAttribute(transaction, self.get_iid(), self.get_type(), self.get_value())

grakn/concept/thing/entity.py

@@ -27,10 +27,10 @@ class Entity(Thing):
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return Entity(concept_proto_reader.iid(thing_proto.iid))
+        return Entity(concept_proto_reader.iid(thing_proto.iid), concept_proto_reader.type_(thing_proto.type))
 
     def as_remote(self, transaction):
-        return RemoteEntity(transaction, self._iid)
+        return RemoteEntity(transaction, self._iid, self.get_type())
 
     def is_entity(self):
         return True
@@ -39,7 +39,7 @@ def is_entity(self):
 class RemoteEntity(RemoteThing):
 
     def as_remote(self, transaction):
-        return RemoteEntity(transaction, self._iid)
+        return RemoteEntity(transaction, self._iid, self.get_type())
 
     def is_entity(self):
         return True

grakn/concept/thing/relation.py

@@ -28,10 +28,10 @@ class Relation(Thing):
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return Relation(concept_proto_reader.iid(thing_proto.iid))
+        return Relation(concept_proto_reader.iid(thing_proto.iid), concept_proto_reader.type_(thing_proto.type))
 
     def as_remote(self, transaction):
-        return RemoteRelation(transaction, self.get_iid())
+        return RemoteRelation(transaction, self.get_iid(), self.get_type())
 
     def is_relation(self):
         return True
@@ -40,7 +40,7 @@ def is_relation(self):
 class RemoteRelation(RemoteThing):
 
     def as_remote(self, transaction):
-        return RemoteRelation(transaction, self.get_iid())
+        return RemoteRelation(transaction, self.get_iid(), self.get_type())
 
     def get_players_by_role_type(self):
         method = concept_proto.Thing.Req()