tinybird-toolset 2.5.4__tar.gz → 2.5.5__tar.gz

{tinybird_toolset-2.5.4/src/tinybird_toolset.egg-info → tinybird_toolset-2.5.5}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: tinybird-toolset
-Version: 2.5.4
+Version: 2.5.5
 Home-page: https://gitlab.com/tinybird/clickhouse-toolset
 Author: Tinybird.co
 Author-email: support@tinybird.co
-Requires-Python: >=3.10, <3.15
+Requires-Python: >=3.13, <3.15
 License-File: LICENSE
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"

{tinybird_toolset-2.5.4 → tinybird_toolset-2.5.5}/README.md

@@ -70,9 +70,9 @@ You'll also need `objcopy` or `llvm-objcopy` in your path. The latter is more pr
 in the bin path of your homebrew llvm installation, so you'll have to do something like: `export PATH="/opt/homebrew/opt/llvm@19/bin:$PATH"`
 
 ```bash
-make build-3.11    # Build for Python 3.11
-make test-3.11     # Build and test
-OMIT_PATCHES=1 make build-3.11  # Skip patches on rebuild
+make build-3.13    # Build for Python 3.13
+make test-3.13     # Build and test
+OMIT_PATCHES=1 make build-3.13  # Skip patches on rebuild
 ```
 
 ### Key Profiling Targets
@@ -113,8 +113,8 @@ make build      # Build for all Python versions
 make test       # Run tests for all Python versions
 
 # Or for a specific Python version
-make build-3.11 # Build only for Python 3.11
-make test-3.11  # Test only for Python 3.11
+make build-3.13 # Build only for Python 3.13
+make test-3.13  # Test only for Python 3.13
 ```
 
 The Docker image includes:
@@ -139,7 +139,7 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 sudo add-apt-repository ppa:deadsnakes/ppa
 sudo apt update
-sudo apt install python3.10-dev python3.11-dev python3.12-dev python3.13-dev python3.14-dev
+sudo apt install python3.13-dev python3.14-dev
 
 pip3 install virtualenv
 ```
@@ -199,7 +199,7 @@ source ~/.zshrc
 
 * Follow the normal build. When validating a new machine or toolchain, prefer building a single Python version first:
 ```bash
-make build-3.11
+make build-3.13
 ```
 Then run the full build only after that succeeds:
 ```bash
@@ -283,7 +283,7 @@ export TWINE_PASSWORD=pypi-...  # PyPI API token
 ```
 
 The script will:
-- Build wheels for Python 3.10-3.14
+- Build wheels for Python 3.13-3.14
 - Delocate them (bundle dynamic libraries, set minimum macOS version to 11.0)
 - Run tests for each Python version
 - Upload to PyPI

{tinybird_toolset-2.5.4 → tinybird_toolset-2.5.5}/conf.py

@@ -417,7 +417,7 @@ class CustomBuildWithFromCH(build_ext):
 
         compiler = getattr(self.compiler, "compiler_so")
         if sys.platform == 'darwin':
-            # Fix for problem in Apple Silicon Mac with Python 3.11
+            # Fix for problem in Apple Silicon Mac with Python 3.x
             # both -arch arm64 and -arch x86_64 are included and this collides with
             # other -march option from cflags() (generated by Ninja)
             if 'x86_64' in compiler and 'arm64' in compiler:

{tinybird_toolset-2.5.4 → tinybird_toolset-2.5.5}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, Extension
 
 NAME = 'tinybird-toolset'
-VERSION = '2.5.4'
+VERSION = '2.5.5'
 
 # Shared metadata for both the full (extension) build and the metadata-only
 # fallback below, so the two setup() calls can't drift apart.
@@ -13,7 +13,7 @@ common_kwargs = dict(
     author_email="support@tinybird.co",
     packages=["chtoolset"],
     package_dir={"": "src"},
-    python_requires=">=3.10, <3.15",
+    python_requires=">=3.13, <3.15",
     install_requires=[],
 )
 

