diff --git a/.codecov.yml b/.codecov.yml index 35f9f95e..19ede3d9 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,4 +1,4 @@ ignore: - - "influxdb2/domain/*.py" - - "influxdb2/service/*.py" - - "influxdb2_test/*.py" \ No newline at end of file + - "influxdb_client/domain/*.py" + - "influxdb_client/service/*.py" + - "tests/*.py" \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index eb91e5d7..7061ba7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,4 @@ install: # command to run tests script: - ./scripts/influxdb-restart.sh - - pytest influxdb2_test \ No newline at end of file + - pytest tests \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 5fac7b52..00000000 --- a/README.md +++ /dev/null @@ -1,373 +0,0 @@ -# influxdb-client-python - -[![CircleCI](https://circleci.com/gh/influxdata/influxdb-client-python.svg?style=svg)](https://circleci.com/gh/influxdata/influxdb-client-python) -[![codecov](https://codecov.io/gh/influxdata/influxdb-client-python/branch/master/graph/badge.svg)](https://codecov.io/gh/influxdata/influxdb-client-python) - -InfluxDB 2.0 python client library. TODO... - -- [Requirements](#requirements) -- [Getting Started](#getting-started) -- [Features](#how-to-use) - - [Writing data](#writes) - - [How to efficiently import large dataset](#how-to-efficiently-import-large-dataset) - - [Efficiency write data from IOT sensor](#efficiency-write-data-from-iot-sensor) -- [Advanced Usage](#advanced-usage) - - [Gzip support](#gzip-support) - -## Requirements - -Python 3.6+ - -## Installation & Usage -### pip install - -If the python package is hosted on Github, you can install directly from Github - -```sh -pip install git+https://github.com/influxdata/influxdb-client-python.git -``` -(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/influxdata/influxdb-client-python.git`) - -Then import the package: -```python -import influxdb2 -``` - -### Setuptools - -Install via [Setuptools](http://pypi.python.org/pypi/setuptools). - -```sh -python setup.py install --user -``` -(or `sudo python setup.py install` to install the package for all users) - -Then import the package: -```python -import influxdb2 -``` - -## Getting Started - -Please follow the [installation procedure](#installation--usage) and then run the following: - -```python -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write.point import Point -from influxdb2.client.write_api import SYNCHRONOUS - -bucket = "test_bucket" - -client = InfluxDBClient(url="http://localhost:9999/api/v2", token="my-token", org="my-org") - -write_api = client.write_api(write_options=SYNCHRONOUS) -query_api = client.query_api() - -p = Point("my_measurement").tag("location", "Prague").field("temperature", 25.3) - -write_api.write(bucket=bucket, org="my-org", record=p) - -## using Table structure -tables = query_api.query('from(bucket:"my-bucket") |> range(start: -10m)') - -for table in tables: - print(table) - for row in table.records: - print (row.values) - - -## using csv library -csv_result = query_api.query_csv('from(bucket:"my-bucket") |> range(start: -10m)') -val_count = 0 -for row in csv_result: - for cell in row: - val_count += 1 -``` - -## How to use - -### Writes - -The [WriteApi](https://github.com/influxdata/influxdb-client-python/blob/master/influxdb2/client/write_api.py) supports synchronous, asynchronous and batching writes into InfluxDB 2.0. -The data should be passed as a [InfluxDB Line Protocol](https://docs.influxdata.com/influxdb/v1.6/write_protocols/line_protocol_tutorial/), [Data Point](https://github.com/influxdata/influxdb-client-python/blob/master/influxdb2/client/write/point.py) or Observable stream. - -_The default instance of `WriteApi` use batching._ - -#### Batching - -The batching is configurable by `write_options`: - -| Property | Description | Default Value | -| --- | --- | --- | -| **batch_size** | the number of data point to collect in batch | `1000` | -| **flush_interval** | the number of milliseconds before the batch is written | `1000` | -| **jitter_interval** | the number of milliseconds to increase the batch flush interval by a random amount | `0` | -| **retry_interval** | the number of milliseconds to retry unsuccessful write. The retry interval is used when the InfluxDB server does not specify "Retry-After" header. | `1000` | - -```python -import rx -from rx import operators as ops - -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write_api import WriteOptions -from influxdb2.client.write.point import Point - -_client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org") -_write_client = _client.write_api(write_options=WriteOptions(batch_size=500, - flush_interval=10_000, - jitter_interval=2_000, - retry_interval=5_000)) - -""" -Write Line Protocol -""" -_write_client.write("my-bucket", "my-org", "h2o_feet,location=coyote_creek water_level=1.0 1") -_write_client.write("my-bucket", "my-org", ["h2o_feet,location=coyote_creek water_level=2.0 2", - "h2o_feet,location=coyote_creek water_level=3.0 3"]) - -""" -Write Data Point -""" -_write_client.write("my-bucket", "my-org", Point("h2o_feet").tag("location", "coyote_creek").field("water_level", 4.0).time(4)) -_write_client.write("my-bucket", "my-org", [Point("h2o_feet").tag("location", "coyote_creek").field("water_level", 5.0).time(5), - Point("h2o_feet").tag("location", "coyote_creek").field("water_level", 6.0).time(6)]) - -""" -Write Observable stream -""" -_data = rx \ - .range(7, 11) \ - .pipe(ops.map(lambda i: "h2o_feet,location=coyote_creek water_level={0}.0 {0}".format(i))) - -_write_client.write("my-bucket", "my-org", _data) - - -""" -Close client -""" -_write_client.__del__() -_client.__del__() -``` - -##### Asynchronous client -Data are writes in an asynchronous HTTP request. - -```python -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write_api import ASYNCHRONOUS - -client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org") -write_client = client.write_api(write_options=ASYNCHRONOUS) - -... - -client.__del__() -``` - -##### Synchronous client - -Data are writes in a synchronous HTTP request. - -```python -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write_api import SYNCHRONOUS - -client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org") -write_client = client.write_api(write_options=SYNCHRONOUS) - -... - -client.__del__() -``` - -#### How to efficiently import large dataset - -- sources - [import_data_set.py](https://github.com/influxdata/influxdb-client-python/blob/master/influxdb2_test/import_data_set.py) - -```python -""" -Import VIX - CBOE Volatility Index - from "vix-daily.csv" file into InfluxDB 2.0 - -https://datahub.io/core/finance-vix#data -""" - -from collections import OrderedDict -from csv import DictReader -from datetime import datetime - -import rx -from rx import operators as ops - -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write.point import Point -from influxdb2.client.write_api import WriteOptions - - -def parse_row(row: OrderedDict): - """Parse row of CSV file into Point with structure: - - financial-analysis,type=vix-daily close=18.47,high=19.82,low=18.28,open=19.82 1198195200000000000 - - CSV format: - Date,VIX Open,VIX High,VIX Low,VIX Close\n - 2004-01-02,17.96,18.68,17.54,18.22\n - 2004-01-05,18.45,18.49,17.44,17.49\n - 2004-01-06,17.66,17.67,16.19,16.73\n - 2004-01-07,16.72,16.75,15.5,15.5\n - 2004-01-08,15.42,15.68,15.32,15.61\n - 2004-01-09,16.15,16.88,15.57,16.75\n - ... - - :param row: the row of CSV file - :return: Parsed csv row to [Point] - """ - return Point("financial-analysis") \ - .tag("type", "vix-daily") \ - .field("open", float(row['VIX Open'])) \ - .field("high", float(row['VIX High'])) \ - .field("low", float(row['VIX Low'])) \ - .field("close", float(row['VIX Close'])) \ - .time(datetime.strptime(row['Date'], '%Y-%m-%d')) - - -""" -Converts vix-daily.csv into sequence of data point -""" -data = rx \ - .from_iterable(DictReader(open('vix-daily.csv', 'r'))) \ - .pipe(ops.map(lambda row: parse_row(row))) - -client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org", debug=True) - -""" -Create client that writes data in batches with 500 items. -""" -write_api = client.write_api(write_options=WriteOptions(batch_size=500, jitter_interval=1_000)) - -""" -Write data into InfluxDB -""" -write_api.write(org="my-org", bucket="my-bucket", record=data) -write_api.__del__() - -""" -Querying max value of CBOE Volatility Index -""" -query = 'from(bucket:"my-bucket")' \ - ' |> range(start: 0, stop: now())' \ - ' |> filter(fn: (r) => r._measurement == "financial-analysis")' \ - ' |> max()' -result = client.query_api().query(org="my-org", query=query) - -""" -Processing results -""" -print() -print("=== results ===") -print() -for table in result: - for record in table.records: - print('max {0:5} = {1}'.format(record.get_field(), record.get_value())) - -""" -Close client -""" -client.__del__() -``` - -#### Efficiency write data from IOT sensor - -- sources - [iot_sensor.py](https://github.com/influxdata/influxdb-client-python/blob/master/influxdb2_test/iot_sensor.py) - -```python -""" -Efficiency write data from IOT sensor - write changed temperature every minute -""" -import atexit -import platform -from datetime import timedelta - -import psutil as psutil -import rx -from rx import operators as ops - -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write_api import WriteApi -from influxdb2.client.write_api import WriteOptions - - -def on_exit(db_client: InfluxDBClient, write_api: WriteApi): - """Close clients after terminate a script. - - :param db_client: InfluxDB client - :param write_api: WriteApi - :return: nothing - """ - write_api.__del__() - db_client.__del__() - - -def sensor_temperature(): - """Read a CPU temperature. The [psutil] doesn't support MacOS so we use [sysctl]. - - :return: actual CPU temperature - """ - os_name = platform.system() - if os_name == 'Darwin': - from subprocess import check_output - output = check_output(["sysctl", "machdep.xcpm.cpu_thermal_level"]) - import re - return re.findall(r'\d+', str(output))[0] - else: - return psutil.sensors_temperatures()["coretemp"][0] - - -def line_protocol(temperature): - """Create a InfluxDB line protocol with structure: - - iot_sensor,hostname=mine_sensor_12,type=temperature value=68 - - :param temperature: the sensor temperature - :return: Line protocol to write into InfluxDB - """ - - import socket - return 'iot_sensor,hostname={},type=temperature value={}'.format(socket.gethostname(), temperature) - - -""" -Read temperature every minute; distinct_until_changed - produce only if temperature change -""" -data = rx\ - .interval(period=timedelta(seconds=60))\ - .pipe(ops.map(lambda t: sensor_temperature()), - ops.distinct_until_changed(), - ops.map(lambda temperature: line_protocol(temperature))) - -_db_client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org", debug=True) - -""" -Create client that writes data into InfluxDB -""" -_write_api = _db_client.write_api(write_options=WriteOptions(batch_size=1)) -_write_api.write(org="my-org", bucket="my-bucket", record=data) - - -""" -Call after terminate a script -""" -atexit.register(on_exit, _db_client, _write_api) - -input() -``` - -## Advanced Usage - -### Gzip support -`InfluxDBClient` does not enable gzip compress for http request by default. If you want to enable gzip to reduce transfer data's size, you can call: - -```python -from influxdb2.client.influxdb_client import InfluxDBClient - -_db_client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org", enable_gzip=True) -``` diff --git a/README.rst b/README.rst new file mode 100644 index 00000000..9158b6c8 --- /dev/null +++ b/README.rst @@ -0,0 +1,423 @@ + +influxdb-client-python +====================== + + +.. image:: https://circleci.com/gh/influxdata/influxdb-client-python.svg?style=svg + :target: https://circleci.com/gh/influxdata/influxdb-client-python + :alt: CircleCI + + +.. image:: https://codecov.io/gh/influxdata/influxdb-client-python/branch/master/graph/badge.svg + :target: https://codecov.io/gh/influxdata/influxdb-client-python + :alt: codecov + + +InfluxDB 2.0 python client library. + + +* `Requirements <#requirements>`_ +* `Getting Started <#getting-started>`_ +* `Features <#how-to-use>`_ + + * `Writing data <#writes>`_ + * `How to efficiently import large dataset <#how-to-efficiently-import-large-dataset>`_ + * `Efficiency write data from IOT sensor <#efficiency-write-data-from-iot-sensor>`_ + +* `Advanced Usage <#advanced-usage>`_ + + * `Gzip support <#gzip-support>`_ + +* InfluxDB 2.0 API client (generated from swagger) + + * Bucket + * Organizations + * Authorizations + * Labels + * Tasks + +Requirements +------------ + +Python 3.6+ + +Installation & Usage +-------------------- + +pip install +^^^^^^^^^^^ + +If the python package is hosted on Github, you can install directly from Github + +.. code-block:: sh + + pip install git+https://github.com/influxdata/influxdb-client-python.git + +(you may need to run ``pip`` with root permission: ``sudo pip install git+https://github.com/influxdata/influxdb-client-python.git``\ ) + +Then import the package: + +.. code-block:: python + + import influxdb_client + +Setuptools +^^^^^^^^^^ + +Install via `Setuptools `_. + +.. code-block:: sh + + python setup.py install --user + +(or ``sudo python setup.py install`` to install the package for all users) + +Then import the package: + +.. code-block:: python + + import influxdb_client + +Getting Started +--------------- + +Please follow the `installation procedure <#installation--usage>`_ and then run the following: + +.. code-block:: python + + from influxdb_client import InfluxDBClient, Point + from influxdb_client.client.write_api import SYNCHRONOUS + + bucket = "my-bucket" + + client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org") + + write_api = client.write_api(write_options=SYNCHRONOUS) + query_api = client.query_api() + + p = Point("my_measurement").tag("location", "Prague").field("temperature", 25.3) + + write_api.write(bucket=bucket, org="my-org", record=p) + + ## using Table structure + tables = query_api.query('from(bucket:"my-bucket") |> range(start: -10m)') + + for table in tables: + print(table) + for row in table.records: + print (row.values) + + + ## using csv library + csv_result = query_api.query_csv('from(bucket:"my-bucket") |> range(start: -10m)') + val_count = 0 + for row in csv_result: + for cell in row: + val_count += 1 + +How to use +---------- + +Writes +^^^^^^ + +The `WriteApi `_ supports synchronous, asynchronous and batching writes into InfluxDB 2.0. +The data should be passed as a `InfluxDB Line Protocol `_\ , `Data Point `_ or Observable stream. + +*The default instance of ``WriteApi`` use batching.* + +Batching +~~~~~~~~ + +The batching is configurable by ``write_options``\ : + +.. list-table:: + :header-rows: 1 + + * - Property + - Description + - Default Value + * - **batch_size** + - the number of data point to collect in batch + - ``1000`` + * - **flush_interval** + - the number of milliseconds before the batch is written + - ``1000`` + * - **jitter_interval** + - the number of milliseconds to increase the batch flush interval by a random amount + - ``0`` + * - **retry_interval** + - the number of milliseconds to retry unsuccessful write. The retry interval is used when the InfluxDB server does not specify "Retry-After" header. + - ``1000`` + + +.. code-block:: python + + import rx + from rx import operators as ops + + from influxdb_client import InfluxDBClient, Point, WriteOptions + from influxdb_client.client.write_api import SYNCHRONOUS + + _client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org") + _write_client = _client.write_api(write_options=WriteOptions(batch_size=500, + flush_interval=10_000, + jitter_interval=2_000, + retry_interval=5_000)) + + """ + Write Line Protocol + """ + _write_client.write("my-bucket", "my-org", "h2o_feet,location=coyote_creek water_level=1.0 1") + _write_client.write("my-bucket", "my-org", ["h2o_feet,location=coyote_creek water_level=2.0 2", + "h2o_feet,location=coyote_creek water_level=3.0 3"]) + + """ + Write Data Point + """ + _write_client.write("my-bucket", "my-org", Point("h2o_feet").tag("location", "coyote_creek").field("water_level", 4.0).time(4)) + _write_client.write("my-bucket", "my-org", [Point("h2o_feet").tag("location", "coyote_creek").field("water_level", 5.0).time(5), + Point("h2o_feet").tag("location", "coyote_creek").field("water_level", 6.0).time(6)]) + + """ + Write Observable stream + """ + _data = rx \ + .range(7, 11) \ + .pipe(ops.map(lambda i: "h2o_feet,location=coyote_creek water_level={0}.0 {0}".format(i))) + + _write_client.write("my-bucket", "my-org", _data) + + + """ + Close client + """ + _write_client.__del__() + _client.__del__() + +Asynchronous client +""""""""""""""""""" + +Data are writes in an asynchronous HTTP request. + +.. code-block:: python + + from influxdb_client import InfluxDBClient + from influxdb_client.client.write_api import ASYNCHRONOUS + + client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org") + write_client = client.write_api(write_options=ASYNCHRONOUS) + + ... + + client.__del__() + +Synchronous client +"""""""""""""""""" + +Data are writes in a synchronous HTTP request. + +.. code-block:: python + + from influxdb_client import InfluxDBClient + from influxdb_client .client.write_api import SYNCHRONOUS + + client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org") + write_client = client.write_api(write_options=SYNCHRONOUS) + + ... + + client.__del__() + +How to efficiently import large dataset +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + +* sources - `import_data_set.py `_ + +.. code-block:: python + + """ + Import VIX - CBOE Volatility Index - from "vix-daily.csv" file into InfluxDB 2.0 + + https://datahub.io/core/finance-vix#data + """ + + from collections import OrderedDict + from csv import DictReader + from datetime import datetime + + import rx + from rx import operators as ops + + from influxdb_client import InfluxDBClient, Point, WriteOptions + + def parse_row(row: OrderedDict): + """Parse row of CSV file into Point with structure: + + financial-analysis,type=ily close=18.47,high=19.82,low=18.28,open=19.82 1198195200000000000 + + CSV format: + Date,VIX Open,VIX High,VIX Low,VIX Close\n + 2004-01-02,17.96,18.68,17.54,18.22\n + 2004-01-05,18.45,18.49,17.44,17.49\n + 2004-01-06,17.66,17.67,16.19,16.73\n + 2004-01-07,16.72,16.75,15.5,15.5\n + 2004-01-08,15.42,15.68,15.32,15.61\n + 2004-01-09,16.15,16.88,15.57,16.75\n + ... + + :param row: the row of CSV file + :return: Parsed csv row to [Point] + """ + return Point("financial-analysis") \ + .tag("type", "vix-daily") \ + .field("open", float(row['VIX Open'])) \ + .field("high", float(row['VIX High'])) \ + .field("low", float(row['VIX Low'])) \ + .field("close", float(row['VIX Close'])) \ + .time(datetime.strptime(row['Date'], '%Y-%m-%d')) + + + """ + Converts vix-daily.csv into sequence of data point + """ + data = rx \ + .from_iterable(DictReader(open('vix-daily.csv', 'r'))) \ + .pipe(ops.map(lambda row: parse_row(row))) + + client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org", debug=True) + + """ + Create client that writes data in batches with 500 items. + """ + write_api = client.write_api(write_options=WriteOptions(batch_size=500, jitter_interval=1_000)) + + """ + Write data into InfluxDB + """ + write_api.write(org="my-org", bucket="my-bucket", record=data) + write_api.__del__() + + """ + Querying max value of CBOE Volatility Index + """ + query = 'from(bucket:"my-bucket")' \ + ' |> range(start: 0, stop: now())' \ + ' |> filter(fn: (r) => r._measurement == "financial-analysis")' \ + ' |> max()' + result = client.query_api().query(org="my-org", query=query) + + """ + Processing results + """ + print() + print("=== results ===") + print() + for table in result: + for record in table.records: + print('max {0:5} = {1}'.format(record.get_field(), record.get_value())) + + """ + Close client + """ + client.__del__() + +Efficiency write data from IOT sensor +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + +* sources - `iot_sensor.py `_ + +.. code-block:: python + + """ + Efficiency write data from IOT sensor - write changed temperature every minute + """ + import atexit + import platform + from datetime import timedelta + + import psutil as psutil + import rx + from rx import operators as ops + + from influxdb_client import InfluxDBClient, WriteApi, WriteOptions + + def on_exit(db_client: InfluxDBClient, write_api: WriteApi): + """Close clients after terminate a script. + + :param db_client: InfluxDB client + :param write_api: WriteApi + :return: nothing + """ + write_api.__del__() + db_client.__del__() + + + def sensor_temperature(): + """Read a CPU temperature. The [psutil] doesn't support MacOS so we use [sysctl]. + + :return: actual CPU temperature + """ + os_name = platform.system() + if os_name == 'Darwin': + from subprocess import check_output + output = check_output(["sysctl", "machdep.xcpm.cpu_thermal_level"]) + import re + return re.findall(r'\d+', str(output))[0] + else: + return psutil.sensors_temperatures()["coretemp"][0] + + + def line_protocol(temperature): + """Create a InfluxDB line protocol with structure: + + iot_sensor,hostname=mine_sensor_12,type=temperature value=68 + + :param temperature: the sensor temperature + :return: Line protocol to write into InfluxDB + """ + + import socket + return 'iot_sensor,hostname={},type=temperature value={}'.format(socket.gethostname(), temperature) + + + """ + Read temperature every minute; distinct_until_changed - produce only if temperature change + """ + data = rx\ + .interval(period=timedelta(seconds=60))\ + .pipe(ops.map(lambda t: sensor_temperature()), + ops.distinct_until_changed(), + ops.map(lambda temperature: line_protocol(temperature))) + + _db_client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org", debug=True) + + """ + Create client that writes data into InfluxDB + """ + _write_api = _db_client.write_api(write_options=WriteOptions(batch_size=1)) + _write_api.write(org="my-org", bucket="my-bucket", record=data) + + + """ + Call after terminate a script + """ + atexit.register(on_exit, _db_client, _write_api) + + input() + +Advanced Usage +-------------- + +Gzip support +^^^^^^^^^^^^ + +``InfluxDBClient`` does not enable gzip compress for http request by default. If you want to enable gzip to reduce transfer data's size, you can call: + +.. code-block:: python + + from influxdb_client import InfluxDBClient + + _db_client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org", enable_gzip=True) diff --git a/influxdb2/__init__.py b/influxdb2/__init__.py deleted file mode 100644 index 64895f1b..00000000 --- a/influxdb2/__init__.py +++ /dev/null @@ -1,287 +0,0 @@ -# coding: utf-8 - -# flake8: noqa - -""" - Influx API Service - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501 - - OpenAPI spec version: 0.1.0 - Generated by: https://openapi-generator.tech -""" - - -from __future__ import absolute_import - -__version__ = "1.0.0" - -# import apis into sdk package -from influxdb2.service.authorizations_service import AuthorizationsService -from influxdb2.service.buckets_service import BucketsService -from influxdb2.service.cells_service import CellsService -from influxdb2.service.checks_service import ChecksService -from influxdb2.service.dashboards_service import DashboardsService -from influxdb2.service.health_service import HealthService -from influxdb2.service.labels_service import LabelsService -from influxdb2.service.notification_endpoints_service import NotificationEndpointsService -from influxdb2.service.notification_rules_service import NotificationRulesService -from influxdb2.service.operation_logs_service import OperationLogsService -from influxdb2.service.organizations_service import OrganizationsService -from influxdb2.service.query_service import QueryService -from influxdb2.service.ready_service import ReadyService -from influxdb2.service.scraper_targets_service import ScraperTargetsService -from influxdb2.service.secrets_service import SecretsService -from influxdb2.service.setup_service import SetupService -from influxdb2.service.sources_service import SourcesService -from influxdb2.service.tasks_service import TasksService -from influxdb2.service.telegrafs_service import TelegrafsService -from influxdb2.service.templates_service import TemplatesService -from influxdb2.service.users_service import UsersService -from influxdb2.service.variables_service import VariablesService -from influxdb2.service.views_service import ViewsService -from influxdb2.service.write_service import WriteService -from influxdb2.service.default_service import DefaultService - -# import ApiClient -from influxdb2.api_client import ApiClient -from influxdb2.configuration import Configuration -# import models into sdk package -from influxdb2.domain.ast_response import ASTResponse -from influxdb2.domain.add_resource_member_request_body import AddResourceMemberRequestBody -from influxdb2.domain.analyze_query_response import AnalyzeQueryResponse -from influxdb2.domain.analyze_query_response_errors import AnalyzeQueryResponseErrors -from influxdb2.domain.array_expression import ArrayExpression -from influxdb2.domain.authorization import Authorization -from influxdb2.domain.authorization_update_request import AuthorizationUpdateRequest -from influxdb2.domain.authorizations import Authorizations -from influxdb2.domain.axes import Axes -from influxdb2.domain.axis import Axis -from influxdb2.domain.axis_scale import AxisScale -from influxdb2.domain.bad_statement import BadStatement -from influxdb2.domain.binary_expression import BinaryExpression -from influxdb2.domain.block import Block -from influxdb2.domain.boolean_literal import BooleanLiteral -from influxdb2.domain.bucket import Bucket -from influxdb2.domain.bucket_links import BucketLinks -from influxdb2.domain.bucket_retention_rules import BucketRetentionRules -from influxdb2.domain.buckets import Buckets -from influxdb2.domain.builder_config import BuilderConfig -from influxdb2.domain.builder_config_aggregate_window import BuilderConfigAggregateWindow -from influxdb2.domain.builder_functions_type import BuilderFunctionsType -from influxdb2.domain.builder_tags_type import BuilderTagsType -from influxdb2.domain.builtin_statement import BuiltinStatement -from influxdb2.domain.call_expression import CallExpression -from influxdb2.domain.cell import Cell -from influxdb2.domain.cell_links import CellLinks -from influxdb2.domain.cell_update import CellUpdate -from influxdb2.domain.check import Check -from influxdb2.domain.check_base import CheckBase -from influxdb2.domain.check_base_tags import CheckBaseTags -from influxdb2.domain.check_status_level import CheckStatusLevel -from influxdb2.domain.check_view_properties import CheckViewProperties -from influxdb2.domain.checks import Checks -from influxdb2.domain.conditional_expression import ConditionalExpression -from influxdb2.domain.constant_variable_properties import ConstantVariableProperties -from influxdb2.domain.create_cell import CreateCell -from influxdb2.domain.create_dashboard_request import CreateDashboardRequest -from influxdb2.domain.dashboard import Dashboard -from influxdb2.domain.dashboard_color import DashboardColor -from influxdb2.domain.dashboard_query import DashboardQuery -from influxdb2.domain.dashboards import Dashboards -from influxdb2.domain.date_time_literal import DateTimeLiteral -from influxdb2.domain.deadman_check import DeadmanCheck -from influxdb2.domain.decimal_places import DecimalPlaces -from influxdb2.domain.dialect import Dialect -from influxdb2.domain.document import Document -from influxdb2.domain.document_create import DocumentCreate -from influxdb2.domain.document_links import DocumentLinks -from influxdb2.domain.document_list_entry import DocumentListEntry -from influxdb2.domain.document_meta import DocumentMeta -from influxdb2.domain.document_update import DocumentUpdate -from influxdb2.domain.documents import Documents -from influxdb2.domain.duration import Duration -from influxdb2.domain.duration_literal import DurationLiteral -from influxdb2.domain.error import Error -from influxdb2.domain.expression import Expression -from influxdb2.domain.expression_statement import ExpressionStatement -from influxdb2.domain.field import Field -from influxdb2.domain.file import File -from influxdb2.domain.float_literal import FloatLiteral -from influxdb2.domain.flux_response import FluxResponse -from influxdb2.domain.flux_suggestion import FluxSuggestion -from influxdb2.domain.flux_suggestions import FluxSuggestions -from influxdb2.domain.function_expression import FunctionExpression -from influxdb2.domain.gauge_view_properties import GaugeViewProperties -from influxdb2.domain.greater_threshold import GreaterThreshold -from influxdb2.domain.http_notification_endpoint import HTTPNotificationEndpoint -from influxdb2.domain.http_notification_rule import HTTPNotificationRule -from influxdb2.domain.http_notification_rule_base import HTTPNotificationRuleBase -from influxdb2.domain.health_check import HealthCheck -from influxdb2.domain.heatmap_view_properties import HeatmapViewProperties -from influxdb2.domain.histogram_view_properties import HistogramViewProperties -from influxdb2.domain.identifier import Identifier -from influxdb2.domain.import_declaration import ImportDeclaration -from influxdb2.domain.index_expression import IndexExpression -from influxdb2.domain.integer_literal import IntegerLiteral -from influxdb2.domain.is_onboarding import IsOnboarding -from influxdb2.domain.label import Label -from influxdb2.domain.label_create_request import LabelCreateRequest -from influxdb2.domain.label_mapping import LabelMapping -from influxdb2.domain.label_response import LabelResponse -from influxdb2.domain.label_update import LabelUpdate -from influxdb2.domain.labels_response import LabelsResponse -from influxdb2.domain.language_request import LanguageRequest -from influxdb2.domain.legend import Legend -from influxdb2.domain.lesser_threshold import LesserThreshold -from influxdb2.domain.line_plus_single_stat_properties import LinePlusSingleStatProperties -from influxdb2.domain.line_protocol_error import LineProtocolError -from influxdb2.domain.line_protocol_length_error import LineProtocolLengthError -from influxdb2.domain.links import Links -from influxdb2.domain.log_event import LogEvent -from influxdb2.domain.logical_expression import LogicalExpression -from influxdb2.domain.logs import Logs -from influxdb2.domain.map_variable_properties import MapVariableProperties -from influxdb2.domain.markdown_view_properties import MarkdownViewProperties -from influxdb2.domain.member_assignment import MemberAssignment -from influxdb2.domain.member_expression import MemberExpression -from influxdb2.domain.model_property import ModelProperty -from influxdb2.domain.node import Node -from influxdb2.domain.notification_endpoint import NotificationEndpoint -from influxdb2.domain.notification_endpoint_base import NotificationEndpointBase -from influxdb2.domain.notification_endpoint_type import NotificationEndpointType -from influxdb2.domain.notification_endpoint_update import NotificationEndpointUpdate -from influxdb2.domain.notification_endpoints import NotificationEndpoints -from influxdb2.domain.notification_rule import NotificationRule -from influxdb2.domain.notification_rule_base import NotificationRuleBase -from influxdb2.domain.notification_rule_update import NotificationRuleUpdate -from influxdb2.domain.notification_rules import NotificationRules -from influxdb2.domain.object_expression import ObjectExpression -from influxdb2.domain.onboarding_request import OnboardingRequest -from influxdb2.domain.onboarding_response import OnboardingResponse -from influxdb2.domain.operation_log import OperationLog -from influxdb2.domain.operation_log_links import OperationLogLinks -from influxdb2.domain.operation_logs import OperationLogs -from influxdb2.domain.option_statement import OptionStatement -from influxdb2.domain.organization import Organization -from influxdb2.domain.organization_links import OrganizationLinks -from influxdb2.domain.organizations import Organizations -from influxdb2.domain.package import Package -from influxdb2.domain.package_clause import PackageClause -from influxdb2.domain.pager_duty_notification_endpoint import PagerDutyNotificationEndpoint -from influxdb2.domain.pager_duty_notification_rule import PagerDutyNotificationRule -from influxdb2.domain.pager_duty_notification_rule_base import PagerDutyNotificationRuleBase -from influxdb2.domain.password_reset_body import PasswordResetBody -from influxdb2.domain.permission import Permission -from influxdb2.domain.permission_resource import PermissionResource -from influxdb2.domain.pipe_expression import PipeExpression -from influxdb2.domain.pipe_literal import PipeLiteral -from influxdb2.domain.property_key import PropertyKey -from influxdb2.domain.query import Query -from influxdb2.domain.query_edit_mode import QueryEditMode -from influxdb2.domain.query_variable_properties import QueryVariableProperties -from influxdb2.domain.query_variable_properties_values import QueryVariablePropertiesValues -from influxdb2.domain.range_threshold import RangeThreshold -from influxdb2.domain.ready import Ready -from influxdb2.domain.regexp_literal import RegexpLiteral -from influxdb2.domain.renamable_field import RenamableField -from influxdb2.domain.resource_member import ResourceMember -from influxdb2.domain.resource_members import ResourceMembers -from influxdb2.domain.resource_owner import ResourceOwner -from influxdb2.domain.resource_owners import ResourceOwners -from influxdb2.domain.return_statement import ReturnStatement -from influxdb2.domain.routes import Routes -from influxdb2.domain.routes_external import RoutesExternal -from influxdb2.domain.routes_query import RoutesQuery -from influxdb2.domain.routes_system import RoutesSystem -from influxdb2.domain.rule_status_level import RuleStatusLevel -from influxdb2.domain.run import Run -from influxdb2.domain.run_links import RunLinks -from influxdb2.domain.run_log import RunLog -from influxdb2.domain.run_manually import RunManually -from influxdb2.domain.runs import Runs -from influxdb2.domain.smtp_notification_rule import SMTPNotificationRule -from influxdb2.domain.smtp_notification_rule_base import SMTPNotificationRuleBase -from influxdb2.domain.scatter_view_properties import ScatterViewProperties -from influxdb2.domain.scraper_target_request import ScraperTargetRequest -from influxdb2.domain.scraper_target_response import ScraperTargetResponse -from influxdb2.domain.scraper_target_responses import ScraperTargetResponses -from influxdb2.domain.secret_keys import SecretKeys -from influxdb2.domain.secret_keys_response import SecretKeysResponse -from influxdb2.domain.single_stat_view_properties import SingleStatViewProperties -from influxdb2.domain.slack_notification_endpoint import SlackNotificationEndpoint -from influxdb2.domain.slack_notification_rule import SlackNotificationRule -from influxdb2.domain.slack_notification_rule_base import SlackNotificationRuleBase -from influxdb2.domain.source import Source -from influxdb2.domain.source_links import SourceLinks -from influxdb2.domain.sources import Sources -from influxdb2.domain.statement import Statement -from influxdb2.domain.status_rule import StatusRule -from influxdb2.domain.string_literal import StringLiteral -from influxdb2.domain.table_view_properties import TableViewProperties -from influxdb2.domain.tag_rule import TagRule -from influxdb2.domain.task import Task -from influxdb2.domain.task_create_request import TaskCreateRequest -from influxdb2.domain.task_links import TaskLinks -from influxdb2.domain.task_status_type import TaskStatusType -from influxdb2.domain.task_update_request import TaskUpdateRequest -from influxdb2.domain.tasks import Tasks -from influxdb2.domain.telegraf import Telegraf -from influxdb2.domain.telegraf_plugin_input_cpu import TelegrafPluginInputCpu -from influxdb2.domain.telegraf_plugin_input_disk import TelegrafPluginInputDisk -from influxdb2.domain.telegraf_plugin_input_diskio import TelegrafPluginInputDiskio -from influxdb2.domain.telegraf_plugin_input_docker import TelegrafPluginInputDocker -from influxdb2.domain.telegraf_plugin_input_docker_config import TelegrafPluginInputDockerConfig -from influxdb2.domain.telegraf_plugin_input_file import TelegrafPluginInputFile -from influxdb2.domain.telegraf_plugin_input_file_config import TelegrafPluginInputFileConfig -from influxdb2.domain.telegraf_plugin_input_kernel import TelegrafPluginInputKernel -from influxdb2.domain.telegraf_plugin_input_kubernetes import TelegrafPluginInputKubernetes -from influxdb2.domain.telegraf_plugin_input_kubernetes_config import TelegrafPluginInputKubernetesConfig -from influxdb2.domain.telegraf_plugin_input_log_parser import TelegrafPluginInputLogParser -from influxdb2.domain.telegraf_plugin_input_log_parser_config import TelegrafPluginInputLogParserConfig -from influxdb2.domain.telegraf_plugin_input_mem import TelegrafPluginInputMem -from influxdb2.domain.telegraf_plugin_input_net import TelegrafPluginInputNet -from influxdb2.domain.telegraf_plugin_input_net_response import TelegrafPluginInputNetResponse -from influxdb2.domain.telegraf_plugin_input_nginx import TelegrafPluginInputNginx -from influxdb2.domain.telegraf_plugin_input_processes import TelegrafPluginInputProcesses -from influxdb2.domain.telegraf_plugin_input_procstat import TelegrafPluginInputProcstat -from influxdb2.domain.telegraf_plugin_input_procstat_config import TelegrafPluginInputProcstatConfig -from influxdb2.domain.telegraf_plugin_input_prometheus import TelegrafPluginInputPrometheus -from influxdb2.domain.telegraf_plugin_input_prometheus_config import TelegrafPluginInputPrometheusConfig -from influxdb2.domain.telegraf_plugin_input_redis import TelegrafPluginInputRedis -from influxdb2.domain.telegraf_plugin_input_redis_config import TelegrafPluginInputRedisConfig -from influxdb2.domain.telegraf_plugin_input_swap import TelegrafPluginInputSwap -from influxdb2.domain.telegraf_plugin_input_syslog import TelegrafPluginInputSyslog -from influxdb2.domain.telegraf_plugin_input_syslog_config import TelegrafPluginInputSyslogConfig -from influxdb2.domain.telegraf_plugin_input_system import TelegrafPluginInputSystem -from influxdb2.domain.telegraf_plugin_input_tail import TelegrafPluginInputTail -from influxdb2.domain.telegraf_plugin_output_file import TelegrafPluginOutputFile -from influxdb2.domain.telegraf_plugin_output_file_config import TelegrafPluginOutputFileConfig -from influxdb2.domain.telegraf_plugin_output_file_config_files import TelegrafPluginOutputFileConfigFiles -from influxdb2.domain.telegraf_plugin_output_influx_dbv2 import TelegrafPluginOutputInfluxDBV2 -from influxdb2.domain.telegraf_plugin_output_influx_dbv2_config import TelegrafPluginOutputInfluxDBV2Config -from influxdb2.domain.telegraf_request import TelegrafRequest -from influxdb2.domain.telegraf_request_agent import TelegrafRequestAgent -from influxdb2.domain.telegraf_request_plugin import TelegrafRequestPlugin -from influxdb2.domain.telegrafs import Telegrafs -from influxdb2.domain.test_statement import TestStatement -from influxdb2.domain.threshold import Threshold -from influxdb2.domain.threshold_base import ThresholdBase -from influxdb2.domain.threshold_check import ThresholdCheck -from influxdb2.domain.unary_expression import UnaryExpression -from influxdb2.domain.unsigned_integer_literal import UnsignedIntegerLiteral -from influxdb2.domain.user import User -from influxdb2.domain.user_links import UserLinks -from influxdb2.domain.users import Users -from influxdb2.domain.users_links import UsersLinks -from influxdb2.domain.variable import Variable -from influxdb2.domain.variable_assignment import VariableAssignment -from influxdb2.domain.variable_links import VariableLinks -from influxdb2.domain.variables import Variables -from influxdb2.domain.view import View -from influxdb2.domain.view_links import ViewLinks -from influxdb2.domain.view_properties import ViewProperties -from influxdb2.domain.views import Views -from influxdb2.domain.write_precision import WritePrecision -from influxdb2.domain.xy_geom import XYGeom -from influxdb2.domain.xy_view_properties import XYViewProperties diff --git a/influxdb2/client/__init__.py b/influxdb2/client/__init__.py deleted file mode 100644 index 23eb6193..00000000 --- a/influxdb2/client/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -from __future__ import absolute_import - -from influxdb2.client.influxdb_client import InfluxDBClient - -# flake8: noqa -# import apis into api package diff --git a/influxdb2/client/write/__init__.py b/influxdb2/client/write/__init__.py deleted file mode 100644 index d109302f..00000000 --- a/influxdb2/client/write/__init__.py +++ /dev/null @@ -1,30 +0,0 @@ -from __future__ import absolute_import - -# flake8: noqa - -# import apis into api package -from influxdb2.service.authorizations_service import AuthorizationsService -from influxdb2.service.buckets_service import BucketsService -from influxdb2.service.cells_service import CellsService -from influxdb2.service.checks_service import ChecksService -from influxdb2.service.dashboards_service import DashboardsService -from influxdb2.service.health_service import HealthService -from influxdb2.service.labels_service import LabelsService -from influxdb2.service.notification_endpoints_service import NotificationEndpointsService -from influxdb2.service.notification_rules_service import NotificationRulesService -from influxdb2.service.operation_logs_service import OperationLogsService -from influxdb2.service.organizations_service import OrganizationsService -from influxdb2.service.query_service import QueryService -from influxdb2.service.ready_service import ReadyService -from influxdb2.service.scraper_targets_service import ScraperTargetsService -from influxdb2.service.secrets_service import SecretsService -from influxdb2.service.setup_service import SetupService -from influxdb2.service.sources_service import SourcesService -from influxdb2.service.tasks_service import TasksService -from influxdb2.service.telegrafs_service import TelegrafsService -from influxdb2.service.templates_service import TemplatesService -from influxdb2.service.users_service import UsersService -from influxdb2.service.variables_service import VariablesService -from influxdb2.service.views_service import ViewsService -from influxdb2.service.write_service import WriteService -from influxdb2.service.default_service import DefaultService diff --git a/influxdb2/domain/__init__.py b/influxdb2/domain/__init__.py deleted file mode 100644 index 463bcf04..00000000 --- a/influxdb2/domain/__init__.py +++ /dev/null @@ -1,254 +0,0 @@ -# coding: utf-8 - -# flake8: noqa -""" - Influx API Service - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501 - - OpenAPI spec version: 0.1.0 - Generated by: https://openapi-generator.tech -""" - - -from __future__ import absolute_import - -# import models into model package -from influxdb2.domain.ast_response import ASTResponse -from influxdb2.domain.add_resource_member_request_body import AddResourceMemberRequestBody -from influxdb2.domain.analyze_query_response import AnalyzeQueryResponse -from influxdb2.domain.analyze_query_response_errors import AnalyzeQueryResponseErrors -from influxdb2.domain.array_expression import ArrayExpression -from influxdb2.domain.authorization import Authorization -from influxdb2.domain.authorization_update_request import AuthorizationUpdateRequest -from influxdb2.domain.authorizations import Authorizations -from influxdb2.domain.axes import Axes -from influxdb2.domain.axis import Axis -from influxdb2.domain.axis_scale import AxisScale -from influxdb2.domain.bad_statement import BadStatement -from influxdb2.domain.binary_expression import BinaryExpression -from influxdb2.domain.block import Block -from influxdb2.domain.boolean_literal import BooleanLiteral -from influxdb2.domain.bucket import Bucket -from influxdb2.domain.bucket_links import BucketLinks -from influxdb2.domain.bucket_retention_rules import BucketRetentionRules -from influxdb2.domain.buckets import Buckets -from influxdb2.domain.builder_config import BuilderConfig -from influxdb2.domain.builder_config_aggregate_window import BuilderConfigAggregateWindow -from influxdb2.domain.builder_functions_type import BuilderFunctionsType -from influxdb2.domain.builder_tags_type import BuilderTagsType -from influxdb2.domain.builtin_statement import BuiltinStatement -from influxdb2.domain.call_expression import CallExpression -from influxdb2.domain.cell import Cell -from influxdb2.domain.cell_links import CellLinks -from influxdb2.domain.cell_update import CellUpdate -from influxdb2.domain.check import Check -from influxdb2.domain.check_base import CheckBase -from influxdb2.domain.check_base_tags import CheckBaseTags -from influxdb2.domain.check_status_level import CheckStatusLevel -from influxdb2.domain.check_view_properties import CheckViewProperties -from influxdb2.domain.checks import Checks -from influxdb2.domain.conditional_expression import ConditionalExpression -from influxdb2.domain.constant_variable_properties import ConstantVariableProperties -from influxdb2.domain.create_cell import CreateCell -from influxdb2.domain.create_dashboard_request import CreateDashboardRequest -from influxdb2.domain.dashboard import Dashboard -from influxdb2.domain.dashboard_color import DashboardColor -from influxdb2.domain.dashboard_query import DashboardQuery -from influxdb2.domain.dashboards import Dashboards -from influxdb2.domain.date_time_literal import DateTimeLiteral -from influxdb2.domain.deadman_check import DeadmanCheck -from influxdb2.domain.decimal_places import DecimalPlaces -from influxdb2.domain.dialect import Dialect -from influxdb2.domain.document import Document -from influxdb2.domain.document_create import DocumentCreate -from influxdb2.domain.document_links import DocumentLinks -from influxdb2.domain.document_list_entry import DocumentListEntry -from influxdb2.domain.document_meta import DocumentMeta -from influxdb2.domain.document_update import DocumentUpdate -from influxdb2.domain.documents import Documents -from influxdb2.domain.duration import Duration -from influxdb2.domain.duration_literal import DurationLiteral -from influxdb2.domain.error import Error -from influxdb2.domain.expression import Expression -from influxdb2.domain.expression_statement import ExpressionStatement -from influxdb2.domain.field import Field -from influxdb2.domain.file import File -from influxdb2.domain.float_literal import FloatLiteral -from influxdb2.domain.flux_response import FluxResponse -from influxdb2.domain.flux_suggestion import FluxSuggestion -from influxdb2.domain.flux_suggestions import FluxSuggestions -from influxdb2.domain.function_expression import FunctionExpression -from influxdb2.domain.gauge_view_properties import GaugeViewProperties -from influxdb2.domain.greater_threshold import GreaterThreshold -from influxdb2.domain.http_notification_endpoint import HTTPNotificationEndpoint -from influxdb2.domain.http_notification_rule import HTTPNotificationRule -from influxdb2.domain.http_notification_rule_base import HTTPNotificationRuleBase -from influxdb2.domain.health_check import HealthCheck -from influxdb2.domain.heatmap_view_properties import HeatmapViewProperties -from influxdb2.domain.histogram_view_properties import HistogramViewProperties -from influxdb2.domain.identifier import Identifier -from influxdb2.domain.import_declaration import ImportDeclaration -from influxdb2.domain.index_expression import IndexExpression -from influxdb2.domain.integer_literal import IntegerLiteral -from influxdb2.domain.is_onboarding import IsOnboarding -from influxdb2.domain.label import Label -from influxdb2.domain.label_create_request import LabelCreateRequest -from influxdb2.domain.label_mapping import LabelMapping -from influxdb2.domain.label_response import LabelResponse -from influxdb2.domain.label_update import LabelUpdate -from influxdb2.domain.labels_response import LabelsResponse -from influxdb2.domain.language_request import LanguageRequest -from influxdb2.domain.legend import Legend -from influxdb2.domain.lesser_threshold import LesserThreshold -from influxdb2.domain.line_plus_single_stat_properties import LinePlusSingleStatProperties -from influxdb2.domain.line_protocol_error import LineProtocolError -from influxdb2.domain.line_protocol_length_error import LineProtocolLengthError -from influxdb2.domain.links import Links -from influxdb2.domain.log_event import LogEvent -from influxdb2.domain.logical_expression import LogicalExpression -from influxdb2.domain.logs import Logs -from influxdb2.domain.map_variable_properties import MapVariableProperties -from influxdb2.domain.markdown_view_properties import MarkdownViewProperties -from influxdb2.domain.member_assignment import MemberAssignment -from influxdb2.domain.member_expression import MemberExpression -from influxdb2.domain.model_property import ModelProperty -from influxdb2.domain.node import Node -from influxdb2.domain.notification_endpoint import NotificationEndpoint -from influxdb2.domain.notification_endpoint_base import NotificationEndpointBase -from influxdb2.domain.notification_endpoint_type import NotificationEndpointType -from influxdb2.domain.notification_endpoint_update import NotificationEndpointUpdate -from influxdb2.domain.notification_endpoints import NotificationEndpoints -from influxdb2.domain.notification_rule import NotificationRule -from influxdb2.domain.notification_rule_base import NotificationRuleBase -from influxdb2.domain.notification_rule_update import NotificationRuleUpdate -from influxdb2.domain.notification_rules import NotificationRules -from influxdb2.domain.object_expression import ObjectExpression -from influxdb2.domain.onboarding_request import OnboardingRequest -from influxdb2.domain.onboarding_response import OnboardingResponse -from influxdb2.domain.operation_log import OperationLog -from influxdb2.domain.operation_log_links import OperationLogLinks -from influxdb2.domain.operation_logs import OperationLogs -from influxdb2.domain.option_statement import OptionStatement -from influxdb2.domain.organization import Organization -from influxdb2.domain.organization_links import OrganizationLinks -from influxdb2.domain.organizations import Organizations -from influxdb2.domain.package import Package -from influxdb2.domain.package_clause import PackageClause -from influxdb2.domain.pager_duty_notification_endpoint import PagerDutyNotificationEndpoint -from influxdb2.domain.pager_duty_notification_rule import PagerDutyNotificationRule -from influxdb2.domain.pager_duty_notification_rule_base import PagerDutyNotificationRuleBase -from influxdb2.domain.password_reset_body import PasswordResetBody -from influxdb2.domain.permission import Permission -from influxdb2.domain.permission_resource import PermissionResource -from influxdb2.domain.pipe_expression import PipeExpression -from influxdb2.domain.pipe_literal import PipeLiteral -from influxdb2.domain.property_key import PropertyKey -from influxdb2.domain.query import Query -from influxdb2.domain.query_edit_mode import QueryEditMode -from influxdb2.domain.query_variable_properties import QueryVariableProperties -from influxdb2.domain.query_variable_properties_values import QueryVariablePropertiesValues -from influxdb2.domain.range_threshold import RangeThreshold -from influxdb2.domain.ready import Ready -from influxdb2.domain.regexp_literal import RegexpLiteral -from influxdb2.domain.renamable_field import RenamableField -from influxdb2.domain.resource_member import ResourceMember -from influxdb2.domain.resource_members import ResourceMembers -from influxdb2.domain.resource_owner import ResourceOwner -from influxdb2.domain.resource_owners import ResourceOwners -from influxdb2.domain.return_statement import ReturnStatement -from influxdb2.domain.routes import Routes -from influxdb2.domain.routes_external import RoutesExternal -from influxdb2.domain.routes_query import RoutesQuery -from influxdb2.domain.routes_system import RoutesSystem -from influxdb2.domain.rule_status_level import RuleStatusLevel -from influxdb2.domain.run import Run -from influxdb2.domain.run_links import RunLinks -from influxdb2.domain.run_log import RunLog -from influxdb2.domain.run_manually import RunManually -from influxdb2.domain.runs import Runs -from influxdb2.domain.smtp_notification_rule import SMTPNotificationRule -from influxdb2.domain.smtp_notification_rule_base import SMTPNotificationRuleBase -from influxdb2.domain.scatter_view_properties import ScatterViewProperties -from influxdb2.domain.scraper_target_request import ScraperTargetRequest -from influxdb2.domain.scraper_target_response import ScraperTargetResponse -from influxdb2.domain.scraper_target_responses import ScraperTargetResponses -from influxdb2.domain.secret_keys import SecretKeys -from influxdb2.domain.secret_keys_response import SecretKeysResponse -from influxdb2.domain.single_stat_view_properties import SingleStatViewProperties -from influxdb2.domain.slack_notification_endpoint import SlackNotificationEndpoint -from influxdb2.domain.slack_notification_rule import SlackNotificationRule -from influxdb2.domain.slack_notification_rule_base import SlackNotificationRuleBase -from influxdb2.domain.source import Source -from influxdb2.domain.source_links import SourceLinks -from influxdb2.domain.sources import Sources -from influxdb2.domain.statement import Statement -from influxdb2.domain.status_rule import StatusRule -from influxdb2.domain.string_literal import StringLiteral -from influxdb2.domain.table_view_properties import TableViewProperties -from influxdb2.domain.tag_rule import TagRule -from influxdb2.domain.task import Task -from influxdb2.domain.task_create_request import TaskCreateRequest -from influxdb2.domain.task_links import TaskLinks -from influxdb2.domain.task_status_type import TaskStatusType -from influxdb2.domain.task_update_request import TaskUpdateRequest -from influxdb2.domain.tasks import Tasks -from influxdb2.domain.telegraf import Telegraf -from influxdb2.domain.telegraf_plugin_input_cpu import TelegrafPluginInputCpu -from influxdb2.domain.telegraf_plugin_input_disk import TelegrafPluginInputDisk -from influxdb2.domain.telegraf_plugin_input_diskio import TelegrafPluginInputDiskio -from influxdb2.domain.telegraf_plugin_input_docker import TelegrafPluginInputDocker -from influxdb2.domain.telegraf_plugin_input_docker_config import TelegrafPluginInputDockerConfig -from influxdb2.domain.telegraf_plugin_input_file import TelegrafPluginInputFile -from influxdb2.domain.telegraf_plugin_input_file_config import TelegrafPluginInputFileConfig -from influxdb2.domain.telegraf_plugin_input_kernel import TelegrafPluginInputKernel -from influxdb2.domain.telegraf_plugin_input_kubernetes import TelegrafPluginInputKubernetes -from influxdb2.domain.telegraf_plugin_input_kubernetes_config import TelegrafPluginInputKubernetesConfig -from influxdb2.domain.telegraf_plugin_input_log_parser import TelegrafPluginInputLogParser -from influxdb2.domain.telegraf_plugin_input_log_parser_config import TelegrafPluginInputLogParserConfig -from influxdb2.domain.telegraf_plugin_input_mem import TelegrafPluginInputMem -from influxdb2.domain.telegraf_plugin_input_net import TelegrafPluginInputNet -from influxdb2.domain.telegraf_plugin_input_net_response import TelegrafPluginInputNetResponse -from influxdb2.domain.telegraf_plugin_input_nginx import TelegrafPluginInputNginx -from influxdb2.domain.telegraf_plugin_input_processes import TelegrafPluginInputProcesses -from influxdb2.domain.telegraf_plugin_input_procstat import TelegrafPluginInputProcstat -from influxdb2.domain.telegraf_plugin_input_procstat_config import TelegrafPluginInputProcstatConfig -from influxdb2.domain.telegraf_plugin_input_prometheus import TelegrafPluginInputPrometheus -from influxdb2.domain.telegraf_plugin_input_prometheus_config import TelegrafPluginInputPrometheusConfig -from influxdb2.domain.telegraf_plugin_input_redis import TelegrafPluginInputRedis -from influxdb2.domain.telegraf_plugin_input_redis_config import TelegrafPluginInputRedisConfig -from influxdb2.domain.telegraf_plugin_input_swap import TelegrafPluginInputSwap -from influxdb2.domain.telegraf_plugin_input_syslog import TelegrafPluginInputSyslog -from influxdb2.domain.telegraf_plugin_input_syslog_config import TelegrafPluginInputSyslogConfig -from influxdb2.domain.telegraf_plugin_input_system import TelegrafPluginInputSystem -from influxdb2.domain.telegraf_plugin_input_tail import TelegrafPluginInputTail -from influxdb2.domain.telegraf_plugin_output_file import TelegrafPluginOutputFile -from influxdb2.domain.telegraf_plugin_output_file_config import TelegrafPluginOutputFileConfig -from influxdb2.domain.telegraf_plugin_output_file_config_files import TelegrafPluginOutputFileConfigFiles -from influxdb2.domain.telegraf_plugin_output_influx_dbv2 import TelegrafPluginOutputInfluxDBV2 -from influxdb2.domain.telegraf_plugin_output_influx_dbv2_config import TelegrafPluginOutputInfluxDBV2Config -from influxdb2.domain.telegraf_request import TelegrafRequest -from influxdb2.domain.telegraf_request_agent import TelegrafRequestAgent -from influxdb2.domain.telegraf_request_plugin import TelegrafRequestPlugin -from influxdb2.domain.telegrafs import Telegrafs -from influxdb2.domain.test_statement import TestStatement -from influxdb2.domain.threshold import Threshold -from influxdb2.domain.threshold_base import ThresholdBase -from influxdb2.domain.threshold_check import ThresholdCheck -from influxdb2.domain.unary_expression import UnaryExpression -from influxdb2.domain.unsigned_integer_literal import UnsignedIntegerLiteral -from influxdb2.domain.user import User -from influxdb2.domain.user_links import UserLinks -from influxdb2.domain.users import Users -from influxdb2.domain.users_links import UsersLinks -from influxdb2.domain.variable import Variable -from influxdb2.domain.variable_assignment import VariableAssignment -from influxdb2.domain.variable_links import VariableLinks -from influxdb2.domain.variables import Variables -from influxdb2.domain.view import View -from influxdb2.domain.view_links import ViewLinks -from influxdb2.domain.view_properties import ViewProperties -from influxdb2.domain.views import Views -from influxdb2.domain.write_precision import WritePrecision -from influxdb2.domain.xy_geom import XYGeom -from influxdb2.domain.xy_view_properties import XYViewProperties diff --git a/influxdb2/service/__init__.py b/influxdb2/service/__init__.py deleted file mode 100644 index d109302f..00000000 --- a/influxdb2/service/__init__.py +++ /dev/null @@ -1,30 +0,0 @@ -from __future__ import absolute_import - -# flake8: noqa - -# import apis into api package -from influxdb2.service.authorizations_service import AuthorizationsService -from influxdb2.service.buckets_service import BucketsService -from influxdb2.service.cells_service import CellsService -from influxdb2.service.checks_service import ChecksService -from influxdb2.service.dashboards_service import DashboardsService -from influxdb2.service.health_service import HealthService -from influxdb2.service.labels_service import LabelsService -from influxdb2.service.notification_endpoints_service import NotificationEndpointsService -from influxdb2.service.notification_rules_service import NotificationRulesService -from influxdb2.service.operation_logs_service import OperationLogsService -from influxdb2.service.organizations_service import OrganizationsService -from influxdb2.service.query_service import QueryService -from influxdb2.service.ready_service import ReadyService -from influxdb2.service.scraper_targets_service import ScraperTargetsService -from influxdb2.service.secrets_service import SecretsService -from influxdb2.service.setup_service import SetupService -from influxdb2.service.sources_service import SourcesService -from influxdb2.service.tasks_service import TasksService -from influxdb2.service.telegrafs_service import TelegrafsService -from influxdb2.service.templates_service import TemplatesService -from influxdb2.service.users_service import UsersService -from influxdb2.service.variables_service import VariablesService -from influxdb2.service.views_service import ViewsService -from influxdb2.service.write_service import WriteService -from influxdb2.service.default_service import DefaultService diff --git a/influxdb2_test/__init__.py b/influxdb2_test/__init__.py deleted file mode 100644 index d109302f..00000000 --- a/influxdb2_test/__init__.py +++ /dev/null @@ -1,30 +0,0 @@ -from __future__ import absolute_import - -# flake8: noqa - -# import apis into api package -from influxdb2.service.authorizations_service import AuthorizationsService -from influxdb2.service.buckets_service import BucketsService -from influxdb2.service.cells_service import CellsService -from influxdb2.service.checks_service import ChecksService -from influxdb2.service.dashboards_service import DashboardsService -from influxdb2.service.health_service import HealthService -from influxdb2.service.labels_service import LabelsService -from influxdb2.service.notification_endpoints_service import NotificationEndpointsService -from influxdb2.service.notification_rules_service import NotificationRulesService -from influxdb2.service.operation_logs_service import OperationLogsService -from influxdb2.service.organizations_service import OrganizationsService -from influxdb2.service.query_service import QueryService -from influxdb2.service.ready_service import ReadyService -from influxdb2.service.scraper_targets_service import ScraperTargetsService -from influxdb2.service.secrets_service import SecretsService -from influxdb2.service.setup_service import SetupService -from influxdb2.service.sources_service import SourcesService -from influxdb2.service.tasks_service import TasksService -from influxdb2.service.telegrafs_service import TelegrafsService -from influxdb2.service.templates_service import TemplatesService -from influxdb2.service.users_service import UsersService -from influxdb2.service.variables_service import VariablesService -from influxdb2.service.views_service import ViewsService -from influxdb2.service.write_service import WriteService -from influxdb2.service.default_service import DefaultService diff --git a/influxdb_client/__init__.py b/influxdb_client/__init__.py new file mode 100644 index 00000000..6ca09622 --- /dev/null +++ b/influxdb_client/__init__.py @@ -0,0 +1,303 @@ +# coding: utf-8 + +# flake8: noqa + +""" + Influx API Service + + No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501 + + OpenAPI spec version: 0.1.0 + Generated by: https://openapi-generator.tech +""" + + +from __future__ import absolute_import + +__version__ = "1.0.0" + +# import apis into sdk package +from influxdb_client.service.authorizations_service import AuthorizationsService +from influxdb_client.service.buckets_service import BucketsService +from influxdb_client.service.cells_service import CellsService +from influxdb_client.service.checks_service import ChecksService +from influxdb_client.service.dashboards_service import DashboardsService +from influxdb_client.service.health_service import HealthService +from influxdb_client.service.labels_service import LabelsService +from influxdb_client.service.notification_endpoints_service import NotificationEndpointsService +from influxdb_client.service.notification_rules_service import NotificationRulesService +from influxdb_client.service.operation_logs_service import OperationLogsService +from influxdb_client.service.organizations_service import OrganizationsService +from influxdb_client.service.query_service import QueryService +from influxdb_client.service.ready_service import ReadyService +from influxdb_client.service.scraper_targets_service import ScraperTargetsService +from influxdb_client.service.secrets_service import SecretsService +from influxdb_client.service.setup_service import SetupService +from influxdb_client.service.sources_service import SourcesService +from influxdb_client.service.tasks_service import TasksService +from influxdb_client.service.telegrafs_service import TelegrafsService +from influxdb_client.service.templates_service import TemplatesService +from influxdb_client.service.users_service import UsersService +from influxdb_client.service.variables_service import VariablesService +from influxdb_client.service.views_service import ViewsService +from influxdb_client.service.write_service import WriteService +from influxdb_client.service.default_service import DefaultService + +# import ApiClient +from influxdb_client.api_client import ApiClient +from influxdb_client.configuration import Configuration +# import models into sdk package +from influxdb_client.domain.ast_response import ASTResponse +from influxdb_client.domain.add_resource_member_request_body import AddResourceMemberRequestBody +from influxdb_client.domain.analyze_query_response import AnalyzeQueryResponse +from influxdb_client.domain.analyze_query_response_errors import AnalyzeQueryResponseErrors +from influxdb_client.domain.array_expression import ArrayExpression +from influxdb_client.domain.authorization import Authorization +from influxdb_client.domain.authorization_update_request import AuthorizationUpdateRequest +from influxdb_client.domain.authorizations import Authorizations +from influxdb_client.domain.axes import Axes +from influxdb_client.domain.axis import Axis +from influxdb_client.domain.axis_scale import AxisScale +from influxdb_client.domain.bad_statement import BadStatement +from influxdb_client.domain.binary_expression import BinaryExpression +from influxdb_client.domain.block import Block +from influxdb_client.domain.boolean_literal import BooleanLiteral +from influxdb_client.domain.bucket import Bucket +from influxdb_client.domain.bucket_links import BucketLinks +from influxdb_client.domain.bucket_retention_rules import BucketRetentionRules +from influxdb_client.domain.buckets import Buckets +from influxdb_client.domain.builder_config import BuilderConfig +from influxdb_client.domain.builder_config_aggregate_window import BuilderConfigAggregateWindow +from influxdb_client.domain.builder_functions_type import BuilderFunctionsType +from influxdb_client.domain.builder_tags_type import BuilderTagsType +from influxdb_client.domain.builtin_statement import BuiltinStatement +from influxdb_client.domain.call_expression import CallExpression +from influxdb_client.domain.cell import Cell +from influxdb_client.domain.cell_links import CellLinks +from influxdb_client.domain.cell_update import CellUpdate +from influxdb_client.domain.check import Check +from influxdb_client.domain.check_base import CheckBase +from influxdb_client.domain.check_base_tags import CheckBaseTags +from influxdb_client.domain.check_status_level import CheckStatusLevel +from influxdb_client.domain.check_view_properties import CheckViewProperties +from influxdb_client.domain.checks import Checks +from influxdb_client.domain.conditional_expression import ConditionalExpression +from influxdb_client.domain.constant_variable_properties import ConstantVariableProperties +from influxdb_client.domain.create_cell import CreateCell +from influxdb_client.domain.create_dashboard_request import CreateDashboardRequest +from influxdb_client.domain.dashboard import Dashboard +from influxdb_client.domain.dashboard_color import DashboardColor +from influxdb_client.domain.dashboard_query import DashboardQuery +from influxdb_client.domain.dashboards import Dashboards +from influxdb_client.domain.date_time_literal import DateTimeLiteral +from influxdb_client.domain.deadman_check import DeadmanCheck +from influxdb_client.domain.decimal_places import DecimalPlaces +from influxdb_client.domain.dialect import Dialect +from influxdb_client.domain.document import Document +from influxdb_client.domain.document_create import DocumentCreate +from influxdb_client.domain.document_links import DocumentLinks +from influxdb_client.domain.document_list_entry import DocumentListEntry +from influxdb_client.domain.document_meta import DocumentMeta +from influxdb_client.domain.document_update import DocumentUpdate +from influxdb_client.domain.documents import Documents +from influxdb_client.domain.duration import Duration +from influxdb_client.domain.duration_literal import DurationLiteral +from influxdb_client.domain.error import Error +from influxdb_client.domain.expression import Expression +from influxdb_client.domain.expression_statement import ExpressionStatement +from influxdb_client.domain.field import Field +from influxdb_client.domain.file import File +from influxdb_client.domain.float_literal import FloatLiteral +from influxdb_client.domain.flux_response import FluxResponse +from influxdb_client.domain.flux_suggestion import FluxSuggestion +from influxdb_client.domain.flux_suggestions import FluxSuggestions +from influxdb_client.domain.function_expression import FunctionExpression +from influxdb_client.domain.gauge_view_properties import GaugeViewProperties +from influxdb_client.domain.greater_threshold import GreaterThreshold +from influxdb_client.domain.http_notification_endpoint import HTTPNotificationEndpoint +from influxdb_client.domain.http_notification_rule import HTTPNotificationRule +from influxdb_client.domain.http_notification_rule_base import HTTPNotificationRuleBase +from influxdb_client.domain.health_check import HealthCheck +from influxdb_client.domain.heatmap_view_properties import HeatmapViewProperties +from influxdb_client.domain.histogram_view_properties import HistogramViewProperties +from influxdb_client.domain.identifier import Identifier +from influxdb_client.domain.import_declaration import ImportDeclaration +from influxdb_client.domain.index_expression import IndexExpression +from influxdb_client.domain.integer_literal import IntegerLiteral +from influxdb_client.domain.is_onboarding import IsOnboarding +from influxdb_client.domain.label import Label +from influxdb_client.domain.label_create_request import LabelCreateRequest +from influxdb_client.domain.label_mapping import LabelMapping +from influxdb_client.domain.label_response import LabelResponse +from influxdb_client.domain.label_update import LabelUpdate +from influxdb_client.domain.labels_response import LabelsResponse +from influxdb_client.domain.language_request import LanguageRequest +from influxdb_client.domain.legend import Legend +from influxdb_client.domain.lesser_threshold import LesserThreshold +from influxdb_client.domain.line_plus_single_stat_properties import LinePlusSingleStatProperties +from influxdb_client.domain.line_protocol_error import LineProtocolError +from influxdb_client.domain.line_protocol_length_error import LineProtocolLengthError +from influxdb_client.domain.links import Links +from influxdb_client.domain.log_event import LogEvent +from influxdb_client.domain.logical_expression import LogicalExpression +from influxdb_client.domain.logs import Logs +from influxdb_client.domain.map_variable_properties import MapVariableProperties +from influxdb_client.domain.markdown_view_properties import MarkdownViewProperties +from influxdb_client.domain.member_assignment import MemberAssignment +from influxdb_client.domain.member_expression import MemberExpression +from influxdb_client.domain.model_property import ModelProperty +from influxdb_client.domain.node import Node +from influxdb_client.domain.notification_endpoint import NotificationEndpoint +from influxdb_client.domain.notification_endpoint_base import NotificationEndpointBase +from influxdb_client.domain.notification_endpoint_type import NotificationEndpointType +from influxdb_client.domain.notification_endpoint_update import NotificationEndpointUpdate +from influxdb_client.domain.notification_endpoints import NotificationEndpoints +from influxdb_client.domain.notification_rule import NotificationRule +from influxdb_client.domain.notification_rule_base import NotificationRuleBase +from influxdb_client.domain.notification_rule_update import NotificationRuleUpdate +from influxdb_client.domain.notification_rules import NotificationRules +from influxdb_client.domain.object_expression import ObjectExpression +from influxdb_client.domain.onboarding_request import OnboardingRequest +from influxdb_client.domain.onboarding_response import OnboardingResponse +from influxdb_client.domain.operation_log import OperationLog +from influxdb_client.domain.operation_log_links import OperationLogLinks +from influxdb_client.domain.operation_logs import OperationLogs +from influxdb_client.domain.option_statement import OptionStatement +from influxdb_client.domain.organization import Organization +from influxdb_client.domain.organization_links import OrganizationLinks +from influxdb_client.domain.organizations import Organizations +from influxdb_client.domain.package import Package +from influxdb_client.domain.package_clause import PackageClause +from influxdb_client.domain.pager_duty_notification_endpoint import PagerDutyNotificationEndpoint +from influxdb_client.domain.pager_duty_notification_rule import PagerDutyNotificationRule +from influxdb_client.domain.pager_duty_notification_rule_base import PagerDutyNotificationRuleBase +from influxdb_client.domain.password_reset_body import PasswordResetBody +from influxdb_client.domain.permission import Permission +from influxdb_client.domain.permission_resource import PermissionResource +from influxdb_client.domain.pipe_expression import PipeExpression +from influxdb_client.domain.pipe_literal import PipeLiteral +from influxdb_client.domain.property_key import PropertyKey +from influxdb_client.domain.query import Query +from influxdb_client.domain.query_edit_mode import QueryEditMode +from influxdb_client.domain.query_variable_properties import QueryVariableProperties +from influxdb_client.domain.query_variable_properties_values import QueryVariablePropertiesValues +from influxdb_client.domain.range_threshold import RangeThreshold +from influxdb_client.domain.ready import Ready +from influxdb_client.domain.regexp_literal import RegexpLiteral +from influxdb_client.domain.renamable_field import RenamableField +from influxdb_client.domain.resource_member import ResourceMember +from influxdb_client.domain.resource_members import ResourceMembers +from influxdb_client.domain.resource_owner import ResourceOwner +from influxdb_client.domain.resource_owners import ResourceOwners +from influxdb_client.domain.return_statement import ReturnStatement +from influxdb_client.domain.routes import Routes +from influxdb_client.domain.routes_external import RoutesExternal +from influxdb_client.domain.routes_query import RoutesQuery +from influxdb_client.domain.routes_system import RoutesSystem +from influxdb_client.domain.rule_status_level import RuleStatusLevel +from influxdb_client.domain.run import Run +from influxdb_client.domain.run_links import RunLinks +from influxdb_client.domain.run_log import RunLog +from influxdb_client.domain.run_manually import RunManually +from influxdb_client.domain.runs import Runs +from influxdb_client.domain.smtp_notification_rule import SMTPNotificationRule +from influxdb_client.domain.smtp_notification_rule_base import SMTPNotificationRuleBase +from influxdb_client.domain.scatter_view_properties import ScatterViewProperties +from influxdb_client.domain.scraper_target_request import ScraperTargetRequest +from influxdb_client.domain.scraper_target_response import ScraperTargetResponse +from influxdb_client.domain.scraper_target_responses import ScraperTargetResponses +from influxdb_client.domain.secret_keys import SecretKeys +from influxdb_client.domain.secret_keys_response import SecretKeysResponse +from influxdb_client.domain.single_stat_view_properties import SingleStatViewProperties +from influxdb_client.domain.slack_notification_endpoint import SlackNotificationEndpoint +from influxdb_client.domain.slack_notification_rule import SlackNotificationRule +from influxdb_client.domain.slack_notification_rule_base import SlackNotificationRuleBase +from influxdb_client.domain.source import Source +from influxdb_client.domain.source_links import SourceLinks +from influxdb_client.domain.sources import Sources +from influxdb_client.domain.statement import Statement +from influxdb_client.domain.status_rule import StatusRule +from influxdb_client.domain.string_literal import StringLiteral +from influxdb_client.domain.table_view_properties import TableViewProperties +from influxdb_client.domain.tag_rule import TagRule +from influxdb_client.domain.task import Task +from influxdb_client.domain.task_create_request import TaskCreateRequest +from influxdb_client.domain.task_links import TaskLinks +from influxdb_client.domain.task_status_type import TaskStatusType +from influxdb_client.domain.task_update_request import TaskUpdateRequest +from influxdb_client.domain.tasks import Tasks +from influxdb_client.domain.telegraf import Telegraf +from influxdb_client.domain.telegraf_plugin_input_cpu import TelegrafPluginInputCpu +from influxdb_client.domain.telegraf_plugin_input_disk import TelegrafPluginInputDisk +from influxdb_client.domain.telegraf_plugin_input_diskio import TelegrafPluginInputDiskio +from influxdb_client.domain.telegraf_plugin_input_docker import TelegrafPluginInputDocker +from influxdb_client.domain.telegraf_plugin_input_docker_config import TelegrafPluginInputDockerConfig +from influxdb_client.domain.telegraf_plugin_input_file import TelegrafPluginInputFile +from influxdb_client.domain.telegraf_plugin_input_file_config import TelegrafPluginInputFileConfig +from influxdb_client.domain.telegraf_plugin_input_kernel import TelegrafPluginInputKernel +from influxdb_client.domain.telegraf_plugin_input_kubernetes import TelegrafPluginInputKubernetes +from influxdb_client.domain.telegraf_plugin_input_kubernetes_config import TelegrafPluginInputKubernetesConfig +from influxdb_client.domain.telegraf_plugin_input_log_parser import TelegrafPluginInputLogParser +from influxdb_client.domain.telegraf_plugin_input_log_parser_config import TelegrafPluginInputLogParserConfig +from influxdb_client.domain.telegraf_plugin_input_mem import TelegrafPluginInputMem +from influxdb_client.domain.telegraf_plugin_input_net import TelegrafPluginInputNet +from influxdb_client.domain.telegraf_plugin_input_net_response import TelegrafPluginInputNetResponse +from influxdb_client.domain.telegraf_plugin_input_nginx import TelegrafPluginInputNginx +from influxdb_client.domain.telegraf_plugin_input_processes import TelegrafPluginInputProcesses +from influxdb_client.domain.telegraf_plugin_input_procstat import TelegrafPluginInputProcstat +from influxdb_client.domain.telegraf_plugin_input_procstat_config import TelegrafPluginInputProcstatConfig +from influxdb_client.domain.telegraf_plugin_input_prometheus import TelegrafPluginInputPrometheus +from influxdb_client.domain.telegraf_plugin_input_prometheus_config import TelegrafPluginInputPrometheusConfig +from influxdb_client.domain.telegraf_plugin_input_redis import TelegrafPluginInputRedis +from influxdb_client.domain.telegraf_plugin_input_redis_config import TelegrafPluginInputRedisConfig +from influxdb_client.domain.telegraf_plugin_input_swap import TelegrafPluginInputSwap +from influxdb_client.domain.telegraf_plugin_input_syslog import TelegrafPluginInputSyslog +from influxdb_client.domain.telegraf_plugin_input_syslog_config import TelegrafPluginInputSyslogConfig +from influxdb_client.domain.telegraf_plugin_input_system import TelegrafPluginInputSystem +from influxdb_client.domain.telegraf_plugin_input_tail import TelegrafPluginInputTail +from influxdb_client.domain.telegraf_plugin_output_file import TelegrafPluginOutputFile +from influxdb_client.domain.telegraf_plugin_output_file_config import TelegrafPluginOutputFileConfig +from influxdb_client.domain.telegraf_plugin_output_file_config_files import TelegrafPluginOutputFileConfigFiles +from influxdb_client.domain.telegraf_plugin_output_influx_dbv2 import TelegrafPluginOutputInfluxDBV2 +from influxdb_client.domain.telegraf_plugin_output_influx_dbv2_config import TelegrafPluginOutputInfluxDBV2Config +from influxdb_client.domain.telegraf_request import TelegrafRequest +from influxdb_client.domain.telegraf_request_agent import TelegrafRequestAgent +from influxdb_client.domain.telegraf_request_plugin import TelegrafRequestPlugin +from influxdb_client.domain.telegrafs import Telegrafs +from influxdb_client.domain.test_statement import TestStatement +from influxdb_client.domain.threshold import Threshold +from influxdb_client.domain.threshold_base import ThresholdBase +from influxdb_client.domain.threshold_check import ThresholdCheck +from influxdb_client.domain.unary_expression import UnaryExpression +from influxdb_client.domain.unsigned_integer_literal import UnsignedIntegerLiteral +from influxdb_client.domain.user import User +from influxdb_client.domain.user_links import UserLinks +from influxdb_client.domain.users import Users +from influxdb_client.domain.users_links import UsersLinks +from influxdb_client.domain.variable import Variable +from influxdb_client.domain.variable_assignment import VariableAssignment +from influxdb_client.domain.variable_links import VariableLinks +from influxdb_client.domain.variables import Variables +from influxdb_client.domain.view import View +from influxdb_client.domain.view_links import ViewLinks +from influxdb_client.domain.view_properties import ViewProperties +from influxdb_client.domain.views import Views +from influxdb_client.domain.write_precision import WritePrecision +from influxdb_client.domain.xy_geom import XYGeom +from influxdb_client.domain.xy_view_properties import XYViewProperties + +from influxdb_client import Configuration, ApiClient, HealthCheck, HealthService, Ready, ReadyService +from influxdb_client.client.authorizations_api import AuthorizationsApi +from influxdb_client.client.bucket_api import BucketsApi +from influxdb_client.client.labels_api import LabelsApi +from influxdb_client.client.organizations_api import OrganizationsApi +from influxdb_client.client.query_api import QueryApi +from influxdb_client.client.tasks_api import TasksApi +from influxdb_client.client.users_api import UsersApi +from influxdb_client.client.write_api import WriteApi, WriteOptions +from influxdb_client.client.influxdb_client import InfluxDBClient +from influxdb_client.client.write.point import Point + +__version__ = '0.0.1' + + diff --git a/influxdb2/api_client.py b/influxdb_client/api_client.py similarity index 99% rename from influxdb2/api_client.py rename to influxdb_client/api_client.py index d1781587..900e5779 100644 --- a/influxdb2/api_client.py +++ b/influxdb_client/api_client.py @@ -22,9 +22,9 @@ import six from six.moves.urllib.parse import quote -from influxdb2.configuration import Configuration -import influxdb2.domain -from influxdb2 import rest +from influxdb_client.configuration import Configuration +import influxdb_client.domain +from influxdb_client import rest class ApiClient(object): @@ -273,7 +273,7 @@ def __deserialize(self, data, klass): if klass in self.NATIVE_TYPES_MAPPING: klass = self.NATIVE_TYPES_MAPPING[klass] else: - klass = getattr(influxdb2.domain, klass) + klass = getattr(influxdb_client.domain, klass) if klass in self.PRIMITIVE_TYPES: return self.__deserialize_primitive(data, klass) diff --git a/influxdb_client/client/__init__.py b/influxdb_client/client/__init__.py new file mode 100644 index 00000000..e8d70033 --- /dev/null +++ b/influxdb_client/client/__init__.py @@ -0,0 +1,5 @@ +from __future__ import absolute_import + +from influxdb_client.client.influxdb_client import InfluxDBClient + +__version__ = '1.0.0' \ No newline at end of file diff --git a/influxdb2/client/abstract_client.py b/influxdb_client/client/abstract_client.py similarity index 100% rename from influxdb2/client/abstract_client.py rename to influxdb_client/client/abstract_client.py diff --git a/influxdb2/client/authorizations_api.py b/influxdb_client/client/authorizations_api.py similarity index 98% rename from influxdb2/client/authorizations_api.py rename to influxdb_client/client/authorizations_api.py index a49cd31d..8a1471f1 100644 --- a/influxdb2/client/authorizations_api.py +++ b/influxdb_client/client/authorizations_api.py @@ -1,4 +1,4 @@ -from influxdb2 import Authorization, AuthorizationsService, User, Organization +from influxdb_client import Authorization, AuthorizationsService, User, Organization class AuthorizationsApi(object): diff --git a/influxdb2/client/bucket_api.py b/influxdb_client/client/bucket_api.py similarity index 95% rename from influxdb2/client/bucket_api.py rename to influxdb_client/client/bucket_api.py index 04186d89..4d20bce0 100644 --- a/influxdb2/client/bucket_api.py +++ b/influxdb_client/client/bucket_api.py @@ -1,4 +1,4 @@ -from influxdb2 import BucketsService, Bucket +from influxdb_client import BucketsService, Bucket class BucketsApi(object): @@ -37,7 +37,7 @@ def create_bucket(self, bucket=None, bucket_name=None, org_id=None, retention_ru bucket = Bucket(name=bucket_name, retention_rules=rules, description=description) if org_id is None: - org_id = self._influxdb_client.org_id + org_id = self._influxdb_client.org bucket.org_id = org_id return self._buckets_service.post_buckets(bucket=bucket) diff --git a/influxdb2/client/flux_csv_parser.py b/influxdb_client/client/flux_csv_parser.py similarity index 98% rename from influxdb2/client/flux_csv_parser.py rename to influxdb_client/client/flux_csv_parser.py index 92bff429..504de3ba 100644 --- a/influxdb2/client/flux_csv_parser.py +++ b/influxdb_client/client/flux_csv_parser.py @@ -5,7 +5,7 @@ from dateutil.parser import parse as timestamp_parser import ciso8601 -from influxdb2.client.flux_table import FluxTable, FluxColumn, FluxRecord +from influxdb_client.client.flux_table import FluxTable, FluxColumn, FluxRecord class FluxQueryException(Exception): diff --git a/influxdb2/client/flux_table.py b/influxdb_client/client/flux_table.py similarity index 100% rename from influxdb2/client/flux_table.py rename to influxdb_client/client/flux_table.py diff --git a/influxdb2/client/influxdb_client.py b/influxdb_client/client/influxdb_client.py similarity index 88% rename from influxdb2/client/influxdb_client.py rename to influxdb_client/client/influxdb_client.py index 6f80cb1e..f419c8e2 100644 --- a/influxdb2/client/influxdb_client.py +++ b/influxdb_client/client/influxdb_client.py @@ -1,14 +1,14 @@ from __future__ import absolute_import -from influxdb2 import Configuration, ApiClient, HealthCheck, HealthService, Ready, ReadyService -from influxdb2.client.authorizations_api import AuthorizationsApi -from influxdb2.client.bucket_api import BucketsApi -from influxdb2.client.labels_api import LabelsApi -from influxdb2.client.organizations_api import OrganizationsApi -from influxdb2.client.query_api import QueryApi -from influxdb2.client.tasks_api import TasksApi -from influxdb2.client.users_api import UsersApi -from influxdb2.client.write_api import WriteApi, WriteOptions +from influxdb_client import Configuration, ApiClient, HealthCheck, HealthService, Ready, ReadyService +from influxdb_client.client.authorizations_api import AuthorizationsApi +from influxdb_client.client.bucket_api import BucketsApi +from influxdb_client.client.labels_api import LabelsApi +from influxdb_client.client.organizations_api import OrganizationsApi +from influxdb_client.client.query_api import QueryApi +from influxdb_client.client.tasks_api import TasksApi +from influxdb_client.client.users_api import UsersApi +from influxdb_client.client.write_api import WriteApi, WriteOptions class InfluxDBClient(object): diff --git a/influxdb2/client/labels_api.py b/influxdb_client/client/labels_api.py similarity index 97% rename from influxdb2/client/labels_api.py rename to influxdb_client/client/labels_api.py index 54eee03e..91ac1250 100644 --- a/influxdb2/client/labels_api.py +++ b/influxdb_client/client/labels_api.py @@ -1,6 +1,6 @@ from typing import List, Dict -from influxdb2 import LabelsService, LabelCreateRequest, Label, LabelUpdate +from influxdb_client import LabelsService, LabelCreateRequest, Label, LabelUpdate class LabelsApi(object): diff --git a/influxdb2/client/organizations_api.py b/influxdb_client/client/organizations_api.py similarity index 88% rename from influxdb2/client/organizations_api.py rename to influxdb_client/client/organizations_api.py index e18ecf0a..07f33c3d 100644 --- a/influxdb2/client/organizations_api.py +++ b/influxdb_client/client/organizations_api.py @@ -1,4 +1,4 @@ -from influxdb2 import OrganizationsService, UsersService, Organization +from influxdb_client import OrganizationsService, UsersService, Organization class OrganizationsApi(object): @@ -19,7 +19,7 @@ def find_organization(self, org_id): return self._organizations_service.get_orgs_id(org_id=org_id) def find_organizations(self): - return self._organizations_service.get_orgs() + return self._organizations_service.get_orgs().orgs def create_organization(self, name: str = None, organization: Organization = None) -> Organization: if organization is None: diff --git a/influxdb2/client/query_api.py b/influxdb_client/client/query_api.py similarity index 92% rename from influxdb2/client/query_api.py rename to influxdb_client/client/query_api.py index d6536b64..64285374 100644 --- a/influxdb2/client/query_api.py +++ b/influxdb_client/client/query_api.py @@ -2,10 +2,10 @@ import csv from typing import List -from influxdb2 import Dialect -from influxdb2 import Query, QueryService -from influxdb2.client.flux_csv_parser import FluxCsvParser, FluxResponseConsumerTable -from influxdb2.client.flux_table import FluxTable +from influxdb_client import Dialect +from influxdb_client import Query, QueryService +from influxdb_client.client.flux_csv_parser import FluxCsvParser, FluxResponseConsumerTable +from influxdb_client.client.flux_table import FluxTable class QueryApi(object): diff --git a/influxdb2/client/tasks_api.py b/influxdb_client/client/tasks_api.py similarity index 98% rename from influxdb2/client/tasks_api.py rename to influxdb_client/client/tasks_api.py index 041b8c13..e74bd1da 100644 --- a/influxdb2/client/tasks_api.py +++ b/influxdb_client/client/tasks_api.py @@ -1,7 +1,7 @@ import datetime from typing import List -from influxdb2 import TasksService, Task, TaskCreateRequest, TaskUpdateRequest, LabelResponse, LabelMapping, \ +from influxdb_client import TasksService, Task, TaskCreateRequest, TaskUpdateRequest, LabelResponse, LabelMapping, \ AddResourceMemberRequestBody, RunManually, Run, LogEvent diff --git a/influxdb2/client/users_api.py b/influxdb_client/client/users_api.py similarity index 89% rename from influxdb2/client/users_api.py rename to influxdb_client/client/users_api.py index 664bb653..2dfeea81 100644 --- a/influxdb2/client/users_api.py +++ b/influxdb_client/client/users_api.py @@ -1,4 +1,4 @@ -from influxdb2 import UsersService, User +from influxdb_client import UsersService, User class UsersApi(object): diff --git a/influxdb_client/client/write/__init__.py b/influxdb_client/client/write/__init__.py new file mode 100644 index 00000000..f0c74b50 --- /dev/null +++ b/influxdb_client/client/write/__init__.py @@ -0,0 +1,30 @@ +from __future__ import absolute_import + +# flake8: noqa + +# import apis into api package +from influxdb_client.service.authorizations_service import AuthorizationsService +from influxdb_client.service.buckets_service import BucketsService +from influxdb_client.service.cells_service import CellsService +from influxdb_client.service.checks_service import ChecksService +from influxdb_client.service.dashboards_service import DashboardsService +from influxdb_client.service.health_service import HealthService +from influxdb_client.service.labels_service import LabelsService +from influxdb_client.service.notification_endpoints_service import NotificationEndpointsService +from influxdb_client.service.notification_rules_service import NotificationRulesService +from influxdb_client.service.operation_logs_service import OperationLogsService +from influxdb_client.service.organizations_service import OrganizationsService +from influxdb_client.service.query_service import QueryService +from influxdb_client.service.ready_service import ReadyService +from influxdb_client.service.scraper_targets_service import ScraperTargetsService +from influxdb_client.service.secrets_service import SecretsService +from influxdb_client.service.setup_service import SetupService +from influxdb_client.service.sources_service import SourcesService +from influxdb_client.service.tasks_service import TasksService +from influxdb_client.service.telegrafs_service import TelegrafsService +from influxdb_client.service.templates_service import TemplatesService +from influxdb_client.service.users_service import UsersService +from influxdb_client.service.variables_service import VariablesService +from influxdb_client.service.views_service import ViewsService +from influxdb_client.service.write_service import WriteService +from influxdb_client.service.default_service import DefaultService diff --git a/influxdb2/client/write/point.py b/influxdb_client/client/write/point.py similarity index 98% rename from influxdb2/client/write/point.py rename to influxdb_client/client/write/point.py index 5bcbcd69..59476fef 100644 --- a/influxdb2/client/write/point.py +++ b/influxdb_client/client/write/point.py @@ -8,7 +8,7 @@ from pytz import UTC from six import iteritems -from influxdb2.domain.write_precision import WritePrecision +from influxdb_client.domain.write_precision import WritePrecision EPOCH = UTC.localize(datetime.utcfromtimestamp(0)) DEFAULT_WRITE_PRECISION = WritePrecision.NS diff --git a/influxdb2/client/write_api.py b/influxdb_client/client/write_api.py similarity index 97% rename from influxdb2/client/write_api.py rename to influxdb_client/client/write_api.py index b4ca92ee..ad8e3e06 100644 --- a/influxdb2/client/write_api.py +++ b/influxdb_client/client/write_api.py @@ -12,10 +12,10 @@ from rx.scheduler import ThreadPoolScheduler from rx.subject import Subject -from influxdb2 import WritePrecision, WriteService -from influxdb2.client.abstract_client import AbstractClient -from influxdb2.client.write.point import Point, DEFAULT_WRITE_PRECISION -from influxdb2.rest import ApiException +from influxdb_client import WritePrecision, WriteService +from influxdb_client.client.abstract_client import AbstractClient +from influxdb_client.client.write.point import Point, DEFAULT_WRITE_PRECISION +from influxdb_client.rest import ApiException logger = logging.getLogger(__name__) @@ -142,7 +142,7 @@ def __init__(self, influxdb_client, write_options: WriteOptions = WriteOptions() self._subject = None self._disposable = None - def write(self, bucket: str, org: str, record: Union[str, List['str'], Point, List['Point']], + def write(self, bucket: str, org: str, record: Union[str, List['str'], Point, List['Point'], Observable], write_precision: WritePrecision = DEFAULT_WRITE_PRECISION) -> None: """ Writes time-series data into influxdb. diff --git a/influxdb2/configuration.py b/influxdb_client/configuration.py similarity index 99% rename from influxdb2/configuration.py rename to influxdb_client/configuration.py index 8d24115c..93a2ed58 100644 --- a/influxdb2/configuration.py +++ b/influxdb_client/configuration.py @@ -62,7 +62,7 @@ def __init__(self): # Logging Settings self.logger = {} - self.logger["package_logger"] = logging.getLogger("influxdb2") + self.logger["package_logger"] = logging.getLogger("influxdb_client") self.logger["urllib3_logger"] = logging.getLogger("urllib3") # Log format self.logger_format = '%(asctime)s %(levelname)s %(message)s' diff --git a/influxdb_client/domain/__init__.py b/influxdb_client/domain/__init__.py new file mode 100644 index 00000000..2210d0c6 --- /dev/null +++ b/influxdb_client/domain/__init__.py @@ -0,0 +1,254 @@ +# coding: utf-8 + +# flake8: noqa +""" + Influx API Service + + No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501 + + OpenAPI spec version: 0.1.0 + Generated by: https://openapi-generator.tech +""" + + +from __future__ import absolute_import + +# import models into model package +from influxdb_client.domain.ast_response import ASTResponse +from influxdb_client.domain.add_resource_member_request_body import AddResourceMemberRequestBody +from influxdb_client.domain.analyze_query_response import AnalyzeQueryResponse +from influxdb_client.domain.analyze_query_response_errors import AnalyzeQueryResponseErrors +from influxdb_client.domain.array_expression import ArrayExpression +from influxdb_client.domain.authorization import Authorization +from influxdb_client.domain.authorization_update_request import AuthorizationUpdateRequest +from influxdb_client.domain.authorizations import Authorizations +from influxdb_client.domain.axes import Axes +from influxdb_client.domain.axis import Axis +from influxdb_client.domain.axis_scale import AxisScale +from influxdb_client.domain.bad_statement import BadStatement +from influxdb_client.domain.binary_expression import BinaryExpression +from influxdb_client.domain.block import Block +from influxdb_client.domain.boolean_literal import BooleanLiteral +from influxdb_client.domain.bucket import Bucket +from influxdb_client.domain.bucket_links import BucketLinks +from influxdb_client.domain.bucket_retention_rules import BucketRetentionRules +from influxdb_client.domain.buckets import Buckets +from influxdb_client.domain.builder_config import BuilderConfig +from influxdb_client.domain.builder_config_aggregate_window import BuilderConfigAggregateWindow +from influxdb_client.domain.builder_functions_type import BuilderFunctionsType +from influxdb_client.domain.builder_tags_type import BuilderTagsType +from influxdb_client.domain.builtin_statement import BuiltinStatement +from influxdb_client.domain.call_expression import CallExpression +from influxdb_client.domain.cell import Cell +from influxdb_client.domain.cell_links import CellLinks +from influxdb_client.domain.cell_update import CellUpdate +from influxdb_client.domain.check import Check +from influxdb_client.domain.check_base import CheckBase +from influxdb_client.domain.check_base_tags import CheckBaseTags +from influxdb_client.domain.check_status_level import CheckStatusLevel +from influxdb_client.domain.check_view_properties import CheckViewProperties +from influxdb_client.domain.checks import Checks +from influxdb_client.domain.conditional_expression import ConditionalExpression +from influxdb_client.domain.constant_variable_properties import ConstantVariableProperties +from influxdb_client.domain.create_cell import CreateCell +from influxdb_client.domain.create_dashboard_request import CreateDashboardRequest +from influxdb_client.domain.dashboard import Dashboard +from influxdb_client.domain.dashboard_color import DashboardColor +from influxdb_client.domain.dashboard_query import DashboardQuery +from influxdb_client.domain.dashboards import Dashboards +from influxdb_client.domain.date_time_literal import DateTimeLiteral +from influxdb_client.domain.deadman_check import DeadmanCheck +from influxdb_client.domain.decimal_places import DecimalPlaces +from influxdb_client.domain.dialect import Dialect +from influxdb_client.domain.document import Document +from influxdb_client.domain.document_create import DocumentCreate +from influxdb_client.domain.document_links import DocumentLinks +from influxdb_client.domain.document_list_entry import DocumentListEntry +from influxdb_client.domain.document_meta import DocumentMeta +from influxdb_client.domain.document_update import DocumentUpdate +from influxdb_client.domain.documents import Documents +from influxdb_client.domain.duration import Duration +from influxdb_client.domain.duration_literal import DurationLiteral +from influxdb_client.domain.error import Error +from influxdb_client.domain.expression import Expression +from influxdb_client.domain.expression_statement import ExpressionStatement +from influxdb_client.domain.field import Field +from influxdb_client.domain.file import File +from influxdb_client.domain.float_literal import FloatLiteral +from influxdb_client.domain.flux_response import FluxResponse +from influxdb_client.domain.flux_suggestion import FluxSuggestion +from influxdb_client.domain.flux_suggestions import FluxSuggestions +from influxdb_client.domain.function_expression import FunctionExpression +from influxdb_client.domain.gauge_view_properties import GaugeViewProperties +from influxdb_client.domain.greater_threshold import GreaterThreshold +from influxdb_client.domain.http_notification_endpoint import HTTPNotificationEndpoint +from influxdb_client.domain.http_notification_rule import HTTPNotificationRule +from influxdb_client.domain.http_notification_rule_base import HTTPNotificationRuleBase +from influxdb_client.domain.health_check import HealthCheck +from influxdb_client.domain.heatmap_view_properties import HeatmapViewProperties +from influxdb_client.domain.histogram_view_properties import HistogramViewProperties +from influxdb_client.domain.identifier import Identifier +from influxdb_client.domain.import_declaration import ImportDeclaration +from influxdb_client.domain.index_expression import IndexExpression +from influxdb_client.domain.integer_literal import IntegerLiteral +from influxdb_client.domain.is_onboarding import IsOnboarding +from influxdb_client.domain.label import Label +from influxdb_client.domain.label_create_request import LabelCreateRequest +from influxdb_client.domain.label_mapping import LabelMapping +from influxdb_client.domain.label_response import LabelResponse +from influxdb_client.domain.label_update import LabelUpdate +from influxdb_client.domain.labels_response import LabelsResponse +from influxdb_client.domain.language_request import LanguageRequest +from influxdb_client.domain.legend import Legend +from influxdb_client.domain.lesser_threshold import LesserThreshold +from influxdb_client.domain.line_plus_single_stat_properties import LinePlusSingleStatProperties +from influxdb_client.domain.line_protocol_error import LineProtocolError +from influxdb_client.domain.line_protocol_length_error import LineProtocolLengthError +from influxdb_client.domain.links import Links +from influxdb_client.domain.log_event import LogEvent +from influxdb_client.domain.logical_expression import LogicalExpression +from influxdb_client.domain.logs import Logs +from influxdb_client.domain.map_variable_properties import MapVariableProperties +from influxdb_client.domain.markdown_view_properties import MarkdownViewProperties +from influxdb_client.domain.member_assignment import MemberAssignment +from influxdb_client.domain.member_expression import MemberExpression +from influxdb_client.domain.model_property import ModelProperty +from influxdb_client.domain.node import Node +from influxdb_client.domain.notification_endpoint import NotificationEndpoint +from influxdb_client.domain.notification_endpoint_base import NotificationEndpointBase +from influxdb_client.domain.notification_endpoint_type import NotificationEndpointType +from influxdb_client.domain.notification_endpoint_update import NotificationEndpointUpdate +from influxdb_client.domain.notification_endpoints import NotificationEndpoints +from influxdb_client.domain.notification_rule import NotificationRule +from influxdb_client.domain.notification_rule_base import NotificationRuleBase +from influxdb_client.domain.notification_rule_update import NotificationRuleUpdate +from influxdb_client.domain.notification_rules import NotificationRules +from influxdb_client.domain.object_expression import ObjectExpression +from influxdb_client.domain.onboarding_request import OnboardingRequest +from influxdb_client.domain.onboarding_response import OnboardingResponse +from influxdb_client.domain.operation_log import OperationLog +from influxdb_client.domain.operation_log_links import OperationLogLinks +from influxdb_client.domain.operation_logs import OperationLogs +from influxdb_client.domain.option_statement import OptionStatement +from influxdb_client.domain.organization import Organization +from influxdb_client.domain.organization_links import OrganizationLinks +from influxdb_client.domain.organizations import Organizations +from influxdb_client.domain.package import Package +from influxdb_client.domain.package_clause import PackageClause +from influxdb_client.domain.pager_duty_notification_endpoint import PagerDutyNotificationEndpoint +from influxdb_client.domain.pager_duty_notification_rule import PagerDutyNotificationRule +from influxdb_client.domain.pager_duty_notification_rule_base import PagerDutyNotificationRuleBase +from influxdb_client.domain.password_reset_body import PasswordResetBody +from influxdb_client.domain.permission import Permission +from influxdb_client.domain.permission_resource import PermissionResource +from influxdb_client.domain.pipe_expression import PipeExpression +from influxdb_client.domain.pipe_literal import PipeLiteral +from influxdb_client.domain.property_key import PropertyKey +from influxdb_client.domain.query import Query +from influxdb_client.domain.query_edit_mode import QueryEditMode +from influxdb_client.domain.query_variable_properties import QueryVariableProperties +from influxdb_client.domain.query_variable_properties_values import QueryVariablePropertiesValues +from influxdb_client.domain.range_threshold import RangeThreshold +from influxdb_client.domain.ready import Ready +from influxdb_client.domain.regexp_literal import RegexpLiteral +from influxdb_client.domain.renamable_field import RenamableField +from influxdb_client.domain.resource_member import ResourceMember +from influxdb_client.domain.resource_members import ResourceMembers +from influxdb_client.domain.resource_owner import ResourceOwner +from influxdb_client.domain.resource_owners import ResourceOwners +from influxdb_client.domain.return_statement import ReturnStatement +from influxdb_client.domain.routes import Routes +from influxdb_client.domain.routes_external import RoutesExternal +from influxdb_client.domain.routes_query import RoutesQuery +from influxdb_client.domain.routes_system import RoutesSystem +from influxdb_client.domain.rule_status_level import RuleStatusLevel +from influxdb_client.domain.run import Run +from influxdb_client.domain.run_links import RunLinks +from influxdb_client.domain.run_log import RunLog +from influxdb_client.domain.run_manually import RunManually +from influxdb_client.domain.runs import Runs +from influxdb_client.domain.smtp_notification_rule import SMTPNotificationRule +from influxdb_client.domain.smtp_notification_rule_base import SMTPNotificationRuleBase +from influxdb_client.domain.scatter_view_properties import ScatterViewProperties +from influxdb_client.domain.scraper_target_request import ScraperTargetRequest +from influxdb_client.domain.scraper_target_response import ScraperTargetResponse +from influxdb_client.domain.scraper_target_responses import ScraperTargetResponses +from influxdb_client.domain.secret_keys import SecretKeys +from influxdb_client.domain.secret_keys_response import SecretKeysResponse +from influxdb_client.domain.single_stat_view_properties import SingleStatViewProperties +from influxdb_client.domain.slack_notification_endpoint import SlackNotificationEndpoint +from influxdb_client.domain.slack_notification_rule import SlackNotificationRule +from influxdb_client.domain.slack_notification_rule_base import SlackNotificationRuleBase +from influxdb_client.domain.source import Source +from influxdb_client.domain.source_links import SourceLinks +from influxdb_client.domain.sources import Sources +from influxdb_client.domain.statement import Statement +from influxdb_client.domain.status_rule import StatusRule +from influxdb_client.domain.string_literal import StringLiteral +from influxdb_client.domain.table_view_properties import TableViewProperties +from influxdb_client.domain.tag_rule import TagRule +from influxdb_client.domain.task import Task +from influxdb_client.domain.task_create_request import TaskCreateRequest +from influxdb_client.domain.task_links import TaskLinks +from influxdb_client.domain.task_status_type import TaskStatusType +from influxdb_client.domain.task_update_request import TaskUpdateRequest +from influxdb_client.domain.tasks import Tasks +from influxdb_client.domain.telegraf import Telegraf +from influxdb_client.domain.telegraf_plugin_input_cpu import TelegrafPluginInputCpu +from influxdb_client.domain.telegraf_plugin_input_disk import TelegrafPluginInputDisk +from influxdb_client.domain.telegraf_plugin_input_diskio import TelegrafPluginInputDiskio +from influxdb_client.domain.telegraf_plugin_input_docker import TelegrafPluginInputDocker +from influxdb_client.domain.telegraf_plugin_input_docker_config import TelegrafPluginInputDockerConfig +from influxdb_client.domain.telegraf_plugin_input_file import TelegrafPluginInputFile +from influxdb_client.domain.telegraf_plugin_input_file_config import TelegrafPluginInputFileConfig +from influxdb_client.domain.telegraf_plugin_input_kernel import TelegrafPluginInputKernel +from influxdb_client.domain.telegraf_plugin_input_kubernetes import TelegrafPluginInputKubernetes +from influxdb_client.domain.telegraf_plugin_input_kubernetes_config import TelegrafPluginInputKubernetesConfig +from influxdb_client.domain.telegraf_plugin_input_log_parser import TelegrafPluginInputLogParser +from influxdb_client.domain.telegraf_plugin_input_log_parser_config import TelegrafPluginInputLogParserConfig +from influxdb_client.domain.telegraf_plugin_input_mem import TelegrafPluginInputMem +from influxdb_client.domain.telegraf_plugin_input_net import TelegrafPluginInputNet +from influxdb_client.domain.telegraf_plugin_input_net_response import TelegrafPluginInputNetResponse +from influxdb_client.domain.telegraf_plugin_input_nginx import TelegrafPluginInputNginx +from influxdb_client.domain.telegraf_plugin_input_processes import TelegrafPluginInputProcesses +from influxdb_client.domain.telegraf_plugin_input_procstat import TelegrafPluginInputProcstat +from influxdb_client.domain.telegraf_plugin_input_procstat_config import TelegrafPluginInputProcstatConfig +from influxdb_client.domain.telegraf_plugin_input_prometheus import TelegrafPluginInputPrometheus +from influxdb_client.domain.telegraf_plugin_input_prometheus_config import TelegrafPluginInputPrometheusConfig +from influxdb_client.domain.telegraf_plugin_input_redis import TelegrafPluginInputRedis +from influxdb_client.domain.telegraf_plugin_input_redis_config import TelegrafPluginInputRedisConfig +from influxdb_client.domain.telegraf_plugin_input_swap import TelegrafPluginInputSwap +from influxdb_client.domain.telegraf_plugin_input_syslog import TelegrafPluginInputSyslog +from influxdb_client.domain.telegraf_plugin_input_syslog_config import TelegrafPluginInputSyslogConfig +from influxdb_client.domain.telegraf_plugin_input_system import TelegrafPluginInputSystem +from influxdb_client.domain.telegraf_plugin_input_tail import TelegrafPluginInputTail +from influxdb_client.domain.telegraf_plugin_output_file import TelegrafPluginOutputFile +from influxdb_client.domain.telegraf_plugin_output_file_config import TelegrafPluginOutputFileConfig +from influxdb_client.domain.telegraf_plugin_output_file_config_files import TelegrafPluginOutputFileConfigFiles +from influxdb_client.domain.telegraf_plugin_output_influx_dbv2 import TelegrafPluginOutputInfluxDBV2 +from influxdb_client.domain.telegraf_plugin_output_influx_dbv2_config import TelegrafPluginOutputInfluxDBV2Config +from influxdb_client.domain.telegraf_request import TelegrafRequest +from influxdb_client.domain.telegraf_request_agent import TelegrafRequestAgent +from influxdb_client.domain.telegraf_request_plugin import TelegrafRequestPlugin +from influxdb_client.domain.telegrafs import Telegrafs +from influxdb_client.domain.test_statement import TestStatement +from influxdb_client.domain.threshold import Threshold +from influxdb_client.domain.threshold_base import ThresholdBase +from influxdb_client.domain.threshold_check import ThresholdCheck +from influxdb_client.domain.unary_expression import UnaryExpression +from influxdb_client.domain.unsigned_integer_literal import UnsignedIntegerLiteral +from influxdb_client.domain.user import User +from influxdb_client.domain.user_links import UserLinks +from influxdb_client.domain.users import Users +from influxdb_client.domain.users_links import UsersLinks +from influxdb_client.domain.variable import Variable +from influxdb_client.domain.variable_assignment import VariableAssignment +from influxdb_client.domain.variable_links import VariableLinks +from influxdb_client.domain.variables import Variables +from influxdb_client.domain.view import View +from influxdb_client.domain.view_links import ViewLinks +from influxdb_client.domain.view_properties import ViewProperties +from influxdb_client.domain.views import Views +from influxdb_client.domain.write_precision import WritePrecision +from influxdb_client.domain.xy_geom import XYGeom +from influxdb_client.domain.xy_view_properties import XYViewProperties diff --git a/influxdb2/domain/add_resource_member_request_body.py b/influxdb_client/domain/add_resource_member_request_body.py similarity index 100% rename from influxdb2/domain/add_resource_member_request_body.py rename to influxdb_client/domain/add_resource_member_request_body.py diff --git a/influxdb2/domain/analyze_query_response.py b/influxdb_client/domain/analyze_query_response.py similarity index 100% rename from influxdb2/domain/analyze_query_response.py rename to influxdb_client/domain/analyze_query_response.py diff --git a/influxdb2/domain/analyze_query_response_errors.py b/influxdb_client/domain/analyze_query_response_errors.py similarity index 100% rename from influxdb2/domain/analyze_query_response_errors.py rename to influxdb_client/domain/analyze_query_response_errors.py diff --git a/influxdb2/domain/array_expression.py b/influxdb_client/domain/array_expression.py similarity index 100% rename from influxdb2/domain/array_expression.py rename to influxdb_client/domain/array_expression.py diff --git a/influxdb2/domain/ast_response.py b/influxdb_client/domain/ast_response.py similarity index 100% rename from influxdb2/domain/ast_response.py rename to influxdb_client/domain/ast_response.py diff --git a/influxdb2/domain/authorization.py b/influxdb_client/domain/authorization.py similarity index 98% rename from influxdb2/domain/authorization.py rename to influxdb_client/domain/authorization.py index 22ac9630..b1c98e40 100644 --- a/influxdb2/domain/authorization.py +++ b/influxdb_client/domain/authorization.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.authorization_update_request import AuthorizationUpdateRequest +from influxdb_client.domain.authorization_update_request import AuthorizationUpdateRequest class Authorization(AuthorizationUpdateRequest): diff --git a/influxdb2/domain/authorization_update_request.py b/influxdb_client/domain/authorization_update_request.py similarity index 100% rename from influxdb2/domain/authorization_update_request.py rename to influxdb_client/domain/authorization_update_request.py diff --git a/influxdb2/domain/authorizations.py b/influxdb_client/domain/authorizations.py similarity index 100% rename from influxdb2/domain/authorizations.py rename to influxdb_client/domain/authorizations.py diff --git a/influxdb2/domain/axes.py b/influxdb_client/domain/axes.py similarity index 100% rename from influxdb2/domain/axes.py rename to influxdb_client/domain/axes.py diff --git a/influxdb2/domain/axis.py b/influxdb_client/domain/axis.py similarity index 100% rename from influxdb2/domain/axis.py rename to influxdb_client/domain/axis.py diff --git a/influxdb2/domain/axis_scale.py b/influxdb_client/domain/axis_scale.py similarity index 100% rename from influxdb2/domain/axis_scale.py rename to influxdb_client/domain/axis_scale.py diff --git a/influxdb2/domain/bad_statement.py b/influxdb_client/domain/bad_statement.py similarity index 100% rename from influxdb2/domain/bad_statement.py rename to influxdb_client/domain/bad_statement.py diff --git a/influxdb2/domain/binary_expression.py b/influxdb_client/domain/binary_expression.py similarity index 100% rename from influxdb2/domain/binary_expression.py rename to influxdb_client/domain/binary_expression.py diff --git a/influxdb2/domain/block.py b/influxdb_client/domain/block.py similarity index 100% rename from influxdb2/domain/block.py rename to influxdb_client/domain/block.py diff --git a/influxdb2/domain/boolean_literal.py b/influxdb_client/domain/boolean_literal.py similarity index 100% rename from influxdb2/domain/boolean_literal.py rename to influxdb_client/domain/boolean_literal.py diff --git a/influxdb2/domain/bucket.py b/influxdb_client/domain/bucket.py similarity index 100% rename from influxdb2/domain/bucket.py rename to influxdb_client/domain/bucket.py diff --git a/influxdb2/domain/bucket_links.py b/influxdb_client/domain/bucket_links.py similarity index 100% rename from influxdb2/domain/bucket_links.py rename to influxdb_client/domain/bucket_links.py diff --git a/influxdb2/domain/bucket_retention_rules.py b/influxdb_client/domain/bucket_retention_rules.py similarity index 100% rename from influxdb2/domain/bucket_retention_rules.py rename to influxdb_client/domain/bucket_retention_rules.py diff --git a/influxdb2/domain/buckets.py b/influxdb_client/domain/buckets.py similarity index 100% rename from influxdb2/domain/buckets.py rename to influxdb_client/domain/buckets.py diff --git a/influxdb2/domain/builder_config.py b/influxdb_client/domain/builder_config.py similarity index 100% rename from influxdb2/domain/builder_config.py rename to influxdb_client/domain/builder_config.py diff --git a/influxdb2/domain/builder_config_aggregate_window.py b/influxdb_client/domain/builder_config_aggregate_window.py similarity index 100% rename from influxdb2/domain/builder_config_aggregate_window.py rename to influxdb_client/domain/builder_config_aggregate_window.py diff --git a/influxdb2/domain/builder_functions_type.py b/influxdb_client/domain/builder_functions_type.py similarity index 100% rename from influxdb2/domain/builder_functions_type.py rename to influxdb_client/domain/builder_functions_type.py diff --git a/influxdb2/domain/builder_tags_type.py b/influxdb_client/domain/builder_tags_type.py similarity index 100% rename from influxdb2/domain/builder_tags_type.py rename to influxdb_client/domain/builder_tags_type.py diff --git a/influxdb2/domain/builtin_statement.py b/influxdb_client/domain/builtin_statement.py similarity index 100% rename from influxdb2/domain/builtin_statement.py rename to influxdb_client/domain/builtin_statement.py diff --git a/influxdb2/domain/call_expression.py b/influxdb_client/domain/call_expression.py similarity index 100% rename from influxdb2/domain/call_expression.py rename to influxdb_client/domain/call_expression.py diff --git a/influxdb2/domain/cell.py b/influxdb_client/domain/cell.py similarity index 100% rename from influxdb2/domain/cell.py rename to influxdb_client/domain/cell.py diff --git a/influxdb2/domain/cell_links.py b/influxdb_client/domain/cell_links.py similarity index 100% rename from influxdb2/domain/cell_links.py rename to influxdb_client/domain/cell_links.py diff --git a/influxdb2/domain/cell_update.py b/influxdb_client/domain/cell_update.py similarity index 100% rename from influxdb2/domain/cell_update.py rename to influxdb_client/domain/cell_update.py diff --git a/influxdb2/domain/check.py b/influxdb_client/domain/check.py similarity index 98% rename from influxdb2/domain/check.py rename to influxdb_client/domain/check.py index 234b45c4..da859c60 100644 --- a/influxdb2/domain/check.py +++ b/influxdb_client/domain/check.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.check_base import CheckBase +from influxdb_client.domain.check_base import CheckBase class Check(CheckBase): diff --git a/influxdb2/domain/check_base.py b/influxdb_client/domain/check_base.py similarity index 100% rename from influxdb2/domain/check_base.py rename to influxdb_client/domain/check_base.py diff --git a/influxdb2/domain/check_base_tags.py b/influxdb_client/domain/check_base_tags.py similarity index 100% rename from influxdb2/domain/check_base_tags.py rename to influxdb_client/domain/check_base_tags.py diff --git a/influxdb2/domain/check_status_level.py b/influxdb_client/domain/check_status_level.py similarity index 100% rename from influxdb2/domain/check_status_level.py rename to influxdb_client/domain/check_status_level.py diff --git a/influxdb2/domain/check_view_properties.py b/influxdb_client/domain/check_view_properties.py similarity index 99% rename from influxdb2/domain/check_view_properties.py rename to influxdb_client/domain/check_view_properties.py index fc2d127f..5865b757 100644 --- a/influxdb2/domain/check_view_properties.py +++ b/influxdb_client/domain/check_view_properties.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.view_properties import ViewProperties +from influxdb_client.domain.view_properties import ViewProperties class CheckViewProperties(ViewProperties): diff --git a/influxdb2/domain/checks.py b/influxdb_client/domain/checks.py similarity index 100% rename from influxdb2/domain/checks.py rename to influxdb_client/domain/checks.py diff --git a/influxdb2/domain/conditional_expression.py b/influxdb_client/domain/conditional_expression.py similarity index 100% rename from influxdb2/domain/conditional_expression.py rename to influxdb_client/domain/conditional_expression.py diff --git a/influxdb2/domain/constant_variable_properties.py b/influxdb_client/domain/constant_variable_properties.py similarity index 100% rename from influxdb2/domain/constant_variable_properties.py rename to influxdb_client/domain/constant_variable_properties.py diff --git a/influxdb2/domain/create_cell.py b/influxdb_client/domain/create_cell.py similarity index 100% rename from influxdb2/domain/create_cell.py rename to influxdb_client/domain/create_cell.py diff --git a/influxdb2/domain/create_dashboard_request.py b/influxdb_client/domain/create_dashboard_request.py similarity index 100% rename from influxdb2/domain/create_dashboard_request.py rename to influxdb_client/domain/create_dashboard_request.py diff --git a/influxdb2/domain/dashboard.py b/influxdb_client/domain/dashboard.py similarity index 98% rename from influxdb2/domain/dashboard.py rename to influxdb_client/domain/dashboard.py index 2c189b4a..035ed385 100644 --- a/influxdb2/domain/dashboard.py +++ b/influxdb_client/domain/dashboard.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.create_dashboard_request import CreateDashboardRequest +from influxdb_client.domain.create_dashboard_request import CreateDashboardRequest class Dashboard(CreateDashboardRequest): diff --git a/influxdb2/domain/dashboard_color.py b/influxdb_client/domain/dashboard_color.py similarity index 100% rename from influxdb2/domain/dashboard_color.py rename to influxdb_client/domain/dashboard_color.py diff --git a/influxdb2/domain/dashboard_query.py b/influxdb_client/domain/dashboard_query.py similarity index 100% rename from influxdb2/domain/dashboard_query.py rename to influxdb_client/domain/dashboard_query.py diff --git a/influxdb2/domain/dashboards.py b/influxdb_client/domain/dashboards.py similarity index 100% rename from influxdb2/domain/dashboards.py rename to influxdb_client/domain/dashboards.py diff --git a/influxdb2/domain/date_time_literal.py b/influxdb_client/domain/date_time_literal.py similarity index 100% rename from influxdb2/domain/date_time_literal.py rename to influxdb_client/domain/date_time_literal.py diff --git a/influxdb2/domain/deadman_check.py b/influxdb_client/domain/deadman_check.py similarity index 99% rename from influxdb2/domain/deadman_check.py rename to influxdb_client/domain/deadman_check.py index c91ca85e..04b28157 100644 --- a/influxdb2/domain/deadman_check.py +++ b/influxdb_client/domain/deadman_check.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.check_base import CheckBase +from influxdb_client.domain.check_base import CheckBase class DeadmanCheck(CheckBase): diff --git a/influxdb2/domain/decimal_places.py b/influxdb_client/domain/decimal_places.py similarity index 100% rename from influxdb2/domain/decimal_places.py rename to influxdb_client/domain/decimal_places.py diff --git a/influxdb2/domain/dialect.py b/influxdb_client/domain/dialect.py similarity index 100% rename from influxdb2/domain/dialect.py rename to influxdb_client/domain/dialect.py diff --git a/influxdb2/domain/document.py b/influxdb_client/domain/document.py similarity index 100% rename from influxdb2/domain/document.py rename to influxdb_client/domain/document.py diff --git a/influxdb2/domain/document_create.py b/influxdb_client/domain/document_create.py similarity index 100% rename from influxdb2/domain/document_create.py rename to influxdb_client/domain/document_create.py diff --git a/influxdb2/domain/document_links.py b/influxdb_client/domain/document_links.py similarity index 100% rename from influxdb2/domain/document_links.py rename to influxdb_client/domain/document_links.py diff --git a/influxdb2/domain/document_list_entry.py b/influxdb_client/domain/document_list_entry.py similarity index 100% rename from influxdb2/domain/document_list_entry.py rename to influxdb_client/domain/document_list_entry.py diff --git a/influxdb2/domain/document_meta.py b/influxdb_client/domain/document_meta.py similarity index 100% rename from influxdb2/domain/document_meta.py rename to influxdb_client/domain/document_meta.py diff --git a/influxdb2/domain/document_update.py b/influxdb_client/domain/document_update.py similarity index 100% rename from influxdb2/domain/document_update.py rename to influxdb_client/domain/document_update.py diff --git a/influxdb2/domain/documents.py b/influxdb_client/domain/documents.py similarity index 100% rename from influxdb2/domain/documents.py rename to influxdb_client/domain/documents.py diff --git a/influxdb2/domain/duration.py b/influxdb_client/domain/duration.py similarity index 100% rename from influxdb2/domain/duration.py rename to influxdb_client/domain/duration.py diff --git a/influxdb2/domain/duration_literal.py b/influxdb_client/domain/duration_literal.py similarity index 100% rename from influxdb2/domain/duration_literal.py rename to influxdb_client/domain/duration_literal.py diff --git a/influxdb2/domain/error.py b/influxdb_client/domain/error.py similarity index 100% rename from influxdb2/domain/error.py rename to influxdb_client/domain/error.py diff --git a/influxdb2/domain/expression.py b/influxdb_client/domain/expression.py similarity index 100% rename from influxdb2/domain/expression.py rename to influxdb_client/domain/expression.py diff --git a/influxdb2/domain/expression_statement.py b/influxdb_client/domain/expression_statement.py similarity index 100% rename from influxdb2/domain/expression_statement.py rename to influxdb_client/domain/expression_statement.py diff --git a/influxdb2/domain/field.py b/influxdb_client/domain/field.py similarity index 100% rename from influxdb2/domain/field.py rename to influxdb_client/domain/field.py diff --git a/influxdb2/domain/file.py b/influxdb_client/domain/file.py similarity index 100% rename from influxdb2/domain/file.py rename to influxdb_client/domain/file.py diff --git a/influxdb2/domain/float_literal.py b/influxdb_client/domain/float_literal.py similarity index 100% rename from influxdb2/domain/float_literal.py rename to influxdb_client/domain/float_literal.py diff --git a/influxdb2/domain/flux_response.py b/influxdb_client/domain/flux_response.py similarity index 100% rename from influxdb2/domain/flux_response.py rename to influxdb_client/domain/flux_response.py diff --git a/influxdb2/domain/flux_suggestion.py b/influxdb_client/domain/flux_suggestion.py similarity index 100% rename from influxdb2/domain/flux_suggestion.py rename to influxdb_client/domain/flux_suggestion.py diff --git a/influxdb2/domain/flux_suggestions.py b/influxdb_client/domain/flux_suggestions.py similarity index 100% rename from influxdb2/domain/flux_suggestions.py rename to influxdb_client/domain/flux_suggestions.py diff --git a/influxdb2/domain/function_expression.py b/influxdb_client/domain/function_expression.py similarity index 100% rename from influxdb2/domain/function_expression.py rename to influxdb_client/domain/function_expression.py diff --git a/influxdb2/domain/gauge_view_properties.py b/influxdb_client/domain/gauge_view_properties.py similarity index 99% rename from influxdb2/domain/gauge_view_properties.py rename to influxdb_client/domain/gauge_view_properties.py index edea15f7..afe5eb67 100644 --- a/influxdb2/domain/gauge_view_properties.py +++ b/influxdb_client/domain/gauge_view_properties.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.view_properties import ViewProperties +from influxdb_client.domain.view_properties import ViewProperties class GaugeViewProperties(ViewProperties): diff --git a/influxdb2/domain/greater_threshold.py b/influxdb_client/domain/greater_threshold.py similarity index 98% rename from influxdb2/domain/greater_threshold.py rename to influxdb_client/domain/greater_threshold.py index 26035378..98a52abe 100644 --- a/influxdb2/domain/greater_threshold.py +++ b/influxdb_client/domain/greater_threshold.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.threshold_base import ThresholdBase +from influxdb_client.domain.threshold_base import ThresholdBase class GreaterThreshold(ThresholdBase): diff --git a/influxdb2/domain/health_check.py b/influxdb_client/domain/health_check.py similarity index 100% rename from influxdb2/domain/health_check.py rename to influxdb_client/domain/health_check.py diff --git a/influxdb2/domain/heatmap_view_properties.py b/influxdb_client/domain/heatmap_view_properties.py similarity index 99% rename from influxdb2/domain/heatmap_view_properties.py rename to influxdb_client/domain/heatmap_view_properties.py index bb1f7870..55fe1528 100644 --- a/influxdb2/domain/heatmap_view_properties.py +++ b/influxdb_client/domain/heatmap_view_properties.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.view_properties import ViewProperties +from influxdb_client.domain.view_properties import ViewProperties class HeatmapViewProperties(ViewProperties): diff --git a/influxdb2/domain/histogram_view_properties.py b/influxdb_client/domain/histogram_view_properties.py similarity index 99% rename from influxdb2/domain/histogram_view_properties.py rename to influxdb_client/domain/histogram_view_properties.py index 7ad4b7d4..ee1afde1 100644 --- a/influxdb2/domain/histogram_view_properties.py +++ b/influxdb_client/domain/histogram_view_properties.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.view_properties import ViewProperties +from influxdb_client.domain.view_properties import ViewProperties class HistogramViewProperties(ViewProperties): diff --git a/influxdb2/domain/http_notification_endpoint.py b/influxdb_client/domain/http_notification_endpoint.py similarity index 99% rename from influxdb2/domain/http_notification_endpoint.py rename to influxdb_client/domain/http_notification_endpoint.py index f017ef0f..ccb5c665 100644 --- a/influxdb2/domain/http_notification_endpoint.py +++ b/influxdb_client/domain/http_notification_endpoint.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.notification_endpoint_base import NotificationEndpointBase +from influxdb_client.domain.notification_endpoint_base import NotificationEndpointBase class HTTPNotificationEndpoint(NotificationEndpointBase): diff --git a/influxdb2/domain/http_notification_rule.py b/influxdb_client/domain/http_notification_rule.py similarity index 96% rename from influxdb2/domain/http_notification_rule.py rename to influxdb_client/domain/http_notification_rule.py index f9037d3b..3fe00f4b 100644 --- a/influxdb2/domain/http_notification_rule.py +++ b/influxdb_client/domain/http_notification_rule.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.http_notification_rule_base import HTTPNotificationRuleBase +from influxdb_client.domain.http_notification_rule_base import HTTPNotificationRuleBase class HTTPNotificationRule(HTTPNotificationRuleBase): diff --git a/influxdb2/domain/http_notification_rule_base.py b/influxdb_client/domain/http_notification_rule_base.py similarity index 100% rename from influxdb2/domain/http_notification_rule_base.py rename to influxdb_client/domain/http_notification_rule_base.py diff --git a/influxdb2/domain/identifier.py b/influxdb_client/domain/identifier.py similarity index 100% rename from influxdb2/domain/identifier.py rename to influxdb_client/domain/identifier.py diff --git a/influxdb2/domain/import_declaration.py b/influxdb_client/domain/import_declaration.py similarity index 100% rename from influxdb2/domain/import_declaration.py rename to influxdb_client/domain/import_declaration.py diff --git a/influxdb2/domain/index_expression.py b/influxdb_client/domain/index_expression.py similarity index 100% rename from influxdb2/domain/index_expression.py rename to influxdb_client/domain/index_expression.py diff --git a/influxdb2/domain/integer_literal.py b/influxdb_client/domain/integer_literal.py similarity index 100% rename from influxdb2/domain/integer_literal.py rename to influxdb_client/domain/integer_literal.py diff --git a/influxdb2/domain/is_onboarding.py b/influxdb_client/domain/is_onboarding.py similarity index 100% rename from influxdb2/domain/is_onboarding.py rename to influxdb_client/domain/is_onboarding.py diff --git a/influxdb2/domain/label.py b/influxdb_client/domain/label.py similarity index 100% rename from influxdb2/domain/label.py rename to influxdb_client/domain/label.py diff --git a/influxdb2/domain/label_create_request.py b/influxdb_client/domain/label_create_request.py similarity index 100% rename from influxdb2/domain/label_create_request.py rename to influxdb_client/domain/label_create_request.py diff --git a/influxdb2/domain/label_mapping.py b/influxdb_client/domain/label_mapping.py similarity index 100% rename from influxdb2/domain/label_mapping.py rename to influxdb_client/domain/label_mapping.py diff --git a/influxdb2/domain/label_response.py b/influxdb_client/domain/label_response.py similarity index 100% rename from influxdb2/domain/label_response.py rename to influxdb_client/domain/label_response.py diff --git a/influxdb2/domain/label_update.py b/influxdb_client/domain/label_update.py similarity index 100% rename from influxdb2/domain/label_update.py rename to influxdb_client/domain/label_update.py diff --git a/influxdb2/domain/labels_response.py b/influxdb_client/domain/labels_response.py similarity index 100% rename from influxdb2/domain/labels_response.py rename to influxdb_client/domain/labels_response.py diff --git a/influxdb2/domain/language_request.py b/influxdb_client/domain/language_request.py similarity index 100% rename from influxdb2/domain/language_request.py rename to influxdb_client/domain/language_request.py diff --git a/influxdb2/domain/legend.py b/influxdb_client/domain/legend.py similarity index 100% rename from influxdb2/domain/legend.py rename to influxdb_client/domain/legend.py diff --git a/influxdb2/domain/lesser_threshold.py b/influxdb_client/domain/lesser_threshold.py similarity index 98% rename from influxdb2/domain/lesser_threshold.py rename to influxdb_client/domain/lesser_threshold.py index a6bca4d1..12cb3170 100644 --- a/influxdb2/domain/lesser_threshold.py +++ b/influxdb_client/domain/lesser_threshold.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.threshold_base import ThresholdBase +from influxdb_client.domain.threshold_base import ThresholdBase class LesserThreshold(ThresholdBase): diff --git a/influxdb2/domain/line_plus_single_stat_properties.py b/influxdb_client/domain/line_plus_single_stat_properties.py similarity index 100% rename from influxdb2/domain/line_plus_single_stat_properties.py rename to influxdb_client/domain/line_plus_single_stat_properties.py diff --git a/influxdb2/domain/line_protocol_error.py b/influxdb_client/domain/line_protocol_error.py similarity index 100% rename from influxdb2/domain/line_protocol_error.py rename to influxdb_client/domain/line_protocol_error.py diff --git a/influxdb2/domain/line_protocol_length_error.py b/influxdb_client/domain/line_protocol_length_error.py similarity index 100% rename from influxdb2/domain/line_protocol_length_error.py rename to influxdb_client/domain/line_protocol_length_error.py diff --git a/influxdb2/domain/links.py b/influxdb_client/domain/links.py similarity index 100% rename from influxdb2/domain/links.py rename to influxdb_client/domain/links.py diff --git a/influxdb2/domain/log_event.py b/influxdb_client/domain/log_event.py similarity index 100% rename from influxdb2/domain/log_event.py rename to influxdb_client/domain/log_event.py diff --git a/influxdb2/domain/logical_expression.py b/influxdb_client/domain/logical_expression.py similarity index 100% rename from influxdb2/domain/logical_expression.py rename to influxdb_client/domain/logical_expression.py diff --git a/influxdb2/domain/logs.py b/influxdb_client/domain/logs.py similarity index 100% rename from influxdb2/domain/logs.py rename to influxdb_client/domain/logs.py diff --git a/influxdb2/domain/map_variable_properties.py b/influxdb_client/domain/map_variable_properties.py similarity index 100% rename from influxdb2/domain/map_variable_properties.py rename to influxdb_client/domain/map_variable_properties.py diff --git a/influxdb2/domain/markdown_view_properties.py b/influxdb_client/domain/markdown_view_properties.py similarity index 98% rename from influxdb2/domain/markdown_view_properties.py rename to influxdb_client/domain/markdown_view_properties.py index 13c4785b..85645bd3 100644 --- a/influxdb2/domain/markdown_view_properties.py +++ b/influxdb_client/domain/markdown_view_properties.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.view_properties import ViewProperties +from influxdb_client.domain.view_properties import ViewProperties class MarkdownViewProperties(ViewProperties): diff --git a/influxdb2/domain/member_assignment.py b/influxdb_client/domain/member_assignment.py similarity index 100% rename from influxdb2/domain/member_assignment.py rename to influxdb_client/domain/member_assignment.py diff --git a/influxdb2/domain/member_expression.py b/influxdb_client/domain/member_expression.py similarity index 100% rename from influxdb2/domain/member_expression.py rename to influxdb_client/domain/member_expression.py diff --git a/influxdb2/domain/model_property.py b/influxdb_client/domain/model_property.py similarity index 100% rename from influxdb2/domain/model_property.py rename to influxdb_client/domain/model_property.py diff --git a/influxdb2/domain/node.py b/influxdb_client/domain/node.py similarity index 100% rename from influxdb2/domain/node.py rename to influxdb_client/domain/node.py diff --git a/influxdb2/domain/notification_endpoint.py b/influxdb_client/domain/notification_endpoint.py similarity index 97% rename from influxdb2/domain/notification_endpoint.py rename to influxdb_client/domain/notification_endpoint.py index dae58147..0ec5b607 100644 --- a/influxdb2/domain/notification_endpoint.py +++ b/influxdb_client/domain/notification_endpoint.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.notification_endpoint_base import NotificationEndpointBase +from influxdb_client.domain.notification_endpoint_base import NotificationEndpointBase class NotificationEndpoint(NotificationEndpointBase): diff --git a/influxdb2/domain/notification_endpoint_base.py b/influxdb_client/domain/notification_endpoint_base.py similarity index 100% rename from influxdb2/domain/notification_endpoint_base.py rename to influxdb_client/domain/notification_endpoint_base.py diff --git a/influxdb2/domain/notification_endpoint_type.py b/influxdb_client/domain/notification_endpoint_type.py similarity index 100% rename from influxdb2/domain/notification_endpoint_type.py rename to influxdb_client/domain/notification_endpoint_type.py diff --git a/influxdb2/domain/notification_endpoint_update.py b/influxdb_client/domain/notification_endpoint_update.py similarity index 100% rename from influxdb2/domain/notification_endpoint_update.py rename to influxdb_client/domain/notification_endpoint_update.py diff --git a/influxdb2/domain/notification_endpoints.py b/influxdb_client/domain/notification_endpoints.py similarity index 100% rename from influxdb2/domain/notification_endpoints.py rename to influxdb_client/domain/notification_endpoints.py diff --git a/influxdb2/domain/notification_rule.py b/influxdb_client/domain/notification_rule.py similarity index 98% rename from influxdb2/domain/notification_rule.py rename to influxdb_client/domain/notification_rule.py index 5377fc98..997121c5 100644 --- a/influxdb2/domain/notification_rule.py +++ b/influxdb_client/domain/notification_rule.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.notification_rule_base import NotificationRuleBase +from influxdb_client.domain.notification_rule_base import NotificationRuleBase class NotificationRule(NotificationRuleBase): diff --git a/influxdb2/domain/notification_rule_base.py b/influxdb_client/domain/notification_rule_base.py similarity index 100% rename from influxdb2/domain/notification_rule_base.py rename to influxdb_client/domain/notification_rule_base.py diff --git a/influxdb2/domain/notification_rule_update.py b/influxdb_client/domain/notification_rule_update.py similarity index 100% rename from influxdb2/domain/notification_rule_update.py rename to influxdb_client/domain/notification_rule_update.py diff --git a/influxdb2/domain/notification_rules.py b/influxdb_client/domain/notification_rules.py similarity index 100% rename from influxdb2/domain/notification_rules.py rename to influxdb_client/domain/notification_rules.py diff --git a/influxdb2/domain/object_expression.py b/influxdb_client/domain/object_expression.py similarity index 100% rename from influxdb2/domain/object_expression.py rename to influxdb_client/domain/object_expression.py diff --git a/influxdb2/domain/onboarding_request.py b/influxdb_client/domain/onboarding_request.py similarity index 100% rename from influxdb2/domain/onboarding_request.py rename to influxdb_client/domain/onboarding_request.py diff --git a/influxdb2/domain/onboarding_response.py b/influxdb_client/domain/onboarding_response.py similarity index 100% rename from influxdb2/domain/onboarding_response.py rename to influxdb_client/domain/onboarding_response.py diff --git a/influxdb2/domain/operation_log.py b/influxdb_client/domain/operation_log.py similarity index 100% rename from influxdb2/domain/operation_log.py rename to influxdb_client/domain/operation_log.py diff --git a/influxdb2/domain/operation_log_links.py b/influxdb_client/domain/operation_log_links.py similarity index 100% rename from influxdb2/domain/operation_log_links.py rename to influxdb_client/domain/operation_log_links.py diff --git a/influxdb2/domain/operation_logs.py b/influxdb_client/domain/operation_logs.py similarity index 100% rename from influxdb2/domain/operation_logs.py rename to influxdb_client/domain/operation_logs.py diff --git a/influxdb2/domain/option_statement.py b/influxdb_client/domain/option_statement.py similarity index 100% rename from influxdb2/domain/option_statement.py rename to influxdb_client/domain/option_statement.py diff --git a/influxdb2/domain/organization.py b/influxdb_client/domain/organization.py similarity index 100% rename from influxdb2/domain/organization.py rename to influxdb_client/domain/organization.py diff --git a/influxdb2/domain/organization_links.py b/influxdb_client/domain/organization_links.py similarity index 100% rename from influxdb2/domain/organization_links.py rename to influxdb_client/domain/organization_links.py diff --git a/influxdb2/domain/organizations.py b/influxdb_client/domain/organizations.py similarity index 100% rename from influxdb2/domain/organizations.py rename to influxdb_client/domain/organizations.py diff --git a/influxdb2/domain/package.py b/influxdb_client/domain/package.py similarity index 100% rename from influxdb2/domain/package.py rename to influxdb_client/domain/package.py diff --git a/influxdb2/domain/package_clause.py b/influxdb_client/domain/package_clause.py similarity index 100% rename from influxdb2/domain/package_clause.py rename to influxdb_client/domain/package_clause.py diff --git a/influxdb2/domain/pager_duty_notification_endpoint.py b/influxdb_client/domain/pager_duty_notification_endpoint.py similarity index 98% rename from influxdb2/domain/pager_duty_notification_endpoint.py rename to influxdb_client/domain/pager_duty_notification_endpoint.py index bab808e3..217317ed 100644 --- a/influxdb2/domain/pager_duty_notification_endpoint.py +++ b/influxdb_client/domain/pager_duty_notification_endpoint.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.notification_endpoint_base import NotificationEndpointBase +from influxdb_client.domain.notification_endpoint_base import NotificationEndpointBase class PagerDutyNotificationEndpoint(NotificationEndpointBase): diff --git a/influxdb2/domain/pager_duty_notification_rule.py b/influxdb_client/domain/pager_duty_notification_rule.py similarity index 96% rename from influxdb2/domain/pager_duty_notification_rule.py rename to influxdb_client/domain/pager_duty_notification_rule.py index 10b70df0..b63df9ee 100644 --- a/influxdb2/domain/pager_duty_notification_rule.py +++ b/influxdb_client/domain/pager_duty_notification_rule.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.pager_duty_notification_rule_base import PagerDutyNotificationRuleBase +from influxdb_client.domain.pager_duty_notification_rule_base import PagerDutyNotificationRuleBase class PagerDutyNotificationRule(PagerDutyNotificationRuleBase): diff --git a/influxdb2/domain/pager_duty_notification_rule_base.py b/influxdb_client/domain/pager_duty_notification_rule_base.py similarity index 100% rename from influxdb2/domain/pager_duty_notification_rule_base.py rename to influxdb_client/domain/pager_duty_notification_rule_base.py diff --git a/influxdb2/domain/password_reset_body.py b/influxdb_client/domain/password_reset_body.py similarity index 100% rename from influxdb2/domain/password_reset_body.py rename to influxdb_client/domain/password_reset_body.py diff --git a/influxdb2/domain/permission.py b/influxdb_client/domain/permission.py similarity index 100% rename from influxdb2/domain/permission.py rename to influxdb_client/domain/permission.py diff --git a/influxdb2/domain/permission_resource.py b/influxdb_client/domain/permission_resource.py similarity index 100% rename from influxdb2/domain/permission_resource.py rename to influxdb_client/domain/permission_resource.py diff --git a/influxdb2/domain/pipe_expression.py b/influxdb_client/domain/pipe_expression.py similarity index 100% rename from influxdb2/domain/pipe_expression.py rename to influxdb_client/domain/pipe_expression.py diff --git a/influxdb2/domain/pipe_literal.py b/influxdb_client/domain/pipe_literal.py similarity index 100% rename from influxdb2/domain/pipe_literal.py rename to influxdb_client/domain/pipe_literal.py diff --git a/influxdb2/domain/property_key.py b/influxdb_client/domain/property_key.py similarity index 100% rename from influxdb2/domain/property_key.py rename to influxdb_client/domain/property_key.py diff --git a/influxdb2/domain/query.py b/influxdb_client/domain/query.py similarity index 100% rename from influxdb2/domain/query.py rename to influxdb_client/domain/query.py diff --git a/influxdb2/domain/query_edit_mode.py b/influxdb_client/domain/query_edit_mode.py similarity index 100% rename from influxdb2/domain/query_edit_mode.py rename to influxdb_client/domain/query_edit_mode.py diff --git a/influxdb2/domain/query_variable_properties.py b/influxdb_client/domain/query_variable_properties.py similarity index 100% rename from influxdb2/domain/query_variable_properties.py rename to influxdb_client/domain/query_variable_properties.py diff --git a/influxdb2/domain/query_variable_properties_values.py b/influxdb_client/domain/query_variable_properties_values.py similarity index 100% rename from influxdb2/domain/query_variable_properties_values.py rename to influxdb_client/domain/query_variable_properties_values.py diff --git a/influxdb2/domain/range_threshold.py b/influxdb_client/domain/range_threshold.py similarity index 98% rename from influxdb2/domain/range_threshold.py rename to influxdb_client/domain/range_threshold.py index 3b6103ed..2a7aed63 100644 --- a/influxdb2/domain/range_threshold.py +++ b/influxdb_client/domain/range_threshold.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.threshold_base import ThresholdBase +from influxdb_client.domain.threshold_base import ThresholdBase class RangeThreshold(ThresholdBase): diff --git a/influxdb2/domain/ready.py b/influxdb_client/domain/ready.py similarity index 100% rename from influxdb2/domain/ready.py rename to influxdb_client/domain/ready.py diff --git a/influxdb2/domain/regexp_literal.py b/influxdb_client/domain/regexp_literal.py similarity index 100% rename from influxdb2/domain/regexp_literal.py rename to influxdb_client/domain/regexp_literal.py diff --git a/influxdb2/domain/renamable_field.py b/influxdb_client/domain/renamable_field.py similarity index 100% rename from influxdb2/domain/renamable_field.py rename to influxdb_client/domain/renamable_field.py diff --git a/influxdb2/domain/resource_member.py b/influxdb_client/domain/resource_member.py similarity index 98% rename from influxdb2/domain/resource_member.py rename to influxdb_client/domain/resource_member.py index fa729abd..27d4d8b6 100644 --- a/influxdb2/domain/resource_member.py +++ b/influxdb_client/domain/resource_member.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.user import User +from influxdb_client.domain.user import User class ResourceMember(User): diff --git a/influxdb2/domain/resource_members.py b/influxdb_client/domain/resource_members.py similarity index 100% rename from influxdb2/domain/resource_members.py rename to influxdb_client/domain/resource_members.py diff --git a/influxdb2/domain/resource_owner.py b/influxdb_client/domain/resource_owner.py similarity index 98% rename from influxdb2/domain/resource_owner.py rename to influxdb_client/domain/resource_owner.py index 51aa8c64..10d829d3 100644 --- a/influxdb2/domain/resource_owner.py +++ b/influxdb_client/domain/resource_owner.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.user import User +from influxdb_client.domain.user import User class ResourceOwner(User): diff --git a/influxdb2/domain/resource_owners.py b/influxdb_client/domain/resource_owners.py similarity index 100% rename from influxdb2/domain/resource_owners.py rename to influxdb_client/domain/resource_owners.py diff --git a/influxdb2/domain/return_statement.py b/influxdb_client/domain/return_statement.py similarity index 100% rename from influxdb2/domain/return_statement.py rename to influxdb_client/domain/return_statement.py diff --git a/influxdb2/domain/routes.py b/influxdb_client/domain/routes.py similarity index 100% rename from influxdb2/domain/routes.py rename to influxdb_client/domain/routes.py diff --git a/influxdb2/domain/routes_external.py b/influxdb_client/domain/routes_external.py similarity index 100% rename from influxdb2/domain/routes_external.py rename to influxdb_client/domain/routes_external.py diff --git a/influxdb2/domain/routes_query.py b/influxdb_client/domain/routes_query.py similarity index 100% rename from influxdb2/domain/routes_query.py rename to influxdb_client/domain/routes_query.py diff --git a/influxdb2/domain/routes_system.py b/influxdb_client/domain/routes_system.py similarity index 100% rename from influxdb2/domain/routes_system.py rename to influxdb_client/domain/routes_system.py diff --git a/influxdb2/domain/rule_status_level.py b/influxdb_client/domain/rule_status_level.py similarity index 100% rename from influxdb2/domain/rule_status_level.py rename to influxdb_client/domain/rule_status_level.py diff --git a/influxdb2/domain/run.py b/influxdb_client/domain/run.py similarity index 100% rename from influxdb2/domain/run.py rename to influxdb_client/domain/run.py diff --git a/influxdb2/domain/run_links.py b/influxdb_client/domain/run_links.py similarity index 100% rename from influxdb2/domain/run_links.py rename to influxdb_client/domain/run_links.py diff --git a/influxdb2/domain/run_log.py b/influxdb_client/domain/run_log.py similarity index 100% rename from influxdb2/domain/run_log.py rename to influxdb_client/domain/run_log.py diff --git a/influxdb2/domain/run_manually.py b/influxdb_client/domain/run_manually.py similarity index 100% rename from influxdb2/domain/run_manually.py rename to influxdb_client/domain/run_manually.py diff --git a/influxdb2/domain/runs.py b/influxdb_client/domain/runs.py similarity index 100% rename from influxdb2/domain/runs.py rename to influxdb_client/domain/runs.py diff --git a/influxdb2/domain/scatter_view_properties.py b/influxdb_client/domain/scatter_view_properties.py similarity index 99% rename from influxdb2/domain/scatter_view_properties.py rename to influxdb_client/domain/scatter_view_properties.py index 68843e20..45d8d935 100644 --- a/influxdb2/domain/scatter_view_properties.py +++ b/influxdb_client/domain/scatter_view_properties.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.view_properties import ViewProperties +from influxdb_client.domain.view_properties import ViewProperties class ScatterViewProperties(ViewProperties): diff --git a/influxdb2/domain/scraper_target_request.py b/influxdb_client/domain/scraper_target_request.py similarity index 100% rename from influxdb2/domain/scraper_target_request.py rename to influxdb_client/domain/scraper_target_request.py diff --git a/influxdb2/domain/scraper_target_response.py b/influxdb_client/domain/scraper_target_response.py similarity index 98% rename from influxdb2/domain/scraper_target_response.py rename to influxdb_client/domain/scraper_target_response.py index d015ec8a..c5f1d12a 100644 --- a/influxdb2/domain/scraper_target_response.py +++ b/influxdb_client/domain/scraper_target_response.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.scraper_target_request import ScraperTargetRequest +from influxdb_client.domain.scraper_target_request import ScraperTargetRequest class ScraperTargetResponse(ScraperTargetRequest): diff --git a/influxdb2/domain/scraper_target_responses.py b/influxdb_client/domain/scraper_target_responses.py similarity index 100% rename from influxdb2/domain/scraper_target_responses.py rename to influxdb_client/domain/scraper_target_responses.py diff --git a/influxdb2/domain/secret_keys.py b/influxdb_client/domain/secret_keys.py similarity index 100% rename from influxdb2/domain/secret_keys.py rename to influxdb_client/domain/secret_keys.py diff --git a/influxdb2/domain/secret_keys_response.py b/influxdb_client/domain/secret_keys_response.py similarity index 98% rename from influxdb2/domain/secret_keys_response.py rename to influxdb_client/domain/secret_keys_response.py index b1646acb..6a138814 100644 --- a/influxdb2/domain/secret_keys_response.py +++ b/influxdb_client/domain/secret_keys_response.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.secret_keys import SecretKeys +from influxdb_client.domain.secret_keys import SecretKeys class SecretKeysResponse(SecretKeys): diff --git a/influxdb2/domain/single_stat_view_properties.py b/influxdb_client/domain/single_stat_view_properties.py similarity index 99% rename from influxdb2/domain/single_stat_view_properties.py rename to influxdb_client/domain/single_stat_view_properties.py index 0373ca8e..fe5bb440 100644 --- a/influxdb2/domain/single_stat_view_properties.py +++ b/influxdb_client/domain/single_stat_view_properties.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.view_properties import ViewProperties +from influxdb_client.domain.view_properties import ViewProperties class SingleStatViewProperties(ViewProperties): diff --git a/influxdb2/domain/slack_notification_endpoint.py b/influxdb_client/domain/slack_notification_endpoint.py similarity index 98% rename from influxdb2/domain/slack_notification_endpoint.py rename to influxdb_client/domain/slack_notification_endpoint.py index 5e21165e..a69a57bb 100644 --- a/influxdb2/domain/slack_notification_endpoint.py +++ b/influxdb_client/domain/slack_notification_endpoint.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.notification_endpoint_base import NotificationEndpointBase +from influxdb_client.domain.notification_endpoint_base import NotificationEndpointBase class SlackNotificationEndpoint(NotificationEndpointBase): diff --git a/influxdb2/domain/slack_notification_rule.py b/influxdb_client/domain/slack_notification_rule.py similarity index 96% rename from influxdb2/domain/slack_notification_rule.py rename to influxdb_client/domain/slack_notification_rule.py index d8bc1f0c..c22d7837 100644 --- a/influxdb2/domain/slack_notification_rule.py +++ b/influxdb_client/domain/slack_notification_rule.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.slack_notification_rule_base import SlackNotificationRuleBase +from influxdb_client.domain.slack_notification_rule_base import SlackNotificationRuleBase class SlackNotificationRule(SlackNotificationRuleBase): diff --git a/influxdb2/domain/slack_notification_rule_base.py b/influxdb_client/domain/slack_notification_rule_base.py similarity index 100% rename from influxdb2/domain/slack_notification_rule_base.py rename to influxdb_client/domain/slack_notification_rule_base.py diff --git a/influxdb2/domain/smtp_notification_rule.py b/influxdb_client/domain/smtp_notification_rule.py similarity index 96% rename from influxdb2/domain/smtp_notification_rule.py rename to influxdb_client/domain/smtp_notification_rule.py index 52a7ab78..ee6366d9 100644 --- a/influxdb2/domain/smtp_notification_rule.py +++ b/influxdb_client/domain/smtp_notification_rule.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.smtp_notification_rule_base import SMTPNotificationRuleBase +from influxdb_client.domain.smtp_notification_rule_base import SMTPNotificationRuleBase class SMTPNotificationRule(SMTPNotificationRuleBase): diff --git a/influxdb2/domain/smtp_notification_rule_base.py b/influxdb_client/domain/smtp_notification_rule_base.py similarity index 100% rename from influxdb2/domain/smtp_notification_rule_base.py rename to influxdb_client/domain/smtp_notification_rule_base.py diff --git a/influxdb2/domain/source.py b/influxdb_client/domain/source.py similarity index 100% rename from influxdb2/domain/source.py rename to influxdb_client/domain/source.py diff --git a/influxdb2/domain/source_links.py b/influxdb_client/domain/source_links.py similarity index 100% rename from influxdb2/domain/source_links.py rename to influxdb_client/domain/source_links.py diff --git a/influxdb2/domain/sources.py b/influxdb_client/domain/sources.py similarity index 100% rename from influxdb2/domain/sources.py rename to influxdb_client/domain/sources.py diff --git a/influxdb2/domain/statement.py b/influxdb_client/domain/statement.py similarity index 100% rename from influxdb2/domain/statement.py rename to influxdb_client/domain/statement.py diff --git a/influxdb2/domain/status_rule.py b/influxdb_client/domain/status_rule.py similarity index 100% rename from influxdb2/domain/status_rule.py rename to influxdb_client/domain/status_rule.py diff --git a/influxdb2/domain/string_literal.py b/influxdb_client/domain/string_literal.py similarity index 100% rename from influxdb2/domain/string_literal.py rename to influxdb_client/domain/string_literal.py diff --git a/influxdb2/domain/table_view_properties.py b/influxdb_client/domain/table_view_properties.py similarity index 99% rename from influxdb2/domain/table_view_properties.py rename to influxdb_client/domain/table_view_properties.py index eb6b3917..461e201b 100644 --- a/influxdb2/domain/table_view_properties.py +++ b/influxdb_client/domain/table_view_properties.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.view_properties import ViewProperties +from influxdb_client.domain.view_properties import ViewProperties class TableViewProperties(ViewProperties): diff --git a/influxdb2/domain/tag_rule.py b/influxdb_client/domain/tag_rule.py similarity index 100% rename from influxdb2/domain/tag_rule.py rename to influxdb_client/domain/tag_rule.py diff --git a/influxdb2/domain/task.py b/influxdb_client/domain/task.py similarity index 100% rename from influxdb2/domain/task.py rename to influxdb_client/domain/task.py diff --git a/influxdb2/domain/task_create_request.py b/influxdb_client/domain/task_create_request.py similarity index 100% rename from influxdb2/domain/task_create_request.py rename to influxdb_client/domain/task_create_request.py diff --git a/influxdb2/domain/task_links.py b/influxdb_client/domain/task_links.py similarity index 100% rename from influxdb2/domain/task_links.py rename to influxdb_client/domain/task_links.py diff --git a/influxdb2/domain/task_status_type.py b/influxdb_client/domain/task_status_type.py similarity index 100% rename from influxdb2/domain/task_status_type.py rename to influxdb_client/domain/task_status_type.py diff --git a/influxdb2/domain/task_update_request.py b/influxdb_client/domain/task_update_request.py similarity index 100% rename from influxdb2/domain/task_update_request.py rename to influxdb_client/domain/task_update_request.py diff --git a/influxdb2/domain/tasks.py b/influxdb_client/domain/tasks.py similarity index 100% rename from influxdb2/domain/tasks.py rename to influxdb_client/domain/tasks.py diff --git a/influxdb2/domain/telegraf.py b/influxdb_client/domain/telegraf.py similarity index 98% rename from influxdb2/domain/telegraf.py rename to influxdb_client/domain/telegraf.py index e5b417b4..3d8ba7ce 100644 --- a/influxdb2/domain/telegraf.py +++ b/influxdb_client/domain/telegraf.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.telegraf_request import TelegrafRequest +from influxdb_client.domain.telegraf_request import TelegrafRequest class Telegraf(TelegrafRequest): diff --git a/influxdb2/domain/telegraf_plugin_input_cpu.py b/influxdb_client/domain/telegraf_plugin_input_cpu.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_cpu.py rename to influxdb_client/domain/telegraf_plugin_input_cpu.py diff --git a/influxdb2/domain/telegraf_plugin_input_disk.py b/influxdb_client/domain/telegraf_plugin_input_disk.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_disk.py rename to influxdb_client/domain/telegraf_plugin_input_disk.py diff --git a/influxdb2/domain/telegraf_plugin_input_diskio.py b/influxdb_client/domain/telegraf_plugin_input_diskio.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_diskio.py rename to influxdb_client/domain/telegraf_plugin_input_diskio.py diff --git a/influxdb2/domain/telegraf_plugin_input_docker.py b/influxdb_client/domain/telegraf_plugin_input_docker.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_docker.py rename to influxdb_client/domain/telegraf_plugin_input_docker.py diff --git a/influxdb2/domain/telegraf_plugin_input_docker_config.py b/influxdb_client/domain/telegraf_plugin_input_docker_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_docker_config.py rename to influxdb_client/domain/telegraf_plugin_input_docker_config.py diff --git a/influxdb2/domain/telegraf_plugin_input_file.py b/influxdb_client/domain/telegraf_plugin_input_file.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_file.py rename to influxdb_client/domain/telegraf_plugin_input_file.py diff --git a/influxdb2/domain/telegraf_plugin_input_file_config.py b/influxdb_client/domain/telegraf_plugin_input_file_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_file_config.py rename to influxdb_client/domain/telegraf_plugin_input_file_config.py diff --git a/influxdb2/domain/telegraf_plugin_input_kernel.py b/influxdb_client/domain/telegraf_plugin_input_kernel.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_kernel.py rename to influxdb_client/domain/telegraf_plugin_input_kernel.py diff --git a/influxdb2/domain/telegraf_plugin_input_kubernetes.py b/influxdb_client/domain/telegraf_plugin_input_kubernetes.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_kubernetes.py rename to influxdb_client/domain/telegraf_plugin_input_kubernetes.py diff --git a/influxdb2/domain/telegraf_plugin_input_kubernetes_config.py b/influxdb_client/domain/telegraf_plugin_input_kubernetes_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_kubernetes_config.py rename to influxdb_client/domain/telegraf_plugin_input_kubernetes_config.py diff --git a/influxdb2/domain/telegraf_plugin_input_log_parser.py b/influxdb_client/domain/telegraf_plugin_input_log_parser.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_log_parser.py rename to influxdb_client/domain/telegraf_plugin_input_log_parser.py diff --git a/influxdb2/domain/telegraf_plugin_input_log_parser_config.py b/influxdb_client/domain/telegraf_plugin_input_log_parser_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_log_parser_config.py rename to influxdb_client/domain/telegraf_plugin_input_log_parser_config.py diff --git a/influxdb2/domain/telegraf_plugin_input_mem.py b/influxdb_client/domain/telegraf_plugin_input_mem.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_mem.py rename to influxdb_client/domain/telegraf_plugin_input_mem.py diff --git a/influxdb2/domain/telegraf_plugin_input_net.py b/influxdb_client/domain/telegraf_plugin_input_net.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_net.py rename to influxdb_client/domain/telegraf_plugin_input_net.py diff --git a/influxdb2/domain/telegraf_plugin_input_net_response.py b/influxdb_client/domain/telegraf_plugin_input_net_response.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_net_response.py rename to influxdb_client/domain/telegraf_plugin_input_net_response.py diff --git a/influxdb2/domain/telegraf_plugin_input_nginx.py b/influxdb_client/domain/telegraf_plugin_input_nginx.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_nginx.py rename to influxdb_client/domain/telegraf_plugin_input_nginx.py diff --git a/influxdb2/domain/telegraf_plugin_input_processes.py b/influxdb_client/domain/telegraf_plugin_input_processes.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_processes.py rename to influxdb_client/domain/telegraf_plugin_input_processes.py diff --git a/influxdb2/domain/telegraf_plugin_input_procstat.py b/influxdb_client/domain/telegraf_plugin_input_procstat.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_procstat.py rename to influxdb_client/domain/telegraf_plugin_input_procstat.py diff --git a/influxdb2/domain/telegraf_plugin_input_procstat_config.py b/influxdb_client/domain/telegraf_plugin_input_procstat_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_procstat_config.py rename to influxdb_client/domain/telegraf_plugin_input_procstat_config.py diff --git a/influxdb2/domain/telegraf_plugin_input_prometheus.py b/influxdb_client/domain/telegraf_plugin_input_prometheus.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_prometheus.py rename to influxdb_client/domain/telegraf_plugin_input_prometheus.py diff --git a/influxdb2/domain/telegraf_plugin_input_prometheus_config.py b/influxdb_client/domain/telegraf_plugin_input_prometheus_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_prometheus_config.py rename to influxdb_client/domain/telegraf_plugin_input_prometheus_config.py diff --git a/influxdb2/domain/telegraf_plugin_input_redis.py b/influxdb_client/domain/telegraf_plugin_input_redis.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_redis.py rename to influxdb_client/domain/telegraf_plugin_input_redis.py diff --git a/influxdb2/domain/telegraf_plugin_input_redis_config.py b/influxdb_client/domain/telegraf_plugin_input_redis_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_redis_config.py rename to influxdb_client/domain/telegraf_plugin_input_redis_config.py diff --git a/influxdb2/domain/telegraf_plugin_input_swap.py b/influxdb_client/domain/telegraf_plugin_input_swap.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_swap.py rename to influxdb_client/domain/telegraf_plugin_input_swap.py diff --git a/influxdb2/domain/telegraf_plugin_input_syslog.py b/influxdb_client/domain/telegraf_plugin_input_syslog.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_syslog.py rename to influxdb_client/domain/telegraf_plugin_input_syslog.py diff --git a/influxdb2/domain/telegraf_plugin_input_syslog_config.py b/influxdb_client/domain/telegraf_plugin_input_syslog_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_syslog_config.py rename to influxdb_client/domain/telegraf_plugin_input_syslog_config.py diff --git a/influxdb2/domain/telegraf_plugin_input_system.py b/influxdb_client/domain/telegraf_plugin_input_system.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_system.py rename to influxdb_client/domain/telegraf_plugin_input_system.py diff --git a/influxdb2/domain/telegraf_plugin_input_tail.py b/influxdb_client/domain/telegraf_plugin_input_tail.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_input_tail.py rename to influxdb_client/domain/telegraf_plugin_input_tail.py diff --git a/influxdb2/domain/telegraf_plugin_output_file.py b/influxdb_client/domain/telegraf_plugin_output_file.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_output_file.py rename to influxdb_client/domain/telegraf_plugin_output_file.py diff --git a/influxdb2/domain/telegraf_plugin_output_file_config.py b/influxdb_client/domain/telegraf_plugin_output_file_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_output_file_config.py rename to influxdb_client/domain/telegraf_plugin_output_file_config.py diff --git a/influxdb2/domain/telegraf_plugin_output_file_config_files.py b/influxdb_client/domain/telegraf_plugin_output_file_config_files.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_output_file_config_files.py rename to influxdb_client/domain/telegraf_plugin_output_file_config_files.py diff --git a/influxdb2/domain/telegraf_plugin_output_influx_dbv2.py b/influxdb_client/domain/telegraf_plugin_output_influx_dbv2.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_output_influx_dbv2.py rename to influxdb_client/domain/telegraf_plugin_output_influx_dbv2.py diff --git a/influxdb2/domain/telegraf_plugin_output_influx_dbv2_config.py b/influxdb_client/domain/telegraf_plugin_output_influx_dbv2_config.py similarity index 100% rename from influxdb2/domain/telegraf_plugin_output_influx_dbv2_config.py rename to influxdb_client/domain/telegraf_plugin_output_influx_dbv2_config.py diff --git a/influxdb2/domain/telegraf_request.py b/influxdb_client/domain/telegraf_request.py similarity index 100% rename from influxdb2/domain/telegraf_request.py rename to influxdb_client/domain/telegraf_request.py diff --git a/influxdb2/domain/telegraf_request_agent.py b/influxdb_client/domain/telegraf_request_agent.py similarity index 100% rename from influxdb2/domain/telegraf_request_agent.py rename to influxdb_client/domain/telegraf_request_agent.py diff --git a/influxdb2/domain/telegraf_request_plugin.py b/influxdb_client/domain/telegraf_request_plugin.py similarity index 100% rename from influxdb2/domain/telegraf_request_plugin.py rename to influxdb_client/domain/telegraf_request_plugin.py diff --git a/influxdb2/domain/telegrafs.py b/influxdb_client/domain/telegrafs.py similarity index 100% rename from influxdb2/domain/telegrafs.py rename to influxdb_client/domain/telegrafs.py diff --git a/influxdb2/domain/test_statement.py b/influxdb_client/domain/test_statement.py similarity index 100% rename from influxdb2/domain/test_statement.py rename to influxdb_client/domain/test_statement.py diff --git a/influxdb2/domain/threshold.py b/influxdb_client/domain/threshold.py similarity index 97% rename from influxdb2/domain/threshold.py rename to influxdb_client/domain/threshold.py index b7b160c8..a9acc509 100644 --- a/influxdb2/domain/threshold.py +++ b/influxdb_client/domain/threshold.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.threshold_base import ThresholdBase +from influxdb_client.domain.threshold_base import ThresholdBase class Threshold(ThresholdBase): diff --git a/influxdb2/domain/threshold_base.py b/influxdb_client/domain/threshold_base.py similarity index 100% rename from influxdb2/domain/threshold_base.py rename to influxdb_client/domain/threshold_base.py diff --git a/influxdb2/domain/threshold_check.py b/influxdb_client/domain/threshold_check.py similarity index 98% rename from influxdb2/domain/threshold_check.py rename to influxdb_client/domain/threshold_check.py index 72f4c733..f63314ae 100644 --- a/influxdb2/domain/threshold_check.py +++ b/influxdb_client/domain/threshold_check.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.check_base import CheckBase +from influxdb_client.domain.check_base import CheckBase class ThresholdCheck(CheckBase): diff --git a/influxdb2/domain/unary_expression.py b/influxdb_client/domain/unary_expression.py similarity index 100% rename from influxdb2/domain/unary_expression.py rename to influxdb_client/domain/unary_expression.py diff --git a/influxdb2/domain/unsigned_integer_literal.py b/influxdb_client/domain/unsigned_integer_literal.py similarity index 100% rename from influxdb2/domain/unsigned_integer_literal.py rename to influxdb_client/domain/unsigned_integer_literal.py diff --git a/influxdb2/domain/user.py b/influxdb_client/domain/user.py similarity index 100% rename from influxdb2/domain/user.py rename to influxdb_client/domain/user.py diff --git a/influxdb2/domain/user_links.py b/influxdb_client/domain/user_links.py similarity index 100% rename from influxdb2/domain/user_links.py rename to influxdb_client/domain/user_links.py diff --git a/influxdb2/domain/users.py b/influxdb_client/domain/users.py similarity index 100% rename from influxdb2/domain/users.py rename to influxdb_client/domain/users.py diff --git a/influxdb2/domain/users_links.py b/influxdb_client/domain/users_links.py similarity index 100% rename from influxdb2/domain/users_links.py rename to influxdb_client/domain/users_links.py diff --git a/influxdb2/domain/variable.py b/influxdb_client/domain/variable.py similarity index 100% rename from influxdb2/domain/variable.py rename to influxdb_client/domain/variable.py diff --git a/influxdb2/domain/variable_assignment.py b/influxdb_client/domain/variable_assignment.py similarity index 100% rename from influxdb2/domain/variable_assignment.py rename to influxdb_client/domain/variable_assignment.py diff --git a/influxdb2/domain/variable_links.py b/influxdb_client/domain/variable_links.py similarity index 100% rename from influxdb2/domain/variable_links.py rename to influxdb_client/domain/variable_links.py diff --git a/influxdb2/domain/variables.py b/influxdb_client/domain/variables.py similarity index 100% rename from influxdb2/domain/variables.py rename to influxdb_client/domain/variables.py diff --git a/influxdb2/domain/view.py b/influxdb_client/domain/view.py similarity index 100% rename from influxdb2/domain/view.py rename to influxdb_client/domain/view.py diff --git a/influxdb2/domain/view_links.py b/influxdb_client/domain/view_links.py similarity index 100% rename from influxdb2/domain/view_links.py rename to influxdb_client/domain/view_links.py diff --git a/influxdb2/domain/view_properties.py b/influxdb_client/domain/view_properties.py similarity index 100% rename from influxdb2/domain/view_properties.py rename to influxdb_client/domain/view_properties.py diff --git a/influxdb2/domain/views.py b/influxdb_client/domain/views.py similarity index 100% rename from influxdb2/domain/views.py rename to influxdb_client/domain/views.py diff --git a/influxdb2/domain/write_precision.py b/influxdb_client/domain/write_precision.py similarity index 100% rename from influxdb2/domain/write_precision.py rename to influxdb_client/domain/write_precision.py diff --git a/influxdb2/domain/xy_geom.py b/influxdb_client/domain/xy_geom.py similarity index 100% rename from influxdb2/domain/xy_geom.py rename to influxdb_client/domain/xy_geom.py diff --git a/influxdb2/domain/xy_view_properties.py b/influxdb_client/domain/xy_view_properties.py similarity index 99% rename from influxdb2/domain/xy_view_properties.py rename to influxdb_client/domain/xy_view_properties.py index 54f3d2a9..1df59f90 100644 --- a/influxdb2/domain/xy_view_properties.py +++ b/influxdb_client/domain/xy_view_properties.py @@ -14,7 +14,7 @@ import re # noqa: F401 import six -from influxdb2.domain.view_properties import ViewProperties +from influxdb_client.domain.view_properties import ViewProperties class XYViewProperties(ViewProperties): diff --git a/influxdb2/rest.py b/influxdb_client/rest.py similarity index 100% rename from influxdb2/rest.py rename to influxdb_client/rest.py diff --git a/influxdb_client/service/__init__.py b/influxdb_client/service/__init__.py new file mode 100644 index 00000000..f0c74b50 --- /dev/null +++ b/influxdb_client/service/__init__.py @@ -0,0 +1,30 @@ +from __future__ import absolute_import + +# flake8: noqa + +# import apis into api package +from influxdb_client.service.authorizations_service import AuthorizationsService +from influxdb_client.service.buckets_service import BucketsService +from influxdb_client.service.cells_service import CellsService +from influxdb_client.service.checks_service import ChecksService +from influxdb_client.service.dashboards_service import DashboardsService +from influxdb_client.service.health_service import HealthService +from influxdb_client.service.labels_service import LabelsService +from influxdb_client.service.notification_endpoints_service import NotificationEndpointsService +from influxdb_client.service.notification_rules_service import NotificationRulesService +from influxdb_client.service.operation_logs_service import OperationLogsService +from influxdb_client.service.organizations_service import OrganizationsService +from influxdb_client.service.query_service import QueryService +from influxdb_client.service.ready_service import ReadyService +from influxdb_client.service.scraper_targets_service import ScraperTargetsService +from influxdb_client.service.secrets_service import SecretsService +from influxdb_client.service.setup_service import SetupService +from influxdb_client.service.sources_service import SourcesService +from influxdb_client.service.tasks_service import TasksService +from influxdb_client.service.telegrafs_service import TelegrafsService +from influxdb_client.service.templates_service import TemplatesService +from influxdb_client.service.users_service import UsersService +from influxdb_client.service.variables_service import VariablesService +from influxdb_client.service.views_service import ViewsService +from influxdb_client.service.write_service import WriteService +from influxdb_client.service.default_service import DefaultService diff --git a/influxdb2/service/authorizations_service.py b/influxdb_client/service/authorizations_service.py similarity index 99% rename from influxdb2/service/authorizations_service.py rename to influxdb_client/service/authorizations_service.py index 4c8ad99b..fcedfb0f 100644 --- a/influxdb2/service/authorizations_service.py +++ b/influxdb_client/service/authorizations_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class AuthorizationsService(object): diff --git a/influxdb2/service/buckets_service.py b/influxdb_client/service/buckets_service.py similarity index 99% rename from influxdb2/service/buckets_service.py rename to influxdb_client/service/buckets_service.py index 50b1bdc2..91c834db 100644 --- a/influxdb2/service/buckets_service.py +++ b/influxdb_client/service/buckets_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class BucketsService(object): diff --git a/influxdb2/service/cells_service.py b/influxdb_client/service/cells_service.py similarity index 99% rename from influxdb2/service/cells_service.py rename to influxdb_client/service/cells_service.py index d6394257..2d544ccb 100644 --- a/influxdb2/service/cells_service.py +++ b/influxdb_client/service/cells_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class CellsService(object): diff --git a/influxdb2/service/checks_service.py b/influxdb_client/service/checks_service.py similarity index 99% rename from influxdb2/service/checks_service.py rename to influxdb_client/service/checks_service.py index bfc384c6..fdae3a60 100644 --- a/influxdb2/service/checks_service.py +++ b/influxdb_client/service/checks_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class ChecksService(object): diff --git a/influxdb2/service/dashboards_service.py b/influxdb_client/service/dashboards_service.py similarity index 99% rename from influxdb2/service/dashboards_service.py rename to influxdb_client/service/dashboards_service.py index 626b6e43..41cdbe86 100644 --- a/influxdb2/service/dashboards_service.py +++ b/influxdb_client/service/dashboards_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class DashboardsService(object): diff --git a/influxdb2/service/default_service.py b/influxdb_client/service/default_service.py similarity index 99% rename from influxdb2/service/default_service.py rename to influxdb_client/service/default_service.py index 6b54bd5d..b1dc48f1 100644 --- a/influxdb2/service/default_service.py +++ b/influxdb_client/service/default_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class DefaultService(object): diff --git a/influxdb2/service/health_service.py b/influxdb_client/service/health_service.py similarity index 98% rename from influxdb2/service/health_service.py rename to influxdb_client/service/health_service.py index eb6d4a35..7904c130 100644 --- a/influxdb2/service/health_service.py +++ b/influxdb_client/service/health_service.py @@ -17,7 +17,7 @@ # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class HealthService(object): diff --git a/influxdb2/service/labels_service.py b/influxdb_client/service/labels_service.py similarity index 99% rename from influxdb2/service/labels_service.py rename to influxdb_client/service/labels_service.py index 00027e7d..7165bf7f 100644 --- a/influxdb2/service/labels_service.py +++ b/influxdb_client/service/labels_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class LabelsService(object): diff --git a/influxdb2/service/notification_endpoints_service.py b/influxdb_client/service/notification_endpoints_service.py similarity index 99% rename from influxdb2/service/notification_endpoints_service.py rename to influxdb_client/service/notification_endpoints_service.py index b4ab2e08..cfa5b8b9 100644 --- a/influxdb2/service/notification_endpoints_service.py +++ b/influxdb_client/service/notification_endpoints_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class NotificationEndpointsService(object): diff --git a/influxdb2/service/notification_rules_service.py b/influxdb_client/service/notification_rules_service.py similarity index 99% rename from influxdb2/service/notification_rules_service.py rename to influxdb_client/service/notification_rules_service.py index fc4896a0..469df4c0 100644 --- a/influxdb2/service/notification_rules_service.py +++ b/influxdb_client/service/notification_rules_service.py @@ -17,7 +17,7 @@ # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class NotificationRulesService(object): diff --git a/influxdb2/service/operation_logs_service.py b/influxdb_client/service/operation_logs_service.py similarity index 99% rename from influxdb2/service/operation_logs_service.py rename to influxdb_client/service/operation_logs_service.py index f87bf10f..75a4f48b 100644 --- a/influxdb2/service/operation_logs_service.py +++ b/influxdb_client/service/operation_logs_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class OperationLogsService(object): diff --git a/influxdb2/service/organizations_service.py b/influxdb_client/service/organizations_service.py similarity index 99% rename from influxdb2/service/organizations_service.py rename to influxdb_client/service/organizations_service.py index 5b44d41d..5614cfbb 100644 --- a/influxdb2/service/organizations_service.py +++ b/influxdb_client/service/organizations_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class OrganizationsService(object): diff --git a/influxdb2/service/query_service.py b/influxdb_client/service/query_service.py similarity index 99% rename from influxdb2/service/query_service.py rename to influxdb_client/service/query_service.py index b5823eac..a974a17a 100644 --- a/influxdb2/service/query_service.py +++ b/influxdb_client/service/query_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class QueryService(object): diff --git a/influxdb2/service/ready_service.py b/influxdb_client/service/ready_service.py similarity index 98% rename from influxdb2/service/ready_service.py rename to influxdb_client/service/ready_service.py index 4a2594a0..dba4bd54 100644 --- a/influxdb2/service/ready_service.py +++ b/influxdb_client/service/ready_service.py @@ -17,7 +17,7 @@ # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class ReadyService(object): diff --git a/influxdb2/service/scraper_targets_service.py b/influxdb_client/service/scraper_targets_service.py similarity index 99% rename from influxdb2/service/scraper_targets_service.py rename to influxdb_client/service/scraper_targets_service.py index c89170a2..5ed6860f 100644 --- a/influxdb2/service/scraper_targets_service.py +++ b/influxdb_client/service/scraper_targets_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class ScraperTargetsService(object): diff --git a/influxdb2/service/secrets_service.py b/influxdb_client/service/secrets_service.py similarity index 99% rename from influxdb2/service/secrets_service.py rename to influxdb_client/service/secrets_service.py index 7af2fc45..e4a5b38a 100644 --- a/influxdb2/service/secrets_service.py +++ b/influxdb_client/service/secrets_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class SecretsService(object): diff --git a/influxdb2/service/setup_service.py b/influxdb_client/service/setup_service.py similarity index 99% rename from influxdb2/service/setup_service.py rename to influxdb_client/service/setup_service.py index c9e678d1..a1b370f4 100644 --- a/influxdb2/service/setup_service.py +++ b/influxdb_client/service/setup_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class SetupService(object): diff --git a/influxdb2/service/sources_service.py b/influxdb_client/service/sources_service.py similarity index 99% rename from influxdb2/service/sources_service.py rename to influxdb_client/service/sources_service.py index 242c9e71..2875cad5 100644 --- a/influxdb2/service/sources_service.py +++ b/influxdb_client/service/sources_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class SourcesService(object): diff --git a/influxdb2/service/tasks_service.py b/influxdb_client/service/tasks_service.py similarity index 99% rename from influxdb2/service/tasks_service.py rename to influxdb_client/service/tasks_service.py index 90a70cd3..a185f86f 100644 --- a/influxdb2/service/tasks_service.py +++ b/influxdb_client/service/tasks_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class TasksService(object): diff --git a/influxdb2/service/telegrafs_service.py b/influxdb_client/service/telegrafs_service.py similarity index 99% rename from influxdb2/service/telegrafs_service.py rename to influxdb_client/service/telegrafs_service.py index 725aad48..207e08df 100644 --- a/influxdb2/service/telegrafs_service.py +++ b/influxdb_client/service/telegrafs_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class TelegrafsService(object): diff --git a/influxdb2/service/templates_service.py b/influxdb_client/service/templates_service.py similarity index 99% rename from influxdb2/service/templates_service.py rename to influxdb_client/service/templates_service.py index b5ab7157..56dc8e69 100644 --- a/influxdb2/service/templates_service.py +++ b/influxdb_client/service/templates_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class TemplatesService(object): diff --git a/influxdb2/service/users_service.py b/influxdb_client/service/users_service.py similarity index 99% rename from influxdb2/service/users_service.py rename to influxdb_client/service/users_service.py index 306a5123..20d5f9d8 100644 --- a/influxdb2/service/users_service.py +++ b/influxdb_client/service/users_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class UsersService(object): diff --git a/influxdb2/service/variables_service.py b/influxdb_client/service/variables_service.py similarity index 99% rename from influxdb2/service/variables_service.py rename to influxdb_client/service/variables_service.py index 8683980e..a10aad44 100644 --- a/influxdb2/service/variables_service.py +++ b/influxdb_client/service/variables_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class VariablesService(object): diff --git a/influxdb2/service/views_service.py b/influxdb_client/service/views_service.py similarity index 99% rename from influxdb2/service/views_service.py rename to influxdb_client/service/views_service.py index d5db6c5b..f96b62c0 100644 --- a/influxdb2/service/views_service.py +++ b/influxdb_client/service/views_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class ViewsService(object): diff --git a/influxdb2/service/write_service.py b/influxdb_client/service/write_service.py similarity index 99% rename from influxdb2/service/write_service.py rename to influxdb_client/service/write_service.py index 77558873..88f41bb5 100644 --- a/influxdb2/service/write_service.py +++ b/influxdb_client/service/write_service.py @@ -12,10 +12,12 @@ from __future__ import absolute_import +import re # noqa: F401 + # python 2 and python 3 compatibility library import six -from influxdb2.api_client import ApiClient +from influxdb_client.api_client import ApiClient class WriteService(object): diff --git a/openapi-generator/src/main/resources/python/model.mustache b/openapi-generator/src/main/resources/python/model.mustache index fbde6678..e1669f59 100644 --- a/openapi-generator/src/main/resources/python/model.mustache +++ b/openapi-generator/src/main/resources/python/model.mustache @@ -9,7 +9,7 @@ import six {{#models}} {{#model}} {{#parent}} -from influxdb2.domain.{{{vendorExtensions.x-parent-classFilename}}} import {{{parent}}} +from influxdb_client.domain.{{{vendorExtensions.x-parent-classFilename}}} import {{{parent}}} {{/parent}} {{/model}} {{/models}} diff --git a/scripts/ci-test.sh b/scripts/ci-test.sh index 6c651f74..39f2c837 100755 --- a/scripts/ci-test.sh +++ b/scripts/ci-test.sh @@ -18,5 +18,5 @@ mkdir test-reports || true # # Test # -pytest influxdb2_test --junitxml=test-reports/junit.xml --cov=./ --cov-report xml:coverage.xml +pytest tests --junitxml=test-reports/junit.xml --cov=./ --cov-report xml:coverage.xml diff --git a/scripts/generate-sources.sh b/scripts/generate-sources.sh index 48ecf982..91a2c76a 100755 --- a/scripts/generate-sources.sh +++ b/scripts/generate-sources.sh @@ -9,13 +9,13 @@ cd "${SCRIPT_PATH}"/../openapi-generator/ || exit mvn clean install -DskipTests # delete old sources -rm "${SCRIPT_PATH}"/../influxdb2/domain/*.py -rm "${SCRIPT_PATH}"/../influxdb2/service/*.py +rm "${SCRIPT_PATH}"/../influxdb_client/domain/*.py +rm "${SCRIPT_PATH}"/../influxdb_client/service/*.py # Generate client cd "${SCRIPT_PATH}"/ || exit mvn org.openapitools:openapi-generator-maven-plugin:generate -cp "${SCRIPT_PATH}"/../influxdb2/service/__init__.py "${SCRIPT_PATH}"/../influxdb2/client/ -cp "${SCRIPT_PATH}"/../influxdb2/service/__init__.py "${SCRIPT_PATH}"/../influxdb2/client/write/ -cp "${SCRIPT_PATH}"/../influxdb2/service/__init__.py "${SCRIPT_PATH}"/../influxdb2_test/ \ No newline at end of file +cp "${SCRIPT_PATH}"/../influxdb_client/service/__init__.py "${SCRIPT_PATH}"/../influxdb_client/client/ +cp "${SCRIPT_PATH}"/../influxdb_client/service/__init__.py "${SCRIPT_PATH}"/../influxdb_client/client/write/ +cp "${SCRIPT_PATH}"/../influxdb_client/service/__init__.py "${SCRIPT_PATH}"/../tests/ \ No newline at end of file diff --git a/scripts/pom.xml b/scripts/pom.xml index c939a6d6..45a10a32 100644 --- a/scripts/pom.xml +++ b/scripts/pom.xml @@ -21,7 +21,7 @@ optionalProjectFile=true true - influxdb2 + influxdb_client / false diff --git a/setup.py b/setup.py index 90d5b1c7..c2557450 100644 --- a/setup.py +++ b/setup.py @@ -1,39 +1,50 @@ -# coding: utf-8 +#!/usr/bin/env python -""" - Influx API Service +import sys +from setuptools import setup +from pathlib import Path +from setuptools import setup, find_packages # noqa: H301 - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501 +with open('requirements.txt', 'r') as f: + requires = [x.strip() for x in f if x.strip()] - OpenAPI spec version: 0.1.0 - Generated by: https://openapi-generator.tech -""" +with open('test-requirements.txt', 'r') as f: + test_requires = [x.strip() for x in f if x.strip()] +with open('README.rst', 'r') as f: + readme = f.read() -from setuptools import setup, find_packages # noqa: H301 -NAME = "influxdb2" -VERSION = "1.0.0" -# To install the library, run the following -# -# python setup.py install -# -# prerequisite: setuptools -# http://pypi.python.org/pypi/setuptools +NAME = "influxdb_client" + +meta = {} +with open(Path(__file__).parent / 'influxdb_client' / '__init__.py') as f: + exec('\n'.join(l for l in f if l.startswith('__')), meta) -REQUIRES = ["urllib3 >= 1.15", "six >= 1.10", "certifi", "python-dateutil" , "rx >= 3.0.1"] + +REQUIRES = ["urllib3 >= 1.15", "six >= 1.10", "certifi", "python-dateutil" , "rx >= 3.0.1", "ciso8601 >= 2.1.1" ] setup( name=NAME, - version=VERSION, - description="Influx API Service", - author_email="", - url="", - keywords=["OpenAPI", "OpenAPI-Generator", "Influx API Service"], - install_requires=REQUIRES, + version=meta['__version__'], + description="InfluxDB 2.0 Python client library", + long_description=readme, + url="https://github.com/influxdata/influxdb-client-python", + keywords=["InfluxDB", "InfluxDB Python Client"], + tests_require=test_requires, + install_requires=requires, packages=find_packages(), + test_suite='tests', + python_requires='>=3.6', include_package_data=True, - long_description="""\ - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501 - """ -) + classifiers = [ + 'Development Status :: 3 - Alfa', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: MIT License', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Topic :: Database', + 'Topic :: Software Development :: Libraries', + 'Topic :: Software Development :: Libraries :: Python Modules', + ]) + diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 00000000..f0c74b50 --- /dev/null +++ b/tests/__init__.py @@ -0,0 +1,30 @@ +from __future__ import absolute_import + +# flake8: noqa + +# import apis into api package +from influxdb_client.service.authorizations_service import AuthorizationsService +from influxdb_client.service.buckets_service import BucketsService +from influxdb_client.service.cells_service import CellsService +from influxdb_client.service.checks_service import ChecksService +from influxdb_client.service.dashboards_service import DashboardsService +from influxdb_client.service.health_service import HealthService +from influxdb_client.service.labels_service import LabelsService +from influxdb_client.service.notification_endpoints_service import NotificationEndpointsService +from influxdb_client.service.notification_rules_service import NotificationRulesService +from influxdb_client.service.operation_logs_service import OperationLogsService +from influxdb_client.service.organizations_service import OrganizationsService +from influxdb_client.service.query_service import QueryService +from influxdb_client.service.ready_service import ReadyService +from influxdb_client.service.scraper_targets_service import ScraperTargetsService +from influxdb_client.service.secrets_service import SecretsService +from influxdb_client.service.setup_service import SetupService +from influxdb_client.service.sources_service import SourcesService +from influxdb_client.service.tasks_service import TasksService +from influxdb_client.service.telegrafs_service import TelegrafsService +from influxdb_client.service.templates_service import TemplatesService +from influxdb_client.service.users_service import UsersService +from influxdb_client.service.variables_service import VariablesService +from influxdb_client.service.views_service import ViewsService +from influxdb_client.service.write_service import WriteService +from influxdb_client.service.default_service import DefaultService diff --git a/influxdb2_test/base_test.py b/tests/base_test.py similarity index 88% rename from influxdb2_test/base_test.py rename to tests/base_test.py index c26861ba..37737a7e 100644 --- a/influxdb2_test/base_test.py +++ b/tests/base_test.py @@ -4,9 +4,8 @@ import time import unittest -import influxdb2 -from influxdb2 import BucketRetentionRules, Organization -from influxdb2.client.influxdb_client import InfluxDBClient +import influxdb_client +from influxdb_client import BucketRetentionRules, Organization, InfluxDBClient current_milli_time = lambda: int(round(time.time() * 1000)) @@ -18,7 +17,7 @@ def generate_bucket_name(): class BaseTest(unittest.TestCase): def setUp(self) -> None: - self.conf = influxdb2.configuration.Configuration() + self.conf = influxdb_client.configuration.Configuration() self.host = os.getenv('INFLUXDB_V2_URL', "http://localhost:9999") self.debug = False @@ -50,7 +49,7 @@ def delete_test_bucket(self, bucket): return self.buckets_api.delete_bucket(bucket) def find_my_org(self) -> Organization: - org_api = influxdb2.service.organizations_service.OrganizationsService(self.api_client) + org_api = influxdb_client.service.organizations_service.OrganizationsService(self.api_client) orgs = org_api.get_orgs() for org in orgs.orgs: if org.name == self.org: diff --git a/influxdb2_test/example.py b/tests/example.py similarity index 84% rename from influxdb2_test/example.py rename to tests/example.py index 18e6d8ea..71b7af32 100644 --- a/influxdb2_test/example.py +++ b/tests/example.py @@ -1,12 +1,11 @@ import codecs from datetime import datetime -from influxdb2 import WritePrecision -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write.point import Point -from influxdb2.client.write_api import SYNCHRONOUS +from influxdb_client import WritePrecision, InfluxDBClient, Point -bucket = "test_bucket" +from influxdb_client.client.write_api import SYNCHRONOUS + +bucket = "my-bucket" client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org") diff --git a/influxdb2_test/import_data_set.py b/tests/import_data_set.py similarity index 93% rename from influxdb2_test/import_data_set.py rename to tests/import_data_set.py index b6706ee7..77c490d3 100644 --- a/influxdb2_test/import_data_set.py +++ b/tests/import_data_set.py @@ -11,9 +11,7 @@ import rx from rx import operators as ops -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write.point import Point -from influxdb2.client.write_api import WriteOptions +from influxdb_client import Point, InfluxDBClient, WriteOptions def parse_row(row: OrderedDict): diff --git a/influxdb2_test/iot_sensor.py b/tests/iot_sensor.py similarity index 90% rename from influxdb2_test/iot_sensor.py rename to tests/iot_sensor.py index 1b1a9d1d..c31580db 100644 --- a/influxdb2_test/iot_sensor.py +++ b/tests/iot_sensor.py @@ -9,9 +9,8 @@ import rx from rx import operators as ops -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write_api import WriteApi -from influxdb2.client.write_api import WriteOptions +from influxdb_client import WriteApi, WriteOptions +from influxdb_client.client.influxdb_client import InfluxDBClient def on_exit(db_client: InfluxDBClient, write_api: WriteApi): @@ -56,8 +55,8 @@ def line_protocol(temperature): """ Read temperature every minute; distinct_until_changed - produce only if temperature change """ -data = rx\ - .interval(period=timedelta(seconds=60))\ +data = rx \ + .interval(period=timedelta(seconds=60)) \ .pipe(ops.map(lambda t: sensor_temperature()), ops.distinct_until_changed(), ops.map(lambda temperature: line_protocol(temperature))) @@ -70,7 +69,6 @@ def line_protocol(temperature): _write_api = _db_client.write_api(write_options=WriteOptions(batch_size=1)) _write_api.write(org="my-org", bucket="my-bucket", record=data) - """ Call after terminate a script """ diff --git a/influxdb2_test/rx_playground.py b/tests/rx_playground.py similarity index 100% rename from influxdb2_test/rx_playground.py rename to tests/rx_playground.py diff --git a/influxdb2_test/test_AuthorizationApi.py b/tests/test_AuthorizationApi.py similarity index 97% rename from influxdb2_test/test_AuthorizationApi.py rename to tests/test_AuthorizationApi.py index 5e2b76b4..53ceb845 100644 --- a/influxdb2_test/test_AuthorizationApi.py +++ b/tests/test_AuthorizationApi.py @@ -1,9 +1,8 @@ import pytest -from influxdb2 import PermissionResource, Permission, Authorization -from influxdb2.client.authorizations_api import AuthorizationsApi -from influxdb2.rest import ApiException -from influxdb2_test.base_test import BaseTest +from influxdb_client import PermissionResource, Permission, Authorization, AuthorizationsApi +from influxdb_client.rest import ApiException +from tests.base_test import BaseTest class AuthorizationsClientTest(BaseTest): diff --git a/influxdb2_test/test_BucketsApi.py b/tests/test_BucketsApi.py similarity index 94% rename from influxdb2_test/test_BucketsApi.py rename to tests/test_BucketsApi.py index c3a32cd8..876e5e67 100644 --- a/influxdb2_test/test_BucketsApi.py +++ b/tests/test_BucketsApi.py @@ -2,9 +2,9 @@ import pytest -from influxdb2 import BucketRetentionRules -from influxdb2.rest import ApiException -from influxdb2_test.base_test import BaseTest, generate_bucket_name +from influxdb_client import BucketRetentionRules +from influxdb_client.rest import ApiException +from tests.base_test import BaseTest, generate_bucket_name class BucketsClientTest(BaseTest): diff --git a/influxdb2_test/test_LabelsApi.py b/tests/test_LabelsApi.py similarity index 98% rename from influxdb2_test/test_LabelsApi.py rename to tests/test_LabelsApi.py index d4a2358d..421568d9 100644 --- a/influxdb2_test/test_LabelsApi.py +++ b/tests/test_LabelsApi.py @@ -1,7 +1,7 @@ import pytest -from influxdb2.rest import ApiException -from influxdb2_test.base_test import BaseTest +from influxdb_client.rest import ApiException +from tests.base_test import BaseTest class TestLabelsApi(BaseTest): diff --git a/influxdb2_test/test_QueryApi.py b/tests/test_QueryApi.py similarity index 96% rename from influxdb2_test/test_QueryApi.py rename to tests/test_QueryApi.py index 1c97c75e..706b9cb1 100644 --- a/influxdb2_test/test_QueryApi.py +++ b/tests/test_QueryApi.py @@ -1,6 +1,6 @@ import unittest -from influxdb2_test.base_test import BaseTest +from tests.base_test import BaseTest class SimpleQueryTest(BaseTest): diff --git a/influxdb2_test/test_TasksApi.py b/tests/test_TasksApi.py similarity index 98% rename from influxdb2_test/test_TasksApi.py rename to tests/test_TasksApi.py index f4f4b842..7b278444 100644 --- a/influxdb2_test/test_TasksApi.py +++ b/tests/test_TasksApi.py @@ -3,10 +3,9 @@ import pytest -from influxdb2 import PermissionResource, Permission, Task -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.rest import ApiException -from influxdb2_test.base_test import BaseTest +from influxdb_client import PermissionResource, Permission, Task, InfluxDBClient +from influxdb_client.rest import ApiException +from tests.base_test import BaseTest TASK_FLUX = 'from(bucket: "my-bucket") |> range(start: -2m) |> last()' diff --git a/influxdb2_test/test_WriteApi.py b/tests/test_WriteApi.py similarity index 95% rename from influxdb2_test/test_WriteApi.py rename to tests/test_WriteApi.py index 4e4b1686..69eb6ec0 100644 --- a/influxdb2_test/test_WriteApi.py +++ b/tests/test_WriteApi.py @@ -6,11 +6,10 @@ import unittest from multiprocessing.pool import ApplyResult -from influxdb2 import WritePrecision -from influxdb2.client.write.point import Point -from influxdb2.client.write_api import SYNCHRONOUS, ASYNCHRONOUS -from influxdb2.rest import ApiException -from influxdb2_test.base_test import BaseTest +from influxdb_client import Point, WritePrecision +from influxdb_client.client.write_api import SYNCHRONOUS, ASYNCHRONOUS +from influxdb_client.rest import ApiException +from tests.base_test import BaseTest class SynchronousWriteTest(BaseTest): diff --git a/influxdb2_test/test_WriteApiBatching.py b/tests/test_WriteApiBatching.py similarity index 96% rename from influxdb2_test/test_WriteApiBatching.py rename to tests/test_WriteApiBatching.py index 9a1050b5..875991d1 100644 --- a/influxdb2_test/test_WriteApiBatching.py +++ b/tests/test_WriteApiBatching.py @@ -9,11 +9,11 @@ import rx from rx import operators as ops -import influxdb2 -from influxdb2 import WritePrecision -from influxdb2.client.write.point import Point -from influxdb2.client.write_api import WriteOptions, WriteApi -from influxdb2_test.base_test import BaseTest +import influxdb_client +from influxdb_client import WritePrecision +from influxdb_client.client.write.point import Point +from influxdb_client.client.write_api import WriteOptions, WriteApi +from tests.base_test import BaseTest class BatchingWriteTest(BaseTest): @@ -27,13 +27,13 @@ def setUp(self) -> None: httpretty.enable() httpretty.reset() - conf = influxdb2.configuration.Configuration() + conf = influxdb_client.configuration.Configuration() conf.host = "http://localhost" conf.debug = False - self.influxdb_client = influxdb2.client.InfluxDBClient(url=conf.host, token="my-token") + self.influxdb_client = influxdb_client.client.InfluxDBClient(url=conf.host, token="my-token") - # self._api_client = influxdb2.ApiClient(configuration=conf, header_name="Authorization", + # self._api_client = influxdb_client.ApiClient(configuration=conf, header_name="Authorization", # header_value="Token my-token") write_options = WriteOptions(batch_size=2, flush_interval=5_000, retry_interval=3_000) diff --git a/influxdb2_test/test_gzip.py b/tests/test_gzip.py similarity index 98% rename from influxdb2_test/test_gzip.py rename to tests/test_gzip.py index 8813fcbc..76c097fc 100644 --- a/influxdb2_test/test_gzip.py +++ b/tests/test_gzip.py @@ -2,9 +2,9 @@ import httpretty -from influxdb2.client.influxdb_client import InfluxDBClient -from influxdb2.client.write_api import SYNCHRONOUS -from influxdb2_test.base_test import BaseTest +from influxdb_client.client.influxdb_client import InfluxDBClient +from influxdb_client.client.write_api import SYNCHRONOUS +from tests.base_test import BaseTest class GzipSupportTest(BaseTest): diff --git a/influxdb2_test/test_health.py b/tests/test_health.py similarity index 92% rename from influxdb2_test/test_health.py rename to tests/test_health.py index c31411e9..b3c7751f 100644 --- a/influxdb2_test/test_health.py +++ b/tests/test_health.py @@ -1,7 +1,7 @@ import datetime -from influxdb2.client import InfluxDBClient -from influxdb2_test.base_test import BaseTest +from influxdb_client.client import InfluxDBClient +from tests.base_test import BaseTest class TestHealth(BaseTest): diff --git a/influxdb2_test/test_point.py b/tests/test_point.py similarity index 97% rename from influxdb2_test/test_point.py rename to tests/test_point.py index 57dae3d9..d9cff9be 100644 --- a/influxdb2_test/test_point.py +++ b/tests/test_point.py @@ -1,14 +1,10 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from datetime import datetime - from pytz import UTC +from influxdb_client import Point, WritePrecision + EPOCH = UTC.localize(datetime.utcfromtimestamp(0)) import unittest @@ -17,9 +13,7 @@ from decimal import Decimal from pytz import UTC, timezone -from influxdb2.client.write.point import Point -from influxdb2.domain.write_precision import WritePrecision -from influxdb2_test.base_test import BaseTest +from tests.base_test import BaseTest class TimeSpan(object): diff --git a/tox.ini b/tox.ini index 3d0be613..a36578f4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] -envlist = py27, py3 +envlist = py3 -[testenv] -deps=-r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +#[testenv] +#deps=-r{toxinidir}/requirements.txt +# -r{toxinidir}/test-requirements.txt -commands= - nosetests \ - [] +#commands= +# nosetests \ +# []