Updated swagger to latest version

.gitignore

@@ -104,3 +104,10 @@ venv.bak/
 .mypy_cache/
 
 sandbox
+
+# PyCharm
+**/.idea
+**/*.iml
+
+# OpenAPI-generator
+/.openapi-generator*

README.md

@@ -50,15 +50,15 @@ bucket = "test_bucket"
 
 client = InfluxDBClient(url="http://localhost:9999/api/v2", token="my-token-123", org="my-org")
 
-write_client = client.write_client()
-query_client = client.query_client()
+write_api = client.write_api()
+query_api = client.query_api()
 
 p = Point("my_measurement").tag("location", "Prague").field("temperature", 25.3)
 
-write_client.write(bucket=bucket, org="my-org", record=p)
+write_api.write(bucket=bucket, org="my-org", record=p)
 
 ## using Table structure
-tables = query_client.query('from(bucket:"my-bucket") |> range(start: -10m)')
+tables = query_api.query('from(bucket:"my-bucket") |> range(start: -10m)')
 
 for table in tables:
     print(table)
@@ -67,7 +67,7 @@ for table in tables:
 
 
 ## using csv library
-csv_result = query_client.query_csv('from(bucket:"my-bucket") |> range(start: -10m)')
+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:

influxdb2/api_client.py

@@ -23,7 +23,7 @@
 from six.moves.urllib.parse import quote
 
 from influxdb2.configuration import Configuration
-import influxdb2.models
+import influxdb2.domain
 from influxdb2 import rest
 
 
@@ -271,7 +271,7 @@ def __deserialize(self, data, klass):
             if klass in self.NATIVE_TYPES_MAPPING:
                 klass = self.NATIVE_TYPES_MAPPING[klass]
             else:
-                klass = getattr(influxdb2.models, klass)
+                klass = getattr(influxdb2.domain, klass)
 
         if klass in self.PRIMITIVE_TYPES:
             return self.__deserialize_primitive(data, klass)

influxdb2/client/__init__.py

@@ -3,25 +3,28 @@
 # flake8: noqa
 
 # import apis into api package
-from influxdb2.api.authorizations_api import AuthorizationsApi
-from influxdb2.api.buckets_api import BucketsApi
-from influxdb2.api.cells_api import CellsApi
-from influxdb2.api.dashboards_api import DashboardsApi
-from influxdb2.api.health_api import HealthApi
-from influxdb2.api.labels_api import LabelsApi
-from influxdb2.api.operation_logs_api import OperationLogsApi
-from influxdb2.api.organizations_api import OrganizationsApi
-from influxdb2.api.query_api import QueryApi
-from influxdb2.api.ready_api import ReadyApi
-from influxdb2.api.scraper_targets_api import ScraperTargetsApi
-from influxdb2.api.secrets_api import SecretsApi
-from influxdb2.api.setup_api import SetupApi
-from influxdb2.api.sources_api import SourcesApi
-from influxdb2.api.tasks_api import TasksApi
-from influxdb2.api.telegrafs_api import TelegrafsApi
-from influxdb2.api.templates_api import TemplatesApi
-from influxdb2.api.users_api import UsersApi
-from influxdb2.api.variables_api import VariablesApi
-from influxdb2.api.views_api import ViewsApi
-from influxdb2.api.write_api import WriteApi
-from influxdb2.api.default_api import DefaultApi
+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

influxdb2/client/authorizations_client.py → influxdb2/client/authorizations_api.py

@@ -1,11 +1,11 @@
-from influxdb2 import Authorization, AuthorizationsApi, User, Organization
+from influxdb2 import Authorization, AuthorizationsService, User, Organization
 
 
-class AuthorizationsClient(object):
+class AuthorizationsApi(object):
 
     def __init__(self, influxdb_client):
         self._influxdb_client = influxdb_client
-        self._authorizations_client = AuthorizationsApi(influxdb_client.api_client)
+        self._authorizations_service = AuthorizationsService(influxdb_client.api_client)
 
     def create_authorization(self, org_id=None, permissions: list = None,
                              authorization: Authorization = None) -> Authorization:
@@ -18,19 +18,19 @@ def create_authorization(self, org_id=None, permissions: list = None,
 
         """
         if authorization is not None:
-            return self._authorizations_client.post_authorizations(authorization=authorization)
+            return self._authorizations_service.post_authorizations(authorization=authorization)
 
             # if org_id is not None and permissions is not None:
         authorization = Authorization(org_id=org_id, permissions=permissions)
-        return self._authorizations_client.post_authorizations(authorization=authorization)
+        return self._authorizations_service.post_authorizations(authorization=authorization)
 
     def find_authorization_by_id(self, auth_id: str) -> Authorization:
         """
         Finds authorization by id
         :param auth_id: authorization id
         :return: Authorization
         """
-        return self._authorizations_client.get_authorizations_id(auth_id=auth_id)
+        return self._authorizations_service.get_authorizations_id(auth_id=auth_id)
 
     def find_authorizations(self, **kwargs):
         """
@@ -41,7 +41,7 @@ def find_authorizations(self, **kwargs):
         :param str org: filter authorizations belonging to a org name
         :return: Authorizations
         """
-        authorizations = self._authorizations_client.get_authorizations(**kwargs)
+        authorizations = self._authorizations_service.get_authorizations(**kwargs)
 
         return authorizations.authorizations
 
@@ -95,7 +95,7 @@ def update_authorization(self, auth):
         :param auth:
         :return:
         """
-        return self._authorizations_client.patch_authorizations_id(auth_id=auth.id, authorization_update_request=auth)
+        return self._authorizations_service.patch_authorizations_id(auth_id=auth.id, authorization_update_request=auth)
 
     def clone_authorization(self, auth) -> Authorization:
 
@@ -113,8 +113,8 @@ def clone_authorization(self, auth) -> Authorization:
 
     def delete_authorization(self, auth):
         if isinstance(auth, Authorization):
-            return self._authorizations_client.delete_authorizations_id(auth_id=auth.id)
+            return self._authorizations_service.delete_authorizations_id(auth_id=auth.id)
 
         if isinstance(auth, str):
-            return self._authorizations_client.delete_authorizations_id(auth_id=auth)
+            return self._authorizations_service.delete_authorizations_id(auth_id=auth)
         raise ValueError("Invalid argument")

influxdb2/client/bucket_client.py → influxdb2/client/bucket_api.py

@@ -1,11 +1,11 @@
-from influxdb2 import BucketsApi, Bucket
+from influxdb2 import BucketsService, Bucket
 
 
-class BucketsClient(object):
+class BucketsApi(object):
 
     def __init__(self, influxdb_client):
         self._influxdb_client = influxdb_client
-        self._buckets_api = BucketsApi(influxdb_client.api_client)
+        self._buckets_service = BucketsService(influxdb_client.api_client)
 
     def create_bucket(self, bucket=None, bucket_name=None, org_id=None, retention_rules=None,
                       description=None) -> Bucket:
@@ -40,7 +40,7 @@ def create_bucket(self, bucket=None, bucket_name=None, org_id=None, retention_ru
                 org_id = self._influxdb_client.org_id
             bucket.org_id = org_id
 
-        return self._buckets_api.post_buckets(bucket=bucket)
+        return self._buckets_service.post_buckets(bucket=bucket)
 
     def delete_bucket(self, bucket):
         """Delete a bucket  # noqa: E501
@@ -56,15 +56,15 @@ def delete_bucket(self, bucket):
         else:
             bucket_id = bucket
 
-        return self._buckets_api.delete_buckets_id(bucket_id=bucket_id)
+        return self._buckets_service.delete_buckets_id(bucket_id=bucket_id)
 
     def find_bucket_by_id(self, id):
         """Find bucket by ID
 
         :param id:
         :return:
         """
-        return self._buckets_api.get_buckets_id(id)
+        return self._buckets_service.get_buckets_id(id)
 
     def find_bucket_by_name(self, bucket_name):
         """Find bucket by name
@@ -73,7 +73,7 @@ def find_bucket_by_name(self, bucket_name):
         :return: Bucket
         """
 
-        buckets = self._buckets_api.get_buckets(name=bucket_name)
+        buckets = self._buckets_service.get_buckets(name=bucket_name)
 
         if len(buckets.buckets) > 0:
             return buckets.buckets[0]
@@ -83,4 +83,4 @@ def find_bucket_by_name(self, bucket_name):
     def find_buckets(self):
         """Gets all buckets
         """
-        return self._buckets_api.get_buckets()
+        return self._buckets_service.get_buckets()

influxdb2/client/influxdb_client.py

@@ -1,11 +1,11 @@
 from __future__ import absolute_import
 
 import influxdb2
-from influxdb2.client.authorizations_client import AuthorizationsClient
-from influxdb2.client.bucket_client import BucketsClient
-from influxdb2.client.organizations_client import OrganizationsClient
-from influxdb2.client.query_client import QueryClient
-from influxdb2.client.users_client import UsersClient
+from influxdb2.client.authorizations_api import AuthorizationsApi
+from influxdb2.client.bucket_api import BucketsApi
+from influxdb2.client.organizations_api import OrganizationsApi
+from influxdb2.client.query_api import QueryApi
+from influxdb2.client.users_api import UsersApi
 from influxdb2.client.write_api import WriteApiClient
 
 
@@ -38,25 +38,25 @@ def __init__(self,
         self.api_client = influxdb2.ApiClient(configuration=conf, header_name=auth_header_name,
                                               header_value=auth_header_value)
 
-    def write_client(self):
-        service = influxdb2.api.write_api.WriteApi(self.api_client)
+    def write_api(self):
+        service = influxdb2.service.write_service.WriteService(self.api_client)
         return WriteApiClient(service=service)
         # return
 
-    def query_client(self):
-        return QueryClient(self)
+    def query_api(self):
+        return QueryApi(self)
 
     def __del__(self):
         self.api_client.__del__()
 
-    def buckets_client(self) -> BucketsClient:
-        return BucketsClient(self)
+    def buckets_api(self) -> BucketsApi:
+        return BucketsApi(self)
 
-    def authorizations_client(self) -> AuthorizationsClient:
-        return AuthorizationsClient(self)
+    def authorizations_api(self) -> AuthorizationsApi:
+        return AuthorizationsApi(self)
 
-    def users_client(self) -> UsersClient:
-        return UsersClient(self)
+    def users_api(self) -> UsersApi:
+        return UsersApi(self)
 
-    def organizations_client(self) -> OrganizationsClient:
-        return OrganizationsClient(self)
+    def organizations_api(self) -> OrganizationsApi:
+        return OrganizationsApi(self)

influxdb2/client/organizations_api.py

@@ -0,0 +1,24 @@
+from influxdb2 import OrganizationsService, UsersService, Organization
+
+
+class OrganizationsApi(object):
+
+    def __init__(self, influxdb_client):
+        self._influxdb_client = influxdb_client
+        self._organizations_service = OrganizationsService(influxdb_client.api_client)
+        self._users_service = UsersService(influxdb_client.api_client)
+
+    def me(self):
+        user = self._users_service.get_me()
+        return user
+
+    def find_organization(self, id):
+        return self._organizations_service.get_orgs_id(org_id=id)
+
+    def find_organizations(self):
+        return self._organizations_service.get_orgs()
+
+    def create_organization(self, name=None, organization=None) -> Organization:
+        if organization is None:
+            organization = Organization(name=name)
+        return self._organizations_service.post_orgs(organization)