clickhouse-driver 0.2.8__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, 8)
+VERSION = (0, 2, 10)
 __version__ = '.'.join(str(x) for x in VERSION)
 
 __all__ = ['Client', 'connect']

clickhouse_driver/client.py

@@ -1,10 +1,9 @@
 import re
-import ssl
 from collections import deque
 from contextlib import contextmanager
 from time import time
 import types
-from urllib.parse import urlparse, parse_qs, unquote
+from urllib.parse import urlparse
 
 from . import errors, defines
 from .block import ColumnOrientedBlock, RowOrientedBlock
@@ -15,7 +14,7 @@ from .result import (
     IterQueryResult, ProgressQueryResult, QueryResult, QueryInfo
 )
 from .util.escape import escape_params
-from .util.helpers import column_chunks, chunks, asbool
+from .util.helpers import column_chunks, chunks, parse_url
 
 
 class Client(object):
@@ -312,6 +311,7 @@ class Client(object):
     def disconnect_on_error(self, query, settings):
         try:
             self.establish_connection(settings)
+            self.connection.server_info.session_timezone = None
 
             yield
 
@@ -746,9 +746,13 @@ class Client(object):
             elif packet.type == ServerPacketTypes.EXCEPTION:
                 raise packet.exception
 
+            elif packet.type == ServerPacketTypes.TIMEZONE_UPDATE:
+                pass
+
             else:
                 message = self.connection.unexpected_packet_message(
-                    'ProfileEvents, Progress, Log or Exception', packet.type
+                    'ProfileEvents, Progress, Log, Exception or '
+                    'TimezoneUpdate', packet.type
                 )
                 raise errors.UnexpectedPacketFromServerError(message)
 
@@ -796,101 +800,13 @@ class Client(object):
             clickhouses://[user:password]@localhost:9440/default
 
         Three URL schemes are supported:
