fixes

Author: rustyconover

src/query_farm_server_base/duckdb_serialized_values.py

@@ -33,7 +33,7 @@ class SerializedValueValue_base64(BaseModel):
 class SerializedValueTypeInfo_list(BaseModel):
     alias: str
     child_type: "AllValidTypeIdAndInfo"
-    modifiers: list[Any]
+    #    modifiers: list[Any] | None = None
     type: Literal["LIST_TYPE_INFO"] = "LIST_TYPE_INFO"
 
 
@@ -1088,6 +1088,7 @@ class ExpressionBoundFunctionFunctionData(BaseModel):
 
 class ExpressionBoundFunction(ExpressionBase):
     expression_class: Literal["BOUND_FUNCTION"] = "BOUND_FUNCTION"
+    type: Literal["BOUND_FUNCTION"] = "BOUND_FUNCTION"
     name: str
     return_type: AllValidTypeIdAndInfo
     children: list[AnyExpression]

src/query_farm_server_base/test_duckdb_serialized_expression.py

@@ -4,6 +4,7 @@
 import pytest
 
 from . import duckdb_serialized_expression
+from . import duckdb_serialized_values
 
 owner_type_info = {
     "Owner": 'STRUCT("DisplayName" VARCHAR,"ID" VARCHAR)',
@@ -16,6 +17,85 @@
 }
 
 
+@pytest.mark.parametrize(
+    "parser_cls,input",
+    [
+        (
+            duckdb_serialized_values.SerializedValueType_list,
+            {
+                "id": "LIST",
+                "type_info": {
+                    "type": "LIST_TYPE_INFO",
+                    "alias": "",
+                    "extension_info": None,
+                    "child_type": {"id": "INTEGER", "type_info": None},
+                },
+            },
+        ),
+        (
+            duckdb_serialized_values.ExpressionBoundFunction,
+            {
+                "expression_class": "BOUND_FUNCTION",
+                "type": "BOUND_FUNCTION",
+                "alias": "",
+                "query_location": 18446744073709552000,
+                "return_type": {"id": "INTEGER", "type_info": None},
+                "children": [
+                    {
+                        "expression_class": "BOUND_COLUMN_REF",
+                        "type": "BOUND_COLUMN_REF",
+                        "alias": "switches",
+                        "query_location": 18446744073709552000,
+                        "return_type": {
+                            "id": "LIST",
+                            "type_info": {
+                                "type": "LIST_TYPE_INFO",
+                                "alias": "",
+                                "extension_info": None,
+                                "child_type": {"id": "INTEGER", "type_info": None},
+                            },
+                        },
+                        "binding": {"table_index": 0, "column_index": 0},
+                        "depth": 0,
+                    },
+                    {
+                        "expression_class": "BOUND_CONSTANT",
+                        "type": "VALUE_CONSTANT",
+                        "alias": "",
+                        "query_location": 18446744073709552000,
+                        "value": {
+                            "type": {"id": "BIGINT", "type_info": None},
+                            "is_null": False,
+                            "value": 0,
+                        },
+                    },
+                ],
+                "name": "array_extract",
+                "arguments": [
+                    {
+                        "id": "LIST",
+                        "type_info": {
+                            "type": "LIST_TYPE_INFO",
+                            "alias": "",
+                            "extension_info": None,
+                            "child_type": {"id": "INTEGER", "type_info": None},
+                        },
+                    },
+                    {"id": "BIGINT", "type_info": None},
+                ],
+                "original_arguments": [],
+                "catalog_name": "system",
+                "schema_name": "main",
+                "has_serialize": False,
+                "is_operator": False,
+            },
+        ),
+    ],
+)
+def test_parse(parser_cls: Any, input: dict[str, Any]) -> None:
+    parser_cls.model_validate(input)
+
+
 @pytest.mark.parametrize(
     "json_source,expected_sql,expected_bound_types",
     [