chore: make path optional

- more correctly represent path being optional

Author: benfdking

sqlmesh/core/context.py

@@ -935,10 +935,15 @@ def config_for_path(self, path: Path) -> t.Tuple[Config, Path]:
 
     def config_for_node(self, node: str | Model | Audit) -> Config:
         if isinstance(node, str):
-            return self.config_for_path(self.get_snapshot(node, raise_if_missing=True).node._path)[
-                0
-            ]  # type: ignore
-        return self.config_for_path(node._path)[0]  # type: ignore
+            path = self.get_snapshot(node, raise_if_missing=True).node._path
+            if path is None:
+                return self.config
+            config = self.config_for_path(path)
+            return config[0]
+        path = node._path
+        if path is None:
+            return self.config
+        return self.config_for_path(path)[0]  # type: ignore
 
     @property
     def models(self) -> MappingProxyType[str, Model]:

sqlmesh/core/macros.py

@@ -171,7 +171,7 @@ def __init__(
         resolve_tables: t.Optional[t.Callable[[exp.Expression], exp.Expression]] = None,
         snapshots: t.Optional[t.Dict[str, Snapshot]] = None,
         default_catalog: t.Optional[str] = None,
-        path: Path = Path(),
+        path: t.Optional[Path] = None,
         environment_naming_info: t.Optional[EnvironmentNamingInfo] = None,
         model_fqn: t.Optional[str] = None,
     ):