{tinybird_toolset-2.5.4 → tinybird_toolset-2.5.5/src/tinybird_toolset.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: tinybird-toolset
-Version: 2.5.4
+Version: 2.5.5
 Home-page: https://gitlab.com/tinybird/clickhouse-toolset
 Author: Tinybird.co
 Author-email: support@tinybird.co
-Requires-Python: >=3.10, <3.15
+Requires-Python: >=3.13, <3.15
 License-File: LICENSE
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"

{tinybird_toolset-2.5.4 → tinybird_toolset-2.5.5}/tests/test_check_compatible_types.py

@@ -357,6 +357,21 @@ class TestCast(unittest.TestCase):
             self.assertTrue(chquery.check_compatible_types('AggregateFunction(sum, Int16)', 'AggregateFunction(sum, Int8)'))
         self.assertEqual(str(error.exception), """Different #0 argument: Int16 vs Int8""")
 
+    def test_works_with_aggregate_functions_over_json(self):
+        # Regression test for PLTF-842: resolving an AggregateFunction/
+        # SimpleAggregateFunction over a JSON value type used to segfault.
+        # DataTypeObject::doGetDefaultSerialization() unconditionally
+        # dereferences Context::getGlobalContextInstance() to read the
+        # allow_simdjson setting, which is null since chtoolset never runs
+        # a real clickhouse-server. See CheckCompatibleTypes.cpp.
+        self.assertTrue(chquery.check_compatible_types(
+            'AggregateFunction(argMax, JSON, DateTime)',
+            'AggregateFunction(argMax, JSON, DateTime)'))
+
+        self.assertTrue(chquery.check_compatible_types(
+            'SimpleAggregateFunction(any, JSON)',
+            'SimpleAggregateFunction(any, JSON)'))
+
     def test_rejects_if_agg_parameters_are_incompatible(self):
         with self.assertRaises(ValueError) as error:
             self.assertTrue(chquery.check_compatible_types('AggregateFunction(topK, String)', 'AggregateFunction(topK(100), String)'))
@@ -365,3 +380,44 @@ class TestCast(unittest.TestCase):
         with self.assertRaises(ValueError) as error:
             self.assertTrue(chquery.check_compatible_types('AggregateFunction(topK(99), String)', 'AggregateFunction(topK(100), String)'))
         self.assertEqual(str(error.exception), """Different #0 parameter: 99 vs 100""")
+
+    # Nested/composed types that must resolve without crashing. Covers PLTF-842
+    # (JSON nested inside Array/Map/Tuple/Nested/AggregateFunction combinators,
+    # which all previously segfaulted resolving JSON's default serialization
+    # without a global ClickHouse Context) plus general composed-type coverage.
+    NESTED_AND_COMPOSED_TYPES = [
+        'Array(JSON)',
+        'Map(String, JSON)',
+        'Tuple(JSON, String)',
+        'Tuple(a JSON, b String)',
+        'Nullable(JSON)',
+        'Nested(a JSON, b String)',
+        'AggregateFunction(argMax, Array(JSON), DateTime)',
+        'AggregateFunction(argMax, Map(String, JSON), DateTime)',
+        'AggregateFunction(argMax, Tuple(JSON, String), DateTime)',
+        'SimpleAggregateFunction(any, Array(JSON))',
+        'Array(AggregateFunction(argMax, JSON, DateTime))',
+        'Array(LowCardinality(String))',
+        'Map(String, LowCardinality(String))',
+        'Array(Nullable(Int64))',
+        'Map(String, Nullable(Int64))',
+        'Map(String, AggregateFunction(sum, Int64))',
+        'Nested(a UInt64, b String)',
+        'Tuple(x Float64, y Float64)',
+        'Array(Tuple(UInt8, String))',
+        'Array(Array(String))',
+        'Map(String, Array(String))',
+        'Map(String, Map(String, Int64))',
+        'Variant(String, Int64)',
+        'Dynamic',
+        'LowCardinality(Nullable(String))',
+    ]
+
+    def test_nested_and_composed_types_self_compatible(self):
+        for type_str in self.NESTED_AND_COMPOSED_TYPES:
+            with self.subTest(type_str):
+                self.assertTrue(chquery.check_compatible_types(type_str, type_str))
+
+    def test_low_cardinality_of_json_is_rejected(self):
+        with self.assertRaisesRegex(ValueError, 'DataTypeLowCardinality is supported only for'):
+            chquery.check_compatible_types('LowCardinality(JSON)', 'LowCardinality(JSON)')

{tinybird_toolset-2.5.4 → tinybird_toolset-2.5.5}/tests/test_get_columns_from_create_query.py

@@ -670,6 +670,107 @@ class TestGetColumnsFromCreateQuery(unittest.TestCase):
             'is_primary_key': False,
         })
 
