Fix PR issues

Author: dmikhalin

dependencies/vaticle/repositories.bzl

@@ -67,5 +67,5 @@ def vaticle_typedb_driver_java():
     git_repository(
         name = "vaticle_typedb_driver_java",
         remote = "https://github.com/dmikhalin/typedb-client-java",
-        commit = "c1e6d52fe03f16401edc0768a59589a993ad9854"  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_factory_tracing
+        commit = "f2b324aae5202ca28ce9d528f1439b9ba6ffe7ec"  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_factory_tracing
     )

tests/behaviour/typeql/typeql_steps.py

@@ -44,7 +44,7 @@ def step_impl(context: Context):
 @step("typeql define; throws exception containing \"{pattern}\"")
 def step_impl(context: Context, pattern: str):
     assert_that(calling(context.tx().query.define).with_args(query=context.text),
-                raises(Exception, re.escape(pattern)))
+                raises(TypeDBClientException, re.escape(pattern)))
 
 
 @step("typeql undefine")
@@ -60,7 +60,7 @@ def step_impl(context: Context):
 @step("typeql undefine; throws exception containing \"{pattern}\"")
 def step_impl(context: Context, pattern: str):
     assert_that(calling(context.tx().query.undefine).with_args(query=context.text),
-                raises(Exception, re.escape(pattern)))
+                raises(TypeDBClientException, re.escape(pattern)))
 
 
 @step("typeql insert")
@@ -76,7 +76,7 @@ def step_impl(context: Context):
 @step("typeql insert; throws exception containing \"{pattern}\"")
 def step_impl(context: Context, pattern: str):
     assert_that(calling(next).with_args(context.tx().query.insert(query=context.text)),
-                raises(Exception, re.escape(pattern)))
+                raises(TypeDBClientException, re.escape(pattern)))
 
 
 @step("typeql delete")
@@ -92,7 +92,7 @@ def step_impl(context: Context):
 @step("typeql delete; throws exception containing \"{pattern}\"")
 def step_impl(context: Context, pattern: str):
     assert_that(calling(context.tx().query.delete).with_args(query=context.text),
-                raises(Exception, re.escape(pattern)))
+                raises(TypeDBClientException, re.escape(pattern)))
 
 
 @step("typeql update")
@@ -108,7 +108,7 @@ def step_impl(context: Context):
 @step("typeql update; throws exception containing \"{pattern}\"")
 def step_impl(context: Context, pattern: str):
     assert_that(calling(next).with_args(context.tx().query.update(query=context.text)),
-                raises(Exception, re.escape(pattern)))
+                raises(TypeDBClientException, re.escape(pattern)))
 
 
 @step("get answers of typeql insert")
@@ -131,7 +131,7 @@ def step_impl(context: Context):
 @step("typeql match; throws exception containing \"{pattern}\"")
 def step_impl(context: Context, pattern: str):
     assert_that(calling(next).with_args(context.tx().query.match(query=context.text)),
-                raises(Exception, re.escape(pattern)))
+                raises(TypeDBClientException, re.escape(pattern)))
 
 
 @step("get answer of typeql match aggregate")

typedb/api/connection/credential.py

@@ -21,19 +21,20 @@
 
 from typing import Optional
 
-from typedb.native_client_wrapper import credential_new
+from typedb.native_client_wrapper import credential_new, Credential as NativeCredential
 
-from typedb.common.exception import TypeDBClientExceptionExt, CLUSTER_CREDENTIAL_INCONSISTENT
+from typedb.common.exception import TypeDBClientExceptionExt, CLUSTER_CREDENTIAL_INCONSISTENT, ILLEGAL_STATE
+from typedb.common.native_wrapper import NativeWrapper
 
 
-class TypeDBCredential:
+class TypeDBCredential(NativeWrapper[NativeCredential]):
 
     def __init__(self, username: str, password: str, *, tls_root_ca_path: Optional[str] = None,
                  tls_enabled: bool = True):
         if tls_root_ca_path is not None and not tls_enabled:
             raise TypeDBClientExceptionExt.of(CLUSTER_CREDENTIAL_INCONSISTENT)
-        self._native_object = credential_new(username, password, tls_root_ca_path, tls_enabled)
+        super().__init__(credential_new(username, password, tls_root_ca_path, tls_enabled))
 
     @property
