Skip to content

Commit 8741ea4

Browse files
author
Jay Clifford
committed
updated and fixed write API refrences
1 parent 274c2da commit 8741ea4

26 files changed

+88
-69
lines changed

influxdb_client_3/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import urllib.parse, json
22
import pyarrow as pa
3-
from write_client import InfluxDBClient as _InfluxDBClient, WriteOptions, Point
4-
from write_client.write_api.write_api import WriteApi as _WriteApi, SYNCHRONOUS, ASYNCHRONOUS, PointSettings
5-
from write_client.domain.write_precision import WritePrecision
6-
from write_client.write_api.exceptions import InfluxDBError
3+
from influxdb_client_3.write_client import InfluxDBClient as _InfluxDBClient, WriteOptions, Point
4+
from influxdb_client_3.write_client.client.write_api import WriteApi as _WriteApi, SYNCHRONOUS, ASYNCHRONOUS, PointSettings
5+
from influxdb_client_3.write_client.domain.write_precision import WritePrecision
6+
from influxdb_client_3.write_client.client.exceptions import InfluxDBError
77
from pyarrow.flight import FlightClient, Ticket, FlightCallOptions
88
from influxdb_client_3.read_file import UploadFile
99
import urllib.parse

influxdb_client_3/write_client/__init__.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,18 @@
1414

1515
from __future__ import absolute_import
1616

17-
from write_client.write_api.write_api import WriteApi, WriteOptions
18-
from write_client.write_api.influxdb_client import InfluxDBClient
19-
from write_client.write_api.logging_handler import InfluxLoggingHandler
20-
from write_client.write_api.write.point import Point
17+
from influxdb_client_3.write_client.client.write_api import WriteApi, WriteOptions
18+
from influxdb_client_3.write_client.client.influxdb_client import InfluxDBClient
19+
from influxdb_client_3.write_client.client.logging_handler import InfluxLoggingHandler
20+
from influxdb_client_3.write_client.client.write.point import Point
2121

22-
from write_client.service.write_service import WriteService
23-
from write_client.service.signin_service import SigninService
24-
from write_client.service.signout_service import SignoutService
22+
from influxdb_client_3.write_client.service.write_service import WriteService
23+
from influxdb_client_3.write_client.service.signin_service import SigninService
24+
from influxdb_client_3.write_client.service.signout_service import SignoutService
2525

26-
from write_client.domain.write_precision import WritePrecision
2726

27+
from influxdb_client_3.write_client.domain.write_precision import WritePrecision
2828

29-
from write_client.configuration import Configuration
30-
from write_client.write_api.influxdb_client import InfluxDBClient
31-
from write_client.version import VERSION
29+
from influxdb_client_3.write_client.configuration import Configuration
30+
from influxdb_client_3.write_client.version import VERSION
3231
__version__ = VERSION

influxdb_client_3/write_client/_sync/api_client.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
from multiprocessing.pool import ThreadPool
2020
from urllib.parse import quote
2121

22-
import write_client.domain
23-
from write_client import SigninService
24-
from write_client import SignoutService
25-
from write_client._sync import rest
26-
from write_client.configuration import Configuration
27-
from write_client.rest import _requires_create_user_session, _requires_expire_user_session
22+
import influxdb_client_3.write_client.domain
23+
from influxdb_client_3.write_client import SigninService
24+
from influxdb_client_3.write_client import SignoutService
25+
from influxdb_client_3.write_client._sync import rest
26+
from influxdb_client_3.write_client.configuration import Configuration
27+
from influxdb_client_3.write_client.rest import _requires_create_user_session, _requires_expire_user_session
2828

2929

3030
class ApiClient(object):
@@ -76,7 +76,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
7676
self.default_headers[header_name] = header_value
7777
self.cookie = cookie
7878
# Set default User-Agent.
79-
from write_client import VERSION
79+
from influxdb_client_3.write_client.version import VERSION
8080
self.user_agent = f'influxdb-client-python/{VERSION}'
8181

8282
def __del__(self):
@@ -282,7 +282,7 @@ def __deserialize(self, data, klass):
282282
if klass in self.NATIVE_TYPES_MAPPING:
283283
klass = self.NATIVE_TYPES_MAPPING[klass]
284284
else:
285-
klass = getattr(write_client.domain, klass)
285+
klass = getattr(influxdb_client_3.write_client.domain, klass)
286286