+    def test_aggregate_function_over_json_type(self):
+        """Regression test for PLTF-842: resolving an AggregateFunction over a
+        JSON value type used to segfault inside columnInfoFromColumnDeclaration
+        (functions/NormalizeColumnsFromDict.cpp), which calls DataTypeFactory
+        without a global ClickHouse Context. JSON's default serialization reads
+        that context unconditionally to check the allow_simdjson setting."""
+        sql = """
+        CREATE TABLE test (
+            id UInt64,
+            payload AggregateFunction(argMax, JSON, DateTime)
+        ) ENGINE = AggregatingMergeTree() ORDER BY id
+        """
+        cols = chquery.get_columns_from_create_query(sql)
+        self.assertEqual(len(cols), 2)
+
+        self.assertColumnEquals(cols[1], {
+            'name': 'payload',
+            'type': 'AggregateFunction(argMax, JSON, DateTime)',
+            'nullable': False,
+            'default_specifier': '',
+            'default_expression': None,
+            'codec': None,
+            'comment': None,
+            'ttl': None,
+            'is_primary_key': False,
+        })
+
+    # Nested/composed type -> expected (normalized_type, nullable). Covers PLTF-842
+    # (JSON nested inside Array/Map/Tuple/Nested/AggregateFunction combinators, which
+    # all previously segfaulted resolving JSON's default serialization without a
+    # global ClickHouse Context) plus general composed-type coverage so any similar
+    # gap for other types would show up here too.
+    NESTED_AND_COMPOSED_TYPES = [
+        ('Array(JSON)', ('Array(JSON)', False)),
+        ('Map(String, JSON)', ('Map(String, JSON)', False)),
+        ('Tuple(JSON, String)', ('Tuple(JSON, String)', False)),
+        ('Tuple(a JSON, b String)', ('Tuple(a JSON, b String)', False)),
+        ('Nullable(JSON)', ('Nullable(JSON)', True)),
+        ('Nested(a JSON, b String)', ('Nested(a JSON, b String)', False)),
+        ('AggregateFunction(argMax, JSON, DateTime)', ('AggregateFunction(argMax, JSON, DateTime)', False)),
+        ('AggregateFunction(argMax, Array(JSON), DateTime)', ('AggregateFunction(argMax, Array(JSON), DateTime)', False)),
+        ('AggregateFunction(argMax, Map(String, JSON), DateTime)', ('AggregateFunction(argMax, Map(String, JSON), DateTime)', False)),
+        ('AggregateFunction(argMax, Tuple(JSON, String), DateTime)', ('AggregateFunction(argMax, Tuple(JSON, String), DateTime)', False)),
+        ('SimpleAggregateFunction(any, JSON)', ('SimpleAggregateFunction(any, JSON)', False)),
+        ('SimpleAggregateFunction(any, Array(JSON))', ('SimpleAggregateFunction(any, Array(JSON))', False)),
+        ('Array(AggregateFunction(argMax, JSON, DateTime))', ('Array(AggregateFunction(argMax, JSON, DateTime))', False)),
+        ('Array(LowCardinality(String))', ('Array(LowCardinality(String))', False)),
+        ('Map(String, LowCardinality(String))', ('Map(String, LowCardinality(String))', False)),
+        ('Array(Nullable(Int64))', ('Array(Nullable(Int64))', False)),
+        ('Map(String, Nullable(Int64))', ('Map(String, Nullable(Int64))', False)),
+        ('Map(String, AggregateFunction(sum, Int64))', ('Map(String, AggregateFunction(sum, Int64))', False)),
+        ('Nested(a UInt64, b String)', ('Nested(a UInt64, b String)', False)),
+        ('Tuple(x Float64, y Float64)', ('Tuple(x Float64, y Float64)', False)),
+        ('Array(Tuple(UInt8, String))', ('Array(Tuple(UInt8, String))', False)),
+        ('Array(Array(String))', ('Array(Array(String))', False)),
+        ('Map(String, Array(String))', ('Map(String, Array(String))', False)),
+        ('Map(String, Map(String, Int64))', ('Map(String, Map(String, Int64))', False)),
+        ('Variant(String, Int64)', ('Variant(String, Int64)', False)),
+        ('Dynamic', ('Dynamic', False)),
+        ('LowCardinality(Nullable(String))', ('LowCardinality(Nullable(String))', True)),
+    ]
+
+    def test_nested_and_composed_types(self):
+        """Regression test for PLTF-842 plus general coverage: resolving nested
+        and composed types (Array/Map/Tuple/Nested/AggregateFunction combinators,
+        including JSON nested inside them) must not crash columnInfoFromColumnDeclaration
+        (functions/NormalizeColumnsFromDict.cpp)."""
+        for type_str, (expected_type, expected_nullable) in self.NESTED_AND_COMPOSED_TYPES:
+            with self.subTest(type_str):
+                sql = f"""
+                CREATE TABLE test (
+                    id UInt64,
+                    col {type_str}
+                ) ENGINE = AggregatingMergeTree() ORDER BY id
+                """
+                cols = chquery.get_columns_from_create_query(sql)
+                self.assertEqual(len(cols), 2)
+                self.assertColumnEquals(cols[1], {
+                    'name': 'col',
+                    'type': expected_type,
+                    'nullable': expected_nullable,
+                    'default_specifier': '',
+                    'default_expression': None,
+                    'codec': None,
+                    'comment': None,
+                    'ttl': None,
+                    'is_primary_key': False,
+                })
+
+    def test_low_cardinality_of_json_is_rejected(self):
+        """LowCardinality only supports numbers, strings, Date or DateTime; JSON
+        must be rejected with a clear error rather than crashing."""
+        sql = """
+        CREATE TABLE test (
+            id UInt64,
+            col LowCardinality(JSON)
+        ) ENGINE = AggregatingMergeTree() ORDER BY id
+        """
+        with self.assertRaisesRegex(ValueError, 'DataTypeLowCardinality is supported only for'):
+            chquery.get_columns_from_create_query(sql)
+
     def test_invalid_query(self):
         """Test that invalid queries raise appropriate errors"""
         with self.assertRaises(ValueError):

