Merge branch 'main' into DE-749

Author: aMahanna

arango/client.py

@@ -12,7 +12,7 @@
     JwtSuperuserConnection,
 )
 from arango.database import StandardDatabase
-from arango.exceptions import ServerConnectionError
+from arango.exceptions import ArangoClientError, ServerConnectionError
 from arango.http import (
     DEFAULT_REQUEST_TIMEOUT,
     DefaultHTTPClient,
@@ -300,6 +300,6 @@ def db(
             except ServerConnectionError as err:
                 raise err
             except Exception as err:
-                raise ServerConnectionError(f"bad connection: {err}")
+                raise ArangoClientError(f"bad connection: {err}")
 
         return StandardDatabase(connection)

arango/connection.py

@@ -226,9 +226,13 @@ def ping(self) -> int:
         request = Request(method="get", endpoint="/_api/collection")
         resp = self.send_request(request)
         if resp.status_code in {401, 403}:
-            raise ServerConnectionError("bad username/password or token is expired")
+            raise ServerConnectionError(
+                resp, request, "bad username/password or token is expired"
+            )
         if not resp.is_success:  # pragma: no cover
-            raise ServerConnectionError(resp.error_message or "bad server response")
+            raise ServerConnectionError(
+                resp, request, resp.error_message or "bad server response"
+            )
         return resp.status_code
 
     @abstractmethod

arango/database.py

@@ -1442,10 +1442,11 @@ def create_collection(
         :raise arango.exceptions.CollectionCreateError: If create fails.
         """
         key_options: Json = {"type": key_generator, "allowUserKeys": user_keys}
-        if key_increment is not None:
-            key_options["increment"] = key_increment
-        if key_offset is not None:
-            key_options["offset"] = key_offset
+        if key_generator == "autoincrement":
+            if key_increment is not None:
+                key_options["increment"] = key_increment
+            if key_offset is not None:
+                key_options["offset"] = key_offset
 
         data: Json = {
             "name": name,

arango/exceptions.py

@@ -614,7 +614,7 @@ class PregelJobDeleteError(ArangoServerError):
 #####################
 
 
-class ServerConnectionError(ArangoClientError):
+class ServerConnectionError(ArangoServerError):
     """Failed to connect to ArangoDB server."""
 
 

tests/test_client.py

@@ -8,7 +8,7 @@
 
 from arango.client import ArangoClient
 from arango.database import StandardDatabase
-from arango.exceptions import ServerConnectionError
+from arango.exceptions import ArangoClientError, ServerConnectionError
 from arango.http import DefaultHTTPClient, DeflateRequestCompression
 from arango.resolver import FallbackHostResolver, RandomHostResolver, SingleHostResolver
 from tests.helpers import (
@@ -89,7 +89,7 @@ def test_client_bad_connection(db, username, password, cluster):
 
     # Test connection with invalid host URL
     client = ArangoClient(hosts="http://127.0.0.1:8500")
-    with pytest.raises(ServerConnectionError) as err:
+    with pytest.raises(ArangoClientError) as err:
         client.db(db.name, username, password, verify=True)
     assert "bad connection" in str(err.value)
 

tests/test_collection.py

@@ -190,14 +190,21 @@ def test_collection_management(db, bad_db, cluster):
         }
     ]
 
+    col = db.create_collection(
+        name=col_name, key_generator="autoincrement", key_increment=9, key_offset=100
+    )
+    key_options = col.properties()["key_options"]
+    assert key_options["key_generator"] == "autoincrement"
+    assert key_options["key_increment"] == 9
+    assert key_options["key_offset"] == 100
+    db.delete_collection(col_name)
+
     col = db.create_collection(
         name=col_name,
         sync=True,
         system=False,
         key_generator="traditional",
         user_keys=False,
-        key_increment=9,
-        key_offset=100,
         edge=True,
         shard_count=2,
         shard_fields=["test_attr:"],