BDD: Graql Steps (#156)

Alex Walker · web-flow · commit e23a61772f0e · 2021-01-15T13:20:12.000Z
## What is the goal of this PR?

We had Connection and Concept BDD implementations, but Graql steps were still not implemented. We added support for them.

## What are the changes implemented in this PR?

- Implement all Graql Steps (BDD)
- Fix bad IID format in `Thing` (no leading `0x`)
diff --git a/grakn/client.py b/grakn/client.py
@@ -29,7 +29,7 @@
 from grakn.rpc.transaction import TransactionType  # noqa # pylint: disable=unused-import
 
 
-class GraknClient(object):
+class GraknClient:
     DEFAULT_URI = "localhost:1729"
 
     def __init__(self, address=DEFAULT_URI):
diff --git a/grakn/concept/concept.py b/grakn/concept/concept.py
@@ -18,7 +18,7 @@
 #
 
 
-class Concept(object):
+class Concept:
 
     def is_type(self):
         return False
@@ -54,7 +54,7 @@ def is_remote(self):
         return False
 
 
-class RemoteConcept(object):
+class RemoteConcept:
 
     def is_remote(self):
         return True
diff --git a/grakn/concept/concept_manager.py b/grakn/concept/concept_manager.py
@@ -25,7 +25,7 @@
 from grakn.concept.type.relation_type import RelationType
 
 
-class ConceptManager(object):
+class ConceptManager:
 
     def __init__(self, transaction):
         self._transaction = transaction
diff --git a/grakn/concept/proto/concept_proto_builder.py b/grakn/concept/proto/concept_proto_builder.py
@@ -96,7 +96,7 @@ def value_type(value_type_: ValueType):
 
 
 def iid(iid_: str):
-    return bytes.fromhex(iid_)
+    return bytes.fromhex(iid_.lstrip("0x"))
 
 
 def thing_encoding(thing_):
diff --git a/grakn/concept/proto/concept_proto_reader.py b/grakn/concept/proto/concept_proto_reader.py
@@ -33,6 +33,10 @@
 from grakn.concept.type.thing_type import ThingType
 
 
+def iid(iid_proto: bytes):
+    return "0x" + iid_proto.hex()
+
+
 def concept(con_proto: concept_proto.Concept):
     if con_proto.HasField(ConceptMap._THING):
         concept = thing(con_proto.thing)
diff --git a/grakn/concept/thing/attribute.py b/grakn/concept/thing/attribute.py
@@ -21,7 +21,7 @@
 
 import graknprotocol.protobuf.concept_pb2 as concept_proto
 
-from grakn.concept.proto import concept_proto_builder
+from grakn.concept.proto import concept_proto_builder, concept_proto_reader
 from grakn.concept.thing.thing import Thing, RemoteThing
 
 
@@ -83,7 +83,7 @@ def __init__(self, iid: str, value: bool):
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return BooleanAttribute(thing_proto.iid.hex(), thing_proto.value.boolean)
+        return BooleanAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.value.boolean)
 
     def get_value(self):
         return self._value
@@ -119,7 +119,7 @@ def __init__(self, iid: str, value: int):
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return LongAttribute(thing_proto.iid.hex(), thing_proto.value.long)
+        return LongAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.value.long)
 
     def get_value(self):
         return self._value
@@ -155,7 +155,7 @@ def __init__(self, iid: str, value: float):
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return DoubleAttribute(thing_proto.iid.hex(), thing_proto.value.double)
+        return DoubleAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.value.double)
 
     def get_value(self):
         return self._value
@@ -191,7 +191,7 @@ def __init__(self, iid: str, value: str):
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return StringAttribute(thing_proto.iid.hex(), thing_proto.value.string)
+        return StringAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.value.string)
 
     def get_value(self):
         return self._value
