Fix: use correct type sig for validation info, ensure dialect in expr deser (#3698)

Author: z3z1ma

sqlmesh/core/model/common.py

@@ -197,7 +197,7 @@ def single_value_or_tuple(values: t.Sequence) -> exp.Identifier | exp.Tuple:
 def parse_expression(
     cls: t.Type,
     v: t.Union[t.List[str], t.List[exp.Expression], str, exp.Expression, t.Callable, None],
-    info: t.Optional[ValidationInfo] = None,
+    info: t.Optional[ValidationInfo],
 ) -> t.List[exp.Expression] | exp.Expression | t.Callable | None:
     """Helper method to deserialize SQLGlot expressions in Pydantic Models."""
     if v is None:
@@ -231,7 +231,7 @@ def parse_bool(v: t.Any) -> bool:
 
 
 def parse_properties(
-    cls: t.Type, v: t.Any, info: t.Optional[ValidationInfo] = None
+    cls: t.Type, v: t.Any, info: t.Optional[ValidationInfo]
 ) -> t.Optional[exp.Tuple]:
     if v is None:
         return v

sqlmesh/core/model/kind.py

@@ -612,7 +612,7 @@ def _parse_csv_settings(cls, v: t.Any) -> t.Optional[CsvSettings]:
         if v is None or isinstance(v, CsvSettings):
             return v
         if isinstance(v, exp.Expression):
-            tuple_exp = parse_properties(cls, v)
+            tuple_exp = parse_properties(cls, v, None)
             if not tuple_exp:
                 return None
             return CsvSettings(**{e.left.name: e.right for e in tuple_exp.expressions})
@@ -979,9 +979,7 @@ def create_model_kind(v: t.Any, dialect: str, defaults: t.Dict[str, t.Any]) -> M
     return model_kind_type_from_name(name)(name=name)  # type: ignore
 
 
-def _model_kind_validator(
-    cls: t.Type, v: t.Any, info: t.Optional[ValidationInfo] = None
-) -> ModelKind:
+def _model_kind_validator(cls: t.Type, v: t.Any, info: t.Optional[ValidationInfo]) -> ModelKind:
     dialect = get_dialect(info.data) if info else ""
     return create_model_kind(v, dialect, {})
 

tests/core/test_model.py

@@ -2595,7 +2595,7 @@ def test_parse_expression_list_with_jinja():
         "JINJA_STATEMENT_BEGIN;\n{{ log('log message') }}\nJINJA_END;",
         "GRANT SELECT ON TABLE foo TO DEV",
     ]
-    assert input == [val.sql() for val in parse_expression(SqlModel, input)]
+    assert input == [val.sql() for val in parse_expression(SqlModel, input, None)]
 
 
 def test_no_depends_on_runtime_jinja_query():
@@ -3687,7 +3687,7 @@ def test_scd_type_2_by_time_overrides():
     assert not scd_type_2_model.kind.disable_restatement
 
     model_kind_dict = scd_type_2_model.kind.dict()
-    assert scd_type_2_model.kind == _model_kind_validator(None, model_kind_dict)
+    assert scd_type_2_model.kind == _model_kind_validator(None, model_kind_dict, None)
 
 
 def test_scd_type_2_by_column_defaults():
@@ -3776,7 +3776,7 @@ def test_scd_type_2_by_column_overrides():
     assert not scd_type_2_model.kind.disable_restatement
 
     model_kind_dict = scd_type_2_model.kind.dict()
-    assert scd_type_2_model.kind == _model_kind_validator(None, model_kind_dict)
+    assert scd_type_2_model.kind == _model_kind_validator(None, model_kind_dict, None)
 
 
 def test_scd_type_2_python_model() -> None: