Intermediate changes

commit_hash:36f6f3674eaf6f39f4347c79c0086dbcb43d6f27

8 files changed, 38 insertions, 28 deletions

diff --git a/contrib/python/argcomplete/py3/.dist-info/METADATA b/contrib/python/argcomplete/py3/.dist-info/METADATA
index ce75d7bfa8..8bda4dd4a3 100644
--- a/contrib/python/argcomplete/py3/.dist-info/METADATA
+++ b/contrib/python/argcomplete/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: argcomplete
-Version: 3.5.0
+Version: 3.5.1
 Summary: Bash tab completion for argparse
 Home-page: https://github.com/kislyuk/argcomplete
 Author: Andrey Kislyuk
@@ -9,7 +9,7 @@ License: Apache Software License
 Project-URL: Documentation, https://kislyuk.github.io/argcomplete
 Project-URL: Source Code, https://github.com/kislyuk/argcomplete
 Project-URL: Issue Tracker, https://github.com/kislyuk/argcomplete/issues
-Project-URL: Change Log, https://github.com/kislyuk/argcomplete/blob/master/Changes.rst
+Project-URL: Change Log, https://github.com/kislyuk/argcomplete/blob/develop/Changes.rst
 Platform: MacOS X
 Platform: Posix
 Classifier: Environment :: Console
diff --git a/contrib/python/argcomplete/py3/argcomplete/packages/_argparse.py b/contrib/python/argcomplete/py3/argcomplete/packages/_argparse.py
index 2a064f9a8f..d10cf01da9 100644
--- a/contrib/python/argcomplete/py3/argcomplete/packages/_argparse.py
+++ b/contrib/python/argcomplete/py3/argcomplete/packages/_argparse.py
@@ -162,6 +162,8 @@ class IntrospectiveArgumentParser(ArgumentParser):
         def consume_optional(start_index):
             # get the optional identified at this index
             option_tuple = option_string_indices[start_index]
+            if isinstance(option_tuple, list):  # Python 3.12.7+
+                option_tuple = option_tuple[0]
             if len(option_tuple) == 3:
                 action, option_string, explicit_arg = option_tuple
             else:  # Python 3.11.9+, 3.12.3+, 3.13+
diff --git a/contrib/python/argcomplete/py3/ya.make b/contrib/python/argcomplete/py3/ya.make
index 16487619c8..ddce3929fb 100644
--- a/contrib/python/argcomplete/py3/ya.make
+++ b/contrib/python/argcomplete/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(3.5.0)
+VERSION(3.5.1)
 
 LICENSE(Apache-2.0)
 
diff --git a/contrib/python/clickhouse-connect/.dist-info/METADATA b/contrib/python/clickhouse-connect/.dist-info/METADATA
index bb928a4bc2..f47d5e0e6c 100644
--- a/contrib/python/clickhouse-connect/.dist-info/METADATA
+++ b/contrib/python/clickhouse-connect/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clickhouse-connect
-Version: 0.8.2
+Version: 0.8.3
 Summary: ClickHouse Database Core Driver for Python, Pandas, and Superset
 Home-page: https://github.com/ClickHouse/clickhouse-connect
 Author: ClickHouse Inc.
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py b/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py
index c400d68132..b4ab55be61 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py
@@ -1 +1 @@
-version = '0.8.2'
+version = '0.8.3'
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/driver/__init__.py b/contrib/python/clickhouse-connect/clickhouse_connect/driver/__init__.py
index fe3e4b3fbc..58efb5f8a8 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/driver/__init__.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/driver/__init__.py
@@ -133,6 +133,7 @@ async def create_async_client(*,
                               dsn: Optional[str] = None,
                               settings: Optional[Dict[str, Any]] = None,
                               generic_args: Optional[Dict[str, Any]] = None,
+                              executor_threads: Optional[int] = None,
                               **kwargs) -> AsyncClient:
     """
     The preferred method to get an async ClickHouse Connect Client instance.
@@ -154,6 +155,8 @@ async def create_async_client(*,
     :param settings: ClickHouse server settings to be used with the session/every request
     :param generic_args: Used internally to parse DBAPI connection strings into keyword arguments and ClickHouse settings.
       It is not recommended to use this parameter externally
+    :param: executor_threads 'max_worker' threads used by the client ThreadPoolExecutor.  If not set, the default
+      of 4 + detected CPU cores will be used
     :param kwargs -- Recognized keyword arguments (used by the HTTP client), see below
 
     :param compress: Enable compression for ClickHouse HTTP inserts and query results.  True will select the preferred
@@ -194,4 +197,4 @@ async def create_async_client(*,
 
     loop = asyncio.get_running_loop()
     _client = await loop.run_in_executor(None, _create_client)
-    return AsyncClient(client=_client)
+    return AsyncClient(client=_client, executor_threads=executor_threads)
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/driver/asyncclient.py b/contrib/python/clickhouse-connect/clickhouse_connect/driver/asyncclient.py
index bf56c9783f..b63a14f776 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/driver/asyncclient.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/driver/asyncclient.py
@@ -1,5 +1,7 @@
 import asyncio
 import io
+import os
+from concurrent.futures.thread import ThreadPoolExecutor
 from datetime import tzinfo
 from typing import Optional, Union, Dict, Any, Sequence, Iterable, Generator, BinaryIO
 
@@ -20,10 +22,13 @@ class AsyncClient:
     Internally, each of the methods that uses IO is wrapped in a call to EventLoop.run_in_executor.
     """
 