@@ -227,7 +227,7 @@ def __init__(self, iid: str, value: datetime):
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return DateTimeAttribute(thing_proto.iid.hex(), datetime.fromtimestamp(float(thing_proto.value.date_time) / 1000.0))
+        return DateTimeAttribute(concept_proto_reader.iid(thing_proto.iid), datetime.fromtimestamp(float(thing_proto.value.date_time) / 1000.0))
 
     def get_value(self):
         return self._value
diff --git a/grakn/concept/thing/entity.py b/grakn/concept/thing/entity.py
@@ -19,14 +19,15 @@
 
 import graknprotocol.protobuf.concept_pb2 as concept_proto
 
+from grakn.concept.proto import concept_proto_reader
 from grakn.concept.thing.thing import Thing, RemoteThing
 
 
 class Entity(Thing):
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return Entity(thing_proto.iid.hex())
+        return Entity(concept_proto_reader.iid(thing_proto.iid))
 
     def as_remote(self, transaction):
         return RemoteEntity(transaction, self._iid)
diff --git a/grakn/concept/thing/relation.py b/grakn/concept/thing/relation.py
@@ -28,7 +28,7 @@ class Relation(Thing):
 
     @staticmethod
     def _of(thing_proto: concept_proto.Thing):
-        return Relation(thing_proto.iid.hex())
+        return Relation(concept_proto_reader.iid(thing_proto.iid))
 
     def as_remote(self, transaction):
         return RemoteRelation(transaction, self.get_iid())
diff --git a/grakn/concept/type/value_type.py b/grakn/concept/type/value_type.py
@@ -19,12 +19,18 @@
 
 import enum
 
+from datetime import datetime
+from typing import Union
+
 
-# This lives here to avoid circular imports.
 class ValueType(enum.Enum):
+    # This lives here to avoid circular imports.
     OBJECT = 0
     BOOLEAN = 1
     LONG = 2
     DOUBLE = 3
     STRING = 4
     DATETIME = 5
+
+
+ValueClass = Union[bool, int, float, str, datetime]
diff --git a/grakn/logic/logic_manager.py b/grakn/logic/logic_manager.py
@@ -23,7 +23,7 @@
 from grakn.logic.rule import Rule
 
 
-class LogicManager(object):
+class LogicManager:
 
     def __init__(self, transaction):
         self._transaction = transaction
diff --git a/grakn/logic/rule.py b/grakn/logic/rule.py
@@ -23,7 +23,7 @@
 from grakn.common.exception import GraknClientException
 
 
-class Rule(object):
+class Rule:
 
     def __init__(self, label: str, when: str, then: str):
         if not label:
diff --git a/grakn/options.py b/grakn/options.py
@@ -18,7 +18,7 @@
 #
 
 
-class GraknOptions(object):
+class GraknOptions:
 
     def __init__(self):
         self.infer = None
diff --git a/grakn/query/query_manager.py b/grakn/query/query_manager.py
@@ -27,7 +27,7 @@
 from grakn.options import GraknOptions
 
 
-class QueryManager(object):
+class QueryManager:
 
     def __init__(self, transaction):
         self._transaction = transaction
diff --git a/grakn/rpc/database_manager.py b/grakn/rpc/database_manager.py
@@ -24,7 +24,7 @@
 from grakn.common.exception import GraknClientException
 
 
-class DatabaseManager(object):
+class DatabaseManager:
 
     def __init__(self, channel: Channel):
         self._grpc_stub = GraknStub(channel)
diff --git a/grakn/rpc/session.py b/grakn/rpc/session.py
@@ -37,7 +37,7 @@ class SessionType(enum.Enum):
     SCHEMA = 1
 
 
-class Session(object):
+class Session:
 
     _PULSE_FREQUENCY_SECONDS = 5
 
diff --git a/grakn/rpc/transaction.py b/grakn/rpc/transaction.py
@@ -44,7 +44,7 @@ class TransactionType(enum.Enum):
     WRITE = 1
 
 
-class Transaction(object):
+class Transaction:
 
     def __init__(self, channel: grpc.Channel, session_id: str, transaction_type: TransactionType, options=GraknOptions()):
         self._transaction_type = transaction_type