-            clickhouse:// creates a normal TCP socket connection
-            clickhouses:// creates a SSL wrapped TCP socket connection
+
+            * clickhouse:// creates a normal TCP socket connection
+            * clickhouses:// creates a SSL wrapped TCP socket connection
 
         Any additional querystring arguments will be passed along to
         the Connection class's initializer.
         """
-        url = urlparse(url)
-
-        settings = {}
-        kwargs = {}
-
-        host = url.hostname
-
-        if url.port is not None:
-            kwargs['port'] = url.port
-
-        path = url.path.replace('/', '', 1)
-        if path:
-            kwargs['database'] = path
-
-        if url.username is not None:
-            kwargs['user'] = unquote(url.username)
-
-        if url.password is not None:
-            kwargs['password'] = unquote(url.password)
-
-        if url.scheme == 'clickhouses':
-            kwargs['secure'] = True
-
-        compression_algs = {'lz4', 'lz4hc', 'zstd'}
-        timeouts = {
-            'connect_timeout',
-            'send_receive_timeout',
-            'sync_request_timeout'
-        }
-
-        for name, value in parse_qs(url.query).items():
-            if not value or not len(value):
-                continue
-
-            value = value[0]
-
-            if name == 'compression':
-                value = value.lower()
-                if value in compression_algs:
-                    kwargs[name] = value
-                else:
-                    kwargs[name] = asbool(value)
-
-            elif name == 'secure':
-                kwargs[name] = asbool(value)
-
-            elif name == 'use_numpy':
-                settings[name] = asbool(value)
-
-            elif name == 'round_robin':
-                kwargs[name] = asbool(value)
-
-            elif name == 'client_name':
-                kwargs[name] = value
-
-            elif name in timeouts:
-                kwargs[name] = float(value)
-
-            elif name == 'compress_block_size':
-                kwargs[name] = int(value)
-
-            elif name == 'settings_is_important':
-                kwargs[name] = asbool(value)
-
-            elif name == 'tcp_keepalive':
-                try:
-                    kwargs[name] = asbool(value)
-                except ValueError:
-                    parts = value.split(',')
-                    kwargs[name] = (
-                        int(parts[0]), int(parts[1]), int(parts[2])
-                    )
-            elif name == 'client_revision':
-                kwargs[name] = int(value)
-
-            # ssl
-            elif name == 'verify':
-                kwargs[name] = asbool(value)
-            elif name == 'ssl_version':
-                kwargs[name] = getattr(ssl, value)
-            elif name in ['ca_certs', 'ciphers', 'keyfile', 'certfile',
-                          'server_hostname']:
-                kwargs[name] = value
-            elif name == 'alt_hosts':
-                kwargs['alt_hosts'] = value
-            else:
-                settings[name] = value
-
-        if settings:
-            kwargs['settings'] = settings
+        host, kwargs = parse_url(url)
 
         return cls(host, **kwargs)

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/columns/datetimecolumn.py

@@ -193,8 +193,9 @@ def create_datetime_column(spec, column_options):
     else:
         if not context.settings.get('use_client_time_zone', False):
             local_timezone = get_localzone_name_compat()
-            if local_timezone != context.server_info.timezone:
-                tz_name = context.server_info.timezone
+            remote_timezone = context.server_info.get_timezone()
+            if local_timezone != remote_timezone:
+                tz_name = remote_timezone
 
     if tz_name:
         timezone = get_timezone(tz_name)

clickhouse_driver/columns/enumcolumn.py

@@ -1,20 +1,24 @@
 from enum import Enum
+from collections import OrderedDict
 
 from .. import errors
 from .intcolumn import IntColumn
 
+invalid_names_for_python_enum = frozenset(['mro', ''])
+
 
 class EnumColumn(IntColumn):
     py_types = (Enum, int, str)
 
-    def __init__(self, enum_cls, **kwargs):
-        self.enum_cls = enum_cls
+    def __init__(self, name_by_value, value_by_name, **kwargs):
+        self.name_by_value = name_by_value
+        self.value_by_name = value_by_name
         super(EnumColumn, self).__init__(**kwargs)
 
     def before_write_items(self, items, nulls_map=None):
         null_value = self.null_value
-
-        enum_cls = self.enum_cls
+        name_by_value = self.name_by_value
+        value_by_name = self.value_by_name
 
         for i, item in enumerate(items):
             if nulls_map and nulls_map[i]:
@@ -26,15 +30,15 @@ class EnumColumn(IntColumn):
             # Check real enum value
             try:
                 if isinstance(source_value, str):
-                    items[i] = enum_cls[source_value].value
+                    items[i] = value_by_name[source_value]
                 else:
-                    items[i] = enum_cls(source_value).value
+                    items[i] = value_by_name[name_by_value[source_value]]
             except (ValueError, KeyError):
                 choices = ', '.join(
-                    "'{}' = {}".format(x.name.replace("'", r"\'"), x.value)
-                    for x in enum_cls
+                    "'{}' = {}".format(name.replace("'", r"\'"), value)
+                    for name, value in value_by_name.items()
                 )
-                enum_str = '{}({})'.format(enum_cls.__name__, choices)
+                enum_str = '{}({})'.format(self.ch_type, choices)
 
                 raise errors.LogicalError(
                     "Unknown element '{}' for type {}"
@@ -42,13 +46,13 @@ class EnumColumn(IntColumn):
                 )
 
     def after_read_items(self, items, nulls_map=None):
-        enum_cls = self.enum_cls
+        name_by_value = self.name_by_value
 
         if nulls_map is None:
-            return tuple(enum_cls(item).name for item in items)
+            return tuple(name_by_value[item] for item in items)
         else:
             return tuple(
-                (None if is_null else enum_cls(items[i]).name)
+                (None if is_null else name_by_value[items[i]])
                 for i, is_null in enumerate(nulls_map)
             )
 
@@ -73,11 +77,13 @@ def create_enum_column(spec, column_options):
         params = spec[7:-1]
         cls = Enum16Column
 
-    return cls(Enum(cls.ch_type, _parse_options(params)), **column_options)
+    name_by_value, value_by_name = _parse_options(params)
+
+    return cls(name_by_value, value_by_name, **column_options)
 
 
 def _parse_options(option_string):
-    options = dict()
+    name_by_value, value_by_name = {}, OrderedDict()
     after_name = False
     escaped = False
     quote_character = None
@@ -93,7 +99,9 @@ def _parse_options(option_string):
             if ch in (' ', '='):
                 pass
             elif ch == ',':
-                options[name] = int(value)
+                value = int(value)
+                name_by_value[value] = name
+                value_by_name[name] = value
                 after_name = False
                 name = ''
                 value = ''  # reset before collecting new option
@@ -114,6 +122,8 @@ def _parse_options(option_string):
                 quote_character = ch
 
     if after_name:
-        options.setdefault(name, int(value))  # append word after last comma
+        value = int(value)
+        name_by_value[value] = name
+        value_by_name[name] = value
 
-    return options
+    return name_by_value, value_by_name

clickhouse_driver/columns/numpy/datetimecolumn.py

@@ -33,7 +33,9 @@ class NumpyDateTimeColumnBase(NumpyColumn):
             ts = items
         else:
             timezone = self.timezone if self.timezone else self.local_timezone
-            ts = pd.to_datetime(items).tz_localize(timezone)
+            ts = pd.to_datetime(items)
+            if not getattr(ts.dtype, 'tz', None):
+                ts = ts.tz_localize(timezone)
 
         ts = ts.tz_convert('UTC')
         return ts.tz_localize(None).to_numpy(self.datetime_dtype)
@@ -133,8 +135,9 @@ def create_numpy_datetime_column(spec, column_options):
         offset_naive = False
     else:
         if not context.settings.get('use_client_time_zone', False):
-            if local_tz_name != context.server_info.timezone:
-                tz_name = context.server_info.timezone
+            remote_timezone = context.server_info.get_timezone()
+            if local_tz_name != remote_timezone:
+                tz_name = remote_timezone
 
     timezone = get_timezone(tz_name) if tz_name else None
     local_timezone = get_timezone(local_tz_name) if local_tz_name else None

clickhouse_driver/columns/util.py

@@ -37,12 +37,13 @@ def get_inner_columns(spec):
 
 
 def get_inner_columns_with_types(spec):
+    spec = spec.strip()
     brackets = 0
     prev_comma = 0
     prev_space = 0
 
     columns = []
-    for i, x in enumerate(spec + ','):
+    for i, x in enumerate(spec.strip() + ','):
         if x == ',':
             if brackets == 0:
                 columns.append((

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
@@ -53,11 +58,15 @@ class ServerInfo(object):
         self.version_patch = version_patch
         self.revision = revision
         self.timezone = timezone
+        self.session_timezone = None
         self.display_name = display_name
         self.used_revision = used_revision
 
         super(ServerInfo, self).__init__()
 
+    def get_timezone(self):
+        return self.session_timezone or self.timezone
+
     def version_tuple(self):
         return self.version_major, self.version_minor, self.version_patch
 
@@ -116,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
@@ -137,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__(
@@ -152,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
@@ -183,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
@@ -196,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.
@@ -254,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()
 
@@ -301,15 +330,14 @@ class Connection(object):
     def _create_ssl_context(self, ssl_options):
         purpose = ssl.Purpose.SERVER_AUTH
 
-        version = ssl_options.get('ssl_version', ssl.PROTOCOL_TLS)
+        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'])
         elif ssl_options.get('cert_reqs') != ssl.CERT_NONE:
-            context.load_default_certs(purpose
-                                       )
+            context.load_default_certs(purpose)
         if 'ciphers' in ssl_options:
             context.set_ciphers(ssl_options['ciphers'])
 
@@ -318,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
 
@@ -539,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):
@@ -613,6 +648,12 @@ class Connection(object):
         elif packet_type == ServerPacketTypes.PROFILE_EVENTS:
             packet.block = self.receive_data(may_be_compressed=False)
 
+        elif packet_type == ServerPacketTypes.TIMEZONE_UPDATE:
+            timezone = read_binary_str(self.fin)
+            if timezone:
+                logger.info('Server timezone changed to %s', timezone)
+                self.server_info.session_timezone = timezone
+
         else:
             message = 'Unknown packet {} from server {}'.format(
                 packet_type, self.get_description()

clickhouse_driver/defines.py

@@ -33,6 +33,9 @@ DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS = 54459
 DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS = 54460
 DBMS_MIN_PROTOCOL_VERSION_WITH_PASSWORD_COMPLEXITY_RULES = 54461
 DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2 = 54462
+DBMS_MIN_PROTOCOL_VERSION_WITH_TOTAL_BYTES_IN_PROGRESS = 54463
+DBMS_MIN_PROTOCOL_VERSION_WITH_TIMEZONE_UPDATES = 54464
+DBMS_MIN_REVISION_WITH_SYSTEM_KEYWORDS_TABLE = 54468
 
 # Timeouts
 DBMS_DEFAULT_CONNECT_TIMEOUT_SEC = 10
@@ -48,7 +51,7 @@ CLIENT_NAME = 'python-driver'
 CLIENT_VERSION_MAJOR = 20
 CLIENT_VERSION_MINOR = 10
 CLIENT_VERSION_PATCH = 2
-CLIENT_REVISION = DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2
+CLIENT_REVISION = DBMS_MIN_REVISION_WITH_SYSTEM_KEYWORDS_TABLE
 
 BUFFER_SIZE = 1048576
 

clickhouse_driver/numpy/helpers.py

@@ -1,13 +1,16 @@
 import numpy as np
 import pandas as pd
+from pandas.core.arrays import ExtensionArray
 
 
 def column_chunks(columns, n):
     for column in columns:
-        if not isinstance(column, (np.ndarray, pd.DatetimeIndex)):
+        if not isinstance(
+            column, (np.ndarray, pd.DatetimeIndex, ExtensionArray)
+        ):
             raise TypeError(
                 'Unsupported column type: {}. '
-                'ndarray/DatetimeIndex is expected.'
+                'ndarray/DatetimeIndex/ExtensionArray is expected.'
                 .format(type(column))
             )
 

clickhouse_driver/progress.py

@@ -6,7 +6,8 @@ class Progress(object):
     def __init__(self):
         self.rows = 0
         self.bytes = 0
-        self.total_rows = 0
+        self.total_rows = 0  # total_rows_to_read
+        self.total_bytes = 0  # total_bytes_to_read
         self.written_rows = 0
         self.written_bytes = 0
         self.elapsed_ns = 0
@@ -21,6 +22,10 @@ class Progress(object):
         if revision >= defines.DBMS_MIN_REVISION_WITH_TOTAL_ROWS_IN_PROGRESS:
             self.total_rows = read_varint(fin)
 
+        if revision >= defines. \
+                DBMS_MIN_PROTOCOL_VERSION_WITH_TOTAL_BYTES_IN_PROGRESS:
+            self.total_bytes = read_varint(fin)
+
         if revision >= defines.DBMS_MIN_REVISION_WITH_CLIENT_WRITE_INFO:
             self.written_rows = read_varint(fin)
             self.written_bytes = read_varint(fin)
@@ -33,6 +38,7 @@ class Progress(object):
         self.rows += another_progress.rows
         self.bytes += another_progress.bytes
         self.total_rows += another_progress.total_rows
+        self.total_bytes += another_progress.total_bytes
         self.written_rows += another_progress.written_rows
         self.written_bytes += another_progress.written_bytes
         self.elapsed_ns += another_progress.elapsed_ns

clickhouse_driver/protocol.py

@@ -29,7 +29,10 @@ class ClientPacketTypes(object):
 
     @classmethod
     def to_str(cls, packet):
-        return 'Unknown packet' if packet > 5 else cls._types_str[packet]
+        try:
+            return cls._types_str[packet]
+        except IndexError:
+            return 'Unknown packet'
 
 
 class ServerPacketTypes(object):
@@ -81,15 +84,28 @@ class ServerPacketTypes(object):
     # Packet with profile events from server.
     PROFILE_EVENTS = 14
 
+    MERGE_TREE_ALL_RANGES_ANNOUNCEMENT = 15
+
+    # Request from a MergeTree replica to a coordinator
+    MERGE_TREE_READ_TASK_REQUEST = 16
+
+    # Receive server's (session-wide) default timezone
+    TIMEZONE_UPDATE = 17
+
     _types_str = [
         'Hello', 'Data', 'Exception', 'Progress', 'Pong', 'EndOfStream',
         'ProfileInfo', 'Totals', 'Extremes', 'TablesStatusResponse', 'Log',
-        'TableColumns', 'PartUUIDs', 'ReadTaskRequest', 'ProfileEvents'
+        'TableColumns', 'PartUUIDs', 'ReadTaskRequest', 'ProfileEvents',
+        'MergeTreeAllRangesAnnouncement', 'MergeTreeReadTaskRequest',
+        'TimezoneUpdate'
     ]
 
     @classmethod
     def to_str(cls, packet):
-        return 'Unknown packet' if packet > 14 else cls._types_str[packet]
+        try:
+            return cls._types_str[packet]
+        except IndexError:
+            return 'Unknown packet'
 
     @classmethod
     def strings_in_message(cls, packet):

clickhouse_driver/streams/native.py

@@ -1,3 +1,5 @@
+import logging
+
 from ..block import ColumnOrientedBlock, BlockInfo
 from ..columns.service import read_column, write_column
 from ..reader import read_binary_str, read_binary_uint8
@@ -5,6 +7,8 @@ from ..varint import write_varint, read_varint
 from ..writer import write_binary_str, write_binary_uint8
 from .. import defines
 
+logger = logging.getLogger(__name__)
+
 
 class BlockOutputStream(object):
     def __init__(self, fout, context):
@@ -40,6 +44,7 @@ class BlockOutputStream(object):
                     # We write always sparse data without custom serialization.
                     write_binary_uint8(0, self.fout)
 
+                logger.debug('Writing column %s', col_name)
                 write_column(self.context, col_name, col_type, items,
                              self.fout, types_check=block.types_check)
 
@@ -80,6 +85,7 @@ class BlockInputStream(object):
                 has_custom_serialization = bool(read_binary_uint8(self.fin))
 
             if n_rows:
+                logger.debug('Reading column %s', column_name)
                 column = read_column(
                     self.context, column_type, n_rows,
                     self.fin, use_numpy=use_numpy,

clickhouse_driver/util/escape.py

@@ -21,7 +21,7 @@ escape_chars_map = {
 
 
 def escape_datetime(item, context):
-    server_tz = timezone(context.server_info.timezone)
+    server_tz = timezone(context.server_info.get_timezone())
 
     if item.tzinfo is not None:
         item = item.astimezone(server_tz)

clickhouse_driver/util/helpers.py

@@ -1,4 +1,6 @@
+import ssl
 from itertools import islice, tee
+from urllib.parse import urlparse, parse_qs, unquote
 
 
 def chunks(seq, n):
@@ -55,3 +57,117 @@ def asbool(obj):
         else:
             raise ValueError('String is not true/false: %r' % obj)
     return bool(obj)
+
+
+def parse_url(url):
+    """
+    Parses url into host and kwargs suitable for further Client construction.
+    Return host and kwargs.
+
+    For example::
+
+        clickhouse://[user:password]@localhost:9000/default
+        clickhouses://[user:password]@localhost:9440/default
+
+    Three URL schemes are supported:
+
+        * clickhouse:// creates a normal TCP socket connection
+        * clickhouses:// creates a SSL wrapped TCP socket connection
+
+    Any additional querystring arguments will be passed along to
+    the Connection class's initializer.
+    """
+    url = urlparse(url)
+
+    settings = {}
+    kwargs = {}
+
+    host = url.hostname
+
+    if url.port is not None:
+        kwargs['port'] = url.port
+
+    path = url.path.replace('/', '', 1)
+    if path:
+        kwargs['database'] = path
+
+    if url.username is not None:
+        kwargs['user'] = unquote(url.username)
+
+    if url.password is not None:
+        kwargs['password'] = unquote(url.password)
+
+    if url.scheme == 'clickhouses':
+        kwargs['secure'] = True
+
+    compression_algs = {'lz4', 'lz4hc', 'zstd'}
+    timeouts = {
+        'connect_timeout',
+        'send_receive_timeout',
+        'sync_request_timeout'
+    }
+
+    for name, value in parse_qs(url.query).items():
+        if not value or not len(value):
+            continue
+
+        value = value[0]
+
+        if name == 'compression':
+            value = value.lower()
+            if value in compression_algs:
+                kwargs[name] = value
+            else:
+                kwargs[name] = asbool(value)
+
+        elif name == 'secure':
+            kwargs[name] = asbool(value)
+
+        elif name == 'use_numpy':
+            settings[name] = asbool(value)
+
+        elif name == 'round_robin':
+            kwargs[name] = asbool(value)
+
+        elif name == 'client_name':
+            kwargs[name] = value
+
+        elif name in timeouts:
+            kwargs[name] = float(value)
+
+        elif name == 'compress_block_size':
+            kwargs[name] = int(value)
+
+        elif name == 'settings_is_important':
+            kwargs[name] = asbool(value)
+
+        elif name == 'tcp_keepalive':
+            try:
+                kwargs[name] = asbool(value)
+            except ValueError:
+                parts = value.split(',')
+                kwargs[name] = (
+                    int(parts[0]), int(parts[1]), int(parts[2])
+                )
+        elif name == 'client_revision':
+            kwargs[name] = int(value)
+
+        # 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', 'keypass', 'certfile',
+                      'server_hostname']:
+            kwargs[name] = value
+        elif name == 'alt_hosts':
+            kwargs['alt_hosts'] = value
+        else:
+            settings[name] = value
+
+    if settings:
+        kwargs['settings'] = settings
+
+    return host, kwargs

{clickhouse_driver-0.2.8.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.8
+Version: 0.2.10
 Summary: Python driver with native interface for ClickHouse
 Home-page: https://github.com/mymarilyn/clickhouse-driver
 Author: Konstantin Lebedev
@@ -17,11 +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
@@ -29,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.8.dist-info → clickhouse_driver-0.2.10.dist-info}/RECORD

@@ -1,39 +1,39 @@
-clickhouse_driver/__init__.py,sha256=OmAov0f6GIBaEKyG5T6rvrDLSL4q1Ysnetjt3iEsMZg,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=RmJgKsXzvPwUlflnuPi7rJwsgPzZp3nZ50cRszfywrA,87552
-clickhouse_driver/bufferedwriter.cp312-win32.pyd,sha256=juFtqHO9FHQV8yA-jagPjZAy0Mjer9YhbujE0H2R8Es,86528
-clickhouse_driver/client.py,sha256=aMjWyS98BqonoEuZxNC_q4DdUjBf8vADLAAcrkJPmKA,34703
-clickhouse_driver/clientinfo.py,sha256=Tw3NbuDHglT6_f0AcT0IdhqW_hVePtzh9pypx5nk5ZE,4260
-clickhouse_driver/connection.py,sha256=Ol9ZljjN63P840yrUlWPl5g9lRldh9XTD5fVOiloYi8,28403
+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=cdMA2td6tuYPsN6m4qtGzLzGKY4zQune0s0fZlNRiEA,4271
+clickhouse_driver/connection.py,sha256=1GlehPjkzAPtFaAAzKHlBxyXMAHLyNOtNUKQjG7kjq4,29950
 clickhouse_driver/context.py,sha256=yPkJ_BN4LGODvKCOjNlDGqABwxAMQTQl7w1vIGRPBDg,909
-clickhouse_driver/defines.py,sha256=hXIR10BvH_sxUN35pk-f-VeIbM7CA0Ll2B2yNuAy10A,1958
+clickhouse_driver/defines.py,sha256=EwrQz7sNNUmGZmZywQFpDpBFc67nB9GAZOBQEvvUJzA,2130
 clickhouse_driver/errors.py,sha256=mffBg-Y2LFOSRzvE9V34RwFcvmfh67yqLeEBhrdjeXE,14343
 clickhouse_driver/log.py,sha256=P9VS_YDY3a4JQsNOeUNNK0L1AAallTC1GF4FG5gCrac,1091
 clickhouse_driver/opentelemetry.py,sha256=GIzHCxdB8LB1ozXtUjIpxsdznmRABAts64G2u2l4C_A,1622
-clickhouse_driver/progress.py,sha256=MagDPiLzWG-2Arecu5O6JlK98242ayt9yPa9H7v9o5k,1288
-clickhouse_driver/protocol.py,sha256=ZRJuawN_v8wXFrHrcpSiBqu7idKsPd3tQnCcDuTlIw8,2561
+clickhouse_driver/progress.py,sha256=mom2NRLg8dfE_ObOEthKqjSBIliBvDjt7joePvY_Fdw,1574
+clickhouse_driver/protocol.py,sha256=BxCJiZLH0QkFmdNwog1OJm9MEMwdPZ1i5Jv1_NHcLb0,2965
 clickhouse_driver/queryprocessingstage.py,sha256=lbV-bB5jWUp0hqYBTsUcRYkJhCgCTfN2G21AykMoAp0,186
 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=fjZmM5lZyqpvBZ4XLNG9hMYo5CXFqIHDG6tlI1vrUmU,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
 clickhouse_driver/columns/base.py,sha256=jRThD8Ol7gwNy3x0M7vvslkm0RDOsCLJqKGf0arsa0w,6504
 clickhouse_driver/columns/boolcolumn.py,sha256=QgVCqbZWoFD1yvpppc92iiXIzReCVEh692efNSNH4UE,127
 clickhouse_driver/columns/datecolumn.py,sha256=FT6qzmniFGKw5SpjFITiBf-fJGEwaoUIz7PMZMFxe8M,3209
-clickhouse_driver/columns/datetimecolumn.py,sha256=pO8g1exACp6EfUO0prra5X3T_gg1MJ8bSoi5Rt2Vxjg,6691
+clickhouse_driver/columns/datetimecolumn.py,sha256=RWucoNtcc4wUGQ6xPL0cTNmxFy8eQ50ZdHzexXBm3XE,6730
 clickhouse_driver/columns/decimalcolumn.py,sha256=MBczjN6AtI0jgbVTNguwVE7ZdWql0XuMl-QohxV-sN0,3450
-clickhouse_driver/columns/enumcolumn.py,sha256=GCSW-fjtJC4_5YKo9oKtG8GT9UhLcRWCjrBVhEAUp-A,3219
+clickhouse_driver/columns/enumcolumn.py,sha256=zqZkSVVXfWsaPUbP59ayy7w8rG4otS9J51UPD29zs2Y,3674
 clickhouse_driver/columns/exceptions.py,sha256=vrZMZ9ORRP7RSSd34azM_xFaeMaaYbwy6h6ZCeFNbIg,163
 clickhouse_driver/columns/floatcolumn.py,sha256=Mci7Fl05dgkpDQRfjGaDP9QraZER5nkYX1lVsTA89Yk,925
 clickhouse_driver/columns/intcolumn.py,sha256=ntpxyMiu44VQYJ0HyHlglwxMgUtnIgf3JE9LUD9Xwwc,3519
 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=WPxFFDlRVb3H0tP5j19djieoXjvQNBmxR_mlz0CrNII,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
@@ -44,20 +44,20 @@ clickhouse_driver/columns/service.py,sha256=6nIGwvcG-5LErQFn_3a2GRKZI2OnKYsy2oII
 clickhouse_driver/columns/simpleaggregatefunctioncolumn.py,sha256=zDWBd_Hc7AktHFZ5JY7SwxIk7G4WBHdJdcPBqihe7q0,235
 clickhouse_driver/columns/stringcolumn.py,sha256=C-l7HaReg9AcJGQvgpSH07aV-CZMBP1jKArPHZi8Q2k,2059
 clickhouse_driver/columns/tuplecolumn.py,sha256=DnwtEwVXzm-YyL5-cPe9MiOLOoTEcDhcYeBY6SuuZZQ,2040
-clickhouse_driver/columns/util.py,sha256=5DRGBsWSTldqZRZJ53J85zh_jepkwkAsYXhAeDJQW4I,1395
+clickhouse_driver/columns/util.py,sha256=3q965GjEmKkTmjIva31PhvAEGfuuGulad1amK7kQBEQ,1427
 clickhouse_driver/columns/uuidcolumn.py,sha256=7CLPxsHJtV6Zt9jxILSkE0LAwffloLmrjjbwCZH34mA,1865
 clickhouse_driver/columns/numpy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clickhouse_driver/columns/numpy/base.py,sha256=Wk1ADpoQGWQv5X8sWi0esA2jmQGEoDakXZxImuYM2eM,1410
 clickhouse_driver/columns/numpy/boolcolumn.py,sha256=0_RwEroY2-ZqMuxKeTNG27ZCWN_y9BxYZzbuFKeqoQg,140
 clickhouse_driver/columns/numpy/datecolumn.py,sha256=xWFsFwiRmszK9A20UWnF4beTE5f8XQDj18x53xtXtSI,482
-clickhouse_driver/columns/numpy/datetimecolumn.py,sha256=XQ3JsxVdAvWJndNek4-i07JO2QJIdUnJQWzOxvF3PMc,4777
+clickhouse_driver/columns/numpy/datetimecolumn.py,sha256=X6XgslCvWOF3dtVP3ogDQ4WLWhQqAkAdw5qAIuE8f1o,4890
 clickhouse_driver/columns/numpy/floatcolumn.py,sha256=WnnlyR3vabh6ixllXwdyQ_t8y5MSqCddImWityxz6pE,599
 clickhouse_driver/columns/numpy/intcolumn.py,sha256=ZzmjvjpEaZ_kk-mGEPdBAqUCjqCgGT8tUEzbQKwUVVA,792
 clickhouse_driver/columns/numpy/lowcardinalitycolumn.py,sha256=ExYtwBBn6WfSQtWC0f79ZqjdqO3ZJ3IL6KtlQOgMh-k,3368
 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
@@ -69,7 +69,7 @@ clickhouse_driver/dbapi/errors.py,sha256=yv2SDIK-ZlWmIxBoF5_igfHRyh9zTUJSgAj9g8S
 clickhouse_driver/dbapi/extras.py,sha256=je1tjk6gb-QqLMoWu_iXCqhJK159vyyHsCB_8vXkXyw,2129
 clickhouse_driver/numpy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clickhouse_driver/numpy/block.py,sha256=k8CqQxaVSviZvicS03exPZG_LFwbzB5-NnLB2EuBKgQ,180
-clickhouse_driver/numpy/helpers.py,sha256=jKiZ3GOp1G5Q2Y-6S_YG9t9RtdSLa-AH1grz71OWyS0,704
+clickhouse_driver/numpy/helpers.py,sha256=cwRvBX4a-o-QdccYIxFT3p8DPUaXqyXWsVNTSiG8Cdw,803
 clickhouse_driver/numpy/result.py,sha256=D-7IsaIt0u4WJ8iSzXYBB0OiPgPu5ptu-1HiJvTW-No,3563
 clickhouse_driver/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clickhouse_driver/settings/available.py,sha256=8b1YUjt-_6gO9Cio02VZSMPdhM70zk-NMhE4f_jwFx8,16613
@@ -77,13 +77,13 @@ clickhouse_driver/settings/types.py,sha256=u_A3FzREqIjj4OSEdKUwm1Xn8jEnGpp-9Avqb
 clickhouse_driver/settings/writer.py,sha256=x0FVdbKZR9lN-hXAT2xxkoqvGo1ojvWWwyP3NaI7ZDA,1099
 clickhouse_driver/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 clickhouse_driver/streams/compressed.py,sha256=eyFCuq_sLX6oJLQ_h1QX3IB9IgUx56pPqPfhmeiA6ag,2865
-clickhouse_driver/streams/native.py,sha256=2qAs5deUU4NwLG3zQAyxNwGsKmJO41-qlTRKGRFSAJA,3316
+clickhouse_driver/streams/native.py,sha256=lIJFxLRFrh2zqRAvf8W2JPmXdGtJu3LPDUkfaBrLAfk,3493
 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=4RPfNzC5IvatoZB9llmJM4436XArCXQDEqT_cqdwCBk,2256
-clickhouse_driver/util/helpers.py,sha256=1oLkkkILXZnEbdjAe2Ags-Y-T-Bq9rk94W6edh-1ZLU,1448
-clickhouse_driver-0.2.8.dist-info/LICENSE,sha256=b2SjNa4zGQk6XzJwmeE1dQjjtWRvX_zxJIAl_ZbN_S8,1143
-clickhouse_driver-0.2.8.dist-info/METADATA,sha256=nmFh97sS6TF5P2tzzmvKfO-HUNGxXWzyrFwC4D6OkuU,6290
-clickhouse_driver-0.2.8.dist-info/WHEEL,sha256=4N7jptPh4OYjkcvBzbL_SyiQfKWhgnHPSC8E7zx3zFw,98
-clickhouse_driver-0.2.8.dist-info/top_level.txt,sha256=PrE0Lrs4d-gRQwzABaABfym9Qvr4nN6uTrDy6Q7zQME,18
-clickhouse_driver-0.2.8.dist-info/RECORD,,
+clickhouse_driver/util/escape.py,sha256=vL8sY6XdHhjFwtHn8yQ3JbeZfocWt6jyvxFf-nEiRtM,2262
+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.8.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