Skip to content

Commit 1c3359d

Browse files
committed
Adding missing fields since 3.10
1 parent 2db2f34 commit 1c3359d

File tree

1 file changed

+41
-12
lines changed

1 file changed

+41
-12
lines changed

arango/formatter.py

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ def format_index(body: Json) -> Json:
6565
result["cacheEnabled"] = body["cacheEnabled"]
6666
if "legacyPolygons" in body:
6767
result["legacyPolygons"] = body["legacyPolygons"]
68+
if "estimates" in body:
69+
result["estimates"] = body["estimates"]
6870

6971
return verify_format(body, result)
7072

@@ -215,18 +217,24 @@ def format_collection(body: Json) -> Json:
215217
result["schema"] = body["schema"]
216218

217219
# New in 3.10
218-
if body.get("computedValues") is not None:
219-
result["computedValues"] = [
220-
{
221-
"name": cv["name"],
222-
"expression": cv["expression"],
223-
"overwrite": cv["overwrite"],
224-
"computedOn": cv["computedOn"],
225-
"keepNull": cv["keepNull"],
226-
"failOnWarning": cv["failOnWarning"],
227-
}
228-
for cv in body["computedValues"]
229-
]
220+
if "computedValues" in body:
221+
result["computedValues"] = (
222+
[
223+
{
224+
"name": cv["name"],
225+
"expression": cv["expression"],
226+
"overwrite": cv["overwrite"],
227+
"computedOn": cv["computedOn"],
228+
"keepNull": cv["keepNull"],
229+
"failOnWarning": cv["failOnWarning"],
230+
}
231+
for cv in body["computedValues"]
232+
]
233+
if body.get("computedValues") is not None
234+
else None
235+
)
236+
if "internalValidatorType" in body:
237+
result["internal_validator_type"] = body["internalValidatorType"]
230238

231239
return verify_format(body, result)
232240

@@ -393,6 +401,10 @@ def format_server_status(body: Json) -> Json:
393401
"""
394402
result: Json = {}
395403

404+
if "agency" in body:
405+
result["agency"] = body["agency"]
406+
if "coordinator" in body:
407+
result["coordinator"] = body["coordinator"]
396408
if "foxxApi" in body:
397409
result["foxx_api"] = body["foxxApi"]
398410
if "host" in body:
@@ -985,6 +997,9 @@ def format_backup(body: Json) -> Json:
985997
if "nrPiecesPresent" in body:
986998
result["pieces_present"] = body["nrPiecesPresent"]
987999

1000+
if "countIncludesFilesOnly" in body:
1001+
result["count_includes_files_only"] = body["countIncludesFilesOnly"]
1002+
9881003
return verify_format(body, result)
9891004

9901005

@@ -1135,6 +1150,14 @@ def format_pregel_job_data(body: Json) -> Json:
11351150
# The detail element was introduced in 3.10
11361151
if "detail" in body:
11371152
result["detail"] = body["detail"]
1153+
if "database" in body:
1154+
result["database"] = body["database"]
1155+
if "masterContext" in body:
1156+
result["master_context"] = body["masterContext"]
1157+
if "parallelism" in body:
1158+
result["parallelism"] = body["parallelism"]
1159+
if "useMemoryMaps" in body:
1160+
result["use_memory_maps"] = body["useMemoryMaps"]
11381161

11391162
return verify_format(body, result)
11401163

@@ -1177,12 +1200,18 @@ def format_graph_properties(body: Json) -> Json:
11771200
}
11781201
if "isSmart" in body:
11791202
result["smart"] = body["isSmart"]
1203+
if "isSatellite" in body:
1204+
result["is_satellite"] = body["isSatellite"]
11801205
if "smartGraphAttribute" in body:
11811206
result["smart_field"] = body["smartGraphAttribute"]
11821207
if "numberOfShards" in body:
11831208
result["shard_count"] = body["numberOfShards"]
11841209
if "replicationFactor" in body:
11851210
result["replication_factor"] = body["replicationFactor"]
1211+
if "minReplicationFactor" in body:
1212+
result["min_replication_factor"] = body["minReplicationFactor"]
1213+
if "writeConcern" in body:
1214+
result["write_concern"] = body["writeConcern"]
11861215

11871216
return verify_format(body, result)
11881217

0 commit comments

Comments
 (0)