Repository: TobikoData/sqlmesh
Pull request #4440 (2025-05-16 20:55:33)

fix(vscode): improve handling of uris


Patch:
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d60cd2ea..552824fd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,6 +135,9 @@ importers:
       tailwindcss:
         specifier: ^4.1.3
         version: 4.1.6
+      vscode-uri:
+        specifier: ^3.1.0
+        version: 3.1.0
     devDependencies:
       '@testing-library/dom':
         specifier: ^10.4.0
@@ -5502,6 +5505,9 @@ packages:
   vscode-languageserver-types@3.17.5:
     resolution: {integrity: sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==}
 
+  vscode-uri@3.1.0:
+    resolution: {integrity: sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==}
+
   w3c-keyname@2.2.8:
     resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
 
@@ -11660,6 +11666,8 @@ snapshots:
 
   vscode-languageserver-types@3.17.5: {}
 
+  vscode-uri@3.1.0: {}
+
   w3c-keyname@2.2.8: {}
 
   w3c-xmlserializer@5.0.0:
diff --git a/sqlmesh/core/config/connection.py b/sqlmesh/core/config/connection.py
index be0eee11..1383a8fe 100644
--- a/sqlmesh/core/config/connection.py
+++ b/sqlmesh/core/config/connection.py
@@ -25,7 +25,12 @@ from sqlmesh.core.config.common import (
 from sqlmesh.core.engine_adapter.shared import CatalogSupport
 from sqlmesh.core.engine_adapter import EngineAdapter
 from sqlmesh.utils.errors import ConfigError
-from sqlmesh.utils.pydantic import ValidationInfo, field_validator, model_validator
+from sqlmesh.utils.pydantic import (
+    ValidationInfo,
+    field_validator,
+    model_validator,
+    validation_error_message,
+)
 from sqlmesh.utils.aws import validate_s3_uri
 
 if t.TYPE_CHECKING:
@@ -1846,7 +1851,13 @@ def _connection_config_validator(
 ) -> ConnectionConfig | None:
     if v is None or isinstance(v, ConnectionConfig):
         return v
-    return parse_connection_config(v)
+    try:
+        return parse_connection_config(v)
+    except pydantic.ValidationError as e:
+        raise ConfigError(
+            validation_error_message(e, f"Invalid '{v['type']}' connection config:")
+            + "\n\nVerify your config.yaml and environment variables."
+        )
 
 
 connection_config_validator: t.Callable = field_validator(
diff --git a/sqlmesh/core/config/loader.py b/sqlmesh/core/config/loader.py
index 2faaed5e..10acf74f 100644
--- a/sqlmesh/core/config/loader.py
+++ b/sqlmesh/core/config/loader.py
@@ -5,6 +5,7 @@ import os
 import typing as t
 from pathlib import Path
 
+from pydantic import ValidationError
 from sqlglot.helper import ensure_list
 
 from sqlmesh.core import constants as c
@@ -13,6 +14,7 @@ from sqlmesh.core.config.root import Config
 from sqlmesh.utils import env_vars, merge_dicts, sys_path
 from sqlmesh.utils.errors import ConfigError
 from sqlmesh.utils.metaprogramming import import_python_file
+from sqlmesh.utils.pydantic import validation_error_message
 from sqlmesh.utils.yaml import load as yaml_load
 
 C = t.TypeVar("C", bound=Config)
@@ -99,9 +101,15 @@ def load_config_from_paths(
                 )
             non_python_configs.append(load_config_from_yaml(path))
         elif extension == "py":
-            python_config = load_config_from_python_module(
-                config_type, path, config_name=config_name
-            )
+            try:
+                python_config = load_config_from_python_module(
+                    config_type, path, config_name=config_name
+                )
+            except ValidationError as e:
+                raise ConfigError(
+                    validation_error_message(e, f"Invalid project config '{config_name}':")
+                    + "\n\nVerify your config.py."
+                )
         else:
             raise ConfigError(
                 f"Unsupported config file extension '{extension}' in config file '{path}'."
@@ -126,7 +134,13 @@ def load_config_from_paths(
                 f"'{default}' is not a valid model default configuration key. Please remove it from the `model_defaults` specification in your config file."
             )
 
-    non_python_config = config_type.parse_obj(non_python_config_dict)
+    try:
+        non_python_config = config_type.parse_obj(non_python_config_dict)
+    except ValidationError as e:
+        raise ConfigError(
+            validation_error_message(e, "Invalid project config:")
+            + "\n\nVerify your config.yaml and environment variables."
+        )
 
     no_dialect_err_msg = "Default model SQL dialect is a required configuration parameter. Set it in the `model_defaults` `dialect` key in your config file."
     if python_config:
diff --git a/sqlmesh/core/config/scheduler.py b/sqlmesh/core/config/scheduler.py
index 66c70c35..d4e66f51 100644
--- a/sqlmesh/core/config/scheduler.py
+++ b/sqlmesh/core/config/scheduler.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import abc
 import typing as t
 
-from pydantic import Field
+from pydantic import Field, ValidationError
 
 from sqlglot.helper import subclasses
 from sqlmesh.core.config.base import BaseConfig
@@ -16,7 +16,7 @@ from sqlmesh.core.config import DuckDBConnectionConfig
 from sqlmesh.core.state_sync import EngineAdapterStateSync, StateSync
 from sqlmesh.utils.errors import ConfigError
 from sqlmesh.utils.hashing import md5
-from sqlmesh.utils.pydantic import field_validator
+from sqlmesh.utils.pydantic import field_validator, validation_error_message
 
 if t.TYPE_CHECKING:
     from sqlmesh.core.context import GenericContext
@@ -159,7 +159,13 @@ def _scheduler_config_validator(
     if scheduler_type not in SCHEDULER_CONFIG_TO_TYPE:
         raise ConfigError(f"Unknown scheduler type '{scheduler_type}'.")
 
-    return SCHEDULER_CONFIG_TO_TYPE[scheduler_type](**v)
+    try:
+        return SCHEDULER_CONFIG_TO_TYPE[scheduler_type](**v)
+    except ValidationError as e:
+        raise ConfigError(
+            validation_error_message(e, f"Invalid '{scheduler_type}' scheduler config:")
+            + "\n\nVerify your config.yaml and environment variables."
+        )
 
 
 scheduler_config_validator = field_validator(
diff --git a/sqlmesh/core/loader.py b/sqlmesh/core/loader.py
index 0dfebd7d..4fec342f 100644
--- a/sqlmesh/core/loader.py
+++ b/sqlmesh/core/loader.py
@@ -11,6 +11,7 @@ import typing as t
 from collections import Counter, defaultdict
 from dataclasses import dataclass
 from pathlib import Path
+from pydantic import ValidationError
 
 from sqlglot.errors import SqlglotError
 from sqlglot import exp
@@ -39,6 +40,7 @@ from sqlmesh.utils import UniqueKeyDict, sys_path
 from sqlmesh.utils.errors import ConfigError
 from sqlmesh.utils.jinja import JinjaMacroRegistry, MacroExtractor
 from sqlmesh.utils.metaprogramming import import_python_file
+from sqlmesh.utils.pydantic import validation_error_message
 from sqlmesh.utils.yaml import YAML, load as yaml_load
 
 
@@ -241,7 +243,7 @@ class Loader(abc.ABC):
                         for row in YAML().load(file.read())
                     ]
             except Exception as ex:
-                self._raise_failed_to_load_model_error(path, str(ex))
+                self._raise_failed_to_load_model_error(path, ex)
                 raise
 
         for path in paths_to_load:
@@ -372,8 +374,11 @@ class Loader(abc.ABC):
 
         return self._variables_by_gateway[gateway_name]
 
-    def _raise_failed_to_load_model_error(self, path: Path, message: str) -> None:
-        raise ConfigError(f"Failed to load model definition at '{path}'.\n{message}")
+    def _raise_failed_to_load_model_error(self, path: Path, error: t.Union[str, Exception]) -> None:
+        base_message = f"Failed to load model definition at '{path}':"
+        if isinstance(error, ValidationError):
+            raise ConfigError(validation_error_message(error, base_message))
+        raise ConfigError(f"{base_message}\n  {error}")
 
 
 class SqlMeshLoader(Loader):
@@ -496,7 +501,7 @@ class SqlMeshLoader(Loader):
                         default_catalog_per_gateway=self.context.default_catalog_per_gateway,
                     )
                 except Exception as ex:
-                    self._raise_failed_to_load_model_error(path, str(ex))
+                    self._raise_failed_to_load_model_error(path, ex)
                     raise
 
             for model in cache.get_or_load_models(path, _load):
@@ -561,7 +566,7 @@ class SqlMeshLoader(Loader):
                             if model.enabled:
                                 models[model.fqn] = model
                 except Exception as ex:
-                    self._raise_failed_to_load_model_error(path, str(ex))
+                    self._raise_failed_to_load_model_error(path, ex)
 
         finally:
             model_registry._dialect = None
diff --git a/sqlmesh/core/model/common.py b/sqlmesh/core/model/common.py
index 89e93656..436b4a17 100644
--- a/sqlmesh/core/model/common.py
+++ b/sqlmesh/core/model/common.py
@@ -20,7 +20,7 @@ from sqlmesh.utils.metaprogramming import (
     prepare_env,
     serialize_env,
 )
-from sqlmesh.utils.pydantic import ValidationInfo, field_validator
+from sqlmesh.utils.pydantic import PydanticModel, ValidationInfo, field_validator
 
 if t.TYPE_CHECKING:
     from sqlglot.dialects.dialect import DialectType
@@ -260,6 +260,22 @@ def parse_dependencies(
     return depends_on, used_variables
 
 
+def validate_extra_and_required_fields(
+    klass: t.Type[PydanticModel],
+    provided_fields: t.Set[str],
+    entity_name: str,
+) -> None:
+    missing_required_fields = klass.missing_required_fields(provided_fields)
+    if missing_required_fields:
+        raise_config_error(
+            f"Missing required fields {missing_required_fields} in the {entity_name}"
+        )
+
+    extra_fields = klass.extra_fields(provided_fields)
+    if extra_fields:
+        raise_config_error(f"Invalid extra fields {extra_fields} in the {entity_name}")
+
+
 def single_value_or_tuple(values: t.Sequence) -> exp.Identifier | exp.Tuple:
     return (
         exp.to_identifier(values[0])
diff --git a/sqlmesh/core/model/definition.py b/sqlmesh/core/model/definition.py
index e0f3b14a..c19cf5d7 100644
--- a/sqlmesh/core/model/definition.py
+++ b/sqlmesh/core/model/definition.py
@@ -31,6 +31,7 @@ from sqlmesh.core.model.common import (
     parse_dependencies,
     single_value_or_tuple,
     sorted_python_env_payloads,
+    validate_extra_and_required_fields,
 )
 from sqlmesh.core.model.meta import ModelMeta, FunctionCall
 from sqlmesh.core.model.kind import (
@@ -2190,15 +2191,11 @@ def load_sql_based_model(
     seed_properties = {
         p.name.lower(): p.args.get("value") for p in common_kwargs.pop("kind").expressions
     }
-    try:
-        return create_seed_model(
-            name,
-            SeedKind(**seed_properties),
-            **common_kwargs,
-        )
-    except Exception as ex:
-        raise_config_error(str(ex), path)
-        raise
+    return create_seed_model(
+        name,
+        SeedKind(**seed_properties),
+        **common_kwargs,
+    )
 
 
 def create_sql_model(
@@ -2398,7 +2395,9 @@ def _create_model(
     blueprint_variables: t.Optional[t.Dict[str, t.Any]] = None,
     **kwargs: t.Any,
 ) -> Model:
-    _validate_model_fields(klass, {"name", *kwargs} - {"grain", "table_properties"}, path)
+    validate_extra_and_required_fields(
+        klass, {"name", *kwargs} - {"grain", "table_properties"}, "model definition"
+    )
 
     for prop in PROPERTIES:
         kwargs[prop] = _resolve_properties((defaults or {}).get(prop), kwargs.get(prop))
@@ -2457,21 +2456,17 @@ def _create_model(
     for jinja_macro in jinja_macros.root_macros.values():
         used_variables.update(extract_macro_references_and_variables(jinja_macro.definition)[1])
 
-    try:
-        model = klass(
-            name=name,
-            **{
-                **(defaults or {}),
-                "jinja_macros": jinja_macros or JinjaMacroRegistry(),
-                "dialect": dialect,
-                "depends_on": depends_on,
-                "physical_schema_override": physical_schema_override,
-                **kwargs,
-            },
-        )
-    except Exception as ex:
-        raise_config_error(str(ex), location=path)
-        raise
+    model = klass(
+        name=name,
+        **{
+            **(defaults or {}),
+            "jinja_macros": jinja_macros or JinjaMacroRegistry(),
+            "dialect": dialect,
+            "depends_on": depends_on,
+            "physical_schema_override": physical_schema_override,
+            **kwargs,
+        },
+    )
 
     audit_definitions = {
         **(audit_definitions or {}),
@@ -2636,19 +2631,6 @@ def _resolve_properties(
     return None
 
 
-def _validate_model_fields(klass: t.Type[_Model], provided_fields: t.Set[str], path: Path) -> None:
-    missing_required_fields = klass.missing_required_fields(provided_fields)
-    if missing_required_fields:
-        raise_config_error(
-            f"Missing required fields {missing_required_fields} in the model definition",
-            path,
-        )
-
-    extra_fields = klass.extra_fields(provided_fields)
-    if extra_fields:
-        raise_config_error(f"Invalid extra fields {extra_fields} in the model definition", path)
-
-
 def _list_of_calls_to_exp(value: t.List[t.Tuple[str, t.Dict[str, t.Any]]]) -> exp.Expression:
     return exp.Tuple(
         expressions=[
diff --git a/sqlmesh/core/model/kind.py b/sqlmesh/core/model/kind.py
index e59287ad..c858ac44 100644
--- a/sqlmesh/core/model/kind.py
+++ b/sqlmesh/core/model/kind.py
@@ -12,7 +12,11 @@ from sqlglot.optimizer.simplify import gen
 from sqlglot.time import format_time
 
 from sqlmesh.core import dialect as d
-from sqlmesh.core.model.common import parse_properties, properties_validator
+from sqlmesh.core.model.common import (
+    parse_properties,
+    properties_validator,
+    validate_extra_and_required_fields,
+)
 from sqlmesh.core.model.seed import CsvSettings
 from sqlmesh.utils.errors import ConfigError
 from sqlmesh.utils.pydantic import (
@@ -1011,6 +1015,7 @@ def create_model_kind(v: t.Any, dialect: str, defaults: t.Dict[str, t.Any]) -> M
                 actual_kind_type, _ = custom_materialization
                 return actual_kind_type(**props)
 
+        validate_extra_and_required_fields(kind_type, set(props), f"model kind '{name}'")
         return kind_type(**props)
 
     name = (v.name if isinstance(v, exp.Expression) else str(v)).upper()
diff --git a/sqlmesh/core/model/meta.py b/sqlmesh/core/model/meta.py
index 85d99992..29800d45 100644
--- a/sqlmesh/core/model/meta.py
+++ b/sqlmesh/core/model/meta.py
@@ -355,7 +355,7 @@ class ModelMeta(_Node):
                 and not (kind.is_view and kind.materialized)
             ):
                 name = field[:-1] if field.endswith("_") else field
-                raise ValueError(f"{name} field cannot be set for {kind} models")
+                raise ValueError(f"{name} field cannot be set for {kind.name} models")
         if kind.is_incremental_by_partition and not getattr(self, "partitioned_by_", None):
             raise ValueError(f"partitioned_by field is required for {kind.name} models")
 
diff --git a/sqlmesh/utils/pydantic.py b/sqlmesh/utils/pydantic.py
index 3ef64b41..cfe3ac04 100644
--- a/sqlmesh/utils/pydantic.py
+++ b/sqlmesh/utils/pydantic.py
@@ -211,6 +211,20 @@ def positive_int_validator(v: t.Any) -> int:
     return v
 
 
+def validation_error_message(error: pydantic.ValidationError, base: str) -> str:
+    errors = "\n  ".join(_formatted_validation_errors(error))
+    return f"{base}\n  {errors}"
+
+
+def _formatted_validation_errors(error: pydantic.ValidationError) -> t.List[str]:
+    result = []
+    for e in error.errors():
+        msg = e["msg"]
+        loc: t.Optional[t.Tuple] = e.get("loc")
+        result.append(f"Invalid field '{loc[0]}':\n    {msg}" if loc else msg)
+    return result
+
+
 def _get_field(
     v: t.Any,
     values: t.Any,
@@ -281,6 +295,9 @@ def cron_validator(v: t.Any) -> str:
 
     from croniter import CroniterBadCronError, croniter
 
+    if not isinstance(v, str):
+        raise ValueError(f"Invalid cron expression '{v}'. Value must be a string.")
+
     try:
         croniter(v)
     except CroniterBadCronError:
diff --git a/vscode/extension/src/webviews/lineagePanel.ts b/vscode/extension/src/webviews/lineagePanel.ts
index e9c8a7b3..0c518dd0 100644
--- a/vscode/extension/src/webviews/lineagePanel.ts
+++ b/vscode/extension/src/webviews/lineagePanel.ts
@@ -31,7 +31,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
         key: 'vscode_send',
         payload: {
           key: 'savedFile',
-          payload: { fileUri: document.uri.fsPath },
+          payload: { fileUri: document.uri.toString() },
         },
       })
     })
@@ -42,7 +42,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
           key: 'vscode_send',
           payload: {
             key: 'changeFocusOnFile',
-            payload: { path: editor.document.uri.fsPath },
+            payload: { path: editor.document.uri.toString() },
           },
         })
       }
diff --git a/vscode/react/package.json b/vscode/react/package.json
index ff2ba7ae..55fccbdb 100644
--- a/vscode/react/package.json
+++ b/vscode/react/package.json
@@ -31,7 +31,8 @@
     "react-dom": "^18.2.0",
     "react-router": "^7.0.0",
     "reactflow": "^11.8.3",
-    "tailwindcss": "^4.1.3"
+    "tailwindcss": "^4.1.3",
+    "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.0",
diff --git a/vscode/react/src/pages/lineage.tsx b/vscode/react/src/pages/lineage.tsx
index 90424d16..681df5e4 100644
--- a/vscode/react/src/pages/lineage.tsx
+++ b/vscode/react/src/pages/lineage.tsx
@@ -13,6 +13,7 @@ import React, { useState } from 'react'
 import { ModelSQLMeshModel } from '@/domain/sqlmesh-model'
 import { useEventBus } from '@/hooks/eventBus'
 import type { VSCodeEvent } from '@bus/callbacks'
+import { URI } from 'vscode-uri'
 
 export function LineagePage() {
   const { emit } = useEventBus()
@@ -97,10 +98,7 @@ function Lineage() {
   )
   const selectedModel = selectedModelSet
   on('changeFocusedFile', fileUri => {
-    console.log('on changeFocusedFile', fileUri)
-    const full_path = fileUri.fileUri.startsWith('file://')
-      ? fileUri.fileUri.substring(7)
-      : fileUri.fileUri
+    const full_path = URI.parse(fileUri.fileUri).fsPath
     const model = Object.values(modelsRecord).find(
       (m: Model) => m.full_path === full_path,
     )
@@ -135,7 +133,7 @@ export function LineageComponentFromWeb({
     if (!model) {
       throw new Error('Model not found')
     }
-    vscode('openFile', { uri: 'file://' + model.full_path })
+    vscode('openFile', { uri: URI.file(model.full_path).toString() })
   }
 
   function handleError(error: any): void {


Test patch:
diff --git a/tests/core/test_connection_config.py b/tests/core/test_connection_config.py
index c576d7e3..1b758115 100644
--- a/tests/core/test_connection_config.py
+++ b/tests/core/test_connection_config.py
@@ -973,13 +973,13 @@ def test_databricks(make_config):
     assert oauth_u2m_config.oauth_client_secret is None
 
     # auth_type must match the AuthType enum if specified
-    with pytest.raises(ValueError, match=r".*nonexist does not match a valid option.*"):
+    with pytest.raises(ConfigError, match=r".*nonexist does not match a valid option.*"):
         make_config(
             type="databricks", server_hostname="dbc-test.cloud.databricks.com", auth_type="nonexist"
         )
 
     # if client_secret is specified, client_id must also be specified
-    with pytest.raises(ValueError, match=r"`oauth_client_id` is required.*"):
+    with pytest.raises(ConfigError, match=r"`oauth_client_id` is required.*"):
         make_config(
             type="databricks",
             server_hostname="dbc-test.cloud.databricks.com",
@@ -988,7 +988,7 @@ def test_databricks(make_config):
         )
 
     # http_path is still required when auth_type is specified
-    with pytest.raises(ValueError, match=r"`http_path` is still required.*"):
+    with pytest.raises(ConfigError, match=r"`http_path` is still required.*"):
         make_config(
             type="databricks",
             server_hostname="dbc-test.cloud.databricks.com",
diff --git a/tests/core/test_loader.py b/tests/core/test_loader.py
index c367aa4a..a31b8c8b 100644
--- a/tests/core/test_loader.py
+++ b/tests/core/test_loader.py
@@ -159,7 +159,7 @@ def execute(
 
     with pytest.raises(
         ConfigError,
-        match=r"Failed to load model definition at '.*'.\nDuplicate name: 'test_schema.test_model'.",
+        match=r"Failed to load model definition at '.*'.\n  Duplicate name: 'test_schema.test_model'.",
     ):
         Context(paths=tmp_path, config=config)
 
diff --git a/tests/core/test_model.py b/tests/core/test_model.py
index 5decca86..e805132b 100644
--- a/tests/core/test_model.py
+++ b/tests/core/test_model.py
@@ -17,7 +17,7 @@ from sqlmesh.core.environment import EnvironmentNamingInfo
 from sqlmesh.core.model.kind import TimeColumn, ModelKindName
 
 from sqlmesh import CustomMaterialization, CustomKind
-from pydantic import model_validator
+from pydantic import model_validator, ValidationError
 from sqlmesh.core import constants as c
 from sqlmesh.core import dialect as d
 from sqlmesh.core.console import get_console
@@ -1065,7 +1065,7 @@ def test_seed_model_creation_error():
         );
     """
     )
-    with pytest.raises(ConfigError, match="No such file or directory"):
+    with pytest.raises(FileNotFoundError, match="No such file or directory"):
         load_sql_based_model(expressions)
 
 
@@ -4512,7 +4512,7 @@ def test_view_non_materialized_partition_by():
         SELECT 1;
         """
     )
-    with pytest.raises(ConfigError, match=r".*partitioned_by field cannot be set for ViewKind.*"):
+    with pytest.raises(ValidationError, match=r".*partitioned_by field cannot be set for VIEW.*"):
         load_sql_based_model(view_model_expressions)
 
 
@@ -4527,7 +4527,7 @@ def test_view_non_materialized_clustered_by():
         SELECT 1;
         """
     )
-    with pytest.raises(ConfigError, match=r".*clustered_by field cannot be set for ViewKind.*"):
+    with pytest.raises(ValidationError, match=r".*clustered_by field cannot be set for VIEW.*"):
         load_sql_based_model(view_model_expressions)
 
 
@@ -5578,7 +5578,7 @@ def test_end_date():
     assert model.end == "2023-06-01"
     assert model.interval_unit == IntervalUnit.DAY
 
-    with pytest.raises(ConfigError, match=".*Start date.+can't be greater than end date.*"):
+    with pytest.raises(ValidationError, match=".*Start date.+can't be greater than end date.*"):
         load_sql_based_model(
             d.parse(
                 """
@@ -6829,7 +6829,7 @@ def test_incremental_by_partition(sushi_context, assert_exp_eq):
     assert not model.kind.disable_restatement
 
     with pytest.raises(
-        ConfigError,
+        ValidationError,
         match=r".*partitioned_by field is required for INCREMENTAL_BY_PARTITION models.*",
     ):
         expressions = d.parse(
diff --git a/tests/integrations/github/cicd/test_config.py b/tests/integrations/github/cicd/test_config.py
index cb2d9ac3..50378fc2 100644
--- a/tests/integrations/github/cicd/test_config.py
+++ b/tests/integrations/github/cicd/test_config.py
@@ -8,6 +8,7 @@ from sqlmesh.core.config import (
     Config,
     load_config_from_paths,
 )
+from sqlmesh.utils.errors import ConfigError
 from sqlmesh.integrations.github.cicd.config import MergeMethod
 from tests.utils.test_filesystem import create_temp_file
 
@@ -181,7 +182,7 @@ model_defaults:
 """,
     )
     with pytest.raises(
-        ValueError, match="enable_deploy_command must be set if command_namespace is set"
+        ConfigError, match=r".*enable_deploy_command must be set if command_namespace is set.*"
     ):
         load_config_from_paths(Config, project_paths=[tmp_path / "config.yaml"])
 
@@ -197,7 +198,7 @@ model_defaults:
 """,
     )
     with pytest.raises(
-        ValueError, match="merge_method must be set if enable_deploy_command is True"
+        ConfigError, match=r".*merge_method must be set if enable_deploy_command is True.*"
     ):
         load_config_from_paths(Config, project_paths=[tmp_path / "config.yaml"])
 
@@ -226,8 +227,8 @@ model_defaults:
 """,
     )
     with pytest.raises(
-        ValueError,
-        match="TTL '1 week' is in the past. Please specify a relative time in the future. Ex: `in 1 week` instead of `1 week`.",
+        ConfigError,
+        match=r".*TTL '1 week' is in the past. Please specify a relative time in the future. Ex: `in 1 week` instead of `1 week`.*",
     ):
         load_config_from_paths(Config, project_paths=[tmp_path / "config.yaml"])