Skip to content

Commit da16ee7

Browse files
committed
add version module, remove redundant version and platform modules, add user agent to include platform, python ver, aiohttp ver, and cterasdk ver
1 parent 38e450d commit da16ee7

6 files changed

Lines changed: 12 additions & 61 deletions

File tree

cterasdk/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# pylint: disable=wrong-import-position
22
import cterasdk.settings # noqa: E402, F401
33
import cterasdk.exceptions # noqa: E402, F401
4+
from .version import __version__
45

56
from .common import Object, PolicyRule # noqa: E402, F401
67
from .convert import fromjsonstr, tojsonstr, fromxmlstr, toxmlstr # noqa: E402, F401

cterasdk/clients/base.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import logging
2+
import platform
23
import threading
4+
import aiohttp
35
from . import async_requests, errors
46
from .settings import ClientSessionSettings, TraceSettings
57
from ..common import utils
8+
from ..version import __version__
69

710

811
logger = logging.getLogger('cterasdk.http')
@@ -27,7 +30,13 @@ class PersistentHeaders:
2730
"""Headers to include in every request"""
2831

2932
def __init__(self):
30-
self._headers = {}
33+
self._headers = {
34+
'User-Agent': (
35+
f"CTERA Python SDK/{__version__}; aiohttp/{aiohttp.__version__};"
36+
f" ({' '.join([platform.system(), str(platform.release())])}; {platform.machine()};"
37+
f" Python {'.'.join(platform.python_version_tuple())});"
38+
)
39+
}
3140

3241
@property
3342
def all(self):

cterasdk/lib/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from .cmd import Command # noqa: E402, F401
22
from .consent import ask # noqa: E402, F401
33
from .tempfile import TempfileServices # noqa: E402, F401
4-
from .version import Version # noqa: E402, F401
54
from .iterator import QueryIterator, BaseResponse, \
65
DefaultResponse, KeyValueQueryIterator, QueryLogsResponse, CursorResponse # noqa: E402, F401
76
from .tracker import track, ErrorStatus # noqa: E402, F401

cterasdk/lib/platform.py

Lines changed: 0 additions & 31 deletions
This file was deleted.

cterasdk/lib/version.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

cterasdk/version.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = '2.20.20'

0 commit comments

Comments
 (0)