diff --git a/tests/behaviour/config/parameters.py b/tests/behaviour/config/parameters.py
@@ -18,7 +18,7 @@
 #
 from datetime import datetime
 from enum import Enum
-from typing import List, Dict
+from typing import List, Dict, Tuple
 
 import parse
 from behave import register_type
@@ -51,9 +51,12 @@ def parse_float(text: str) -> float:
 register_type(Float=parse_float)
 
 
-@parse.with_pattern(r"\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d")
+@parse.with_pattern(r"\d\d\d\d-\d\d-\d\d(?: \d\d:\d\d:\d\d)?")
 def parse_datetime(text: str) -> datetime:
-    return datetime.strptime(text, "%Y-%m-%d %H:%M:%S")
+    try:
+        return datetime.strptime(text, "%Y-%m-%d %H:%M:%S")
+    except ValueError:
+        return datetime.strptime(text, "%Y-%m-%d")
 
 
 register_type(DateTime=parse_datetime)
@@ -116,9 +119,27 @@ def parse_list(table: Table) -> List[str]:
 
 
 def parse_dict(table: Table) -> Dict[str, str]:
-    print(table.headings)
-    print(table.rows)
     result = {table.headings[0]: table.headings[1]}
     for row in table.rows:
         result[row[0]] = row[1]
     return result
+
+
+def parse_table(table: Table) -> List[List[Tuple[str, str]]]:
+    """
+    Extracts the rows of a Table as lists of Tuples, where each Tuple contains the column header and the cell value.
+
+    For example, the table::
+
+        | x         | type         |
+        | key:ref:0 | label:person |
+        | key:ref:2 | label:dog    |
+
+    is converted to::
+
+        [
+            [('x', 'key:ref:0'), ('type', 'label:person')],
+            [('x', 'key:ref:2'), ('type', 'label:dog')]
+        ]
+    """
+    return [[(table.headings[idx], row[idx]) for idx in range(len(row))] for row in table.rows]
diff --git a/tests/behaviour/context.py b/tests/behaviour/context.py
@@ -17,21 +17,38 @@
 # under the License.
 #
 from concurrent.futures._base import Future
-from typing import List, Union
+from typing import List, Union, Optional
 
 import behave.runner
+from behave.model import Table
 
 from grakn.client import GraknClient
+from grakn.concept.answer.concept_map import ConceptMap
+from grakn.concept.answer.concept_map_group import ConceptMapGroup
+from grakn.concept.answer.numeric import Numeric
+from grakn.concept.answer.numeric_group import NumericGroup
+from grakn.concept.concept import Concept
 from grakn.concept.thing.attribute import Attribute, BooleanAttribute, LongAttribute, DoubleAttribute, StringAttribute, \
     DateTimeAttribute
 from grakn.concept.thing.entity import Entity
 from grakn.concept.thing.relation import Relation
 from grakn.concept.thing.thing import Thing
+from grakn.concept.type.attribute_type import AttributeType, BooleanAttributeType, LongAttributeType, \
+    DoubleAttributeType, StringAttributeType, DateTimeAttributeType
+from grakn.concept.type.entity_type import EntityType
+from grakn.concept.type.relation_type import RelationType
+from grakn.concept.type.role_type import RoleType
+from grakn.concept.type.thing_type import ThingType
+from grakn.concept.type.type import Type
 from grakn.rpc.session import Session
 from grakn.rpc.transaction import Transaction
 
 
-ThingSubtype: Thing = Union[Entity, Relation, BooleanAttribute, LongAttribute, DoubleAttribute, StringAttribute, DateTimeAttribute]
+AttributeSubtype: Attribute = Union[BooleanAttribute, LongAttribute, DoubleAttribute, StringAttribute, DateTimeAttribute]
+ThingSubtype: Thing = Union[Entity, Relation, AttributeSubtype]
+TypeSubtype: Type = Union[ThingType, EntityType, RelationType, RoleType, AttributeType, BooleanAttributeType, LongAttributeType, DoubleAttributeType, StringAttributeType, DateTimeAttributeType]
+ConceptSubtype: Concept = Union[ThingSubtype, TypeSubtype]
+
 
 class Context(behave.runner.Context):
     """
@@ -40,13 +57,18 @@ class Context(behave.runner.Context):
     This class should not be instantiated. The initialisation of the actual Context object occurs in environment.py.
     """
     def __init__(self):
