Skip to content

Added importlib.metadata for version check #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions arango/request.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
__all__ = ["Request"]

from importlib.metadata import version
from typing import Any, MutableMapping, Optional

from arango.typings import DriverFlags, Fields, Headers, Params
Expand All @@ -8,12 +9,7 @@
def normalize_headers(
headers: Optional[Headers], driver_flags: Optional[DriverFlags] = None
) -> Headers:
flags = ""
if driver_flags is not None:
for flag in driver_flags:
flags = flags + flag + ";"
driver_version = "7.5.3"
driver_header = "python-arango/" + driver_version + " (" + flags + ")"
driver_header = generate_driver_header(driver_flags)
normalized_headers: Headers = {
"charset": "utf-8",
"content-type": "application/json",
Expand All @@ -26,6 +22,18 @@ def normalize_headers(
return normalized_headers


def generate_driver_header(driver_flags: Optional[DriverFlags] = None) -> str:
flags: str = ""
if driver_flags is not None:
for flag in driver_flags:
flags = flags + flag + ";"
name: str = "python-arango"
driver_version: str = ".".join(version(name).split(".")[:3]) # Only keep semver
driver_header: str = name + "/" + driver_version + " (" + flags + ")"

return driver_header


def normalize_params(params: Optional[Params]) -> MutableMapping[str, str]:
normalized_params: MutableMapping[str, str] = {}

Expand Down
2 changes: 1 addition & 1 deletion arango/typings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__all__ = ["Fields", "Headers", "Json", "Jsons", "Params"]
__all__ = ["Fields", "Headers", "Json", "Jsons", "Params", "DriverFlags"]

from typing import Any, Dict, List, MutableMapping, Sequence, Union

Expand Down