Adding generics

arango/api.py

@@ -1,6 +1,6 @@
 __all__ = ["ApiGroup"]
 
-from typing import Callable, Optional, TypeVar
+from typing import Any, Callable, Optional, TypeVar
 
 from arango.connection import Connection
 from arango.executor import ApiExecutor

arango/aql.py

@@ -1,7 +1,7 @@
 __all__ = ["AQL", "AQLQueryCache"]
 
 from numbers import Number
-from typing import MutableMapping, Optional, Sequence, Union
+from typing import Generic, MutableMapping, Optional, Sequence, TypeVar, Union
 
 from arango.api import ApiGroup
 from arango.connection import Connection
@@ -145,14 +145,17 @@ def response_handler(resp: Response) -> bool:
         return self._execute(request, response_handler)
 
 
-class AQL(ApiGroup):
+T = TypeVar("T")
+
+
+class AQL(ApiGroup, Generic[T]):
     """AQL (ArangoDB Query Language) API wrapper.
 
     :param connection: HTTP connection.
     :param executor: API executor.
     """
 
-    def __init__(self, connection: Connection, executor: ApiExecutor) -> None:
+    def __init__(self, connection: Connection[T], executor: ApiExecutor) -> None:
         super().__init__(connection, executor)
 
     def __repr__(self) -> str:
@@ -173,7 +176,7 @@ def explain(
         all_plans: bool = False,
         max_plans: Optional[int] = None,
         opt_rules: Optional[Sequence[str]] = None,
-        bind_vars: Optional[MutableMapping[str, DataTypes]] = None,
+        bind_vars: Optional[MutableMapping[str, Union[DataTypes, T]]] = None,
     ) -> Result[Union[Json, Jsons]]:
         """Inspect the query and return its metadata without executing it.
 
@@ -257,7 +260,7 @@ def execute(
         count: bool = False,
         batch_size: Optional[int] = None,
         ttl: Optional[Number] = None,
-        bind_vars: Optional[MutableMapping[str, DataTypes]] = None,
+        bind_vars: Optional[MutableMapping[str, Union[DataTypes, T]]] = None,
         full_count: Optional[bool] = None,
         max_plans: Optional[int] = None,
         optimizer_rules: Optional[Sequence[str]] = None,

arango/client.py

@@ -1,7 +1,6 @@
 __all__ = ["ArangoClient"]
 
-from json import dumps, loads
-from typing import Any, Callable, Optional, Sequence, Union
+from typing import Any, Generic, Optional, Sequence, TypeVar, Union
 
 import importlib_metadata
 
@@ -27,33 +26,13 @@
     RoundRobinHostResolver,
     SingleHostResolver,
 )
+from arango.serializer import Deserializer, JsonDeserializer, JsonSerializer, Serializer
+from arango.typings import DataTypes
 
-
-def default_serializer(x: Any) -> str:
-    """
-    Default JSON serializer
-
-    :param x: A JSON data type object to serialize
-    :type x: Any
-    :return: The object serialized as a JSON string
-    :rtype: str
-    """
-    return dumps(x, separators=(",", ":"))
-
-
-def default_deserializer(x: str) -> Any:
-    """
-    Default JSON de-serializer
-
-    :param x: A JSON string to deserialize
-    :type x: str
-    :return: The de-serialized JSON object
-    :rtype: Any
-    """
-    return loads(x)
+T = TypeVar("T")
 
 
-class ArangoClient:
+class ArangoClient(Generic[T]):
     """ArangoDB client.
 
     :param hosts: Host URL or list of URLs (coordinators in a cluster).
@@ -104,8 +83,8 @@ def __init__(
         host_resolver: Union[str, HostResolver] = "fallback",
         resolver_max_tries: Optional[int] = None,
         http_client: Optional[HTTPClient] = None,
-        serializer: Callable[..., str] = default_serializer,
-        deserializer: Callable[[str], Any] = default_deserializer,
+        serializer: Serializer[T] = JsonSerializer(),
+        deserializer: Deserializer[DataTypes] = JsonDeserializer(),
         verify_override: Union[bool, str, None] = None,
         request_timeout: Union[int, float, None] = DEFAULT_REQUEST_TIMEOUT,
         request_compression: Optional[RequestCompression] = None,
@@ -199,8 +178,7 @@ def db(
         auth_method: str = "basic",
         user_token: Optional[str] = None,
         superuser_token: Optional[str] = None,
-        verify_certificate: bool = True,
-    ) -> StandardDatabase:
+    ) -> StandardDatabase[T]:
         """Connect to an ArangoDB database and return the database API wrapper.
 
         :param name: Database name.
@@ -228,14 +206,12 @@ def db(
             are ignored. This token is not refreshed automatically. Token
             expiry will not be checked.
         :type superuser_token: str
-        :param verify_certificate: Verify TLS certificates.
-        :type verify_certificate: bool
         :return: Standard database API wrapper.
         :rtype: arango.database.StandardDatabase
         :raise arango.exceptions.ServerConnectionError: If **verify** was set
             to True and the connection fails.
         """
-        connection: Connection
+        connection: Connection[T]
 
         if superuser_token is not None:
             connection = JwtSuperuserConnection(