influxdb3-python 0.14.0__tar.gz → 0.15.0__tar.gz

{influxdb3_python-0.14.0/influxdb3_python.egg-info → influxdb3_python-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: influxdb3-python
-Version: 0.14.0
+Version: 0.15.0
 Summary: Community Python client for InfluxDB 3.0
 Home-page: https://github.com/InfluxCommunity/influxdb3-python
 Author: InfluxData

{influxdb3_python-0.14.0 → influxdb3_python-0.15.0/influxdb3_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: influxdb3-python
-Version: 0.14.0
+Version: 0.15.0
 Summary: Community Python client for InfluxDB 3.0
 Home-page: https://github.com/InfluxCommunity/influxdb3-python
 Author: InfluxData

{influxdb3_python-0.14.0 → influxdb3_python-0.15.0}/influxdb_client_3/__init__.py

@@ -467,6 +467,33 @@ class InfluxDBClient3:
         except ArrowException as e:
             raise InfluxDB3ClientQueryError(f"Error while executing query: {e}")
 
+    def get_server_version(self) -> str:
+        """
+        Get the version of the connected InfluxDB server.
+
+        This method makes a ping request to the server and extracts the version information
+        from either the response headers or response body.
+
+        :return: The version string of the InfluxDB server.
+        :rtype: str
+        """
+        version = None
+        (resp_body, _, header) = self._client.api_client.call_api(
+            resource_path="/ping",
+            method="GET",
+            response_type=object
+        )
+
+        for key, value in header.items():
+            if key.lower() == "x-influxdb-version":
+                version = value
+                break
+
+        if version is None and isinstance(resp_body, dict):
+            version = resp_body['version']
+
+        return version
+
     def close(self):
         """Close the client and clean up resources."""
         self._write_api.close()

{influxdb3_python-0.14.0 → influxdb3_python-0.15.0}/influxdb_client_3/version.py

@@ -1,4 +1,4 @@
 """Version of the Client that is used in User-Agent header."""
 
-VERSION = '0.14.0'
+VERSION = '0.15.0'
 USER_AGENT = f'influxdb3-python/{VERSION}'

{influxdb3_python-0.14.0 → influxdb3_python-0.15.0}/tests/test_influxdb_client_3.py

@@ -1,12 +1,22 @@
+import re
 import unittest
 from unittest.mock import patch
 
+from pytest_httpserver import HTTPServer
+
 from influxdb_client_3 import InfluxDBClient3, WritePrecision, DefaultWriteOptions, Point, WriteOptions, WriteType
 from influxdb_client_3.exceptions import InfluxDB3ClientQueryError
+from influxdb_client_3.write_client.rest import ApiException
 from tests.util import asyncio_run
 from tests.util.mocks import ConstantFlightServer, ConstantData, ErrorFlightServer
 
 
+def http_server():
+    httpserver = HTTPServer()
+    httpserver.start()
+    return httpserver
+
+
 class TestInfluxDBClient3(unittest.TestCase):
 
     @patch('influxdb_client_3._InfluxDBClient')
@@ -22,6 +32,11 @@ class TestInfluxDBClient3(unittest.TestCase):
             database="my_db",
             token="my_token"
         )
+        self.http_server = http_server()
+
+    def tearDown(self):
+        if self.http_server is not None:
+            self.http_server.stop()
 
     def test_init(self):
         self.assertEqual(self.client._org, "my_org")
@@ -226,6 +241,49 @@ class TestInfluxDBClient3(unittest.TestCase):
                 await c.query_async("SELECT * FROM my_data")
             self.assertIn("Error while executing query", str(err.exception))
 
+    def test_get_version_header_success(self):
+        server = self.http_server
+        server.expect_request(re.compile(".*")).respond_with_json(
+            headers={"X-Influxdb-Version": "1.8.2"},
+            response_json={"version": "3.0"}
+        )
+        version = InfluxDBClient3(
+            host=f'http://{server.host}:{server.port}', org="ORG", database="DB", token="TOKEN"
+        ).get_server_version()
+        assert version == "1.8.2"
+
+    def test_get_version_in_body_success(self):
+        server = self.http_server
+        server.expect_request('/ping').respond_with_json(
+            response_json={"version": "3.0"},
+        )
+        version = InfluxDBClient3(
+            host=f'http://{server.host}:{server.port}', org="ORG", database="DB", token="TOKEN"
+        ).get_server_version()
+        assert version == "3.0"
+
+    def test_get_version_empty(self):
+        server = self.http_server
+        server.expect_request("/ping").respond_with_data(
+            headers={"abc": "1.8.2"},
+        )
+
+        version = InfluxDBClient3(
+            host=f'http://{server.host}:{server.port}', org="ORG", database="DB", token="TOKEN"
+        ).get_server_version()
+        assert version is None
+
+    def test_get_version_fail(self):
+        server = self.http_server
+        server.expect_request("/ping").respond_with_json(
+            response_json={"error": "error"},
+            status=400
+        )
+        with self.assertRaises(ApiException):
+            InfluxDBClient3(
+                host=f'http://{server.host}:{server.port}', org="ORG", database="DB", token="TOKEN"
+            ).get_server_version()
+
 
 if __name__ == '__main__':
     unittest.main()

{influxdb3_python-0.14.0 → influxdb3_python-0.15.0}/tests/test_influxdb_client_3_integration.py

@@ -1,15 +1,14 @@
 import logging
 import os
+import pyarrow
+import pytest
 import random
 import string
 import time
 import unittest
 
-import pyarrow
-import pytest
-from influxdb_client_3.exceptions import InfluxDB3ClientQueryError, InfluxDBError
-
 from influxdb_client_3 import InfluxDBClient3, write_client_options, WriteOptions
+from influxdb_client_3.exceptions import InfluxDBError
 from tests.util import asyncio_run, lp_to_py_object
 
 
@@ -64,30 +63,18 @@ class TestInfluxDBClient3Integration(unittest.TestCase):
         test_id = time.time_ns()
         with self.assertRaises(InfluxDBError) as err:
             self.client.write(f"integration_test_python,type=used value=123.0,test_id={test_id}i")
-        self.assertEqual('unauthorized access', err.exception.message)  # Cloud
+        self.assertEqual('Authorization header was malformed, the request was not in the form of '
+                         '\'Authorization: <auth-scheme> <token>\', supported auth-schemes are Bearer, Token and Basic',
+                         err.exception.message)  # Cloud
 
     def test_auth_error_auth_scheme(self):
         self.client = InfluxDBClient3(host=self.host, database=self.database, token=self.token, auth_scheme='Any')
         test_id = time.time_ns()
         with self.assertRaises(InfluxDBError) as err:
             self.client.write(f"integration_test_python,type=used value=123.0,test_id={test_id}i")
-        self.assertEqual('unauthorized access', err.exception.message)  # Cloud
-
-    def test_error_headers(self):
-        self.client = InfluxDBClient3(host=self.host, database=self.database, token=self.token)
-        with self.assertRaises(InfluxDBError) as err:
-            self.client.write("integration_test_python,type=used value=123.0,test_id=")
-        self.assertIn("Could not parse entire line. Found trailing content:", err.exception.message)
-        headers = err.exception.getheaders()
-        try:
-            self.assertIsNotNone(headers)
-            self.assertRegex(headers['trace-id'], '[0-9a-f]{16}')
-            self.assertEqual('false', headers['trace-sampled'])
-            self.assertIsNotNone(headers['Strict-Transport-Security'])
-            self.assertRegex(headers['X-Influxdb-Request-ID'], '[0-9a-f]+')
-            self.assertIsNotNone(headers['X-Influxdb-Build'])
-        except KeyError as ke:
-            self.fail(f'Header {ke} not found')
+        self.assertEqual('Authorization header was malformed, the request was not in the form of '
+                         '\'Authorization: <auth-scheme> <token>\', supported auth-schemes are Bearer, Token and Basic',
+                         err.exception.message)  # Cloud
 
     def test_batch_write_callbacks(self):
         write_success = False
@@ -212,24 +199,6 @@ IdKIRUY6EyIVG+Z/nbuVqUlgnIWOMp0yg4RRC91zHy3Xvykf3Vai25H/jQpa6cbU
     def remove_test_cert(self, cert_file):
         os.remove(cert_file)
 
-    def test_queries_w_bad_cert(self):
-        cert_file = "test_cert.pem"
-        self.create_test_cert(cert_file)
-        with InfluxDBClient3(host=self.host,
-                             database=self.database,
-                             token=self.token,
-                             verify_ssl=True,
-                             ssl_ca_cert=cert_file,
-                             debug=True) as client:
-            try:
-                query = "SELECT table_name FROM information_schema.tables"
-                client.query(query, mode="")
-                assert False, "query should throw SSL_ERROR"
-            except InfluxDB3ClientQueryError as fe:
-                assert str(fe).__contains__('SSL_ERROR_SSL')
-            finally:
-                self.remove_test_cert(cert_file)
-
     def test_verify_ssl_false(self):
         cert_file = "test_cert.pem"
         self.create_test_cert(cert_file)
@@ -274,3 +243,7 @@ IdKIRUY6EyIVG+Z/nbuVqUlgnIWOMp0yg4RRC91zHy3Xvykf3Vai25H/jQpa6cbU
         result_list = result.to_pylist()
         for item in data:
             assert lp_to_py_object(item) in result_list, f"original lp data \"{item}\" should be in result list"
+
+    def test_get_server_version(self):
+        version = self.client.get_server_version()
+        assert version is not None