-    def __init__(self, *, client: Client):
+    def __init__(self, *, client: Client, executor_threads: int = 0):
         if isinstance(client, HttpClient):
             client.headers['User-Agent'] = client.headers['User-Agent'].replace('mode:sync;', 'mode:async;')
         self.client = client
+        if executor_threads == 0:
+            executor_threads = min(32, (os.cpu_count() or 1) + 4)  # Mimic the default behavior
+        self.executor = ThreadPoolExecutor(max_workers=executor_threads)
 
 
     def set_client_setting(self, key, value):
@@ -88,7 +93,7 @@ class AsyncClient:
                                      external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query)
+        result = await loop.run_in_executor(self.executor, _query)
         return result
 
     async def query_column_block_stream(self,
@@ -117,7 +122,7 @@ class AsyncClient:
                                                          external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query_column_block_stream)
+        result = await loop.run_in_executor(self.executor, _query_column_block_stream)
         return result
 
     async def query_row_block_stream(self,
@@ -146,7 +151,7 @@ class AsyncClient:
                                                       external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query_row_block_stream)
+        result = await loop.run_in_executor(self.executor, _query_row_block_stream)
         return result
 
     async def query_rows_stream(self,
@@ -175,7 +180,7 @@ class AsyncClient:
                                                  external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query_rows_stream)
+        result = await loop.run_in_executor(self.executor, _query_rows_stream)
         return result
 
     async def raw_query(self,
@@ -202,7 +207,7 @@ class AsyncClient:
                                          use_database=use_database, external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _raw_query)
+        result = await loop.run_in_executor(self.executor, _raw_query)
         return result
 
     async def raw_stream(self, query: str,
@@ -228,7 +233,7 @@ class AsyncClient:
                                           use_database=use_database, external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _raw_stream)
+        result = await loop.run_in_executor(self.executor, _raw_stream)
         return result
 
     async def query_np(self,
@@ -255,7 +260,7 @@ class AsyncClient:
                                         external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query_np)
+        result = await loop.run_in_executor(self.executor, _query_np)
         return result
 
     async def query_np_stream(self,
@@ -282,7 +287,7 @@ class AsyncClient:
                                                context=context, external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query_np_stream)
+        result = await loop.run_in_executor(self.executor, _query_np_stream)
         return result
 
     async def query_df(self,
@@ -314,7 +319,7 @@ class AsyncClient:
                                         external_data=external_data, use_extended_dtypes=use_extended_dtypes)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query_df)
+        result = await loop.run_in_executor(self.executor, _query_df)
         return result
 
     async def query_df_stream(self,
@@ -347,7 +352,7 @@ class AsyncClient:
                                                external_data=external_data, use_extended_dtypes=use_extended_dtypes)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query_df_stream)
+        result = await loop.run_in_executor(self.executor, _query_df_stream)
         return result
 
     def create_query_context(self,
@@ -433,7 +438,7 @@ class AsyncClient:
                                            use_strings=use_strings, external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query_arrow)
+        result = await loop.run_in_executor(self.executor, _query_arrow)
         return result
 
     async def query_arrow_stream(self,
@@ -457,7 +462,7 @@ class AsyncClient:
                                                   use_strings=use_strings, external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _query_arrow_stream)
+        result = await loop.run_in_executor(self.executor, _query_arrow_stream)
         return result
 
     async def command(self,
@@ -486,7 +491,7 @@ class AsyncClient:
                                        use_database=use_database, external_data=external_data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _command)
+        result = await loop.run_in_executor(self.executor, _command)
         return result
 
     async def ping(self) -> bool:
@@ -499,7 +504,7 @@ class AsyncClient:
             return self.client.ping()
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _ping)
+        result = await loop.run_in_executor(self.executor, _ping)
         return result
 
     async def insert(self,
@@ -537,7 +542,7 @@ class AsyncClient:
                                       column_oriented=column_oriented, settings=settings, context=context)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _insert)
+        result = await loop.run_in_executor(self.executor, _insert)
         return result
 
     async def insert_df(self, table: str = None,
@@ -572,7 +577,7 @@ class AsyncClient:
                                          context=context)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _insert_df)
+        result = await loop.run_in_executor(self.executor, _insert_df)
         return result
 
     async def insert_arrow(self, table: str,
@@ -591,7 +596,7 @@ class AsyncClient:
             return self.client.insert_arrow(table=table, arrow_table=arrow_table, database=database, settings=settings)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _insert_arrow)
+        result = await loop.run_in_executor(self.executor, _insert_arrow)
         return result
 
     async def create_insert_context(self,
@@ -625,7 +630,7 @@ class AsyncClient:
                                                      column_oriented=column_oriented, settings=settings, data=data)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _create_insert_context)
+        result = await loop.run_in_executor(self.executor, _create_insert_context)
         return result
 
     async def data_insert(self, context: InsertContext) -> QuerySummary:
@@ -639,7 +644,7 @@ class AsyncClient:
             return self.client.data_insert(context=context)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _data_insert)
+        result = await loop.run_in_executor(self.executor, _data_insert)
         return result
 
     async def raw_insert(self, table: str,
@@ -663,5 +668,5 @@ class AsyncClient:
                                           settings=settings, fmt=fmt, compression=compression)
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, _raw_insert)
+        result = await loop.run_in_executor(self.executor, _raw_insert)
         return result
diff --git a/contrib/python/clickhouse-connect/ya.make b/contrib/python/clickhouse-connect/ya.make
index 89d942df53..23919d9b30 100644
--- a/contrib/python/clickhouse-connect/ya.make
+++ b/contrib/python/clickhouse-connect/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(0.8.2)
+VERSION(0.8.3)
 
 LICENSE(Apache-2.0)