Update @graknlabs_protocol and rename get_type to get_thing_type

Author: Ganeshwara Hananda

BUILD

@@ -80,7 +80,7 @@ assemble_pip(
     author_email = "[email protected]",
     license = "Apache-2.0",
     install_requires=[
-        'graknprotocol==2.0.0a3',
+        'graknprotocol==2.0.0a4',
         'grpcio==1.33.2',
         'protobuf==3.6.1',
         'six>=1.11.0',

grakn/concept/concept_manager.py

@@ -31,7 +31,7 @@ def __init__(self, transaction):
         self._transaction = transaction
 
     def get_root_thing_type(self):
-        return self.get_type("thing")
+        return self._get_thing_type("thing")
 
     def get_root_entity_type(self):
         return self.get_entity_type("entity")
@@ -51,7 +51,7 @@ def put_entity_type(self, label: str):
         return EntityType._of(res.put_entity_type_res.entity_type)
 
     def get_entity_type(self, label: str):
-        _type = self.get_type(label)
+        _type = self._get_thing_type(label)
         return _type if _type.is_entity_type() else None
 
     def put_relation_type(self, label: str):
@@ -63,7 +63,7 @@ def put_relation_type(self, label: str):
         return RelationType._of(res.put_relation_type_res.relation_type)
 
     def get_relation_type(self, label: str):
-        _type = self.get_type(label)
+        _type = self._get_thing_type(label)
         return _type if _type.is_relation_type() else None
 
     def put_attribute_type(self, label: str, value_type):
@@ -76,7 +76,7 @@ def put_attribute_type(self, label: str, value_type):
         return concept_proto_reader.attribute_type(res.put_attribute_type_res.attribute_type)
 
     def get_attribute_type(self, label: str):
-        _type = self.get_type(label)
+        _type = self._get_thing_type(label)
         return _type if _type.is_attribute_type() else None
 
     def get_thing(self, iid: str):
@@ -88,14 +88,14 @@ def get_thing(self, iid: str):
         response = self._execute(req)
         return concept_proto_reader.thing(response.get_thing_res.thing) if response.get_thing_res.WhichOneof("res") == "thing" else None
 
-    def get_type(self, label: str):
+    def _get_thing_type(self, label: str):
         req = concept_proto.ConceptManager.Req()
-        get_type_req = concept_proto.ConceptManager.GetType.Req()
-        get_type_req.label = label
-        req.get_type_req.CopyFrom(get_type_req)
+        get_thing_type_req = concept_proto.ConceptManager.GetThingType.Req()
+        get_thing_type_req.label = label
+        req.get_thing_type_req.CopyFrom(get_thing_type_req)
 
         response = self._execute(req)
-        return concept_proto_reader.type_(response.get_type_res.type) if response.get_type_res.WhichOneof("res") == "type" else None
+        return concept_proto_reader.thing_type(response.get_thing_type_res.thing_type) if response.get_thing_type_res.WhichOneof("res") == "thing_type" else None
 
     def _execute(self, request: concept_proto.ConceptManager.Req):
         req = transaction_proto.Transaction.Req()

grakn/concept/type/type.py

@@ -154,7 +154,7 @@ def delete(self):
         self._execute(method)
 
     def is_deleted(self):
-        return not self._transaction.concepts().get_type(self.get_label())
+        return not self._transaction.concepts()._get_thing_type(self.get_label())
 
     def _type_stream(self, method: concept_proto.Type.Req, type_list_getter: Callable[[concept_proto.Type.Res], List[concept_proto.Type]]):
         method.label = self.get_label()

requirements.txt

@@ -18,7 +18,7 @@
 #
 
 # --extra-index-url https://repo.grakn.ai/repository/pypi-snapshot/simple
-graknprotocol==2.0.0a3
+graknprotocol==2.0.0a4
 grpcio==1.33.2
 protobuf==3.6.1
 six>=1.11.0

test/integration/test_query.py

@@ -40,7 +40,7 @@ def test_define_and_undef_relation_type(self):
         with client.session("grakn", SessionType.SCHEMA) as session:
             with session.transaction(TransactionType.WRITE) as tx:
                 tx.query().define("define lionfight sub relation, relates victor, relates loser;")
-                lionfight_type = tx.concepts().get_type("lionfight")
+                lionfight_type = tx.concepts().get_relation_type("lionfight")
                 print(lionfight_type._label)
                 tx.query().undefine("undefine lionfight sub relation;")
                 tx.commit()