Made datetime attribute insert and match time-zone invariant

.factory/automation.yml

@@ -113,6 +113,7 @@ build:
       type: foreground
       command: |
         export PATH="$HOME/.local/bin:$PATH"
+        sudo apt-get update
         sudo apt install python3-pip -y
         python3 -m pip install -U pip
         python3 -m pip install -r requirements_dev.txt

dependencies/vaticle/repositories.bzl

@@ -38,6 +38,7 @@ def vaticle_typedb_common():
 def vaticle_typedb_behaviour():
     git_repository(
         name = "vaticle_typedb_behaviour",
-        remote = "https://github.com/vaticle/typedb-behaviour",
-        commit = "767bf98fef7383addf42a1ae6e97a44874bb4f0b" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
+        remote = "https://github.com/shiladitya-mukherjee/typedb-behaviour",
+        commit = "15d6f428437b8a2e92a40236a63cab296f44ceec" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
     )
+

tests/behaviour/concept/thing/attribute/attribute_steps.py

@@ -24,6 +24,8 @@
 from typedb.client import *
 
 from tests.behaviour.context import Context
+import os
+import time
 
 
 @step("attribute({type_label}) get instances contain: {var:Var}")
@@ -149,3 +151,10 @@ def step_impl(context: Context, var: str, value: str):
 @step("attribute {var:Var} has datetime value: {value:DateTime}")
 def step_impl(context: Context, var: str, value: datetime):
     assert_that(context.get(var).as_attribute().get_value(), is_(value))
+
+
+@step("set time-zone is: {time_zone_label}")
+def step_impl(context: Context, time_zone_label: str):
+    os.environ["TZ"] = time_zone_label
+    time.tzset()
+

tests/behaviour/typeql/typeql_steps.py

@@ -21,6 +21,8 @@
 import re
 from collections import defaultdict
 
+import os
+import time
 from behave import *
 from hamcrest import *
 
@@ -178,6 +180,11 @@ def step_impl(context: Context, rule_label: str):
 def step_impl(context: Context, rule_label: str):
     return not (rule_label in [rule.get_label() for rule in context.tx().logic().get_rules()])
 
+@step("set time-zone is: {time_zone_label}")
+def step_impl(context: Context, time_zone_label: str):
+    os.environ["TZ"] = time_zone_label
+    time.tzset()
+
 
 class ConceptMatchResult:
 
@@ -225,7 +232,7 @@ class AttributeMatcher(ConceptMatcher, ABC):
 
     def __init__(self, type_and_value: str):
         self.type_and_value = type_and_value
-        s = type_and_value.split(":")
+        s = type_and_value.split(":", 1)
         assert_that(s, has_length(2),
                     "[%s] is not a valid attribute identifier. It should have format \"type_label:value\"." % type_and_value)
         self.type_label, self.value_string = s
@@ -284,7 +291,7 @@ class ValueMatcher(ConceptMatcher):
 
     def __init__(self, value_type_and_value: str):
         self.value_type_and_value = value_type_and_value
-        s = value_type_and_value.split(":")
+        s = value_type_and_value.split(":", 1)
         assert_that(s, has_length(2),
                     "[%s] is not a valid identifier. It should have format \"value_type:value\"." % value_type_and_value)
         self.value_type_name, self.value_string = s

tool/behave_rule.bzl

@@ -118,7 +118,7 @@ def _rule_implementation(ctx):
     cmd += " && rm -rf " + steps_out_dir
     cmd += " && mkdir " + steps_out_dir + " && "
     cmd += " && ".join(["cp %s %s" % (step_file.path, steps_out_dir) for step_file in ctx.files.steps])
-    cmd += " && behave %s --no-capture -D port=$PORT && export RESULT=0 || export RESULT=1" % feats_dir
+    cmd += " && python3 -m behave %s --no-capture -D port=$PORT && export RESULT=0 || export RESULT=1" % feats_dir
     cmd += """
            echo Tests concluded with exit value $RESULT
            echo Stopping server.

typedb/common/exception.py

@@ -116,7 +116,7 @@ def __init__(self, code: int, message: str):
 NONEXISTENT_EXPLAINABLE_CONCEPT = ConceptErrorMessage(10, "The concept identified by '%s' is not explainable.")
 NONEXISTENT_EXPLAINABLE_OWNERSHIP = ConceptErrorMessage(11, "The ownership by owner '%s' of attribute '%s' is not explainable.")
 GET_HAS_WITH_MULTIPLE_FILTERS = ConceptErrorMessage(12, "Only one filter can be applied at a time to get_has. The possible filters are: [attribute_type, attribute_types, annotations]")
-
+HAS_TIMEZONE_INFO = ConceptErrorMessage(13, "A date-time attribute cannot accept timezone aware datetime objects.")
 
 class QueryErrorMessage(ErrorMessage):
 

typedb/concept/proto/concept_proto_builder.py

@@ -25,7 +25,7 @@
 from typedb.api.concept.type.role_type import RoleType
 from typedb.api.concept.type.thing_type import ThingType, Annotations, Annotation
 from typedb.api.concept.type.type import Type
-from typedb.common.exception import TypeDBClientException, BAD_ENCODING, BAD_ANNOTATION
+from typedb.common.exception import TypeDBClientException, BAD_ENCODING, BAD_ANNOTATION, HAS_TIMEZONE_INFO
 from typedb.common.rpc.request_builder import proto_role_type, proto_thing_type, byte_string
 
 
@@ -83,6 +83,8 @@ def string_value(value: str):
 
 
 def datetime_value(value: datetime):
+    if value.tzinfo is not None:
+        raise TypeDBClientException.of(HAS_TIMEZONE_INFO)
     value_proto = concept_proto.ConceptValue()
     value_proto.date_time = int((value - datetime(1970, 1, 1)).total_seconds() * 1000)
     return value_proto

typedb/concept/thing/attribute.py

@@ -204,14 +204,14 @@ def as_remote(self, transaction):
 
 class _DateTimeAttribute(DateTimeAttribute, _Attribute):
 
-    def __init__(self, iid: str, is_inferred: bool, type_: DateTimeAttributeType, value: datetime):
+    def    __init__(self, iid: str, is_inferred: bool, type_: DateTimeAttributeType, value: datetime):
         super(_DateTimeAttribute, self).__init__(iid, is_inferred)
         self._type = type_
         self._value = value
 
     @staticmethod
     def of(thing_proto: concept_proto.Thing):
-        return _DateTimeAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.inferred, concept_proto_reader.attribute_type(thing_proto.type), datetime.fromtimestamp(float(thing_proto.value.date_time) / 1000.0))
+        return _DateTimeAttribute(concept_proto_reader.iid(thing_proto.iid), thing_proto.inferred, concept_proto_reader.attribute_type(thing_proto.type), datetime.utcfromtimestamp(float(thing_proto.value.date_time) / 1000.0))
 
     def get_type(self) -> "DateTimeAttributeType":
         return self._type

typedb/concept/value/value.py

@@ -111,7 +111,7 @@ def __init__(self, value: datetime):
 
     @staticmethod
     def of(value_proto: concept_proto.Value):
-        return _DateTimeValue(datetime.fromtimestamp(float(value_proto.value.date_time) / 1000.0))
+        return _DateTimeValue(datetime.utcfromtimestamp(float(value_proto.value.date_time) / 1000.0))
 
     def get_value(self):
         return self._value