287287
if klass in self.PRIMITIVE_TYPES:
288288
return self.__deserialize_primitive(data, klass)

influxdb_client_3/write_client/_sync/rest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import ssl
1919
from urllib.parse import urlencode
2020

21-
from write_client.rest import ApiException
22-
from write_client.rest import _BaseRESTClient
21+
from influxdb_client_3.write_client.rest import ApiException
22+
from influxdb_client_3.write_client.rest import _BaseRESTClient
2323

2424
try:
2525
import urllib3

influxdb_client_3/write_client/write_api/write/__init__.py renamed to influxdb_client_3/write_client/client/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
from __future__ import absolute_import
1414

1515
# import apis into api package
16-
from write_client.service.signin_service import SigninService
17-
from write_client.service.signout_service import SignoutService
18-
from write_client.service.write_service import WriteService
16+
from influxdb_client_3.write_client.service.signin_service import SigninService
17+
from influxdb_client_3.write_client.service.signout_service import SignoutService
18+
from influxdb_client_3.write_client.service.write_service import WriteService

influxdb_client_3/write_client/write_api/_base.py renamed to influxdb_client_3/write_client/client/_base.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010

1111
from urllib3 import HTTPResponse
1212

13-
from write_client import Configuration, WriteService
13+
from influxdb_client_3.write_client.configuration import Configuration
14+
from influxdb_client_3.write_client.service.write_service import WriteService
1415

15-
from write_client.write_api.write.dataframe_serializer import DataframeSerializer
16-
from write_client.rest import _UTF_8_encoding
16+
from influxdb_client_3.write_client.client.write.dataframe_serializer import DataframeSerializer
17+
from influxdb_client_3.write_client.rest import _UTF_8_encoding
1718

1819
try:
1920
import dataclasses
@@ -236,7 +237,7 @@ def _append_default_tags(self, record):
236237
self._append_default_tag(key, val, record)
237238

238239
def _serialize(self, record, write_precision, payload, **kwargs):
239-
from write_client import Point
240+
from influxdb_client_3.write_client.client.write.point import Point
240241
if isinstance(record, bytes):
241242
payload[write_precision].append(record)
242243

influxdb_client_3/write_client/write_api/exceptions.py renamed to influxdb_client_3/write_client/client/exceptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from urllib3 import HTTPResponse
66

7-
logger = logging.getLogger('influxdb_client.client.exceptions')
7+
logger = logging.getLogger('influxdb_client_3.write_client.client.exceptions')
88

99

1010
class InfluxDBError(Exception):

influxdb_client_3/write_client/write_api/influxdb_client.py renamed to influxdb_client_3/write_client/client/influxdb_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import warnings
77

88

9-
from write_client.write_api._base import _BaseClient
10-
from write_client.write_api.write_api import WriteApi, WriteOptions, PointSettings
9+
from influxdb_client_3.write_client.client._base import _BaseClient
10+
from influxdb_client_3.write_client.client.write_api import WriteApi, WriteOptions, PointSettings
1111

12-
logger = logging.getLogger('influxdb_client.client.influxdb_client')
12+
logger = logging.getLogger('influxdb_client_3.write_client.client.influxdb_client')
1313

1414

1515
class InfluxDBClient(_BaseClient):
@@ -54,7 +54,7 @@ def __init__(self, url, token: str = None, debug=None, timeout=10_000, enable_gz
5454
super().__init__(url=url, token=token, debug=debug, timeout=timeout, enable_gzip=enable_gzip, org=org,
5555
default_tags=default_tags, http_client_logger="urllib3", **kwargs)
5656

57-
from .._sync.api_client import ApiClient
57+
from influxdb_client_3.write_client._sync.api_client import ApiClient
5858
self.api_client = ApiClient(configuration=self.conf, header_name=self.auth_header_name,
5959
header_value=self.auth_header_value, retries=self.retries)
6060

influxdb_client_3/write_client/write_api/logging_handler.py renamed to influxdb_client_3/write_client/client/logging_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Use the influxdb_client with python native logging."""
22
import logging
33

4-
from write_client import InfluxDBClient
4+
from influxdb_client_3.write_client import InfluxDBClient
55

66

77
class InfluxLoggingHandler(logging.Handler):

influxdb_client_3/write_client/write_api/util/__init__.py renamed to influxdb_client_3/write_client/client/util/__init__.py

File renamed without changes.

0 commit comments

Comments
 (0)