@@ -1384,7 +1384,7 @@ def normalize_macro_name(name: str) -> str:
 def call_macro(
     func: t.Callable,
     dialect: DialectType,
-    path: Path,
+    path: t.Optional[Path],
     provided_args: t.Tuple[t.Any, ...],
     provided_kwargs: t.Dict[str, t.Any],
     **optional_kwargs: t.Any,
@@ -1431,7 +1431,7 @@ def _coerce(
     expr: t.Any,
     typ: t.Any,
     dialect: DialectType,
-    path: Path,
+    path: t.Optional[Path] = None,
     strict: bool = False,
 ) -> t.Any:
     """Coerces the given expression to the specified type on a best-effort basis."""

sqlmesh/core/model/definition.py

@@ -1638,6 +1638,8 @@ def is_seed(self) -> bool:
     def seed_path(self) -> Path:
         seed_path = Path(self.kind.path)
         if not seed_path.is_absolute():
+            if self._path is None:
+                raise SQLMeshError(f"Seed model '{self.name}' has no path")
             return self._path.parent / seed_path
         return seed_path
 
@@ -2003,7 +2005,7 @@ def load_sql_based_model(
     expressions: t.List[exp.Expression],
     *,
     defaults: t.Optional[t.Dict[str, t.Any]] = None,
-    path: Path = Path(),
+    path: t.Optional[Path] = None,
     module_path: Path = Path(),
     time_column_format: str = c.DEFAULT_TIME_COLUMN_FORMAT,
     macros: t.Optional[MacroRegistry] = None,
@@ -2154,6 +2156,8 @@ def load_sql_based_model(
     # The name of the model will be inferred from its path relative to `models/`, if it's not explicitly specified
     name = meta_fields.pop("name", "")
     if not name and infer_names:
+        if path is None:
+            raise ValueError("Model must have a name", path)
         name = get_model_name(path)
 
     if not name:
@@ -2232,7 +2236,7 @@ def create_seed_model(
     name: TableName,
     seed_kind: SeedKind,
     *,
-    path: Path = Path(),
+    path: t.Optional[Path] = None,
     module_path: Path = Path(),
     **kwargs: t.Any,
 ) -> Model:
@@ -2251,7 +2255,12 @@ def create_seed_model(
         seed_path = module_path.joinpath(*subdirs)
         seed_kind.path = str(seed_path)
     elif not seed_path.is_absolute():
-        seed_path = path / seed_path if path.is_dir() else path.parent / seed_path
+        if path is None:
+            seed_path = seed_path
+        elif path.is_dir():
+            seed_path = path / seed_path
+        else:
+            seed_path = path.parent / seed_path
 
     seed = create_seed(seed_path)
 
@@ -2386,7 +2395,7 @@ def _create_model(
     name: TableName,
     *,
     defaults: t.Optional[t.Dict[str, t.Any]] = None,
-    path: Path = Path(),
+    path: t.Optional[Path] = None,
     time_column_format: str = c.DEFAULT_TIME_COLUMN_FORMAT,
     jinja_macros: t.Optional[JinjaMacroRegistry] = None,
     jinja_macro_references: t.Optional[t.Set[MacroReference]] = None,
@@ -2571,7 +2580,7 @@ def _create_model(
 
 def _split_sql_model_statements(
     expressions: t.List[exp.Expression],
-    path: Path,
+    path: t.Optional[Path],
     dialect: t.Optional[str] = None,
 ) -> t.Tuple[
     t.Optional[exp.Expression],
@@ -2692,7 +2701,7 @@ def _refs_to_sql(values: t.Any) -> exp.Expression:
 def render_meta_fields(
     fields: t.Dict[str, t.Any],
     module_path: Path,
-    path: Path,
+    path: t.Optional[Path],
     jinja_macros: t.Optional[JinjaMacroRegistry],
     macros: t.Optional[MacroRegistry],
     dialect: DialectType,
@@ -2776,7 +2785,7 @@ def render_field_value(value: t.Any) -> t.Any:
 def render_model_defaults(
     defaults: t.Dict[str, t.Any],
     module_path: Path,
-    path: Path,
+    path: t.Optional[Path],
     jinja_macros: t.Optional[JinjaMacroRegistry],
     macros: t.Optional[MacroRegistry],
     dialect: DialectType,
@@ -2826,7 +2835,7 @@ def parse_defaults_properties(
 def render_expression(
     expression: exp.Expression,
     module_path: Path,
-    path: Path,
+    path: t.Optional[Path],
     jinja_macros: t.Optional[JinjaMacroRegistry] = None,
     macros: t.Optional[MacroRegistry] = None,
     dialect: DialectType = None,

sqlmesh/core/node.py

@@ -196,7 +196,7 @@ class _Node(PydanticModel):
     interval_unit_: t.Optional[IntervalUnit] = Field(alias="interval_unit", default=None)
     tags: t.List[str] = []
     stamp: t.Optional[str] = None
-    _path: Path = Path()
+    _path: t.Optional[Path] = Path()
     _data_hash: t.Optional[str] = None
     _metadata_hash: t.Optional[str] = None
 

sqlmesh/core/renderer.py

@@ -43,7 +43,7 @@ def __init__(
         expression: exp.Expression,
         dialect: DialectType,
         macro_definitions: t.List[d.MacroDef],
-        path: Path = Path(),
+        path: t.Optional[Path] = None,
         jinja_macro_registry: t.Optional[JinjaMacroRegistry] = None,
         python_env: t.Optional[t.Dict[str, Executable]] = None,
         only_execution_time: bool = False,

sqlmesh/core/snapshot/definition.py

@@ -2173,7 +2173,7 @@ def _check_ready_intervals(
     context: ExecutionContext,
     python_env: t.Dict[str, Executable],
     dialect: DialectType = None,
-    path: Path = Path(),
+    path: t.Optional[Path] = None,
     kwargs: t.Optional[t.Dict] = None,
 ) -> Intervals:
     checked_intervals: Intervals = []

sqlmesh/dbt/converter/convert.py

@@ -207,6 +207,8 @@ def _convert_models(
 
         if model.kind.is_seed:
             # this will produce the original seed file, eg "items.csv"
+            if model._path is None:
+                raise ValueError(f"Unhandled model path: {model._path}")
             seed_filename = model._path.relative_to(input_paths.seeds)
 
             # seed definition - rename "items.csv" -> "items.sql"
@@ -219,12 +221,18 @@ def _convert_models(
             assert isinstance(model.kind, SeedKind)
             model.kind.path = str(Path("../seeds", seed_filename))
         else:
+            if model._path is None:
+                raise ValueError(f"Unhandled model path: {model._path}")
             if input_paths.models in model._path.parents:
                 model_filename = model._path.relative_to(input_paths.models)
             elif input_paths.snapshots in model._path.parents:
                 # /base/path/snapshots/foo.sql -> /output/path/models/dbt_snapshots/foo.sql
                 model_filename = "dbt_snapshots" / model._path.relative_to(input_paths.snapshots)
+            elif input_paths.tests in model._path.parents:
+                # /base/path/tests/foo.sql -> /output/path/audits/foo.sql
+                model_filename = "dbt_tests" / model._path.relative_to(input_paths.tests)
             elif input_paths.packages in model._path.parents:
+                # /base/path/dbt_packages/foo/models/bar.sql -> /output/path/models/dbt_packages/foo/models/bar.sql
                 model_filename = c.MIGRATED_DBT_PACKAGES / model._path.relative_to(
                     input_paths.packages
                 )
@@ -290,6 +298,8 @@ def _convert_standalone_audits(
 
         audit_definition_string = ";\n".join(stringified)
 
+        if audit._path is None:
+            continue
         audit_filename = audit._path.relative_to(input_paths.tests)
         audit_output_path = output_paths.audits / audit_filename
         audit_output_path.write_text(audit_definition_string)

sqlmesh/lsp/reference.py

@@ -164,6 +164,9 @@ def get_model_definitions_for_a_path(
     else:
         return []
 
+    if file_path is None:
+        return []
+
     # Find all possible references
     references: t.List[Reference] = []
 
@@ -235,8 +238,10 @@ def get_model_definitions_for_a_path(
                 if referenced_model is None:
                     continue
                 referenced_model_path = referenced_model._path
+                if referenced_model_path is None:
+                    continue
                 # Check whether the path exists
-                if not referenced_model_path.is_file():
+                if referenced_model_path is None or not referenced_model_path.is_file():
                     continue
                 referenced_model_uri = URI.from_path(referenced_model_path)
 
@@ -336,6 +341,9 @@ def get_macro_definitions_for_a_path(
     else:
         return []
 
+    if file_path is None:
+        return []
+
     references = []
     _, config_path = lsp_context.context.config_for_path(
         file_path,

sqlmesh/magics.py

@@ -237,8 +237,9 @@ def model(self, context: Context, line: str, sql: t.Optional[str] = None) -> Non
             if loaded.name == args.model:
                 model = loaded
         else:
-            with open(model._path, "r", encoding="utf-8") as file:
-                expressions = parse(file.read(), default_dialect=config.dialect)
+            if model._path:
+                with open(model._path, "r", encoding="utf-8") as file:
+                    expressions = parse(file.read(), default_dialect=config.dialect)
 
         formatted = format_model_expressions(
             expressions,
@@ -257,8 +258,9 @@ def model(self, context: Context, line: str, sql: t.Optional[str] = None) -> Non
             replace=True,
         )
 
-        with open(model._path, "w", encoding="utf-8") as file:
-            file.write(formatted)
+        if model._path:
+            with open(model._path, "w", encoding="utf-8") as file:
+                file.write(formatted)
 
         if sql:
             context.console.log_success(f"Model `{args.model}` updated")

tests/core/test_model.py

@@ -3290,7 +3290,7 @@ def runtime_macro(evaluator, **kwargs) -> None:
     model = load_sql_based_model(expressions)
     with pytest.raises(
         ConfigError,
-        match=r"Dependencies must be provided explicitly for models that can be rendered only at runtime at.*",
+        match=r"Dependencies must be provided explicitly for models that can be rendered only at runtime",
     ):
         model.validate_definition()
 
@@ -8105,7 +8105,7 @@ def test_physical_version():
 
     with pytest.raises(
         ConfigError,
-        match=r"Pinning a physical version is only supported for forward only models at.*",
+        match=r"Pinning a physical version is only supported for forward only models( at.*)?",
     ):
         load_sql_based_model(
             d.parse(