+        self.table: Optional[Table] = None
         self.THREAD_POOL_SIZE = 0
-        self.client: GraknClient = None
+        self.client: Optional[GraknClient] = None
         self.sessions: List[Session] = []
         self.sessions_to_transactions: dict[Session, List[Transaction]] = {}
         self.sessions_parallel: List[Future[Session]] = []
         self.sessions_parallel_to_transactions_parallel: dict[Future[Session], List[Transaction]] = {}
         self.things: dict[str, ThingSubtype] = {}
+        self.answers: Optional[List[ConceptMap]] = None
+        self.numeric_answer: Optional[Numeric] = None
+        self.answer_groups: Optional[List[ConceptMapGroup]] = None
+        self.numeric_answer_groups: Optional[List[NumericGroup]] = None
 
     def tx(self) -> Transaction:
         return self.sessions_to_transactions[self.sessions[0]][0]
@@ -56,3 +78,6 @@ def put(self, var: str, thing: ThingSubtype) -> None:
 
     def get(self, var: str) -> ThingSubtype:
         pass
+
+    def clear_answers(self) -> None:
+        pass
diff --git a/tests/behaviour/environment.py b/tests/behaviour/environment.py
@@ -20,10 +20,8 @@
 from behave.model_core import Status
 
 from grakn.client import GraknClient
-from grakn.concept.thing.thing import Thing
 from tests.behaviour.config.parameters import RootLabel
-from tests.behaviour.context import Context
-
+from tests.behaviour.context import Context, ThingSubtype
 
 IGNORE_TAGS = ["ignore", "ignore-client-python"]
 
@@ -51,9 +49,10 @@ def before_scenario(context: Context, scenario):
     context.get = lambda var: context.things[var]
     context.put = lambda var, thing: _put_impl(context, var, thing)
     context.get_thing_type = lambda root_label, type_label: _get_thing_type_impl(context, root_label, type_label)
+    context.clear_answers = lambda: _clear_answers_impl(context)
 
 
-def _put_impl(context: Context, variable: str, thing: Thing):
+def _put_impl(context: Context, variable: str, thing: ThingSubtype):
     context.things[variable] = thing
 
 
@@ -68,6 +67,13 @@ def _get_thing_type_impl(context: Context, root_label: RootLabel, type_label: st
         raise ValueError("Unrecognised value")
 
 
+def _clear_answers_impl(context: Context):
+    context.answers = None
+    context.numeric_answer = None
+    context.answer_groups = None
+    context.numeric_answer_groups = None
+
+
 def after_scenario(context: Context, scenario):
     if scenario.status == Status.skipped:
         return
diff --git a/tests/behaviour/graql/graql_steps.py b/tests/behaviour/graql/graql_steps.py
diff --git a/tests/behaviour/graql/language/define/BUILD b/tests/behaviour/graql/language/define/BUILD
diff --git a/tests/behaviour/graql/language/delete/BUILD b/tests/behaviour/graql/language/delete/BUILD
diff --git a/tests/behaviour/graql/language/get/BUILD b/tests/behaviour/graql/language/get/BUILD
diff --git a/tests/behaviour/graql/language/insert/BUILD b/tests/behaviour/graql/language/insert/BUILD
diff --git a/tests/behaviour/graql/language/match/BUILD b/tests/behaviour/graql/language/match/BUILD
diff --git a/tests/behaviour/graql/language/undefine/BUILD b/tests/behaviour/graql/language/undefine/BUILD
diff --git a/tests/integration/base.py b/tests/integration/base.py