-    def native_object(self):
-        return self._native_object
+    def _native_object_not_owned_exception(self) -> TypeDBClientExceptionExt:
+        return TypeDBClientExceptionExt.of(ILLEGAL_STATE)

typedb/api/connection/options.py

@@ -32,12 +32,13 @@
     options_has_transaction_timeout_millis, options_get_transaction_timeout_millis, \
     options_set_transaction_timeout_millis, options_get_schema_lock_acquire_timeout_millis, \
     options_has_schema_lock_acquire_timeout_millis, options_set_schema_lock_acquire_timeout_millis, \
-    options_set_read_any_replica, options_get_read_any_replica, options_has_read_any_replica
+    options_set_read_any_replica, options_get_read_any_replica, options_has_read_any_replica, Options as NativeOptions
 
-from typedb.common.exception import TypeDBClientExceptionExt, POSITIVE_VALUE_REQUIRED
+from typedb.common.exception import TypeDBClientExceptionExt, ILLEGAL_STATE, POSITIVE_VALUE_REQUIRED
+from typedb.common.native_wrapper import NativeWrapper
 
 
-class TypeDBOptions:
+class TypeDBOptions(NativeWrapper[NativeOptions]):
 
     def __init__(self, *,
                  infer: Optional[bool] = None,
@@ -51,7 +52,7 @@ def __init__(self, *,
                  schema_lock_acquire_timeout_millis: Optional[int] = None,
                  read_any_replica: Optional[bool] = None,
                  ):
-        self._native_object = options_new()
+        super().__init__(options_new())
         if infer is not None:
             self.infer = infer
         if trace_inference is not None:
@@ -74,8 +75,8 @@ def __init__(self, *,
             self.read_any_replica = read_any_replica
 
     @property
-    def native_object(self):
-        return self._native_object
+    def _native_object_not_owned_exception(self) -> TypeDBClientExceptionExt:
+        return TypeDBClientExceptionExt.of(ILLEGAL_STATE)
 
     @property
     def infer(self) -> Optional[bool]:

typedb/common/native_object_mixin.py renamed to typedb/common/native_wrapper.py

@@ -22,17 +22,18 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import Any
+from typing import Any, Generic, TypeVar
 
 from typedb.common.exception import TypeDBClientExceptionExt
 
 
-class NativeObjectMixin(ABC):
+T = TypeVar("T")
 
-    @property
-    @abstractmethod
-    def _native_object(self) -> Any:
-        pass
+
+class NativeWrapper(ABC, Generic[T]):
+
+    def __init__(self, native_object: T):
+        self._native_object = native_object
 
     @property
     @abstractmethod

typedb/concept/answer/concept_map.py

@@ -28,19 +28,18 @@
     explainables_get_relation, explainables_get_attribute, explainables_get_ownership, \
     explainables_get_relations_keys, explainables_get_attributes_keys, explainables_get_ownerships_keys, \
     string_pair_iterator_next, explainables_to_string, explainables_equals, explainable_get_conjunction, \
-    explainable_get_id
+    explainable_get_id, ConceptMap as NativeConceptMap, Explainables as NativeExplainables, \
+    Explainable as NativeExplainable
 
 from typedb.api.answer.concept_map import ConceptMap
 from typedb.common.exception import TypeDBClientExceptionExt, ILLEGAL_STATE, MISSING_VARIABLE, \
     NONEXISTENT_EXPLAINABLE_CONCEPT, NONEXISTENT_EXPLAINABLE_OWNERSHIP, NULL_NATIVE_OBJECT, VARIABLE_DOES_NOT_EXIST
 from typedb.common.iterator_wrapper import IteratorWrapper
-from typedb.common.native_object_mixin import NativeObjectMixin
+from typedb.common.native_wrapper import NativeWrapper
 from typedb.concept import concept_factory
 
 if TYPE_CHECKING:
     from typedb.api.concept.concept import Concept
-    from typedb.native_client_wrapper import ConceptMap as NativeConceptMap, Explainables as NativeExplainables, \
-        Explainable as NativeExplainable
 
 
 def _not_blank_var(var: str) -> str:
@@ -49,16 +48,12 @@ def _not_blank_var(var: str) -> str:
     return var
 
 
-class _ConceptMap(ConceptMap, NativeObjectMixin):
+class _ConceptMap(ConceptMap, NativeWrapper[NativeConceptMap]):
 
     def __init__(self, concept_map: NativeConceptMap):
         if not concept_map:
             raise TypeDBClientExceptionExt(NULL_NATIVE_OBJECT)
-        self.__native_object = concept_map
-
-    @property
-    def _native_object(self) -> NativeConceptMap:
-        return self.__native_object
+        super().__init__(concept_map)
 
     @property
     def _native_object_not_owned_exception(self) -> TypeDBClientExceptionExt:
@@ -93,16 +88,12 @@ def __eq__(self, other):
     def __hash__(self):
         return hash((tuple(self.variables()), tuple(self.concepts())))
 
-    class Explainables(ConceptMap.Explainables, NativeObjectMixin):
+    class Explainables(ConceptMap.Explainables, NativeWrapper[NativeExplainables]):
 
         def __init__(self, explainables: NativeExplainables):
             if not explainables:
                 raise TypeDBClientExceptionExt(NULL_NATIVE_OBJECT)
-            self.__native_object = explainables
-
-        @property
-        def _native_object(self) -> NativeExplainables:
-            return self.__native_object
+            super().__init__(explainables)
 
         @property
         def _native_object_not_owned_exception(self) -> TypeDBClientExceptionExt:
@@ -154,16 +145,12 @@ def __eq__(self, other):
         def __hash__(self):
             return hash((tuple(self.relations()), tuple(self.attributes()), tuple(self.ownerships())))
 
-    class Explainable(ConceptMap.Explainable, NativeObjectMixin):
+    class Explainable(ConceptMap.Explainable, NativeWrapper[NativeExplainable]):
 
         def __init__(self, explainable: NativeExplainable):
             if not explainable:
                 raise TypeDBClientExceptionExt(NULL_NATIVE_OBJECT)
-            self.__native_object = explainable
-
-        @property
-        def _native_object(self) -> NativeExplainable:
-            return self.__native_object
+            super().__init__(explainable)
 
         @property
         def _native_object_not_owned_exception(self) -> TypeDBClientExceptionExt:

typedb/concept/answer/concept_map_group.py

@@ -24,31 +24,27 @@
 from typing import Iterator, TYPE_CHECKING
 
 from typedb.native_client_wrapper import concept_map_group_get_owner, concept_map_group_get_concept_maps, \
-    concept_map_iterator_next, concept_map_group_to_string, concept_map_group_equals
+    concept_map_iterator_next, concept_map_group_to_string, concept_map_group_equals, \
+    ConceptMapGroup as NativeConceptMapGroup
 
 from typedb.api.answer.concept_map_group import ConceptMapGroup
 from typedb.common.exception import TypeDBClientExceptionExt, ILLEGAL_STATE, NULL_NATIVE_OBJECT
 from typedb.common.iterator_wrapper import IteratorWrapper
-from typedb.common.native_object_mixin import NativeObjectMixin
+from typedb.common.native_wrapper import NativeWrapper
 from typedb.concept import concept_factory
 from typedb.concept.answer.concept_map import _ConceptMap
 
 if TYPE_CHECKING:
     from typedb.api.concept.concept import Concept
     from typedb.api.answer.concept_map import ConceptMap
-    from typedb.native_client_wrapper import ConceptMapGroup as NativeConceptMapGroup
 
 
-class _ConceptMapGroup(ConceptMapGroup, NativeObjectMixin):
+class _ConceptMapGroup(ConceptMapGroup, NativeWrapper[NativeConceptMapGroup]):
 
     def __init__(self, concept_map_group: NativeConceptMapGroup):
         if not concept_map_group:
             raise TypeDBClientExceptionExt(NULL_NATIVE_OBJECT)
-        self.__native_object = concept_map_group
-
-    @property
-    def _native_object(self) -> NativeConceptMapGroup:
-        return self.__native_object
+        super().__init__(concept_map_group)
 
     @property
     def _native_object_not_owned_exception(self) -> TypeDBClientExceptionExt:

typedb/concept/answer/numeric.py

@@ -21,29 +21,20 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from typedb.native_client_wrapper import numeric_is_long, numeric_is_double, numeric_is_nan, \
-    numeric_get_long, numeric_get_double, numeric_to_string
+    numeric_get_long, numeric_get_double, numeric_to_string, Numeric as NativeNumeric
 
 from typedb.api.answer.numeric import Numeric
 from typedb.common.exception import TypeDBClientExceptionExt, ILLEGAL_CAST, ILLEGAL_STATE, NULL_NATIVE_OBJECT
-from typedb.common.native_object_mixin import NativeObjectMixin
-
-if TYPE_CHECKING:
-    from typedb.native_client_wrapper import Numeric as NativeNumeric
+from typedb.common.native_wrapper import NativeWrapper
 
 
-class _Numeric(Numeric, NativeObjectMixin):
+class _Numeric(Numeric, NativeWrapper[NativeNumeric]):
 
     def __init__(self, numeric: NativeNumeric):
         if not numeric:
             raise TypeDBClientExceptionExt(NULL_NATIVE_OBJECT)
-        self.__native_object = numeric
-
-    @property
-    def _native_object(self) -> NativeNumeric:
-        return self.__native_object
+        super().__init__(numeric)
 
     @property
     def _native_object_not_owned_exception(self) -> TypeDBClientExceptionExt:

typedb/concept/answer/numeric_group.py

@@ -23,31 +23,26 @@
 
 from typing import TYPE_CHECKING
 
-from typedb.native_client_wrapper import numeric_group_get_owner, \
-    numeric_group_get_numeric, numeric_group_to_string, numeric_group_equals
+from typedb.native_client_wrapper import numeric_group_get_owner, numeric_group_get_numeric, \
+    numeric_group_to_string, numeric_group_equals, NumericGroup as NativeNumericGroup
 
 from typedb.api.answer.numeric_group import NumericGroup
 from typedb.common.exception import TypeDBClientExceptionExt, NULL_NATIVE_OBJECT, ILLEGAL_STATE
-from typedb.common.native_object_mixin import NativeObjectMixin
+from typedb.common.native_wrapper import NativeWrapper
 from typedb.concept import concept_factory
 from typedb.concept.answer.numeric import _Numeric
 
 if TYPE_CHECKING:
     from typedb.api.answer.numeric import Numeric
     from typedb.api.concept.concept import Concept
-    from typedb.native_client_wrapper import NumericGroup as NativeNumericGroup
 
 
-class _NumericGroup(NumericGroup, NativeObjectMixin):
+class _NumericGroup(NumericGroup, NativeWrapper[NativeNumericGroup]):
 
     def __init__(self, numeric_group: NativeNumericGroup):
         if not numeric_group:
             raise TypeDBClientExceptionExt(NULL_NATIVE_OBJECT)
-        self.__native_object = numeric_group
-
-    @property
-    def _native_object(self) -> NativeNumericGroup:
-        return self.__native_object
+        super().__init__(numeric_group)
 
     @property
     def _native_object_not_owned_exception(self) -> TypeDBClientExceptionExt:

typedb/concept/concept.py

@@ -22,28 +22,20 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING
 
-from typedb.native_client_wrapper import concept_to_string, concept_equals
+from typedb.native_client_wrapper import concept_to_string, concept_equals, Concept as NativeConcept
 
 from typedb.api.concept.concept import Concept
 from typedb.common.exception import TypeDBClientExceptionExt, ILLEGAL_STATE, NULL_NATIVE_OBJECT
-from typedb.common.native_object_mixin import NativeObjectMixin
+from typedb.common.native_wrapper import NativeWrapper
 
-if TYPE_CHECKING:
-    from typedb.native_client_wrapper import Concept as NativeConcept
 
-
-class _Concept(Concept, NativeObjectMixin, ABC):
+class _Concept(Concept, NativeWrapper[NativeConcept], ABC):
 
     def __init__(self, concept: NativeConcept):
         if not concept:
             raise TypeDBClientExceptionExt(NULL_NATIVE_OBJECT)
-        self.__native_object = concept
-
-    @property
-    def _native_object(self) -> NativeConcept:
-        return self.__native_object
+        super().__init__(concept)
 
     @property
     def _native_object_not_owned_exception(self) -> TypeDBClientExceptionExt: