chore: call kwargs.keys() only once in init; initialize QueryApiOptions.tls_verify to None

Author: karel-rehor

Examples/basic_ssl_example.py

@@ -78,7 +78,7 @@ def write_and_query_with_explicit_sys_cert(conf):
         lp = f"escooter,id=zx80 speed=3.14,ticks=42i {now - (10 * 1_000_000_000)}"
         _client.write(lp)
 
-        query = "SELECT * FROM \"escooter\""
+        query = "SELECT * FROM \"escooter\" ORDER BY time DESC"
         reader: pyarrow.Table = _client.query(query, mode="")
         print_results(reader.to_pylist())
 
@@ -95,7 +95,7 @@ def query_with_verify_ssl_off(conf, cert):
                          ssl_ca_cert=cert,
                          verify_ssl=False) as _client:
 
-        query = "SELECT * FROM \"escooter\""
+        query = "SELECT * FROM \"escooter\"  ORDER BY time DESC"
         reader: pyarrow.Table = _client.query(query, mode="")
         print_results(reader.to_pylist())
 

influxdb_client_3/__init__.py

@@ -167,11 +167,12 @@ def __init__(
             connection_string = f"grpc+tcp://{hostname}:{port}"
 
         q_opts_builder = QueryApiOptionsBuilder()
-        if kwargs.keys().__contains__('ssl_ca_cert'):
+        kw_keys = kwargs.keys()
+        if kw_keys.__contains__('ssl_ca_cert'):
             q_opts_builder.root_certs(kwargs.get('ssl_ca_cert', None))
-        if kwargs.keys().__contains__('verify_ssl'):
+        if kw_keys.__contains__('verify_ssl'):
             q_opts_builder.tls_verify(kwargs.get('verify_ssl', True))
-        if kwargs.keys().__contains__('proxy'):
+        if kw_keys.__contains__('proxy'):
             q_opts_builder.proxy(kwargs.get('proxy', None))
         self._query_api = _QueryApi(connection_string=connection_string, token=token,
                                     flight_client_options=flight_client_options,

influxdb_client_3/query/query_api.py

@@ -9,7 +9,7 @@
 
 class QueryApiOptions(object):
     tls_root_certs = None
-    tls_verify = True
+    tls_verify = None
     proxy = None
     flight_client_options = None
 
@@ -94,7 +94,8 @@ def __init__(self,
                 self._flight_client_options["tls_root_certs"] = options.tls_root_certs
             if options.proxy:
                 self._proxy = options.proxy
-            self._flight_client_options["disable_server_verification"] = not options.tls_verify
+            if options.tls_verify is not None:
+                self._flight_client_options["disable_server_verification"] = not options.tls_verify
         self._flight_client_options["generic_options"] = [
             ("grpc.secondary_user_agent", USER_AGENT)
         ]

tests/test_query.py

@@ -216,7 +216,6 @@ def test_query_api_options_builder(self):
             .tls_verify(False)\
             .build()
 
-        print(f"\nDEBUG options {vars(options)}")
         try:
             assert options.tls_root_certs.decode('utf-8') == self.sample_cert
             assert not options.tls_verify
@@ -243,7 +242,6 @@ def test_query_client_with_options(self):
                           options
                           )
 
-        print(f"\nDEBUG client {vars(client)}")
         try:
             assert client._token == token
             assert client._flight_client_options['tls_root_certs'].decode('utf-8') == self.sample_cert