clickhouse-driver 0.2.9__cp312-cp312-win32.whl → 0.2.10__cp312-cp312-win32.whl

clickhouse_driver/__init__.py

@@ -3,7 +3,7 @@ from .client import Client
 from .dbapi import connect
 
 
-VERSION = (0, 2, 9)
+VERSION = (0, 2, 10)
 __version__ = '.'.join(str(x) for x in VERSION)
 
 __all__ = ['Client', 'connect']

clickhouse_driver/clientinfo.py

@@ -39,7 +39,7 @@ class ClientInfo(object):
 
         try:
             self.os_user = getpass.getuser()
-        except KeyError:
+        except (KeyError, OSError):
             self.os_user = ''
         self.client_hostname = socket.gethostname()
         self.client_name = client_name

clickhouse_driver/compression/__init__.py

@@ -1,8 +1,11 @@
 import importlib
+import logging
 
 from .. import errors
 from ..protocol import CompressionMethodByte
 
+logger = logging.getLogger(__name__)
+
 
 def get_compressor_cls(alg):
     try:
@@ -10,6 +13,7 @@ def get_compressor_cls(alg):
         return module.Compressor
 
     except ImportError:
+        logger.warning('Unable to import module %s', alg, exc_info=True)
         raise errors.UnknownCompressionMethod(
             "Unknown compression method: '{}'".format(alg)
         )

clickhouse_driver/connection.py

@@ -7,6 +7,11 @@ from sys import platform
 from time import time
 from urllib.parse import urlparse
 
+try:
+    import certifi
+except ImportError:
+    certifi = None
+
 from . import defines
 from . import errors
 from .block import RowOrientedBlock
@@ -120,7 +125,10 @@ class Connection(object):
     :param ca_certs: see :func:`ssl.wrap_socket` docs.
     :param ciphers: see :func:`ssl.wrap_socket` docs.
     :param keyfile: see :func:`ssl.wrap_socket` docs.
+    :param keypass: see :func:`ssl.wrap_socket` docs.
     :param certfile: see :func:`ssl.wrap_socket` docs.
+    :param check_hostname: see :func:`ssl.wrap_socket` docs.
+                           Defaults to ``True``.
     :param server_hostname: Hostname to use in SSL Wrapper construction.
                             Defaults to `None` which will send the passed
                             host param during SSL initialization. This param
@@ -141,6 +149,10 @@ class Connection(object):
                           Defaults to ``False``.
     :param client_revision: can be used for client version downgrading.
                           Defaults to ``None``.