{tinybird_toolset-2.5.4 → tinybird_toolset-2.5.5}/tests/test_normalize_table_column.py

@@ -390,6 +390,81 @@ class TestNormalizeTableColumn(unittest.TestCase):
 
         self.assertEqual(column["type"], "Float64")
 
+    def test_aggregate_function_over_json_type(self):
+        # Regression test for PLTF-842: normalizeColumnInfo() calls
+        # columnInfoFromColumnDeclaration() (functions/NormalizeColumnsFromDict.cpp),
+        # which used to segfault resolving an AggregateFunction over a JSON value
+        # type via DataTypeFactory without a global ClickHouse Context.
+        column = chquery.normalize_table_column(
+            column={
+                "name": "payload",
+                "normalized_name": "payload",
+                "type": "AggregateFunction(argMax, JSON, DateTime)",
+                "nullable": False,
+            },
+        )
+
+        self.assertEqual(column["type"], "AggregateFunction(argMax, JSON, DateTime)")
+        self.assertFalse(column["nullable"])
+
+    # Nested/composed type -> expected (normalized_type, nullable). Covers PLTF-842
+    # (JSON nested inside Array/Map/Tuple/Nested/AggregateFunction combinators)
+    # plus general composed-type coverage for normalizeColumnInfo()
+    # (functions/NormalizeColumnsFromDict.cpp).
+    NESTED_AND_COMPOSED_TYPES = [
+        ('Array(JSON)', ('Array(JSON)', False)),
+        ('Map(String, JSON)', ('Map(String, JSON)', False)),
+        ('Tuple(JSON, String)', ('Tuple(JSON, String)', False)),
+        ('Tuple(a JSON, b String)', ('Tuple(a JSON, b String)', False)),
+        ('Nullable(JSON)', ('Nullable(JSON)', True)),
+        ('Nested(a JSON, b String)', ('Nested(a JSON, b String)', False)),
+        ('AggregateFunction(argMax, Array(JSON), DateTime)', ('AggregateFunction(argMax, Array(JSON), DateTime)', False)),
+        ('AggregateFunction(argMax, Map(String, JSON), DateTime)', ('AggregateFunction(argMax, Map(String, JSON), DateTime)', False)),
+        ('AggregateFunction(argMax, Tuple(JSON, String), DateTime)', ('AggregateFunction(argMax, Tuple(JSON, String), DateTime)', False)),
+        ('SimpleAggregateFunction(any, JSON)', ('SimpleAggregateFunction(any, JSON)', False)),
+        ('SimpleAggregateFunction(any, Array(JSON))', ('SimpleAggregateFunction(any, Array(JSON))', False)),
+        ('Array(AggregateFunction(argMax, JSON, DateTime))', ('Array(AggregateFunction(argMax, JSON, DateTime))', False)),
+        ('Array(LowCardinality(String))', ('Array(LowCardinality(String))', False)),
+        ('Map(String, LowCardinality(String))', ('Map(String, LowCardinality(String))', False)),
+        ('Array(Nullable(Int64))', ('Array(Nullable(Int64))', False)),
+        ('Map(String, Nullable(Int64))', ('Map(String, Nullable(Int64))', False)),
+        ('Map(String, AggregateFunction(sum, Int64))', ('Map(String, AggregateFunction(sum, Int64))', False)),
+        ('Nested(a UInt64, b String)', ('Nested(a UInt64, b String)', False)),
+        ('Tuple(x Float64, y Float64)', ('Tuple(x Float64, y Float64)', False)),
+        ('Array(Tuple(UInt8, String))', ('Array(Tuple(UInt8, String))', False)),
+        ('Array(Array(String))', ('Array(Array(String))', False)),
+        ('Map(String, Array(String))', ('Map(String, Array(String))', False)),
+        ('Map(String, Map(String, Int64))', ('Map(String, Map(String, Int64))', False)),
+        ('Variant(String, Int64)', ('Variant(String, Int64)', False)),
+        ('Dynamic', ('Dynamic', False)),
+        ('LowCardinality(Nullable(String))', ('LowCardinality(Nullable(String))', True)),
+    ]
+
+    def test_nested_and_composed_types(self):
+        for type_str, (expected_type, expected_nullable) in self.NESTED_AND_COMPOSED_TYPES:
+            with self.subTest(type_str):
+                column = chquery.normalize_table_column(
+                    column={
+                        "name": "col",
+                        "normalized_name": "col",
+                        "type": type_str,
+                        "nullable": False,
+                    },
+                )
+                self.assertEqual(column["type"], expected_type)
+                self.assertEqual(column["nullable"], expected_nullable)
+
+    def test_low_cardinality_of_json_is_rejected(self):
+        with self.assertRaisesRegex(ValueError, 'DataTypeLowCardinality is supported only for'):
+            chquery.normalize_table_column(
+                column={
+                    "name": "col",
+                    "normalized_name": "col",
+                    "type": "LowCardinality(JSON)",
+                    "nullable": False,
+                },
+            )
+
     def test_default_now_for_created_at(self):
         column = chquery.normalize_table_column(
             column={