+    :param disable_reconnect: disable automatic reconnect in case of
+                              failed ``ping``, helpful when every reconnect
+                              need to be caught in calling code.
+                              Defaults to ``False``.
     """
 
     def __init__(
@@ -156,12 +168,13 @@ class Connection(object):
             secure=False,
             # Secure socket parameters.
             verify=True, ssl_version=None, ca_certs=None, ciphers=None,
-            keyfile=None, certfile=None,
+            keyfile=None, keypass=None, certfile=None, check_hostname=True,
             server_hostname=None,
             alt_hosts=None,
             settings_is_important=False,
             tcp_keepalive=False,
-            client_revision=None
+            client_revision=None,
+            disable_reconnect=False,
     ):
         if secure:
             default_port = defines.DEFAULT_SECURE_PORT
@@ -187,10 +200,14 @@ class Connection(object):
         self.client_revision = min(
             client_revision or defines.CLIENT_REVISION, defines.CLIENT_REVISION
         )
+        self.disable_reconnect = disable_reconnect
 
         self.secure_socket = secure
         self.verify_cert = verify
 
+        if certifi is not None:
+            ca_certs = ca_certs or certifi.where()
+
         ssl_options = {}
         if ssl_version is not None:
             ssl_options['ssl_version'] = ssl_version
@@ -200,11 +217,14 @@ class Connection(object):
             ssl_options['ciphers'] = ciphers
         if keyfile is not None:
             ssl_options['keyfile'] = keyfile
+        if keypass is not None:
+            ssl_options['keypass'] = keypass
         if certfile is not None:
             ssl_options['certfile'] = certfile
 
         self.ssl_options = ssl_options
 
+        self.check_hostname = check_hostname if self.verify_cert else False
         self.server_hostname = server_hostname
 
         # Use LZ4 compression by default.
@@ -258,6 +278,11 @@ class Connection(object):
             self.connect()
 
         elif not self.ping():
+            if self.disable_reconnect:
+                raise errors.NetworkError(
+                    "Connection was closed, reconnect is disabled."
+                )
+
             logger.warning('Connection was closed, reconnecting.')
             self.connect()
 
@@ -307,7 +332,7 @@ class Connection(object):
 
         version = ssl_options.get('ssl_version', ssl.PROTOCOL_TLS_CLIENT)
         context = ssl.SSLContext(version)
-        context.check_hostname = self.verify_cert
+        context.check_hostname = self.check_hostname
 
         if 'ca_certs' in ssl_options:
             context.load_verify_locations(ssl_options['ca_certs'])
@@ -321,7 +346,11 @@ class Connection(object):
 
         if 'certfile' in ssl_options:
             keyfile = ssl_options.get('keyfile')
-            context.load_cert_chain(ssl_options['certfile'], keyfile=keyfile)
+            keypass = ssl_options.get('keypass')
+            context.load_cert_chain(
+                ssl_options['certfile'],
+                keyfile=keyfile, password=keypass
+            )
 
         return context
 
@@ -542,6 +571,9 @@ class Connection(object):
             )
 
     def ping(self):
+        if not self.socket:
+            return None
+
         timeout = self.sync_request_timeout
 
         with self.timeout_setter(timeout):

clickhouse_driver/util/helpers.py

@@ -155,9 +155,11 @@ def parse_url(url):
         # ssl
         elif name == 'verify':
             kwargs[name] = asbool(value)
+        elif name == 'check_hostname':
+            kwargs[name] = asbool(value)
         elif name == 'ssl_version':
             kwargs[name] = getattr(ssl, value)
-        elif name in ['ca_certs', 'ciphers', 'keyfile', 'certfile',
+        elif name in ['ca_certs', 'ciphers', 'keyfile', 'keypass', 'certfile',
                       'server_hostname']:
             kwargs[name] = value
         elif name == 'alt_hosts':

{clickhouse_driver-0.2.9.dist-info → clickhouse_driver-0.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: clickhouse-driver
-Version: 0.2.9
+Version: 0.2.10
 Summary: Python driver with native interface for ClickHouse
 Home-page: https://github.com/mymarilyn/clickhouse-driver
 Author: Konstantin Lebedev
@@ -17,12 +17,12 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: SQL
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Database
 Classifier: Topic :: Software Development
@@ -30,20 +30,33 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
-Requires-Python: >=3.7, <4
+Requires-Python: >=3.9, <4
 License-File: LICENSE
 Requires-Dist: pytz
 Requires-Dist: tzlocal
 Provides-Extra: lz4
-Requires-Dist: clickhouse-cityhash >=1.0.2.1 ; extra == 'lz4'
-Requires-Dist: lz4 ; (implementation_name != "pypy") and extra == 'lz4'
-Requires-Dist: lz4 <=3.0.1 ; (implementation_name == "pypy") and extra == 'lz4'
-Provides-Extra: numpy
-Requires-Dist: numpy >=1.12.0 ; extra == 'numpy'
-Requires-Dist: pandas >=0.24.0 ; extra == 'numpy'
+Requires-Dist: lz4<=3.0.1; implementation_name == "pypy" and extra == "lz4"
+Requires-Dist: lz4; implementation_name != "pypy" and extra == "lz4"
+Requires-Dist: clickhouse-cityhash>=1.0.2.1; extra == "lz4"
 Provides-Extra: zstd
-Requires-Dist: zstd ; extra == 'zstd'
-Requires-Dist: clickhouse-cityhash >=1.0.2.1 ; extra == 'zstd'
+Requires-Dist: zstd; extra == "zstd"
+Requires-Dist: clickhouse-cityhash>=1.0.2.1; extra == "zstd"
+Provides-Extra: numpy
+Requires-Dist: numpy>=1.12.0; extra == "numpy"
+Requires-Dist: pandas>=0.24.0; extra == "numpy"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ClickHouse Python Driver
 ========================

{clickhouse_driver-0.2.9.dist-info → clickhouse_driver-0.2.10.dist-info}/RECORD

@@ -1,11 +1,11 @@
-clickhouse_driver/__init__.py,sha256=RK_d8W2wu-969SgQpS3ggN249KbViz6uDBaJLbCYsp4,158
+clickhouse_driver/__init__.py,sha256=-RHHLH8KESN2fiVtQ1br8WM8Hl6CkqkunzvCOJCNkbM,159
 clickhouse_driver/block.py,sha256=t2zZhtCzwp4aJj0CuDqXlDEgHXgwc6GRsIks2aaIZvI,6311
 clickhouse_driver/blockstreamprofileinfo.py,sha256=nYx9QXWAS8aPiRbtAzwLRT5JIlJ8S103JMkudncwpFg,712
-clickhouse_driver/bufferedreader.cp312-win32.pyd,sha256=SIMn9Yz0a_YWctgErzZ86CPdp_otOTRxPid2Apv3Kwg,87552
-clickhouse_driver/bufferedwriter.cp312-win32.pyd,sha256=paIWJVUOTALQG5ekGiVGe29sWlK4n30S-qNvvTm8nCs,86528
+clickhouse_driver/bufferedreader.cp312-win32.pyd,sha256=JklvZWSinVBCtwZ4II-Cte7d_NfmHsFTxdyy08HoRiY,74240
+clickhouse_driver/bufferedwriter.cp312-win32.pyd,sha256=sJkk4YeZ24in30X_odp4e4HwyFIYVhzB-7UI_neD5J4,74752
 clickhouse_driver/client.py,sha256=iYSz2DLQC-t6RLmtWJvtHoEWBAFtKDIafl874tz2ebs,32251
-clickhouse_driver/clientinfo.py,sha256=Tw3NbuDHglT6_f0AcT0IdhqW_hVePtzh9pypx5nk5ZE,4260
-clickhouse_driver/connection.py,sha256=RYS-s3jjlfloFNeth6Vy7N3g6E-W5dXM1MGJ9F6H1cU,28760
+clickhouse_driver/clientinfo.py,sha256=cdMA2td6tuYPsN6m4qtGzLzGKY4zQune0s0fZlNRiEA,4271
+clickhouse_driver/connection.py,sha256=1GlehPjkzAPtFaAAzKHlBxyXMAHLyNOtNUKQjG7kjq4,29950
 clickhouse_driver/context.py,sha256=yPkJ_BN4LGODvKCOjNlDGqABwxAMQTQl7w1vIGRPBDg,909
 clickhouse_driver/defines.py,sha256=EwrQz7sNNUmGZmZywQFpDpBFc67nB9GAZOBQEvvUJzA,2130
 clickhouse_driver/errors.py,sha256=mffBg-Y2LFOSRzvE9V34RwFcvmfh67yqLeEBhrdjeXE,14343
@@ -17,7 +17,7 @@ clickhouse_driver/queryprocessingstage.py,sha256=lbV-bB5jWUp0hqYBTsUcRYkJhCgCTfN
 clickhouse_driver/reader.py,sha256=PWKOKwjszu0sJbG-dd_TyGn8tQAzxg2gCJVbz27G3-8,1322
 clickhouse_driver/readhelpers.py,sha256=tXOmSL9GSeHLdKE2yBlk0epfy-hGJ3bTOLq3Q6sXIkw,717
 clickhouse_driver/result.py,sha256=RpjBUvRQJ70xISye7u6gxgQBJwc2UkNuusLkaZF7SmM,4098
-clickhouse_driver/varint.cp312-win32.pyd,sha256=io2cDLCdozT3uarNE8hRKu4fRCCt_dsfZT65bi5VJdQ,34304
+clickhouse_driver/varint.cp312-win32.pyd,sha256=FF4eJeVbjqnrNtCae4bBjDtWRGeX08hqTyyTjcA-KQQ,32768
 clickhouse_driver/writer.py,sha256=yf5f1vTr56YFtL-Swpi_jBsPw5bQS56j53joB0Acdyk,1286
 clickhouse_driver/columns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clickhouse_driver/columns/arraycolumn.py,sha256=UiA48jw3o4-ert8BnzEbl2h1jVmtDH3jtcP1BTPru2w,5322
@@ -33,7 +33,7 @@ clickhouse_driver/columns/intcolumn.py,sha256=ntpxyMiu44VQYJ0HyHlglwxMgUtnIgf3JE
 clickhouse_driver/columns/intervalcolumn.py,sha256=oQeybb4qrcp07LeVYfqgeZuHYGH5RaY7KnWVoIsDe1I,600
 clickhouse_driver/columns/ipcolumn.py,sha256=LIt-NiUy70-8u5Amu0v0tlAlrolZ8gXzlFxcJYmjRAk,4095
 clickhouse_driver/columns/jsoncolumn.py,sha256=SeCLSrmRoEg9wlvoehs7-EmrV8XkOL3lknzeOORhbJg,1175
-clickhouse_driver/columns/largeint.cp312-win32.pyd,sha256=BNlZzUPy6LEYQX7Q9SuqKZBxojnM9E56jMxTU1zLag8,56320
+clickhouse_driver/columns/largeint.cp312-win32.pyd,sha256=cWp3sM8WzTGfr5hRqQtus2X_BIF4ddL67pgAbjm6FBs,55296
 clickhouse_driver/columns/lowcardinalitycolumn.py,sha256=vMlhYYUPNmFhQiUAS77pE25KjI8TrO6ySz6w0ByBdZQ,4920
 clickhouse_driver/columns/mapcolumn.py,sha256=gX7xvwsilfOHDCwmRJu4fW2Y1OrN_1cgZTmbvcyer30,2133
 clickhouse_driver/columns/nestedcolumn.py,sha256=7x3xNYR22kEmgV4_3rPVZea2zCTU364O1tlOewMgw3M,303
@@ -57,7 +57,7 @@ clickhouse_driver/columns/numpy/lowcardinalitycolumn.py,sha256=ExYtwBBn6WfSQtWC0
 clickhouse_driver/columns/numpy/service.py,sha256=ENk26HPfxtbumcO_b2fGTNJdTgaJT0a-l3q_xrRIZZ4,2126
 clickhouse_driver/columns/numpy/stringcolumn.py,sha256=FH87XPQv3ga0ZJnngubqu4DgxmUt8bjW8xJcNfOU7EI,2439
 clickhouse_driver/columns/numpy/tuplecolumn.py,sha256=5RqhCIZ-CrWy_D0yyfTmlWBJgrunT5Yk-bM4OvIKZ1o,1233
-clickhouse_driver/compression/__init__.py,sha256=_XcKSkvWWPvEX4jeefYX1Alee58w6ktFOXrsIFRko_0,714
+clickhouse_driver/compression/__init__.py,sha256=7D3Wk_-KQsnIdaqp9163YCDsQ98Stbl6GF1h1KAFgAg,840
 clickhouse_driver/compression/base.py,sha256=MCTK2aOGT3Lkso5r3-U-ilj2ln4r-nnfNI_2Ostsu6Q,2434
 clickhouse_driver/compression/lz4.py,sha256=ZTf1zn0uG26O29XHBBZeve26JLPNbbEWWMZe065oa0Y,631
 clickhouse_driver/compression/lz4hc.py,sha256=zGbj9vnM20W298kgzD0dIAgIeV30e5Kx8NSN8t4SDas,195
@@ -81,9 +81,9 @@ clickhouse_driver/streams/native.py,sha256=lIJFxLRFrh2zqRAvf8W2JPmXdGtJu3LPDUkfa
 clickhouse_driver/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clickhouse_driver/util/compat.py,sha256=wIB_6ULSapKx-Fi64lZ0YJ-TtWOQXePHE90wZopIM1I,876
 clickhouse_driver/util/escape.py,sha256=vL8sY6XdHhjFwtHn8yQ3JbeZfocWt6jyvxFf-nEiRtM,2262
-clickhouse_driver/util/helpers.py,sha256=AIKa7UPCiNMjGaMwFjn_n1PTij20PCYtA-YMePBKQFY,4483
-clickhouse_driver-0.2.9.dist-info/LICENSE,sha256=b2SjNa4zGQk6XzJwmeE1dQjjtWRvX_zxJIAl_ZbN_S8,1143
-clickhouse_driver-0.2.9.dist-info/METADATA,sha256=O7fUc77cROATgATo5BxkO01nhZH1Akh9uoOqOlADWcw,6342
-clickhouse_driver-0.2.9.dist-info/WHEEL,sha256=4N7jptPh4OYjkcvBzbL_SyiQfKWhgnHPSC8E7zx3zFw,98
-clickhouse_driver-0.2.9.dist-info/top_level.txt,sha256=PrE0Lrs4d-gRQwzABaABfym9Qvr4nN6uTrDy6Q7zQME,18
-clickhouse_driver-0.2.9.dist-info/RECORD,,
+clickhouse_driver/util/helpers.py,sha256=IGmaK3L8_i8C-3NJWPWT2VK5hAtLxfflF0ti2z45SHs,4574
+clickhouse_driver-0.2.10.dist-info/licenses/LICENSE,sha256=b2SjNa4zGQk6XzJwmeE1dQjjtWRvX_zxJIAl_ZbN_S8,1143
+clickhouse_driver-0.2.10.dist-info/METADATA,sha256=L7JSolHa_2zc_NGUpJK-fXouxcU8UNJseMQkSxePWYE,6607
+clickhouse_driver-0.2.10.dist-info/WHEEL,sha256=LwxTQZ0gyDP_uaeNCLm-ZIktY9hv6x0e22Q-hgFd-po,97
+clickhouse_driver-0.2.10.dist-info/top_level.txt,sha256=PrE0Lrs4d-gRQwzABaABfym9Qvr4nN6uTrDy6Q7zQME,18
+clickhouse_driver-0.2.10.dist-info/RECORD,,

{clickhouse_driver-0.2.9.dist-info → clickhouse_driver-0.2.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-win32